From c96bc1dc0e867518b09fafb5a168e676a71214dc Mon Sep 17 00:00:00 2001 From: zhangyue Date: Tue, 12 May 2026 10:33:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7=E5=BE=85?= =?UTF-8?q?=E5=8A=9E=E4=BA=8B=E9=A1=B9=E7=BB=9F=E8=AE=A1=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/project/KeyProjectController.java | 6 ++ .../SafetyEnvironmentalInspectionAddExe.java | 48 +++++++-------- .../command/query/hidden/HiddenQueryExe.java | 16 ++--- ...SafetyEnvironmentalInspectionQueryExe.java | 2 +- .../query/project/KeyProjectQueryExe.java | 60 +++++++++++++++++++ .../project/KeyProjectServiceImpl.java | 5 ++ .../api/project/KeyProjectServiceI.java | 2 + .../hidden/HiddenAcceptRecordCO.java | 2 + .../dto/clientobject/hidden/HiddenCO.java | 2 + .../hidden/HiddenRectificationRecordCO.java | 2 + .../clientobject/project/KeyProjectCO.java | 5 ++ .../project/KeyProjectCountCO.java | 42 +++++++++++++ .../key/project/dto/hidden/HiddenPageQry.java | 4 +- .../SafetyEnvironmentalInspectionPageQry.java | 2 +- .../dto/project/KeyProjectPageQry.java | 2 +- .../project/dto/project/KeyProjectQry.java | 2 +- .../dataobject/hidden/HiddenDO.java | 4 ++ .../dataobject/project/KeyProjectDO.java | 10 ++++ .../SafetyEnvironmentalInspectionMapper.java | 2 + ...fetyEnvironmentalInspectionUserMapper.java | 2 +- ...EnvironmentalInspectionRepositoryImpl.java | 1 + ...ronmentalInspectionUserRepositoryImpl.java | 5 ++ ...fetyEnvironmentalInspectionRepository.java | 1 + ...EnvironmentalInspectionUserRepository.java | 2 + .../main/resources/mapper/HiddenMapper.xml | 39 ++++++------ .../resources/mapper/KeyProjectMapper.xml | 22 ++++--- .../resources/mapper/ai/AiAlarmMapper.xml | 10 +++- .../SafetyEnvironmentalInspectionMapper.xml | 5 ++ ...afetyEnvironmentalInspectionUserMapper.xml | 12 ++++ 29 files changed, 252 insertions(+), 65 deletions(-) create mode 100644 web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectCountCO.java diff --git a/web-adapter/src/main/java/com/zcloud/key/project/web/project/KeyProjectController.java b/web-adapter/src/main/java/com/zcloud/key/project/web/project/KeyProjectController.java index 3443d2f..d953b20 100644 --- a/web-adapter/src/main/java/com/zcloud/key/project/web/project/KeyProjectController.java +++ b/web-adapter/src/main/java/com/zcloud/key/project/web/project/KeyProjectController.java @@ -68,6 +68,12 @@ public class KeyProjectController { return SingleResponse.of(keyProjectService.getInfoById(id)); } + @ApiOperation("用户待办事项-分公司/股份端") + @GetMapping("/count/{id}") + public SingleResponse count(@PathVariable("id") Long id) { + return keyProjectService.count(id); + } + @ApiOperation("删除") @PostMapping("/{id}") public Response remove(@PathVariable("id") Long id) { diff --git a/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionAddExe.java b/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionAddExe.java index aec5383..6faa05c 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionAddExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionAddExe.java @@ -127,33 +127,33 @@ public class SafetyEnvironmentalInspectionAddExe { // 初始化隐患数据 List hiddenFindUserList = new ArrayList(); hiddenAddCmdList.stream().forEach( - hiddenAddCmd -> { - if(ObjectUtils.isEmpty(hiddenAddCmd.getHiddenId())){ - hiddenAddCmd.setHiddenId(Tools.get32UUID()); - } - hiddenAddCmd.setForeignKey(safetyEnvironmentalInspectionE.getInspectionId()); - hiddenAddCmd.setState(1); + hiddenAddCmd -> { + if(ObjectUtils.isEmpty(hiddenAddCmd.getHiddenId())){ + hiddenAddCmd.setHiddenId(Tools.get32UUID()); + } + hiddenAddCmd.setForeignKey(safetyEnvironmentalInspectionE.getInspectionId()); + hiddenAddCmd.setState(1); // hiddenAddCmd.setRectificationCorpId(safetyEnvironmentalInspectionE.getXgfMasterCorpId()); // hiddenAddCmd.setRectificationDepartmentId(safetyEnvironmentalInspectionE.getXgfMasterDepartmentId()); - hiddenAddCmd.setRectificationUserId(safetyEnvironmentalInspectionE.getXgfMasterUserId()); - hiddenAddCmd.setAcceptCorpId(ssoUser.getTenantId()); - hiddenAddCmd.setAcceptDepartmentId(ssoUser.getOrgId()); - hiddenAddCmd.setAcceptUserId(ssoUser.getUserId()); - // 隐患发现人 - if (hiddenAddCmd.getHiddenFindUserList() != null && hiddenAddCmd.getHiddenFindUserList().size() > 0){ - hiddenAddCmd.getHiddenFindUserList().stream().forEach( - findUserId -> { - HiddenFindUserE hiddenFindUserE = new HiddenFindUserE(); - hiddenFindUserE.init(hiddenAddCmd.getHiddenId(), - safetyEnvironmentalInspectionE.getInspectionId(), - findUserId, - userMap.get(findUserId).getFindDepartmentId(), - userMap.get(findUserId).getFindCorpId()); - hiddenFindUserList.add(hiddenFindUserE); - } - ); - } + hiddenAddCmd.setRectificationUserId(safetyEnvironmentalInspectionE.getXgfMasterUserId()); + hiddenAddCmd.setAcceptCorpId(ssoUser.getTenantId()); + hiddenAddCmd.setAcceptDepartmentId(ssoUser.getOrgId()); + hiddenAddCmd.setAcceptUserId(ssoUser.getUserId()); + // 隐患发现人 + if (hiddenAddCmd.getHiddenFindUserList() != null && hiddenAddCmd.getHiddenFindUserList().size() > 0){ + hiddenAddCmd.getHiddenFindUserList().stream().forEach( + findUserId -> { + HiddenFindUserE hiddenFindUserE = new HiddenFindUserE(); + hiddenFindUserE.init(hiddenAddCmd.getHiddenId(), + safetyEnvironmentalInspectionE.getInspectionId(), + findUserId, + userMap.get(findUserId).getFindDepartmentId(), + userMap.get(findUserId).getFindCorpId()); + hiddenFindUserList.add(hiddenFindUserE); + } + ); } + } ); List hiddenList = BeanUtil.copyToList(hiddenAddCmdList, HiddenE.class); diff --git a/web-app/src/main/java/com/zcloud/key/project/command/query/hidden/HiddenQueryExe.java b/web-app/src/main/java/com/zcloud/key/project/command/query/hidden/HiddenQueryExe.java index 9ab4063..ddcaf94 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/query/hidden/HiddenQueryExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/query/hidden/HiddenQueryExe.java @@ -64,14 +64,14 @@ public class HiddenQueryExe { List hiddenFindUserDOs = hiddenFindUserRepository.listAll(params); if (hiddenFindUserDOs != null && hiddenFindUserDOs.size() > 0){ - StringBuffer userNames = new StringBuffer(); - StringBuffer departmentNames = new StringBuffer(); - hiddenFindUserDOs.stream().forEach(hiddenFindUserDO -> { - userNames.append(hiddenFindUserDO.getFindUserName()); - departmentNames.append(hiddenFindUserDO.getFindDepartmentName()); - }); - hiddenCO.setFindUserName(userNames.toString()); - hiddenCO.setFindDepartmentName(departmentNames.toString()); +// StringBuffer userNames = new StringBuffer(); +// StringBuffer departmentNames = new StringBuffer(); +// hiddenFindUserDOs.stream().forEach(hiddenFindUserDO -> { +// userNames.append(hiddenFindUserDO.getFindUserName()); +// departmentNames.append(hiddenFindUserDO.getFindDepartmentName()); +// }); +// hiddenCO.setFindUserName(userNames.toString()); +// hiddenCO.setFindDepartmentName(departmentNames.toString()); hiddenCO.setFindUserList(hiddenFindUserCoConvertor.converDOsToCOs(hiddenFindUserDOs)); } List hiddenRectificationRecordDOs = hiddenRectificationRecordRepository.listAll(params); diff --git a/web-app/src/main/java/com/zcloud/key/project/command/query/inspection/SafetyEnvironmentalInspectionQueryExe.java b/web-app/src/main/java/com/zcloud/key/project/command/query/inspection/SafetyEnvironmentalInspectionQueryExe.java index ef90817..423db13 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/query/inspection/SafetyEnvironmentalInspectionQueryExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/query/inspection/SafetyEnvironmentalInspectionQueryExe.java @@ -69,7 +69,7 @@ public class SafetyEnvironmentalInspectionQueryExe { SafetyEnvironmentalInspectionDO inspectionDO = safetyEnvironmentalInspectionRepository.getByInspectionId(uuid); Integer verifyType = 2; Integer affirmType = 3; - if (!ObjectUtils.isEmpty(inspectionDO.getDefendFlag()) && inspectionDO.getDefendFlag() == 1){ + if (!ObjectUtils.isEmpty(inspectionDO.getDefendFlag()) && inspectionDO.getDefendFlag() == 1 && inspectionDO.getStatus() != 7){ verifyType = 5; affirmType = 6; } diff --git a/web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectQueryExe.java b/web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectQueryExe.java index 90d6ef0..658bcf4 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectQueryExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectQueryExe.java @@ -2,6 +2,7 @@ package com.zcloud.key.project.command.query.project; import cn.hutool.core.collection.CollUtil; import com.alibaba.cola.dto.PageResponse; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jjb.saas.framework.auth.utils.AuthContext; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.key.project.command.convertor.project.KeyProjectCameraCoConvertor; @@ -9,8 +10,13 @@ import com.zcloud.key.project.command.convertor.project.KeyProjectCoConvertor; import com.zcloud.key.project.domain.enums.KeyProjectCameraTypeEnum; import com.zcloud.key.project.dto.clientobject.project.*; import com.zcloud.key.project.dto.project.*; +import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionDO; +import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionUserDO; import com.zcloud.key.project.persistence.dataobject.project.*; import com.zcloud.key.project.persistence.repository.CorpInfoRepository; +import com.zcloud.key.project.persistence.repository.hidden.HiddenRepository; +import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionRepository; +import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionUserRepository; import com.zcloud.key.project.persistence.repository.project.KeyProjectCameraRepository; import com.zcloud.key.project.persistence.repository.project.KeyProjectRepository; import lombok.AllArgsConstructor; @@ -35,6 +41,9 @@ public class KeyProjectQueryExe { private final KeyProjectCoConvertor keyProjectCoConvertor; private final KeyProjectCameraRepository keyProjectCameraRepository; private final KeyProjectCameraCoConvertor keyProjectCameraCoConvertor; + private final SafetyEnvironmentalInspectionRepository safetyEnvironmentalInspectionRepository; + private final SafetyEnvironmentalInspectionUserRepository safetyEnvironmentalInspectionUserRepository; + private final HiddenRepository hiddenRepository; private final CorpInfoRepository corpInfoRepository; /** @@ -194,5 +203,56 @@ public class KeyProjectQueryExe { return keyProjectCoConvertor.converXgfCorpDOsToCOs(xgfCorpDOList); } + + public KeyProjectCountCO count(Long id) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("jurisdiction_user_id", id); + queryWrapper.eq("delete_enum", "FALSE"); + queryWrapper.in("apply_status",2,5); + // 重点作业确认数量 + Long zdzyqrCount = keyProjectRepository.count(queryWrapper); + queryWrapper.clear(); + queryWrapper.eq("xgf_master_user_id", id); + queryWrapper.eq("delete_enum", "FALSE"); + queryWrapper.in("apply_status",1,4); + // 重点作业申请数量 + Long zdzysqCount = keyProjectRepository.count(queryWrapper); + // 检查核实数量 + List insUserList = safetyEnvironmentalInspectionUserRepository.listByUserId(id); + Long jchsCount = 0L; + Long shenbianclCount = 0L; + Long bjcrqrCount = 0L; + for (SafetyEnvironmentalInspectionUserDO insUser : insUserList) { + if (insUser.getType() == 2 || insUser.getType() == 5) { + jchsCount += 1; + } else if (insUser.getType() == 4) { + shenbianclCount += 1; + } else if (insUser.getType() == 3 || insUser.getType() == 6) { + bjcrqrCount += 1; + } + } + queryWrapper.clear(); + queryWrapper.eq("rectification_user_id", id); + queryWrapper.eq("delete_enum", "FALSE"); + queryWrapper.in("state",1,4); + Long yhdzgCount = hiddenRepository.count(queryWrapper); + queryWrapper.clear(); + queryWrapper.eq("accept_user_id", id); + queryWrapper.eq("delete_enum", "FALSE"); + queryWrapper.in("state",2); + Long yhdysCount = hiddenRepository.count(queryWrapper); + + + + KeyProjectCountCO keyProjectCountCO = new KeyProjectCountCO(); + keyProjectCountCO.setZdzyqrCount(zdzyqrCount); + keyProjectCountCO.setJchsCount(jchsCount); + keyProjectCountCO.setBjcrqrCount(bjcrqrCount); + keyProjectCountCO.setShenbianclCount(shenbianclCount); + keyProjectCountCO.setYhdzgCount(yhdzgCount); + keyProjectCountCO.setYhdysCount(yhdysCount); + keyProjectCountCO.setZdzysqCount(zdzysqCount); + return keyProjectCountCO; + } } diff --git a/web-app/src/main/java/com/zcloud/key/project/service/project/KeyProjectServiceImpl.java b/web-app/src/main/java/com/zcloud/key/project/service/project/KeyProjectServiceImpl.java index 859c13f..5240802 100644 --- a/web-app/src/main/java/com/zcloud/key/project/service/project/KeyProjectServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/key/project/service/project/KeyProjectServiceImpl.java @@ -103,5 +103,10 @@ public class KeyProjectServiceImpl implements KeyProjectServiceI { public void updatExecuteStatusJob() { keyProjectUpdateExe.updatExecuteStatusJob(); } + + @Override + public SingleResponse count(Long id) { + return SingleResponse.of(keyProjectQueryExe.count(id)); + } } diff --git a/web-client/src/main/java/com/zcloud/key/project/api/project/KeyProjectServiceI.java b/web-client/src/main/java/com/zcloud/key/project/api/project/KeyProjectServiceI.java index a45639e..3933a74 100644 --- a/web-client/src/main/java/com/zcloud/key/project/api/project/KeyProjectServiceI.java +++ b/web-client/src/main/java/com/zcloud/key/project/api/project/KeyProjectServiceI.java @@ -43,5 +43,7 @@ public interface KeyProjectServiceI { List getXgfCorp(GetXgfCorpQry qry); void updatExecuteStatusJob(); + + SingleResponse count(Long id); } diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenAcceptRecordCO.java b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenAcceptRecordCO.java index 892b799..5459f35 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenAcceptRecordCO.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenAcceptRecordCO.java @@ -2,6 +2,7 @@ package com.zcloud.key.project.dto.clientobject.hidden; import com.alibaba.cola.dto.ClientObject; import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -46,6 +47,7 @@ public class HiddenAcceptRecordCO extends ClientObject { private String acceptUserName; //验收时间 @ApiModelProperty(value = "验收时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime acceptTime; //乐观锁 @ApiModelProperty(value = "乐观锁") diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenCO.java b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenCO.java index e0c207d..be44294 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenCO.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenCO.java @@ -77,6 +77,8 @@ public class HiddenCO extends ClientObject { @ApiModelProperty(value = "整改时间", name = "rectificationTime") private String rectificationTime; // 整改时间 + @ApiModelProperty(value = "验收时间", name = "acceptTime") + private String acceptTime; // 验收时间 @ApiModelProperty(value = "验收人企业id", name = "racceptCorpId") private Long acceptCorpId; diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenRectificationRecordCO.java b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenRectificationRecordCO.java index da7c214..87b4f55 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenRectificationRecordCO.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenRectificationRecordCO.java @@ -1,6 +1,7 @@ package com.zcloud.key.project.dto.clientobject.hidden; import com.alibaba.cola.dto.ClientObject; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -38,6 +39,7 @@ public class HiddenRectificationRecordCO extends ClientObject { private Long rectificationUserId; //整改时间 @ApiModelProperty(value = "整改时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime rectificationTime; //整改描述 @ApiModelProperty(value = "整改描述") diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectCO.java b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectCO.java index 5c44062..4d197c0 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectCO.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectCO.java @@ -75,6 +75,11 @@ public class KeyProjectCO extends ClientObject { //是否设置监理单位,1:是,0:否 @ApiModelProperty(value = "是否设置监理单位,1:是,0:否") private Integer supervisionUnitFlag; + @ApiModelProperty(value = "未验收隐患数") + private Long uncheckHiddenCount; + + @ApiModelProperty(value = "未完成安全环保检查") + private Long unFinishInspectionCount; //监理单位名称 @ApiModelProperty(value = "监理单位名称") private String supervisionUnitCorpName; diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectCountCO.java b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectCountCO.java new file mode 100644 index 0000000..fa14d7b --- /dev/null +++ b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectCountCO.java @@ -0,0 +1,42 @@ +package com.zcloud.key.project.dto.clientobject.project; + +import com.alibaba.cola.dto.ClientObject; +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.List; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2026-03-16 10:00:38 + */ +@Data +public class KeyProjectCountCO extends ClientObject { + //主键 + @ApiModelProperty(value = "重点作业确认数量") + private Long zdzyqrCount; + + @ApiModelProperty(value = "重点作业申请数量") + private Long zdzysqCount; + + @ApiModelProperty(value = "检查核实数量") + private Long jchsCount; + @ApiModelProperty(value = "申辩处理数量") + private Long shenbianclCount; + @ApiModelProperty(value = "被检查人确认数量") + private Long bjcrqrCount; + @ApiModelProperty(value = "隐患待整改数量") + private Long yhdzgCount; + + @ApiModelProperty(value = "隐患待验收数量") + private Long yhdysCount; + +} + diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenPageQry.java b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenPageQry.java index c1a498a..084262e 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenPageQry.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenPageQry.java @@ -32,8 +32,10 @@ public class HiddenPageQry extends PageQuery { private String endTime; private String projectName; private String hiddenFindUserName; - + private String rectificationUserName; private List stateList; + private Long xgfCorpinfoId; + private Integer state; private String menuPath; diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionPageQry.java b/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionPageQry.java index e388614..d9d3ac6 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionPageQry.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionPageQry.java @@ -35,7 +35,7 @@ public class SafetyEnvironmentalInspectionPageQry extends PageQuery { private String projectName; private String inspectionUserName; private List statusList; - + private Integer status; private String year; private String menuPath; diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectPageQry.java b/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectPageQry.java index d0d2a01..e73989d 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectPageQry.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectPageQry.java @@ -57,7 +57,7 @@ public class KeyProjectPageQry extends PageQuery { @ApiModelProperty(value = "创建单位id") private Long corpinfoId; @ApiModelProperty(value = "创建单位名称") - private String corpinfName; + private String corpinfoName; @ApiModelProperty(value = "project_type") private String projectType; diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectQry.java b/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectQry.java index c12baf4..15fac5e 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectQry.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectQry.java @@ -58,7 +58,7 @@ public class KeyProjectQry implements Serializable { @ApiModelProperty(value = "创建单位id") private Long corpinfoId; @ApiModelProperty(value = "创建单位名称") - private String corpinfName; + private String corpinfoName; @ApiModelProperty(value = "project_type") private String projectType; diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/hidden/HiddenDO.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/hidden/HiddenDO.java index acc549d..0e8d01e 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/hidden/HiddenDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/hidden/HiddenDO.java @@ -85,6 +85,10 @@ public class HiddenDO extends BaseDO { @TableField(exist = false) private String rectificationTime; // 整改时间 + @ApiModelProperty(value = "验收时间", name = "acceptTime") + @TableField(exist = false) + private String acceptTime; // 验收时间 + @ApiModelProperty(value = "验收人企业id", name = "racceptCorpId") private Long acceptCorpId; diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/KeyProjectDO.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/KeyProjectDO.java index cf7d788..b582289 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/KeyProjectDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/KeyProjectDO.java @@ -64,6 +64,16 @@ public class KeyProjectDO extends BaseDO { //相关方企业id @ApiModelProperty(value = "相关方企业id") private Long xgfCorpinfoId; + + + + @ApiModelProperty(value = "未验收隐患数") + @TableField(exist = false) + private Long uncheckHiddenCount; + + @ApiModelProperty(value = "未完成安全环保检查") + @TableField(exist = false) + private Long unFinishInspectionCount; //相关方单位负责人id @ApiModelProperty(value = "相关方单位负责人id") private Long xgfMasterUserId; diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/inspection/SafetyEnvironmentalInspectionMapper.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/inspection/SafetyEnvironmentalInspectionMapper.java index 74c3400..2068f73 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/inspection/SafetyEnvironmentalInspectionMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/inspection/SafetyEnvironmentalInspectionMapper.java @@ -33,5 +33,7 @@ public interface SafetyEnvironmentalInspectionMapper extends BaseMapper listAll(@Param("params") Map params); + + } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/inspection/SafetyEnvironmentalInspectionUserMapper.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/inspection/SafetyEnvironmentalInspectionUserMapper.java index 42e5b7a..da697e6 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/inspection/SafetyEnvironmentalInspectionUserMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/inspection/SafetyEnvironmentalInspectionUserMapper.java @@ -18,6 +18,6 @@ import java.util.Map; public interface SafetyEnvironmentalInspectionUserMapper extends BaseMapper { List selectListByInspectionId(@Param("params") Map params); - + List listByUserId(Long userId); } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/inspection/SafetyEnvironmentalInspectionRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/inspection/SafetyEnvironmentalInspectionRepositoryImpl.java index 4421f83..711b465 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/inspection/SafetyEnvironmentalInspectionRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/inspection/SafetyEnvironmentalInspectionRepositoryImpl.java @@ -73,5 +73,6 @@ public class SafetyEnvironmentalInspectionRepositoryImpl extends BaseRepositoryI public List listAll(Map params) { return safetyEnvironmentalInspectionMapper.listAll(params); } + } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/inspection/SafetyEnvironmentalInspectionUserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/inspection/SafetyEnvironmentalInspectionUserRepositoryImpl.java index dcc3ec0..ddc962c 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/inspection/SafetyEnvironmentalInspectionUserRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/inspection/SafetyEnvironmentalInspectionUserRepositoryImpl.java @@ -115,5 +115,10 @@ public class SafetyEnvironmentalInspectionUserRepositoryImpl extends BaseReposit } return safetyEnvironmentalInspectionUserMapper.selectCount(queryWrapper); } + + @Override + public List listByUserId(Long userId) { + return safetyEnvironmentalInspectionUserMapper.listByUserId(userId); + } } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/inspection/SafetyEnvironmentalInspectionRepository.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/inspection/SafetyEnvironmentalInspectionRepository.java index 6617025..ee59472 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/inspection/SafetyEnvironmentalInspectionRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/inspection/SafetyEnvironmentalInspectionRepository.java @@ -25,5 +25,6 @@ public interface SafetyEnvironmentalInspectionRepository extends BaseRepository< SafetyEnvironmentalInspectionDO getInfoById(Long id); List listAll(Map params); + } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/inspection/SafetyEnvironmentalInspectionUserRepository.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/inspection/SafetyEnvironmentalInspectionUserRepository.java index 8e8898d..449e83b 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/inspection/SafetyEnvironmentalInspectionUserRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/inspection/SafetyEnvironmentalInspectionUserRepository.java @@ -32,5 +32,7 @@ public interface SafetyEnvironmentalInspectionUserRepository extends BaseReposit Long countByInspectionId(String inspectionId, Integer status, Integer type); + List listByUserId(Long userId); + } diff --git a/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml b/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml index 831188d..d0b3691 100644 --- a/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml @@ -9,10 +9,11 @@ h.*, ru.name as rectification_user_name, au.name as accept_user_name, - GROUP_CONCAT(DISTINCT hfu.name) hidden_find_user_name, + GROUP_CONCAT(DISTINCT hfu.name) find_user_name, GROUP_CONCAT(DISTINCT hfd.name) find_department_name, kp.project_name, - MAX(hrr.rectification_time) as rectification_time + MAX(hrr.rectification_time) as rectification_time, + MAX(har.accept_time) as accept_time from hidden h left join user ru on h.rectification_user_id = ru.id @@ -24,7 +25,9 @@ left join safety_environmental_inspection i on i.inspection_id = h.foreign_key left join key_project kp on kp.key_project_id = i.key_project_id left join hidden_rectification_record hrr on hrr.hidden_id = h.hidden_id and hrr.delete_enum = 'FALSE' + left join hidden_accept_record har on har.hidden_id = h.hidden_id and har.delete_enum = 'FALSE' and har.state = 1 + h.delete_enum = 'FALSE' and h.hidden_desc LIKE CONCAT('%', #{params.hiddenDesc}, '%') @@ -41,6 +44,10 @@ and kp.project_name LIKE CONCAT('%', #{params.projectName}, '%') + + and ru.name LIKE CONCAT('%', #{params.rectificationUserName}, '%') + + and h.state in @@ -49,11 +56,17 @@ + + and h.state = #{params.state} + + + and kp.xgf_corpinfo_id = #{params.xgfCorpinfoId} + + GROUP BY h.id HAVING hidden_find_user_name LIKE CONCAT('%', #{params.hiddenFindUserName}, '%') - GROUP BY h.id ORDER BY h.create_time desc @@ -65,14 +78,10 @@ kp.project_name, rci.corp_name as rectification_corp_name, ru.name as rectification_user_name, - rd.name as rectification_department_name + rd.name as rectification_department_name, - --- aci.corp_name as accept_corp_name, --- au.name as accept_user_name, --- ad.name as accept_department_name, --- GROUP_CONCAT(DISTINCT hfu.name) find_user_name, --- GROUP_CONCAT(DISTINCT hfd.name) find_department_name + GROUP_CONCAT(DISTINCT hfu.name) find_user_name, + GROUP_CONCAT(DISTINCT hfd.name) find_department_name from hidden h left join safety_environmental_inspection i on i.inspection_id = h.foreign_key @@ -81,13 +90,9 @@ left join user ru on ru.id = h.rectification_user_id left join department rd on rd.id = h.rectification_department_id --- left join corp_info aci on aci.id = h.accept_corp_id --- left join user au on au.id = h.accept_user_id --- left join department ad on ad.id = h.accept_department_id - --- left join hidden_find_user hf on hf.hidden_id = h.hidden_id and hf.delete_enum = 'FALSE' --- left join user hfu on hfu.id = hf.find_user_id --- left join department hfd on hfd.id = hfu.department_id + left join hidden_find_user hf on hf.hidden_id = h.hidden_id and hf.delete_enum = 'FALSE' + left join user hfu on hfu.id = hf.find_user_id + left join department hfd on hfd.id = hfu.department_id h.id = #{id} diff --git a/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml b/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml index 380c528..03d6ab9 100644 --- a/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml @@ -42,8 +42,8 @@ AND xgfci.corp_name LIKE CONCAT('%', #{params.xgfCorpinfoName}, '%') - - AND cp.corp_name LIKE CONCAT('%', #{params.corpinfName}, '%') + + AND cp.corp_name LIKE CONCAT('%', #{params.corpinfoName}, '%') AND kp.xgf_master_user_id = #{params.xgfMasterUserId} @@ -99,7 +99,9 @@ jurcorp.corp_name as jurisdictionCorpinfoName, juruser.name as jurisdictionUserName, xgfci.corp_name AS xgfCorpinfoName, - xgfuser.name as xgfUserName + xgfuser.name as xgfUserName, + count(h.hidden_id) AS uncheckHiddenCount, + count(sei.inspection_id) AS unFinishInspectionCount FROM key_project kp LEFT JOIN department fpd ON kp.master_department_id = fpd.id LEFT JOIN department ci ON kp.jurisdiction_department_id = ci.id @@ -108,6 +110,8 @@ LEFT JOIN corp_info xgfci ON kp.xgf_corpinfo_id = xgfci.id left join user xgfuser ON kp.xgf_master_user_id = xgfuser.id LEFT JOIN corp_info cp ON kp.corpinfo_id = cp.id + left join safety_environmental_inspection sei ON kp.key_project_id = sei.key_project_id and sei.delete_enum = 'FALSE' and sei.status not in (0 ,5) + left join hidden h on h.foreign_key = sei.inspection_id and h.delete_enum = 'FALSE' and h.state != 3 kp.delete_enum = 'FALSE' @@ -130,8 +134,8 @@ AND xgfci.corp_name LIKE CONCAT('%', #{params.xgfCorpinfoName}, '%') - - AND cp.corp_name LIKE CONCAT('%', #{params.corpinfName}, '%') + + AND cp.corp_name LIKE CONCAT('%', #{params.corpinfoName}, '%') AND kp.xgf_master_user_id = #{params.xgfMasterUserId} @@ -176,7 +180,8 @@ GROUP BY kp.key_project_id - ORDER BY kp.update_time desc + ORDER BY + IF(kp.update_time IS NOT NULL, kp.update_time, kp.create_time) DESC + + diff --git a/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionUserMapper.xml b/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionUserMapper.xml index 77327e7..cb83d7c 100644 --- a/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionUserMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionUserMapper.xml @@ -23,5 +23,17 @@ + +