diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityRegionController.java b/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityRegionController.java index d5003cabb..2fe6372ea 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityRegionController.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityRegionController.java @@ -102,7 +102,7 @@ public class QualityRegionController { * @return */ @ApiOperation(value = "通过id查询质量—检查部位信息", notes = "通过id查询质量—检查部位信息", httpMethod = "POST") - @ApiImplicitParam(name = "id", value = "质量—检查部位ID", paramType = "body", required = true, dataType = "Integer") + @ApiImplicitParam(name = "id", value = "质量—检查部位ID", paramType = "body", required = true, dataType = "String") @PostMapping(value = "/queryById") public Result queryById(@RequestBody Map map) { return Result.success(qualityRegionService.queryById(map)); diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/entity/DangerItemRecord.java b/src/main/java/com/zhgd/xmgl/modules/quality/entity/DangerItemRecord.java index 3280dd809..7d4aa155d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/entity/DangerItemRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/entity/DangerItemRecord.java @@ -89,6 +89,8 @@ public class DangerItemRecord implements Serializable { @ApiModelProperty(value = "记录状态，0 启用，1禁用") private java.lang.Integer recordStatus; - @ApiModelProperty(value="编码") - private java.lang.String itemCode ; + @ApiModelProperty(value = "编码") + private java.lang.String itemCode; + @ApiModelProperty(value = "扣分数") + private Double deductScore; } diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityInspectionRecord.java b/src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityInspectionRecord.java index 0dcfe0336..d71d86b12 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityInspectionRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityInspectionRecord.java @@ -244,7 +244,6 @@ public class QualityInspectionRecord implements Serializable { @ApiModelProperty(value = "合作单位id") private Long enterpriseId; - /** * 分部工程名称 */ diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityRegionMapper.xml b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityRegionMapper.xml index 582345dc5..e743e0981 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityRegionMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityRegionMapper.xml @@ -8,21 +8,23 @@ + - + diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/DangerTypeRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/DangerTypeRecordServiceImpl.java index 329d7eabb..46a574be6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/DangerTypeRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/DangerTypeRecordServiceImpl.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.quality.service.impl; +import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.execption.OpenAlertException; @@ -200,6 +201,7 @@ public class DangerTypeRecordServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); @@ -264,6 +266,7 @@ public class DangerTypeRecordServiceImpl extends ServiceImpl implements IQualityInspectionRecordService { + @Autowired + SanjiangDataCall sanjiangDataCall; + @Autowired + DangerItemRecordMapper dangerItemRecordMapper; + @Autowired + SystemUserMapper systemUserMapper; + @Autowired + WorkerInfoMapper workerInfoMapper; + @Autowired + XzDeductScoreRecordMapper xzDeductScoreRecordMapper; @Autowired private QualityRegionMapper qualityRegionMapper; @Autowired private EnterpriseInfoMapper enterpriseInfoMapper; @Autowired - SanjiangDataCall sanjiangDataCall; - @Autowired private QualityInspectionRecordMapper qualityInspectionRecordMapper; @Autowired private QualityRectifyRecordMapper qualityRectifyRecordMapper; @Autowired private INoticeService noticeService; + private static List getChildrenByQualityRegionId(Long regionId, List all) { + ArrayList list = new ArrayList<>(); + for (QualityRegion qualityRegion : all) { + if (Objects.equals(qualityRegion.getParentRegion(), regionId)) { + list.add(qualityRegion.getId()); + list.addAll(getChildrenByQualityRegionId(qualityRegion.getId(), all)); + } + } + return list; + } + + public static List getDayList() { + SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); + Date today = new Date(); + String date = fmt.format(today); + String minDateStr = ""; + Calendar calc = Calendar.getInstance(); + List datefor30List = new ArrayList<>(); + try { + for (int i = 0; i < 30; i++) { + calc.setTime(fmt.parse(date)); + calc.add(Calendar.DATE, -i); + Date minDate = calc.getTime(); + minDateStr = fmt.format(minDate); + datefor30List.add(minDateStr); + + } + } catch (ParseException e1) { + e1.printStackTrace(); + } + return datefor30List; + } + @Override public QualityInspectionRecordVo selectQualityInspectionRecordById(Map map) { QualityInspectionRecordVo vo = qualityInspectionRecordMapper.selectQualityInspectionRecordById(map); @@ -106,17 +155,6 @@ public class QualityInspectionRecordServiceImpl extends ServiceImpl getChildrenByQualityRegionId(Long regionId, List all) { - ArrayList list = new ArrayList<>(); - for (QualityRegion qualityRegion : all) { - if (Objects.equals(qualityRegion.getParentRegion(), regionId)) { - list.add(qualityRegion.getId()); - list.addAll(getChildrenByQualityRegionId(qualityRegion.getId(), all)); - } - } - return list; - } - @Override public SelectQualityStatisticsVo selectQualityStatistics(Map map) { SelectQualityStatisticsVo selectQualityStatisticsVo = new SelectQualityStatisticsVo(); @@ -227,6 +265,52 @@ public class QualityInspectionRecordServiceImpl extends ServiceImpl map = new HashMap<>(); + map.put("id", workerInfo.getId()); + map.put("deductScore", ds); + workerInfoMapper.updateScore(map); + + //存记录 + XzDeductScoreRecord vo = new XzDeductScoreRecord(); + vo.setProjectSn(hiddenDangerInspectRecord.getProjectSn()); + vo.setWorkerId(workerInfo.getId()); + vo.setTypeName(item.getContent()); + vo.setDeductScore(item.getDeductScore()); + vo.setType(1); + vo.setCreateDate(new Date()); + vo.setCurScore(workerInfo.getSafeScore() - item.getDeductScore()); + vo.setDeductReason(StrUtil.format("您在{}发现安全隐患({}-{})扣{}分", DateUtil.format(vo.getCreateDate(), "yyyy年MM月dd日HH:mm:ss"), "质量检査", vo.getTypeName() == null ? "无" : vo.getTypeName(), item.getDeductScore())); + xzDeductScoreRecordMapper.insert(vo); } @Override @@ -391,27 +475,5 @@ public class QualityInspectionRecordServiceImpl extends ServiceImpl getDayList() { - SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); - Date today = new Date(); - String date = fmt.format(today); - String minDateStr = ""; - Calendar calc = Calendar.getInstance(); - List datefor30List = new ArrayList<>(); - try { - for (int i = 0; i < 30; i++) { - calc.setTime(fmt.parse(date)); - calc.add(Calendar.DATE, -i); - Date minDate = calc.getTime(); - minDateStr = fmt.format(minDate); - datefor30List.add(minDateStr); - - } - } catch (ParseException e1) { - e1.printStackTrace(); - } - return datefor30List; - } - } diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java index c62451619..14a1879b0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java @@ -59,7 +59,7 @@ public class QualityRegionServiceImpl extends ServiceImpl systemUsers = qualityRegion.getSystemUsers(); if (CollUtil.isNotEmpty(systemUsers)) { - qualityRegion.setDutyName(StrUtil.join(",", systemUsers.stream().map(SystemUser::getRealName).collect(Collectors.toList()))); + qualityRegion.setDutyUserName(StrUtil.join(",", systemUsers.stream().map(SystemUser::getRealName).collect(Collectors.toList()))); } List enterpriseInfos = qualityRegion.getEnterpriseInfos(); if (CollUtil.isNotEmpty(enterpriseInfos)) { @@ -172,9 +172,13 @@ public class QualityRegionServiceImpl extends ServiceImpl map = new HashMap<>(); - map.put("enterpriseIdList", StrUtil.join(",", enterpriseInfos.stream().map(EnterpriseInfo::getId).collect(Collectors.toList()))); + map.put("enterpriseIdList", enterpriseInfos.stream().map(EnterpriseInfo::getId).collect(Collectors.toList())); + map.put("projectSn", qualityRegion.getProjectSn()); List systemUserList = systemUserService.getProjectChilderSystemUserList(map); Map userMap = systemUserList.stream().collect(Collectors.toMap(SystemUser::getUserId, Function.identity())); + if (CollUtil.isEmpty(userMap)) { + return; + } for (SystemUser systemUser : systemUsers) { Long userId = systemUser.getUserId(); if (userId == null) { diff --git a/src/main/java/com/zhgd/xmgl/util/HikvisionUtil.java b/src/main/java/com/zhgd/xmgl/util/HikvisionUtil.java index 93e13e3dc..56f6b117b 100644 --- a/src/main/java/com/zhgd/xmgl/util/HikvisionUtil.java +++ b/src/main/java/com/zhgd/xmgl/util/HikvisionUtil.java @@ -29,7 +29,7 @@ public class HikvisionUtil { headers.put("Accept", "*/*"); headers.put("Content-Type", "application/json"); //Request request = new Request(Method.POST_STRING, host, path, appKey, appSecret, Constants.DEFAULT_TIMEOUT); - Request request = new Request(Method.POST_STRING, host, path, appKey, appSecret, Constants.DEFAULT_TIMEOUT * 10); + Request request = new Request(Method.POST_STRING, host, path, appKey, appSecret, Constants.DEFAULT_TIMEOUT * 30); request.setHeaders(headers); request.setQuerys(querys); request.setStringBody(body); diff --git a/src/main/resources/excel/质量检查模板_导入模板.xlsx b/src/main/resources/excel/质量检查模板_导入模板.xlsx index 19c7e28c1..085a8136f 100644 Binary files a/src/main/resources/excel/质量检查模板_导入模板.xlsx and b/src/main/resources/excel/质量检查模板_导入模板.xlsx differ