diff --git a/start/pom.xml b/start/pom.xml index 9f013a0..5462690 100644 --- a/start/pom.xml +++ b/start/pom.xml @@ -39,7 +39,7 @@ org.springframework.boot spring-boot-maven-plugin - com.zcloud.risk.Application + com.zcloud.key.project.Application diff --git a/start/src/main/resources/nacos-prod.yml b/start/src/main/resources/nacos-prod.yml new file mode 100644 index 0000000..dc3719e --- /dev/null +++ b/start/src/main/resources/nacos-prod.yml @@ -0,0 +1,42 @@ +nacos: + url: prod-nacos:8848 + namespace: jjb-dragon +application: + name: jjb-saas-zcloud-key-project + version: + gateway: keyProject + cn-name: 重点作业 +spring: + application: + name: ${application.name}${application.version} + profiles: + # 环境配置 + active: test + cloud: + nacos: + config: + username: nacos + password: u9Hc7tLFBY + namespace: ${nacos.namespace} + server-addr: ${nacos.url} + file-extension: yml + shared-configs: + - config-common.yml + - config-port.yml + - config-mq.yml + - config-log.yml + - config-sdk-server.yml + - config-actuator.yml + - config-job.yml + - config-mysql.yml + - config-redis.yml + - config-cache.yml + - config-spring.yml + - config-mybatis.yml + - config-sdk.yml + - config-flyway.yml + discovery: + server-addr: ${spring.cloud.nacos.config.server-addr} + namespace: ${spring.cloud.nacos.config.namespace} + username: nacos + password: u9Hc7tLFBY diff --git a/start/src/main/resources/sdk-prod.yml b/start/src/main/resources/sdk-prod.yml new file mode 100644 index 0000000..83e59d1 --- /dev/null +++ b/start/src/main/resources/sdk-prod.yml @@ -0,0 +1,51 @@ +sdk: + server: + app-key: eff71d20c66840919c16e06554f17990 + client: + gateway: + url: ${common.gateway.network.http.external} + route: + - client: + system-code: ${application.name} + name: ${application.cn-name}-后端 + group-code: public_api + service: + system-code: ${application.name} + name: ${application.cn-name}-后端 + group-code: public_api + strip-prefix: 0 + uri: http://${application.name} + path: /${application.gateway}/** + - client: + system-code: ${application.name}-container + name: ${application.cn-name}-前端 + group-code: public_api + service: + system-code: ${application.name}-container + name: ${application.cn-name}-前端 + group-code: public_api + strip-prefix: 0 + uri: http://jjb-saas-base + path: /${application.gateway}/container/** + order: -2 +openapi: + appId: 1871106785124999168 + appKey: 7314ecfc11ff4d5fad1ac19284ed2ac3 + appSecret: 7565ab15-a2ae-4830-9b4d-fb382cd5fb30 + appPublicKey: 3059301306072a8648ce3d020106082a811ccf5501822d03420004f339671110a06681fcfd968ad9247bd3cd0d2ec6b2159d1d4b775e7ed5566b3297d82cf14b626ef11fdd6bc7ecb6bcfb3ea94ccd1f381f4116f43367be4b360f + appPrivateKey: 308193020100301306072a8648ce3d020106082a811ccf5501822d0479307702010104206b6abc8e717b7d042f1e8531190a7c18113e4a701417f2770d2150d33ba97779a00a06082a811ccf5501822da14403420004f339671110a06681fcfd968ad9247bd3cd0d2ec6b2159d1d4b775e7ed5566b3297d82cf14b626ef11fdd6bc7ecb6bcfb3ea94ccd1f381f4116f43367be4b360f + encryptType: SM2 + platform: + - name: default + openPublicKey: 3059301306072a8648ce3d020106082a811ccf5501822d034200045b5d8fcad91e113910406db4caf0f5c6688048e0f46742d55f872a25855316803ddb177cc9bb5906ff0b2ad4d6b1f1378a49109104613e79b5b5512e3710e88f + url: ${common.gateway.network.http.intranet} + protocol: HTTP + defaultPlatform: true + ##ciphertext plaintext + type: plaintext + apiPlatform: + - name: default + #多个可以逗号隔开 + apiCode: test:01 + #多个可以逗号隔开，可以为空 + tenantIds: 1838408702262321152 diff --git a/web-adapter/src/main/java/com/zcloud/key/project/web/inspection/SafetyEnvironmentalInspectionController.java b/web-adapter/src/main/java/com/zcloud/key/project/web/inspection/SafetyEnvironmentalInspectionController.java index 84cfd03..ca17003 100644 --- a/web-adapter/src/main/java/com/zcloud/key/project/web/inspection/SafetyEnvironmentalInspectionController.java +++ b/web-adapter/src/main/java/com/zcloud/key/project/web/inspection/SafetyEnvironmentalInspectionController.java @@ -5,11 +5,10 @@ import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.Response; import com.alibaba.cola.dto.SingleResponse; -import com.jjb.saas.framework.auth.model.SSOUser; -import com.jjb.saas.framework.auth.utils.AuthContext; import com.zcloud.key.project.api.inspection.SafetyEnvironmentalInspectionServiceI; import com.zcloud.key.project.dto.clientobject.inspection.SafetyEnvironmentalInspectionCO; import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionAddCmd; +import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionAuditDefendCmd; import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionPageQry; import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionUpdateCmd; import io.swagger.annotations.Api; @@ -36,10 +35,36 @@ public class SafetyEnvironmentalInspectionController { @ApiOperation("新增") @PostMapping("/save") public SingleResponse add(@Validated @RequestBody SafetyEnvironmentalInspectionAddCmd cmd) { - SSOUser ssoUser = AuthContext.getCurrentUser(); return safetyEnvironmentalInspectionService.add(cmd); } + + +// @ApiOperation("新增") +// @PostMapping("/save") +// public SingleResponse add(@Validated @RequestBody SafetyEnvironmentalInspectionAddCmd cmd) { +// return safetyEnvironmentalInspectionService.add(cmd); +// } + + + @ApiOperation("修改") + @PostMapping("/edit") + public SingleResponse edit(@Validated @RequestBody SafetyEnvironmentalInspectionUpdateCmd safetyEnvironmentalInspectionUpdateCmd) { + safetyEnvironmentalInspectionService.edit(safetyEnvironmentalInspectionUpdateCmd); + return SingleResponse.buildSuccess(); + } + @ApiOperation("申辩成立") + @PostMapping("/defendPass") + public Response defendPass(@Validated @RequestBody SafetyEnvironmentalInspectionAuditDefendCmd cmd) { + safetyEnvironmentalInspectionService.defendPass(cmd); + return Response.buildSuccess(); + } + @ApiOperation("申辩不成立") + @PostMapping("/defendNotPass") + public Response defendNotPass(@Validated @RequestBody SafetyEnvironmentalInspectionAuditDefendCmd cmd) { + safetyEnvironmentalInspectionService.defendNotPass(cmd); + return Response.buildSuccess(); + } @ApiOperation("分页") @PostMapping("/list") public PageResponse page(@RequestBody SafetyEnvironmentalInspectionPageQry qry) { @@ -59,7 +84,7 @@ public class SafetyEnvironmentalInspectionController { } @ApiOperation("删除") - @DeleteMapping("/{id}") + @PostMapping("/{id}") public Response remove(@PathVariable("id") Long id) { safetyEnvironmentalInspectionService.remove(id); return SingleResponse.buildSuccess(); @@ -72,11 +97,5 @@ public class SafetyEnvironmentalInspectionController { return SingleResponse.buildSuccess(); } - @ApiOperation("修改") - @PutMapping("/edit") - public SingleResponse edit(@Validated @RequestBody SafetyEnvironmentalInspectionUpdateCmd safetyEnvironmentalInspectionUpdateCmd) { - safetyEnvironmentalInspectionService.edit(safetyEnvironmentalInspectionUpdateCmd); - return SingleResponse.buildSuccess(); - } } diff --git a/web-adapter/src/main/java/com/zcloud/key/project/web/inspection/SafetyEnvironmentalInspectionDefendController.java b/web-adapter/src/main/java/com/zcloud/key/project/web/inspection/SafetyEnvironmentalInspectionDefendController.java index e3fedc6..7cc9cd3 100644 --- a/web-adapter/src/main/java/com/zcloud/key/project/web/inspection/SafetyEnvironmentalInspectionDefendController.java +++ b/web-adapter/src/main/java/com/zcloud/key/project/web/inspection/SafetyEnvironmentalInspectionDefendController.java @@ -40,6 +40,13 @@ public class SafetyEnvironmentalInspectionDefendController { return safetyEnvironmentalInspectionDefendService.add(cmd); } + @ApiOperation("确认") + @PostMapping("/affirm") + public Response affirm(@Validated @RequestBody SafetyEnvironmentalInspectionDefendAddCmd cmd) { + return safetyEnvironmentalInspectionDefendService.affirm(cmd); + } + + @ApiOperation("分页") @PostMapping("/list") public PageResponse page(@RequestBody SafetyEnvironmentalInspectionDefendPageQry qry) { diff --git a/web-adapter/src/main/java/com/zcloud/key/project/web/inspection/SafetyEnvironmentalInspectionUserController.java b/web-adapter/src/main/java/com/zcloud/key/project/web/inspection/SafetyEnvironmentalInspectionUserController.java index 8d95996..520f265 100644 --- a/web-adapter/src/main/java/com/zcloud/key/project/web/inspection/SafetyEnvironmentalInspectionUserController.java +++ b/web-adapter/src/main/java/com/zcloud/key/project/web/inspection/SafetyEnvironmentalInspectionUserController.java @@ -12,6 +12,7 @@ import com.zcloud.key.project.dto.clientobject.inspection.SafetyEnvironmentalIns import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionUserAddCmd; import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionUserPageQry; import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionUserUpdateCmd; +import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionUserVerifyCmd; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; @@ -39,6 +40,11 @@ public class SafetyEnvironmentalInspectionUserController { SSOUser ssoUser = AuthContext.getCurrentUser(); return safetyEnvironmentalInspectionUserService.add(cmd); } + @ApiOperation("核实") + @PostMapping("/verify") + public Response verify(@Validated @RequestBody SafetyEnvironmentalInspectionUserVerifyCmd cmd) { + return safetyEnvironmentalInspectionUserService.verify(cmd); + } @ApiOperation("分页") @PostMapping("/list") 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 21c7ce4..b02301d 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 @@ -1,13 +1,41 @@ package com.zcloud.key.project.command.inspection; +import cn.hutool.core.bean.BeanUtil; import com.alibaba.cola.exception.BizException; +import com.jjb.saas.framework.auth.model.SSOUser; +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.gbscommon.utils.Tools; +import com.zcloud.key.project.command.hidden.HiddenAddExe; +import com.zcloud.key.project.command.hidden.HiddenFindUserRemoveExe; import com.zcloud.key.project.domain.gateway.inspection.SafetyEnvironmentalInspectionGateway; +import com.zcloud.key.project.domain.model.hidden.HiddenE; +import com.zcloud.key.project.domain.model.hidden.HiddenFindUserE; +import com.zcloud.key.project.domain.model.inspection.SafetyEnvironmentalInspectionContentE; import com.zcloud.key.project.domain.model.inspection.SafetyEnvironmentalInspectionE; +import com.zcloud.key.project.domain.model.inspection.SafetyEnvironmentalInspectionUserE; +import com.zcloud.key.project.dto.clientobject.inspection.SafetyEnvironmentalInspectionCO; +import com.zcloud.key.project.dto.hidden.HiddenAddCmd; import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionAddCmd; +import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionContentAddCmd; +import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionUserAddCmd; +import com.zcloud.key.project.persistence.dataobject.hidden.HiddenDO; +import com.zcloud.key.project.persistence.dataobject.hidden.HiddenFindUserDO; +import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionContentDO; +import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionUserDO; +import com.zcloud.key.project.persistence.repository.hidden.HiddenFindUserRepository; +import com.zcloud.key.project.persistence.repository.hidden.HiddenRepository; +import com.zcloud.key.project.persistence.repository.impl.inspection.SafetyEnvironmentalInspectionContentRepositoryImpl; +import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionContentRepository; +import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionUserRepository; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.ObjectUtils; + +import java.util.ArrayList; +import java.util.List; /** @@ -18,23 +46,112 @@ import org.springframework.transaction.annotation.Transactional; */ @Component @AllArgsConstructor +@Slf4j public class SafetyEnvironmentalInspectionAddExe { private final SafetyEnvironmentalInspectionGateway safetyEnvironmentalInspectionGateway; + private final SafetyEnvironmentalInspectionUserRepository safetyEnvironmentalInspectionUserRepository; + private final SafetyEnvironmentalInspectionContentRepository safetyEnvironmentalInspectionContentRepository; + private final HiddenRepository hiddenRepository; + private final HiddenFindUserRepository hiddenFindUserRepository; + @Transactional(rollbackFor = Exception.class) - public boolean execute(SafetyEnvironmentalInspectionAddCmd cmd) { + public SafetyEnvironmentalInspectionCO execute(SafetyEnvironmentalInspectionAddCmd cmd) { + SSOUser ssoUser = AuthContext.getCurrentUser(); SafetyEnvironmentalInspectionE safetyEnvironmentalInspectionE = new SafetyEnvironmentalInspectionE(); BeanUtils.copyProperties(cmd, safetyEnvironmentalInspectionE); + + safetyEnvironmentalInspectionE.initSave(ssoUser); + List safetyEnvironmentalInspectionUserAddCmdList = cmd.getInspectionUserList(); + List safetyEnvironmentalInspectionContentAddCmdList = cmd.getInspectionContentList(); + List hiddenAddCmdList = cmd.getHiddenList(); + // 当正式保存时，判断检查人和检查内容不能为空 + if (cmd.getStatus() == 1) { + if(safetyEnvironmentalInspectionUserAddCmdList == null || safetyEnvironmentalInspectionUserAddCmdList.size() == 0){ + throw new BizException("未添加检查人，请选择检查人"); + } + if(safetyEnvironmentalInspectionContentAddCmdList == null || safetyEnvironmentalInspectionContentAddCmdList.size() == 0){ + throw new BizException("未添加检查内容，请选择检查人"); + } + } + safetyEnvironmentalInspectionE.setHiddenNumber(hiddenAddCmdList != null ? hiddenAddCmdList.size() : 0); + // 初始化发起人数据 + SafetyEnvironmentalInspectionUserE initiatorE = new SafetyEnvironmentalInspectionUserE(); + initiatorE.initSave(safetyEnvironmentalInspectionE, ssoUser, 1, 1); + + // 初始化检查人数据 + List insUserList = BeanUtil.copyToList(safetyEnvironmentalInspectionUserAddCmdList, SafetyEnvironmentalInspectionUserE.class); + SafetyEnvironmentalInspectionUserE safetyEnvironmentalInspectionUserE = new SafetyEnvironmentalInspectionUserE(); + insUserList = safetyEnvironmentalInspectionUserE.initSaveList(insUserList, safetyEnvironmentalInspectionE, ssoUser); + // 初始化检查内容数据 + List insContentList = BeanUtil.copyToList(safetyEnvironmentalInspectionContentAddCmdList, SafetyEnvironmentalInspectionContentE.class); + SafetyEnvironmentalInspectionContentE safetyEnvironmentalInspectionContentE = new SafetyEnvironmentalInspectionContentE(); + safetyEnvironmentalInspectionContentE.initSaveList(insContentList, safetyEnvironmentalInspectionE); + + + + boolean res = false; try { + // 新增安全环保检查数据 res = safetyEnvironmentalInspectionGateway.add(safetyEnvironmentalInspectionE); + // 新增发起人和检查核实人数据 + if (insUserList == null){ + insUserList = new ArrayList(); + } + insUserList.add(initiatorE); + safetyEnvironmentalInspectionUserRepository.batchInsert(BeanUtil.copyToList(insUserList, SafetyEnvironmentalInspectionUserDO.class)); + // 新增检查内容数据 + safetyEnvironmentalInspectionContentRepository.batchInsert(BeanUtil.copyToList(insContentList, SafetyEnvironmentalInspectionContentDO.class)); + // 新增隐患数据 + if (hiddenAddCmdList != null && hiddenAddCmdList.size() > 0){ + // 初始化隐患数据 + 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.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( + hiddenFindUserAddCmd -> { + HiddenFindUserE hiddenFindUserE = new HiddenFindUserE(); + hiddenFindUserE.setHiddenFindUserId(Tools.get32UUID()); + hiddenFindUserAddCmd.setHiddenId(hiddenAddCmd.getHiddenId()); + hiddenFindUserAddCmd.setForeignKey(safetyEnvironmentalInspectionE.getInspectionId()); + BeanUtils.copyProperties(hiddenFindUserAddCmd, hiddenFindUserE); + hiddenFindUserList.add(hiddenFindUserE); + } + ); + } + } + ); + + List hiddenList = BeanUtil.copyToList(hiddenAddCmdList, HiddenE.class); + // 新增隐患 + hiddenRepository.batchInsert(BeanUtil.copyToList(hiddenList, HiddenDO.class)); + // 新增隐患发现人 + hiddenFindUserRepository.batchInsert(BeanUtil.copyToList(hiddenFindUserList, HiddenFindUserDO.class)); + } } catch (Exception e) { + log.error("报错了", e); throw new RuntimeException(e); } if (!res) { throw new BizException("保存失败"); } - return true; + SafetyEnvironmentalInspectionCO safetyEnvironmentalInspectionCO = new SafetyEnvironmentalInspectionCO(); + BeanUtils.copyProperties(safetyEnvironmentalInspectionE, safetyEnvironmentalInspectionCO); + return safetyEnvironmentalInspectionCO; } } diff --git a/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionDefendAddExe.java b/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionDefendAddExe.java index af35e34..f98a8c8 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionDefendAddExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionDefendAddExe.java @@ -1,14 +1,26 @@ package com.zcloud.key.project.command.inspection; import com.alibaba.cola.exception.BizException; +import com.jjb.saas.framework.auth.model.SSOUser; +import com.jjb.saas.framework.auth.utils.AuthContext; import com.zcloud.key.project.domain.gateway.inspection.SafetyEnvironmentalInspectionDefendGateway; +import com.zcloud.key.project.domain.gateway.inspection.SafetyEnvironmentalInspectionGateway; +import com.zcloud.key.project.domain.gateway.inspection.SafetyEnvironmentalInspectionUserGateway; import com.zcloud.key.project.domain.model.inspection.SafetyEnvironmentalInspectionDefendE; +import com.zcloud.key.project.domain.model.inspection.SafetyEnvironmentalInspectionUserE; import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionDefendAddCmd; +import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionDO; +import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionUserDO; +import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionRepository; +import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionUserRepository; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDateTime; +import java.util.List; + /** * web-app @@ -20,6 +32,9 @@ import org.springframework.transaction.annotation.Transactional; @AllArgsConstructor public class SafetyEnvironmentalInspectionDefendAddExe { private final SafetyEnvironmentalInspectionDefendGateway safetyEnvironmentalInspectionDefendGateway; + private final SafetyEnvironmentalInspectionRepository safetyEnvironmentalInspectionRepository; + private final SafetyEnvironmentalInspectionUserRepository safetyEnvironmentalInspectionUserRepository; + private final SafetyEnvironmentalInspectionUserGateway safetyEnvironmentalInspectionUserGateway; @Transactional(rollbackFor = Exception.class) public boolean execute(SafetyEnvironmentalInspectionDefendAddCmd cmd) { @@ -36,5 +51,55 @@ public class SafetyEnvironmentalInspectionDefendAddExe { } return true; } + @Transactional(rollbackFor = Exception.class) + public void affirmExecute(SafetyEnvironmentalInspectionDefendAddCmd cmd) { + SSOUser ssoUser = AuthContext.getCurrentUser(); + SafetyEnvironmentalInspectionDefendE safetyEnvironmentalInspectionDefendE = new SafetyEnvironmentalInspectionDefendE(); + BeanUtils.copyProperties(cmd, safetyEnvironmentalInspectionDefendE); + safetyEnvironmentalInspectionDefendE.init(); + // 判断是否申辩 + SafetyEnvironmentalInspectionUserDO safetyEnvironmentalInspectionUserDO = new SafetyEnvironmentalInspectionUserDO(); + safetyEnvironmentalInspectionUserDO.setInspectionId(cmd.getInspectionId()); + safetyEnvironmentalInspectionUserDO.setUserId(ssoUser.getUserId()); + safetyEnvironmentalInspectionUserDO.setType(3); + safetyEnvironmentalInspectionUserDO.setSignatureTime(LocalDateTime.now()); + if(cmd.getIsDefend() == 1){ // 申辩 + // 将确认人改为不通过 + safetyEnvironmentalInspectionUserDO.setStatus(2); + safetyEnvironmentalInspectionUserRepository.editUserInfo(safetyEnvironmentalInspectionUserDO); + // 将安全环保检查状态改为被检查申辩 + safetyEnvironmentalInspectionRepository.updateStatus(cmd.getInspectionId(), 7, 1); + // 新增申辩信息 + safetyEnvironmentalInspectionDefendGateway.add(safetyEnvironmentalInspectionDefendE); + // 增加待申辩人 + // 查找发起人，作为申辩信息审核人 + List initiator = safetyEnvironmentalInspectionUserRepository.listAllByInspectionId(cmd.getInspectionId(), 1); + SafetyEnvironmentalInspectionUserE inspectionUserE = new SafetyEnvironmentalInspectionUserE(); + inspectionUserE.init(cmd.getInspectionId(), 0, 4, initiator.get(0).getCorpId(), initiator.get(0).getDepartmentId(), initiator.get(0).getUserId()); + safetyEnvironmentalInspectionUserGateway.add(inspectionUserE); + }else if (cmd.getIsDefend() == 0){ // 不申辩 + // 将确认人改为通过 + safetyEnvironmentalInspectionUserDO.setStatus(1); + safetyEnvironmentalInspectionUserRepository.editUserInfo(safetyEnvironmentalInspectionUserDO); + + SafetyEnvironmentalInspectionDO inspectionDO = safetyEnvironmentalInspectionRepository.getByInspectionId(cmd.getInspectionId()); + if(inspectionDO.getHiddenNumber() > 0){ + // 有隐患，将安全环保检查状态改为3-待隐患整改 + safetyEnvironmentalInspectionRepository.updateStatus(cmd.getInspectionId(), 3); + // 增加下一步 有隐患，则指定隐患整改人 + SafetyEnvironmentalInspectionUserE hiddenRectificationUser = new SafetyEnvironmentalInspectionUserE(); + hiddenRectificationUser.init(cmd.getInspectionId(), 0, 7, inspectionDO.getXgfMasterUserCorpinfoId(), inspectionDO.getXgfMasterUserDepartmentId(), inspectionDO.getXgfMasterUserId()); + safetyEnvironmentalInspectionUserGateway.add(hiddenRectificationUser); + } else { + // 没有隐患，将安全环保检查状态改为已归档 + safetyEnvironmentalInspectionRepository.updateStatus(cmd.getInspectionId(), 5); + // 增加下一步 没有隐患，则直接归档 + SafetyEnvironmentalInspectionUserE hiddenRectificationUser = new SafetyEnvironmentalInspectionUserE(); + hiddenRectificationUser.init(cmd.getInspectionId(), 1, 9, inspectionDO.getTenantId(), inspectionDO.getOrgId(), inspectionDO.getCreateId()); + hiddenRectificationUser.setSignatureTime(LocalDateTime.now()); + safetyEnvironmentalInspectionUserGateway.add(hiddenRectificationUser); + } + } + } } diff --git a/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionRemoveExe.java b/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionRemoveExe.java index 6b99b58..369c1b4 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionRemoveExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionRemoveExe.java @@ -1,11 +1,26 @@ package com.zcloud.key.project.command.inspection; import com.alibaba.cola.exception.BizException; +import com.zcloud.gbscommon.zcloudimgfiles.facade.ZcloudImgFilesFacade; import com.zcloud.key.project.domain.gateway.inspection.SafetyEnvironmentalInspectionGateway; +import com.zcloud.key.project.persistence.dataobject.hidden.HiddenDO; +import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionContentDO; +import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionDO; +import com.zcloud.key.project.persistence.repository.hidden.HiddenFindUserRepository; +import com.zcloud.key.project.persistence.repository.hidden.HiddenRepository; +import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionContentRepository; +import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionRepository; +import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionUserRepository; import lombok.AllArgsConstructor; +import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + /** * web-app @@ -17,10 +32,36 @@ import org.springframework.transaction.annotation.Transactional; @AllArgsConstructor public class SafetyEnvironmentalInspectionRemoveExe { private final SafetyEnvironmentalInspectionGateway safetyEnvironmentalInspectionGateway; + private final SafetyEnvironmentalInspectionRepository safetyEnvironmentalInspectionRepository; + private final SafetyEnvironmentalInspectionUserRepository safetyEnvironmentalInspectionUserRepository; + private final SafetyEnvironmentalInspectionContentRepository safetyEnvironmentalInspectionContentRepository; + private final HiddenRepository hiddenRepository; + private final HiddenFindUserRepository hiddenFindUserRepository; + @DubboReference + private ZcloudImgFilesFacade zcloudImgFilesFacade; @Transactional(rollbackFor = Exception.class) public boolean execute(Long id) { + SafetyEnvironmentalInspectionDO inspectionDO = safetyEnvironmentalInspectionRepository.getById(id); boolean res = safetyEnvironmentalInspectionGateway.deletedSafetyEnvironmentalInspectionById(id); + // 删除检查核实人数据 + safetyEnvironmentalInspectionUserRepository.deleteByInspectionId(inspectionDO.getInspectionId(), null); + + // 删除检查内容 + List deleteContentList = safetyEnvironmentalInspectionContentRepository.listAllByInspectionId(inspectionDO.getInspectionId()); + safetyEnvironmentalInspectionContentRepository.deleteByInspectionId(inspectionDO.getInspectionId()); + List foreignKeyList = deleteContentList.stream().map(SafetyEnvironmentalInspectionContentDO::getContentId).collect(Collectors.toList()); + // 删除检查内容图片 +// zcloudImgFilesFacade.deleteFiles(foreignKeyList, null); + Map params = new HashMap(); + params.put("eqForeignKey", inspectionDO.getInspectionId()); + // 删除隐患 + List deleteHiddenList = hiddenRepository.listAll(params); + List hiddenVideoFile = deleteHiddenList.stream().map(HiddenDO::getVideoUrl).collect(Collectors.toList()); +// zcloudImgFilesFacade.deleteFileList(hiddenVideoFile); + hiddenRepository.deleteBatch(params); + hiddenFindUserRepository.batchDelete(params); + if (!res) { throw new BizException("删除失败"); } diff --git a/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionUpdateExe.java b/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionUpdateExe.java index fe2c589..b2bf4c3 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionUpdateExe.java @@ -1,13 +1,47 @@ package com.zcloud.key.project.command.inspection; +import cn.hutool.core.bean.BeanUtil; import com.alibaba.cola.exception.BizException; +import com.jjb.saas.framework.auth.model.SSOUser; +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.gbscommon.utils.Tools; +import com.zcloud.gbscommon.zcloudimgfiles.facade.ZcloudImgFilesFacade; import com.zcloud.key.project.domain.gateway.inspection.SafetyEnvironmentalInspectionGateway; +import com.zcloud.key.project.domain.gateway.inspection.SafetyEnvironmentalInspectionUserGateway; +import com.zcloud.key.project.domain.model.hidden.HiddenE; +import com.zcloud.key.project.domain.model.hidden.HiddenFindUserE; +import com.zcloud.key.project.domain.model.inspection.SafetyEnvironmentalInspectionContentE; +import com.zcloud.key.project.domain.model.inspection.SafetyEnvironmentalInspectionDefendE; import com.zcloud.key.project.domain.model.inspection.SafetyEnvironmentalInspectionE; -import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionUpdateCmd; +import com.zcloud.key.project.domain.model.inspection.SafetyEnvironmentalInspectionUserE; +import com.zcloud.key.project.dto.hidden.HiddenAddCmd; +import com.zcloud.key.project.dto.inspection.*; +import com.zcloud.key.project.persistence.dataobject.hidden.HiddenDO; +import com.zcloud.key.project.persistence.dataobject.hidden.HiddenFindUserDO; +import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionContentDO; +import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionDO; +import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionDefendDO; +import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionUserDO; +import com.zcloud.key.project.persistence.repository.hidden.HiddenFindUserRepository; +import com.zcloud.key.project.persistence.repository.hidden.HiddenRepository; +import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionContentRepository; +import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionDefendRepository; +import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionRepository; +import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionUserRepository; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.ObjectUtils; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** @@ -18,16 +52,287 @@ import org.springframework.transaction.annotation.Transactional; */ @Component @AllArgsConstructor +@Slf4j public class SafetyEnvironmentalInspectionUpdateExe { private final SafetyEnvironmentalInspectionGateway safetyEnvironmentalInspectionGateway; + private final SafetyEnvironmentalInspectionUserRepository safetyEnvironmentalInspectionUserRepository; + private final SafetyEnvironmentalInspectionContentRepository safetyEnvironmentalInspectionContentRepository; + private final SafetyEnvironmentalInspectionRepository safetyEnvironmentalInspectionRepository; + private final SafetyEnvironmentalInspectionUserGateway safetyEnvironmentalInspectionUserGateway; + private final SafetyEnvironmentalInspectionDefendRepository safetyEnvironmentalInspectionDefendRepository; + private final HiddenRepository hiddenRepository; + private final HiddenFindUserRepository hiddenFindUserRepository; + + @DubboReference + private ZcloudImgFilesFacade zcloudImgFilesFacade; @Transactional(rollbackFor = Exception.class) - public void execute(SafetyEnvironmentalInspectionUpdateCmd safetyEnvironmentalInspectionUpdateCmd) { + public boolean execute(SafetyEnvironmentalInspectionUpdateCmd cmd) { + SSOUser ssoUser = AuthContext.getCurrentUser(); SafetyEnvironmentalInspectionE safetyEnvironmentalInspectionE = new SafetyEnvironmentalInspectionE(); - BeanUtils.copyProperties(safetyEnvironmentalInspectionUpdateCmd, safetyEnvironmentalInspectionE); - boolean res = safetyEnvironmentalInspectionGateway.update(safetyEnvironmentalInspectionE); + BeanUtils.copyProperties(cmd, safetyEnvironmentalInspectionE); + safetyEnvironmentalInspectionE.init(ssoUser); + List safetyEnvironmentalInspectionUserAddCmdList = cmd.getInspectionUserList(); + List safetyEnvironmentalInspectionContentAddCmdList = cmd.getInspectionContentList(); + List hiddenAddCmdList = cmd.getHiddenList(); + // 当正式保存时，判断检查人和检查内容不能为空 + if (cmd.getStatus() == 1) { + if(safetyEnvironmentalInspectionUserAddCmdList == null || safetyEnvironmentalInspectionUserAddCmdList.size() == 0){ + throw new BizException("未添加检查人，请选择检查人"); + } + if(safetyEnvironmentalInspectionContentAddCmdList == null || safetyEnvironmentalInspectionContentAddCmdList.size() == 0){ + throw new BizException("未添加检查内容，请选择检查人"); + } + } + safetyEnvironmentalInspectionE.setHiddenNumber(hiddenAddCmdList != null ? hiddenAddCmdList.size() : 0); + + // 初始化检查人数据 + List insUserList = BeanUtil.copyToList(safetyEnvironmentalInspectionUserAddCmdList, SafetyEnvironmentalInspectionUserE.class); + SafetyEnvironmentalInspectionUserE safetyEnvironmentalInspectionUserE = new SafetyEnvironmentalInspectionUserE(); + insUserList = safetyEnvironmentalInspectionUserE.initSaveList(insUserList, safetyEnvironmentalInspectionE, ssoUser); + // 初始化检查内容数据 + List insContentList = BeanUtil.copyToList(safetyEnvironmentalInspectionContentAddCmdList, SafetyEnvironmentalInspectionContentE.class); + SafetyEnvironmentalInspectionContentE safetyEnvironmentalInspectionContentE = new SafetyEnvironmentalInspectionContentE(); + safetyEnvironmentalInspectionContentE.initSaveList(insContentList, safetyEnvironmentalInspectionE); + + + + + boolean res = false; + try { + // 修改安全环保检查数据 + res = safetyEnvironmentalInspectionGateway.update(safetyEnvironmentalInspectionE); + // 删除检查核实人数据 + safetyEnvironmentalInspectionUserRepository.deleteByInspectionId(safetyEnvironmentalInspectionE.getInspectionId(), 2); + // 新增检查核实人数据 + safetyEnvironmentalInspectionUserRepository.batchInsert(BeanUtil.copyToList(insUserList, SafetyEnvironmentalInspectionUserDO.class)); + + // 删除检查内容 + List deleteContentList = safetyEnvironmentalInspectionContentRepository.listAllByInspectionId(safetyEnvironmentalInspectionE.getInspectionId()); + safetyEnvironmentalInspectionContentRepository.deleteByInspectionId(safetyEnvironmentalInspectionE.getInspectionId()); + List foreignKeyList = deleteContentList.stream().map(SafetyEnvironmentalInspectionContentDO::getContentId).collect(Collectors.toList()); + // 删除检查内容图片 +// zcloudImgFilesFacade.deleteFiles(foreignKeyList, null); + // 新增检查内容数据 + safetyEnvironmentalInspectionContentRepository.batchInsert(BeanUtil.copyToList(insContentList, SafetyEnvironmentalInspectionContentDO.class)); + + + Map params = new HashMap(); + params.put("eqForeignKey", safetyEnvironmentalInspectionE.getInspectionId()); + // 删除隐患 + List deleteHiddenList = hiddenRepository.listAll(params); + List hiddenVideoFile = deleteHiddenList.stream().map(HiddenDO::getVideoUrl).collect(Collectors.toList()); +// zcloudImgFilesFacade.deleteFileList(hiddenVideoFile); + hiddenRepository.deleteBatch(params); + hiddenFindUserRepository.batchDelete(params); + // 新增隐患数据 + if (hiddenAddCmdList != null && hiddenAddCmdList.size() > 0){ + // 初始化隐患数据 + 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.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( + hiddenFindUserAddCmd -> { + HiddenFindUserE hiddenFindUserE = new HiddenFindUserE(); + hiddenFindUserE.setHiddenFindUserId(Tools.get32UUID()); + hiddenFindUserAddCmd.setHiddenId(hiddenAddCmd.getHiddenId()); + hiddenFindUserAddCmd.setForeignKey(safetyEnvironmentalInspectionE.getInspectionId()); + BeanUtils.copyProperties(hiddenFindUserAddCmd, hiddenFindUserE); + hiddenFindUserList.add(hiddenFindUserE); + } + ); + } + } + ); + + List hiddenList = BeanUtil.copyToList(hiddenAddCmdList, HiddenE.class); + // 新增隐患 + hiddenRepository.batchInsert(BeanUtil.copyToList(hiddenList, HiddenDO.class)); + // 新增隐患发现人 + hiddenFindUserRepository.batchInsert(BeanUtil.copyToList(hiddenFindUserList, HiddenFindUserDO.class)); + } + } catch (Exception e) { + log.error("报错了", e); + throw new RuntimeException(e); + } if (!res) { - throw new BizException("修改失败"); + throw new BizException("保存失败"); + } + return true; + } + + + + + @Transactional(rollbackFor = Exception.class) + public void defendPassExecute(SafetyEnvironmentalInspectionAuditDefendCmd cmd) { + + SSOUser ssoUser = AuthContext.getCurrentUser(); + // 申辩通过，先处理申辩信息 + SafetyEnvironmentalInspectionDefendDO defendDO = new SafetyEnvironmentalInspectionDefendDO(); + defendDO.setInspectionId(cmd.getInspectionId()); + defendDO.setIsPass(1); + defendDO.setCheckSign(cmd.getCheckSign()); + defendDO.setCheckSignTime(LocalDateTime.now()); + safetyEnvironmentalInspectionDefendRepository.updateByInspectionId(defendDO); + // 申辩不通过，直接进入隐患整改步骤 + SafetyEnvironmentalInspectionUserDO safetyEnvironmentalInspectionUserDO = new SafetyEnvironmentalInspectionUserDO(); + safetyEnvironmentalInspectionUserDO.setInspectionId(cmd.getInspectionId()); + safetyEnvironmentalInspectionUserDO.setUserId(ssoUser.getUserId()); + safetyEnvironmentalInspectionUserDO.setType(4); + safetyEnvironmentalInspectionUserDO.setSignatureTime(LocalDateTime.now()); + safetyEnvironmentalInspectionUserDO.setStatus(1); + safetyEnvironmentalInspectionUserRepository.editUserInfo(safetyEnvironmentalInspectionUserDO); + // 申辩通过，重新修改进入核实流程 + SafetyEnvironmentalInspectionE safetyEnvironmentalInspectionE = new SafetyEnvironmentalInspectionE(); + BeanUtils.copyProperties(cmd, safetyEnvironmentalInspectionE); + safetyEnvironmentalInspectionE.init(ssoUser); + safetyEnvironmentalInspectionE.setStatus(1); + List safetyEnvironmentalInspectionUserAddCmdList = cmd.getInspectionUserList(); + List safetyEnvironmentalInspectionContentAddCmdList = cmd.getInspectionContentList(); + List hiddenAddCmdList = cmd.getHiddenList(); + // 判断检查人和检查内容不能为空 + if(safetyEnvironmentalInspectionUserAddCmdList == null || safetyEnvironmentalInspectionUserAddCmdList.size() == 0){ + throw new BizException("未添加检查人，请选择检查人"); + } + if(safetyEnvironmentalInspectionContentAddCmdList == null || safetyEnvironmentalInspectionContentAddCmdList.size() == 0){ + throw new BizException("未添加检查内容，请选择检查人"); + } + safetyEnvironmentalInspectionE.setHiddenNumber(hiddenAddCmdList != null ? hiddenAddCmdList.size() : 0); + + // 初始化检查人数据 + List insUserList = BeanUtil.copyToList(safetyEnvironmentalInspectionUserAddCmdList, SafetyEnvironmentalInspectionUserE.class); + SafetyEnvironmentalInspectionUserE safetyEnvironmentalInspectionUserE = new SafetyEnvironmentalInspectionUserE(); + insUserList = safetyEnvironmentalInspectionUserE.initSaveList(insUserList, safetyEnvironmentalInspectionE, ssoUser, 5); + // 初始化检查内容数据 + List insContentList = BeanUtil.copyToList(safetyEnvironmentalInspectionContentAddCmdList, SafetyEnvironmentalInspectionContentE.class); + SafetyEnvironmentalInspectionContentE safetyEnvironmentalInspectionContentE = new SafetyEnvironmentalInspectionContentE(); + safetyEnvironmentalInspectionContentE.initSaveList(insContentList, safetyEnvironmentalInspectionE); + + + + + boolean res = false; + try { + // 修改安全环保检查数据 + res = safetyEnvironmentalInspectionGateway.update(safetyEnvironmentalInspectionE); + // 新增检查核实人数据 + safetyEnvironmentalInspectionUserRepository.batchInsert(BeanUtil.copyToList(insUserList, SafetyEnvironmentalInspectionUserDO.class)); + + // 删除检查内容 + List deleteContentList = safetyEnvironmentalInspectionContentRepository.listAllByInspectionId(safetyEnvironmentalInspectionE.getInspectionId()); + safetyEnvironmentalInspectionContentRepository.deleteByInspectionId(safetyEnvironmentalInspectionE.getInspectionId()); + List foreignKeyList = deleteContentList.stream().map(SafetyEnvironmentalInspectionContentDO::getContentId).collect(Collectors.toList()); + // 删除检查内容图片 +// zcloudImgFilesFacade.deleteFiles(foreignKeyList, null); + // 新增检查内容数据 + safetyEnvironmentalInspectionContentRepository.batchInsert(BeanUtil.copyToList(insContentList, SafetyEnvironmentalInspectionContentDO.class)); + + + Map params = new HashMap(); + params.put("eqForeignKey", safetyEnvironmentalInspectionE.getInspectionId()); + // 删除隐患 + List deleteHiddenList = hiddenRepository.listAll(params); + List hiddenVideoFile = deleteHiddenList.stream().map(HiddenDO::getVideoUrl).collect(Collectors.toList()); +// zcloudImgFilesFacade.deleteFileList(hiddenVideoFile); + hiddenRepository.deleteBatch(params); + hiddenFindUserRepository.batchDelete(params); + // 新增隐患数据 + if (hiddenAddCmdList != null && hiddenAddCmdList.size() > 0){ + // 初始化隐患数据 + 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.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( + hiddenFindUserAddCmd -> { + HiddenFindUserE hiddenFindUserE = new HiddenFindUserE(); + hiddenFindUserE.setHiddenFindUserId(Tools.get32UUID()); + hiddenFindUserAddCmd.setHiddenId(hiddenAddCmd.getHiddenId()); + hiddenFindUserAddCmd.setForeignKey(safetyEnvironmentalInspectionE.getInspectionId()); + BeanUtils.copyProperties(hiddenFindUserAddCmd, hiddenFindUserE); + hiddenFindUserList.add(hiddenFindUserE); + } + ); + } + } + ); + + List hiddenList = BeanUtil.copyToList(hiddenAddCmdList, HiddenE.class); + // 新增隐患 + hiddenRepository.batchInsert(BeanUtil.copyToList(hiddenList, HiddenDO.class)); + // 新增隐患发现人 + hiddenFindUserRepository.batchInsert(BeanUtil.copyToList(hiddenFindUserList, HiddenFindUserDO.class)); + } + } catch (Exception e) { + log.error("报错了", e); + throw new RuntimeException(e); + } + if (!res) { + throw new BizException("保存失败"); + } + } + + @Transactional(rollbackFor = Exception.class) + public void defendNotPassExecute(SafetyEnvironmentalInspectionAuditDefendCmd cmd) { + SSOUser ssoUser = AuthContext.getCurrentUser(); + SafetyEnvironmentalInspectionDefendE safetyEnvironmentalInspectionDefendE = new SafetyEnvironmentalInspectionDefendE(); + BeanUtils.copyProperties(cmd, safetyEnvironmentalInspectionDefendE); + SafetyEnvironmentalInspectionDefendDO defendDO = new SafetyEnvironmentalInspectionDefendDO(); + defendDO.setInspectionId(cmd.getInspectionId()); + defendDO.setIsPass(2); + defendDO.setRejectContent(cmd.getRejectContent()); + defendDO.setCheckSign(cmd.getCheckSign()); + defendDO.setCheckSignTime(LocalDateTime.now()); + safetyEnvironmentalInspectionDefendRepository.updateByInspectionId(defendDO); + // 申辩不通过，直接进入隐患整改步骤 + SafetyEnvironmentalInspectionUserDO safetyEnvironmentalInspectionUserDO = new SafetyEnvironmentalInspectionUserDO(); + safetyEnvironmentalInspectionUserDO.setInspectionId(cmd.getInspectionId()); + safetyEnvironmentalInspectionUserDO.setUserId(ssoUser.getUserId()); + safetyEnvironmentalInspectionUserDO.setType(4); + safetyEnvironmentalInspectionUserDO.setSignatureTime(LocalDateTime.now()); + safetyEnvironmentalInspectionUserDO.setStatus(2); + safetyEnvironmentalInspectionUserRepository.editUserInfo(safetyEnvironmentalInspectionUserDO); + + SafetyEnvironmentalInspectionDO inspectionDO = safetyEnvironmentalInspectionRepository.getByInspectionId(cmd.getInspectionId()); + if(inspectionDO.getHiddenNumber() > 0){ + // 有隐患，将安全环保检查状态改为3-待隐患整改 + safetyEnvironmentalInspectionRepository.updateStatus(cmd.getInspectionId(), 3); + // 增加下一步 有隐患，则指定隐患整改人 + SafetyEnvironmentalInspectionUserE hiddenRectificationUser = new SafetyEnvironmentalInspectionUserE(); + hiddenRectificationUser.init(cmd.getInspectionId(), 0, 7, inspectionDO.getXgfMasterUserCorpinfoId(), inspectionDO.getXgfMasterUserDepartmentId(), inspectionDO.getXgfMasterUserId()); + safetyEnvironmentalInspectionUserGateway.add(hiddenRectificationUser); + } else { + // 没有隐患，将安全环保检查状态改为已归档 + safetyEnvironmentalInspectionRepository.updateStatus(cmd.getInspectionId(), 5); + // 增加下一步 没有隐患，则直接归档 + SafetyEnvironmentalInspectionUserE hiddenRectificationUser = new SafetyEnvironmentalInspectionUserE(); + hiddenRectificationUser.init(cmd.getInspectionId(), 1, 9, inspectionDO.getTenantId(), inspectionDO.getOrgId(), inspectionDO.getCreateId()); + hiddenRectificationUser.setSignatureTime(LocalDateTime.now()); + safetyEnvironmentalInspectionUserGateway.add(hiddenRectificationUser); } } } diff --git a/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionUserUpdateExe.java b/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionUserUpdateExe.java index 2109bbb..75c70de 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionUserUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionUserUpdateExe.java @@ -1,9 +1,17 @@ package com.zcloud.key.project.command.inspection; import com.alibaba.cola.exception.BizException; +import com.jjb.saas.framework.auth.model.SSOUser; +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.key.project.domain.gateway.inspection.SafetyEnvironmentalInspectionGateway; import com.zcloud.key.project.domain.gateway.inspection.SafetyEnvironmentalInspectionUserGateway; import com.zcloud.key.project.domain.model.inspection.SafetyEnvironmentalInspectionUserE; import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionUserUpdateCmd; +import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionUserVerifyCmd; +import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionDO; +import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionUserDO; +import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionRepository; +import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionUserRepository; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; @@ -20,6 +28,8 @@ import org.springframework.transaction.annotation.Transactional; @AllArgsConstructor public class SafetyEnvironmentalInspectionUserUpdateExe { private final SafetyEnvironmentalInspectionUserGateway safetyEnvironmentalInspectionUserGateway; + private final SafetyEnvironmentalInspectionUserRepository safetyEnvironmentalInspectionUserRepository; + private final SafetyEnvironmentalInspectionRepository safetyEnvironmentalInspectionRepository; @Transactional(rollbackFor = Exception.class) public void execute(SafetyEnvironmentalInspectionUserUpdateCmd safetyEnvironmentalInspectionUserUpdateCmd) { @@ -30,5 +40,34 @@ public class SafetyEnvironmentalInspectionUserUpdateExe { throw new BizException("修改失败"); } } + + @Transactional(rollbackFor = Exception.class) + public void verifyExecute(SafetyEnvironmentalInspectionUserVerifyCmd cmd) { + SSOUser ssoUser = AuthContext.getCurrentUser(); + SafetyEnvironmentalInspectionUserE inspectionUserE = new SafetyEnvironmentalInspectionUserE(); + BeanUtils.copyProperties(cmd, inspectionUserE); + inspectionUserE.initVerify(ssoUser); + SafetyEnvironmentalInspectionUserDO inspectionUserDO = new SafetyEnvironmentalInspectionUserDO(); + BeanUtils.copyProperties(inspectionUserE, inspectionUserDO); + + // 修改自己的检查信息 + safetyEnvironmentalInspectionUserRepository.verifyEdit(inspectionUserDO); + if (cmd.getStatus() == 1){ // 如果通过 + // 查询是否所有人都核实， + Long count = safetyEnvironmentalInspectionUserRepository.countByInspectionId(inspectionUserE.getInspectionId(), 0, 2); + if (count == 0){ + // 如果都核实了，则将安全环保检查改为待确认 + safetyEnvironmentalInspectionRepository.updateStatus(inspectionUserE.getInspectionId(), 2); + // SafetyEnvironmentalInspectionUser 增加下一步，确认人 + SafetyEnvironmentalInspectionUserE affirmUser = new SafetyEnvironmentalInspectionUserE(); + SafetyEnvironmentalInspectionDO inspectionDO = safetyEnvironmentalInspectionRepository.getByInspectionId(inspectionUserE.getInspectionId()); + affirmUser.init(cmd.getInspectionId(), 0, 3, inspectionDO.getXgfMasterUserCorpinfoId(), inspectionDO.getXgfMasterUserDepartmentId(), inspectionDO.getXgfMasterUserId()); + safetyEnvironmentalInspectionUserGateway.add(affirmUser); + } + } else if (cmd.getStatus() == 2){ // 如果不通过 + // 将安全环保检查改为核实打回 + safetyEnvironmentalInspectionRepository.updateStatus(inspectionUserE.getInspectionId(), 6); + } + } } 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 4cb723c..2b8a7e6 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 @@ -2,11 +2,23 @@ package com.zcloud.key.project.command.query.inspection; import com.alibaba.cola.dto.PageResponse; import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.key.project.command.convertor.hidden.HiddenCoConvertor; import com.zcloud.key.project.command.convertor.inspection.SafetyEnvironmentalInspectionCoConvertor; +import com.zcloud.key.project.command.convertor.inspection.SafetyEnvironmentalInspectionContentCoConvertor; +import com.zcloud.key.project.command.convertor.inspection.SafetyEnvironmentalInspectionUserCoConvertor; +import com.zcloud.key.project.dto.clientobject.hidden.HiddenCO; import com.zcloud.key.project.dto.clientobject.inspection.SafetyEnvironmentalInspectionCO; +import com.zcloud.key.project.dto.clientobject.inspection.SafetyEnvironmentalInspectionContentCO; +import com.zcloud.key.project.dto.clientobject.inspection.SafetyEnvironmentalInspectionUserCO; import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionPageQry; +import com.zcloud.key.project.persistence.dataobject.hidden.HiddenDO; +import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionContentDO; import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionDO; +import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionUserDO; +import com.zcloud.key.project.persistence.repository.hidden.HiddenRepository; +import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionContentRepository; import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionRepository; +import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionUserRepository; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; @@ -25,7 +37,12 @@ import java.util.Map; public class SafetyEnvironmentalInspectionQueryExe { private final SafetyEnvironmentalInspectionRepository safetyEnvironmentalInspectionRepository; private final SafetyEnvironmentalInspectionCoConvertor safetyEnvironmentalInspectionCoConvertor; - + private final SafetyEnvironmentalInspectionUserRepository safetyEnvironmentalInspectionUserRepository; + private final SafetyEnvironmentalInspectionContentRepository safetyEnvironmentalInspectionContentRepository; + private final HiddenRepository hiddenRepository; + private final SafetyEnvironmentalInspectionUserCoConvertor safetyEnvironmentalInspectionUserCoConvertor; + private final SafetyEnvironmentalInspectionContentCoConvertor safetyEnvironmentalInspectionContentCoConvertor; + private final HiddenCoConvertor hiddenCoConvertor; /** * 根据id查询 * @@ -33,7 +50,18 @@ public class SafetyEnvironmentalInspectionQueryExe { * @return */ public SafetyEnvironmentalInspectionCO queryById(Long id) { - return safetyEnvironmentalInspectionCoConvertor.converDOToCO(safetyEnvironmentalInspectionRepository.getById(id)); + SafetyEnvironmentalInspectionDO inspectionDO = safetyEnvironmentalInspectionRepository.getById(id); + List inspectionUserDOs = safetyEnvironmentalInspectionUserRepository.listAllByInspectionId(inspectionDO.getInspectionId()); + List inspectionContentDOs = safetyEnvironmentalInspectionContentRepository.listAllByInspectionId(inspectionDO.getInspectionId()); + List hiddenDOs = hiddenRepository.listAllByInspectionId(inspectionDO.getInspectionId()); + List inspectionUserCOS = safetyEnvironmentalInspectionUserCoConvertor.converDOsToCOs(inspectionUserDOs); + List inspectionContentCOS = safetyEnvironmentalInspectionContentCoConvertor.converDOsToCOs(inspectionContentDOs); + List hiddenCOS = hiddenCoConvertor.converDOsToCOs(hiddenDOs); + SafetyEnvironmentalInspectionCO inspectionCO = safetyEnvironmentalInspectionCoConvertor.converDOToCO(inspectionDO); + inspectionCO.setInspectionUserList(inspectionUserCOS); + inspectionCO.setInspectionContentList(inspectionContentCOS); + inspectionCO.setHiddenList(hiddenCOS); + return inspectionCO; } /** diff --git a/web-app/src/main/java/com/zcloud/key/project/service/inspection/SafetyEnvironmentalInspectionDefendServiceImpl.java b/web-app/src/main/java/com/zcloud/key/project/service/inspection/SafetyEnvironmentalInspectionDefendServiceImpl.java index e8c6cce..2b76fc4 100644 --- a/web-app/src/main/java/com/zcloud/key/project/service/inspection/SafetyEnvironmentalInspectionDefendServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/key/project/service/inspection/SafetyEnvironmentalInspectionDefendServiceImpl.java @@ -1,6 +1,7 @@ package com.zcloud.key.project.service.inspection; import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.Response; import com.alibaba.cola.dto.SingleResponse; import com.zcloud.key.project.api.inspection.SafetyEnvironmentalInspectionDefendServiceI; import com.zcloud.key.project.command.inspection.SafetyEnvironmentalInspectionDefendAddExe; @@ -46,6 +47,12 @@ public class SafetyEnvironmentalInspectionDefendServiceImpl implements SafetyEnv return SingleResponse.buildSuccess(); } + @Override + public Response affirm(SafetyEnvironmentalInspectionDefendAddCmd cmd) { + safetyEnvironmentalInspectionDefendAddExe.affirmExecute(cmd); + return Response.buildSuccess(); + } + @Override public void edit(SafetyEnvironmentalInspectionDefendUpdateCmd safetyEnvironmentalInspectionDefendUpdateCmd) { safetyEnvironmentalInspectionDefendUpdateExe.execute(safetyEnvironmentalInspectionDefendUpdateCmd); diff --git a/web-app/src/main/java/com/zcloud/key/project/service/inspection/SafetyEnvironmentalInspectionServiceImpl.java b/web-app/src/main/java/com/zcloud/key/project/service/inspection/SafetyEnvironmentalInspectionServiceImpl.java index 8e844a6..c14e02a 100644 --- a/web-app/src/main/java/com/zcloud/key/project/service/inspection/SafetyEnvironmentalInspectionServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/key/project/service/inspection/SafetyEnvironmentalInspectionServiceImpl.java @@ -9,6 +9,7 @@ import com.zcloud.key.project.command.inspection.SafetyEnvironmentalInspectionUp import com.zcloud.key.project.command.query.inspection.SafetyEnvironmentalInspectionQueryExe; import com.zcloud.key.project.dto.clientobject.inspection.SafetyEnvironmentalInspectionCO; import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionAddCmd; +import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionAuditDefendCmd; import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionPageQry; import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionUpdateCmd; import lombok.AllArgsConstructor; @@ -28,6 +29,7 @@ public class SafetyEnvironmentalInspectionServiceImpl implements SafetyEnvironme private final SafetyEnvironmentalInspectionRemoveExe safetyEnvironmentalInspectionRemoveExe; private final SafetyEnvironmentalInspectionQueryExe safetyEnvironmentalInspectionQueryExe; + @Override public SafetyEnvironmentalInspectionCO queryById(Long id) { return safetyEnvironmentalInspectionQueryExe.queryById(id); @@ -41,9 +43,7 @@ public class SafetyEnvironmentalInspectionServiceImpl implements SafetyEnvironme @Override public SingleResponse add(SafetyEnvironmentalInspectionAddCmd cmd) { - - safetyEnvironmentalInspectionAddExe.execute(cmd); - return SingleResponse.buildSuccess(); + return SingleResponse.of(safetyEnvironmentalInspectionAddExe.execute(cmd)); } @Override @@ -51,6 +51,16 @@ public class SafetyEnvironmentalInspectionServiceImpl implements SafetyEnvironme safetyEnvironmentalInspectionUpdateExe.execute(safetyEnvironmentalInspectionUpdateCmd); } + @Override + public void defendPass(SafetyEnvironmentalInspectionAuditDefendCmd cmd) { + safetyEnvironmentalInspectionUpdateExe.defendPassExecute(cmd); + } + + @Override + public void defendNotPass(SafetyEnvironmentalInspectionAuditDefendCmd cmd) { + safetyEnvironmentalInspectionUpdateExe.defendNotPassExecute(cmd); + } + @Override public void remove(Long id) { safetyEnvironmentalInspectionRemoveExe.execute(id); diff --git a/web-app/src/main/java/com/zcloud/key/project/service/inspection/SafetyEnvironmentalInspectionUserServiceImpl.java b/web-app/src/main/java/com/zcloud/key/project/service/inspection/SafetyEnvironmentalInspectionUserServiceImpl.java index e6ad0dc..f31f1af 100644 --- a/web-app/src/main/java/com/zcloud/key/project/service/inspection/SafetyEnvironmentalInspectionUserServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/key/project/service/inspection/SafetyEnvironmentalInspectionUserServiceImpl.java @@ -1,6 +1,7 @@ package com.zcloud.key.project.service.inspection; import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.Response; import com.alibaba.cola.dto.SingleResponse; import com.zcloud.key.project.api.inspection.SafetyEnvironmentalInspectionUserServiceI; import com.zcloud.key.project.command.inspection.SafetyEnvironmentalInspectionUserAddExe; @@ -11,6 +12,7 @@ import com.zcloud.key.project.dto.clientobject.inspection.SafetyEnvironmentalIns import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionUserAddCmd; import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionUserPageQry; import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionUserUpdateCmd; +import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionUserVerifyCmd; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; @@ -46,6 +48,12 @@ public class SafetyEnvironmentalInspectionUserServiceImpl implements SafetyEnvir return SingleResponse.buildSuccess(); } + @Override + public Response verify(SafetyEnvironmentalInspectionUserVerifyCmd cmd) { + safetyEnvironmentalInspectionUserUpdateExe.verifyExecute(cmd); + return Response.buildSuccess(); + } + @Override public void edit(SafetyEnvironmentalInspectionUserUpdateCmd safetyEnvironmentalInspectionUserUpdateCmd) { safetyEnvironmentalInspectionUserUpdateExe.execute(safetyEnvironmentalInspectionUserUpdateCmd); diff --git a/web-client/src/main/java/com/zcloud/key/project/api/inspection/SafetyEnvironmentalInspectionDefendServiceI.java b/web-client/src/main/java/com/zcloud/key/project/api/inspection/SafetyEnvironmentalInspectionDefendServiceI.java index 01d2937..d300722 100644 --- a/web-client/src/main/java/com/zcloud/key/project/api/inspection/SafetyEnvironmentalInspectionDefendServiceI.java +++ b/web-client/src/main/java/com/zcloud/key/project/api/inspection/SafetyEnvironmentalInspectionDefendServiceI.java @@ -1,6 +1,7 @@ package com.zcloud.key.project.api.inspection; import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.Response; import com.alibaba.cola.dto.SingleResponse; import com.zcloud.key.project.dto.clientobject.inspection.SafetyEnvironmentalInspectionDefendCO; import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionDefendAddCmd; @@ -20,6 +21,8 @@ public interface SafetyEnvironmentalInspectionDefendServiceI { SingleResponse add(SafetyEnvironmentalInspectionDefendAddCmd cmd); + Response affirm(SafetyEnvironmentalInspectionDefendAddCmd cmd); + void edit(SafetyEnvironmentalInspectionDefendUpdateCmd cmd); void remove(Long id); diff --git a/web-client/src/main/java/com/zcloud/key/project/api/inspection/SafetyEnvironmentalInspectionServiceI.java b/web-client/src/main/java/com/zcloud/key/project/api/inspection/SafetyEnvironmentalInspectionServiceI.java index 748cd5f..623aee3 100644 --- a/web-client/src/main/java/com/zcloud/key/project/api/inspection/SafetyEnvironmentalInspectionServiceI.java +++ b/web-client/src/main/java/com/zcloud/key/project/api/inspection/SafetyEnvironmentalInspectionServiceI.java @@ -4,6 +4,7 @@ import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; import com.zcloud.key.project.dto.clientobject.inspection.SafetyEnvironmentalInspectionCO; import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionAddCmd; +import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionAuditDefendCmd; import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionPageQry; import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionUpdateCmd; @@ -22,6 +23,10 @@ public interface SafetyEnvironmentalInspectionServiceI { void edit(SafetyEnvironmentalInspectionUpdateCmd cmd); + + void defendNotPass(SafetyEnvironmentalInspectionAuditDefendCmd cmd); + void defendPass(SafetyEnvironmentalInspectionAuditDefendCmd cmd); + void remove(Long id); void removeBatch(Long[] ids); diff --git a/web-client/src/main/java/com/zcloud/key/project/api/inspection/SafetyEnvironmentalInspectionUserServiceI.java b/web-client/src/main/java/com/zcloud/key/project/api/inspection/SafetyEnvironmentalInspectionUserServiceI.java index bc7956c..75251bc 100644 --- a/web-client/src/main/java/com/zcloud/key/project/api/inspection/SafetyEnvironmentalInspectionUserServiceI.java +++ b/web-client/src/main/java/com/zcloud/key/project/api/inspection/SafetyEnvironmentalInspectionUserServiceI.java @@ -1,11 +1,13 @@ package com.zcloud.key.project.api.inspection; import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.Response; import com.alibaba.cola.dto.SingleResponse; import com.zcloud.key.project.dto.clientobject.inspection.SafetyEnvironmentalInspectionUserCO; import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionUserAddCmd; import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionUserPageQry; import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionUserUpdateCmd; +import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionUserVerifyCmd; /** * web-client @@ -20,6 +22,8 @@ public interface SafetyEnvironmentalInspectionUserServiceI { SingleResponse add(SafetyEnvironmentalInspectionUserAddCmd cmd); + Response verify(SafetyEnvironmentalInspectionUserVerifyCmd cmd); + void edit(SafetyEnvironmentalInspectionUserUpdateCmd cmd); void remove(Long id); 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 c4fd406..4354484 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 @@ -57,12 +57,29 @@ public class HiddenCO extends ClientObject { //整改期限(整改截至日期) @ApiModelProperty(value = "整改期限(整改截至日期)") private LocalDateTime rectificationDeadline; - //整改人部门id - @ApiModelProperty(value = "整改人部门id") + + @ApiModelProperty(value = "整改人企业id", name = "rectificationCorpId") + private Long rectificationCorpId; + + + @ApiModelProperty(value = "整改人部门id", name = "rectificationDepartmentId") private Long rectificationDepartmentId; - //整改人id - @ApiModelProperty(value = "整改人id") + + @ApiModelProperty(value = "整改人id", name = "rectificationUserId") private Long rectificationUserId; + + @ApiModelProperty(value = "验收人企业id", name = "racceptCorpId") + private Long acceptCorpId; + + + @ApiModelProperty(value = "验收人部门id", name = "acceptDepartmentId") + private Long acceptDepartmentId; + + @ApiModelProperty(value = "验收人id", name = "acceptUserId") + private Long acceptUserId; + // 隐患视频 + @ApiModelProperty(value = "隐患视频") + private String videoUrl; //乐观锁 @ApiModelProperty(value = "乐观锁") private Integer version; diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenFindUserCO.java b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenFindUserCO.java index 2cf2b06..ea2520e 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenFindUserCO.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenFindUserCO.java @@ -4,6 +4,7 @@ import com.alibaba.cola.dto.ClientObject; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotNull; import java.time.LocalDateTime; @@ -24,9 +25,19 @@ public class HiddenFindUserCO extends ClientObject { //隐患主键id @ApiModelProperty(value = "隐患主键id") private String hiddenId; - //安全检查id - @ApiModelProperty(value = "安全检查id") - private String inspectionId; +// //安全检查id +// @ApiModelProperty(value = "安全检查id") +// private String inspectionId; + + + //外键id + @ApiModelProperty(value = "外键id") + private String foreignKey; + @ApiModelProperty(value = "发现人企业id") + private Long findCorpId; + + @ApiModelProperty(value = "发现人部门id") + private Long findDepartmentId; //发现人id @ApiModelProperty(value = "发现人id") private Long findUserId; diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/inspection/SafetyEnvironmentalInspectionCO.java b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/inspection/SafetyEnvironmentalInspectionCO.java index 578b0af..78fd126 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/inspection/SafetyEnvironmentalInspectionCO.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/inspection/SafetyEnvironmentalInspectionCO.java @@ -2,11 +2,16 @@ package com.zcloud.key.project.dto.clientobject.inspection; import com.alibaba.cola.dto.ClientObject; import com.fasterxml.jackson.annotation.JsonFormat; +import com.zcloud.key.project.dto.clientobject.hidden.HiddenCO; +import com.zcloud.key.project.dto.hidden.HiddenAddCmd; +import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionContentAddCmd; +import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionUserAddCmd; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.sql.Date; import java.time.LocalDateTime; +import java.util.List; /** @@ -58,6 +63,9 @@ public class SafetyEnvironmentalInspectionCO extends ClientObject { //状态(0-暂存,1-待核实,2-待确认,3-待隐患整改,4-待隐患验收,5-检查归档,6-核实打回,7-被检查申辩) @ApiModelProperty(value = "状态(0-暂存,1-待核实,2-待确认,3-待隐患整改,4-待隐患验收,5-检查归档,6-核实打回,7-被检查申辩)") private Integer status; + //是否申辩过 1-是 0-否 + @ApiModelProperty(value = "是否申辩过 1-是 0-否") + private Integer defendFlag; //关联隐患数 @ApiModelProperty(value = "关联隐患数") private Integer hiddenNumber; @@ -67,6 +75,20 @@ public class SafetyEnvironmentalInspectionCO extends ClientObject { //企业名称 @ApiModelProperty(value = "企业名称") private String corpName; + + + @ApiModelProperty(value = "检查人员", name = "inspectionUserList", required = true) + private List inspectionUserList; + @ApiModelProperty(value = "检查情况", name = "inspectionContentList", required = true) + private List inspectionContentList; + @ApiModelProperty(value = "发现隐患", name = "hiddenList", required = true) + private List hiddenList; + + + + + + //创建时间 @ApiModelProperty(value = "创建时间") @JsonFormat(pattern = "yyyy-MM-dd") diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/inspection/SafetyEnvironmentalInspectionUserCO.java b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/inspection/SafetyEnvironmentalInspectionUserCO.java index 8c491ee..ebbf85a 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/inspection/SafetyEnvironmentalInspectionUserCO.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/inspection/SafetyEnvironmentalInspectionUserCO.java @@ -41,8 +41,8 @@ public class SafetyEnvironmentalInspectionUserCO extends ClientObject { //0-未审批，1-通过，2-不通过 @ApiModelProperty(value = "0-未审批，1-通过，2-不通过") private Integer status; - //状态(0-暂存,1-待核实,2-待确认,3-待隐患整改,4-待隐患验收,5-检查归档,6-核实打回,7-被检查申辩) - @ApiModelProperty(value = "状态(0-暂存,1-待核实,2-待确认,3-待隐患整改,4-待隐患验收,5-检查归档,6-核实打回,7-被检查申辩)") + //操作类型 1-发起 2-检查人核实 3-被检查人确认 4-被检查申辩待处理 5-申辩后待检查人核实 6-申辩后被检查人确认 7-隐患整改 8-隐患验收 9-归档 + @ApiModelProperty(value = "操作类型 1-发起 2-检查人核实 3-被检查人确认 4-被检查申辩待处理 5-申辩后待检查人核实 6-申辩后被检查人确认 7-隐患整改 8-隐患验收 9-归档") private Integer type; //签字 @ApiModelProperty(value = "签字") diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenAddCmd.java b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenAddCmd.java index dea3883..e23f448 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenAddCmd.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenAddCmd.java @@ -1,6 +1,7 @@ package com.zcloud.key.project.dto.hidden; import com.alibaba.cola.dto.Command; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; @@ -10,6 +11,7 @@ import lombok.NoArgsConstructor; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.time.LocalDateTime; +import java.util.List; /** * web-client @@ -22,6 +24,8 @@ import java.time.LocalDateTime; @NoArgsConstructor @AllArgsConstructor public class HiddenAddCmd extends Command { + @ApiModelProperty(value = "业务id", name = "hiddenId", required = true) + private String hiddenId; @ApiModelProperty(value = "来源ID外键", name = "foreignKey", required = true) @NotEmpty(message = "来源ID外键不能为空") private String foreignKey; @@ -68,8 +72,14 @@ public class HiddenAddCmd extends Command { @ApiModelProperty(value = "整改期限(整改截至日期)", name = "rectificationDeadline", required = true) @NotEmpty(message = "整改期限(整改截至日期)不能为空") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime rectificationDeadline; + @ApiModelProperty(value = "整改人企业id", name = "rectificationCorpId", required = true) + @NotNull(message = "整改人企业id不能为空") + private Long rectificationCorpId; + + @ApiModelProperty(value = "整改人部门id", name = "rectificationDepartmentId", required = true) @NotNull(message = "整改人部门id不能为空") private Long rectificationDepartmentId; @@ -78,5 +88,23 @@ public class HiddenAddCmd extends Command { @NotNull(message = "整改人id不能为空") private Long rectificationUserId; + @ApiModelProperty(value = "验收人企业id", name = "racceptCorpId", required = true) + @NotNull(message = "验收人企业id不能为空") + private Long acceptCorpId; + // 隐患视频 + @ApiModelProperty(value = "隐患视频", name = "videoUrl", required = true) + private String videoUrl; + + @ApiModelProperty(value = "验收人部门id", name = "acceptDepartmentId", required = true) + @NotNull(message = "验收人部门id不能为空") + private Long acceptDepartmentId; + + @ApiModelProperty(value = "验收人id", name = "acceptUserId", required = true) + @NotNull(message = "验收人id不能为空") + private Long acceptUserId; + + @ApiModelProperty(value = "隐患发现人集合", name = "hiddenFindUserList", required = true) + private List hiddenFindUserList; + } diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenFindUserAddCmd.java b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenFindUserAddCmd.java index 04e378e..c6451c4 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenFindUserAddCmd.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenFindUserAddCmd.java @@ -25,9 +25,21 @@ public class HiddenFindUserAddCmd extends Command { @NotEmpty(message = "隐患主键id不能为空") private String hiddenId; - @ApiModelProperty(value = "安全检查id", name = "inspectionId", required = true) - @NotEmpty(message = "安全检查id不能为空") - private String inspectionId; +// @ApiModelProperty(value = "安全检查id", name = "inspectionId", required = true) +// @NotEmpty(message = "安全检查id不能为空") +// private String inspectionId; + + @ApiModelProperty(value = "外键id", name = "foreignKey", required = true) + @NotEmpty(message = "外键id不能为空") + private String foreignKey; + + @ApiModelProperty(value = "发现人企业id", name = "findUserId", required = true) + @NotNull(message = "发现人企业id不能为空") + private Long findCorpId; + + @ApiModelProperty(value = "发现人部门id", name = "findUserId", required = true) + @NotNull(message = "发现人部门id不能为空") + private Long findDepartmentId; @ApiModelProperty(value = "发现人id", name = "findUserId", required = true) @NotNull(message = "发现人id不能为空") diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenFindUserUpdateCmd.java b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenFindUserUpdateCmd.java index 974ac6c..b307195 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenFindUserUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenFindUserUpdateCmd.java @@ -33,6 +33,13 @@ public class HiddenFindUserUpdateCmd extends Command { @ApiModelProperty(value = "安全检查id", name = "inspectionId", required = true) @NotEmpty(message = "安全检查id不能为空") private String inspectionId; + @ApiModelProperty(value = "发现人企业id", name = "findUserId", required = true) + @NotNull(message = "发现人企业id不能为空") + private Long findCorpId; + + @ApiModelProperty(value = "发现人部门id", name = "findUserId", required = true) + @NotNull(message = "发现人部门id不能为空") + private Long findDepartmentId; @ApiModelProperty(value = "发现人id", name = "findUserId", required = true) @NotNull(message = "发现人id不能为空") private Long findUserId; diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenUpdateCmd.java b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenUpdateCmd.java index eacbb37..0e941dd 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenUpdateCmd.java @@ -64,11 +64,35 @@ public class HiddenUpdateCmd extends Command { @ApiModelProperty(value = "整改期限(整改截至日期)", name = "rectificationDeadline", required = true) @NotEmpty(message = "整改期限(整改截至日期)不能为空") private LocalDateTime rectificationDeadline; + + + @ApiModelProperty(value = "整改人企业id", name = "rectificationCorpId", required = true) + @NotNull(message = "整改人企业id不能为空") + private Long rectificationCorpId; + + @ApiModelProperty(value = "整改人部门id", name = "rectificationDepartmentId", required = true) @NotNull(message = "整改人部门id不能为空") private Long rectificationDepartmentId; + @ApiModelProperty(value = "整改人id", name = "rectificationUserId", required = true) @NotNull(message = "整改人id不能为空") private Long rectificationUserId; + + @ApiModelProperty(value = "验收人企业id", name = "racceptCorpId", required = true) + @NotNull(message = "验收人企业id不能为空") + private Long acceptCorpId; + + + @ApiModelProperty(value = "验收人部门id", name = "acceptDepartmentId", required = true) + @NotNull(message = "验收人部门id不能为空") + private Long acceptDepartmentId; + + @ApiModelProperty(value = "验收人id", name = "acceptUserId", required = true) + @NotNull(message = "验收人id不能为空") + private Long acceptUserId; + // 隐患视频 + @ApiModelProperty(value = "隐患视频", name = "acceptUserId", required = true) + private String videoUrl; } diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionAddCmd.java b/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionAddCmd.java index 94a06f1..334f90a 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionAddCmd.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionAddCmd.java @@ -2,6 +2,7 @@ package com.zcloud.key.project.dto.inspection; import com.alibaba.cola.dto.Command; import com.fasterxml.jackson.annotation.JsonFormat; +import com.zcloud.key.project.dto.hidden.HiddenAddCmd; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; @@ -11,6 +12,7 @@ import lombok.NoArgsConstructor; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.time.LocalDateTime; +import java.util.List; /** * web-client @@ -24,66 +26,64 @@ import java.time.LocalDateTime; @AllArgsConstructor public class SafetyEnvironmentalInspectionAddCmd extends Command { @ApiModelProperty(value = "安全环保检查ID（业务ID）", name = "inspectionId", required = true) - @NotEmpty(message = "安全环保检查ID（业务ID）不能为空") private String inspectionId; @ApiModelProperty(value = "辖区单位", name = "departmentId", required = true) - @NotNull(message = "辖区单位不能为空") private Long departmentId; @ApiModelProperty(value = "被检查单位", name = "inspectedCorpinfoId", required = true) - @NotNull(message = "被检查单位不能为空") private Long inspectedCorpinfoId; - @ApiModelProperty(value = "重点作业id", name = "keyProjectId", required = true) - @NotEmpty(message = "重点作业id不能为空") + @ApiModelProperty(value = "重点作业", name = "keyProjectId", required = true) private String keyProjectId; @ApiModelProperty(value = "被检查单位现场负责人", name = "xgfMasterUserId", required = true) - @NotNull(message = "被检查单位现场负责人不能为空") private Long xgfMasterUserId; + @ApiModelProperty(value = "被检查单位现场负责人部门", name = "xgfMasterUserId", required = true) + private Long xgfMasterDepartmentId; + @ApiModelProperty(value = "被检查单位现场负责人部门", name = "xgfMasterUserId", required = true) + private Long xgfMasterCorpId; @ApiModelProperty(value = "检查来源（1-监管端 2-企业端）", name = "source", required = true) - @NotNull(message = "检查来源（1-监管端 2-企业端）不能为空") private Integer source; @ApiModelProperty(value = "检查类型", name = "type", required = true) - @NotEmpty(message = "检查类型不能为空") private String type; @ApiModelProperty(value = "检查类型名称", name = "typeName", required = true) - @NotEmpty(message = "检查类型名称不能为空") private String typeName; @ApiModelProperty(value = "检查场所", name = "place", required = true) - @NotEmpty(message = "检查场所不能为空") private String place; @ApiModelProperty(value = "检查开始时间", name = "timeStart", required = true) - @NotNull(message = "检查开始时间不能为空") - @JsonFormat(pattern = "yyyy-MM-dd") + @NotNull(message = "检查结束时间不能为空") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime timeStart; @ApiModelProperty(value = "检查结束时间", name = "timeEnd", required = true) @NotNull(message = "检查结束时间不能为空") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime timeEnd; @ApiModelProperty(value = "状态(0-暂存,1-待核实,2-待确认,3-待隐患整改,4-待隐患验收,5-检查归档,6-核实打回,7-被检查申辩)", name = "status", required = true) - @NotNull(message = "状态(0-暂存,1-待核实,2-待确认,3-待隐患整改,4-待隐患验收,5-检查归档,6-核实打回,7-被检查申辩)不能为空") private Integer status; @ApiModelProperty(value = "关联隐患数", name = "hiddenNumber", required = true) - @NotNull(message = "关联隐患数不能为空") private Integer hiddenNumber; @ApiModelProperty(value = "企业ID", name = "corpId", required = true) - @NotNull(message = "企业ID不能为空") private Long corpId; @ApiModelProperty(value = "企业名称", name = "corpName", required = true) - @NotEmpty(message = "企业名称不能为空") private String corpName; + @ApiModelProperty(value = "检查人员", name = "inspectionUserList", required = true) + private List inspectionUserList; + @ApiModelProperty(value = "检查情况", name = "inspectionContentList", required = true) + private List inspectionContentList; + @ApiModelProperty(value = "发现隐患", name = "hiddenList", required = true) + private List hiddenList; + } diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionAuditDefendCmd.java b/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionAuditDefendCmd.java new file mode 100644 index 0000000..fe87859 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionAuditDefendCmd.java @@ -0,0 +1,84 @@ +package com.zcloud.key.project.dto.inspection; + +import com.alibaba.cola.dto.Command; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.zcloud.key.project.dto.hidden.HiddenAddCmd; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.time.LocalDateTime; +import java.util.List; + +/** + * web-client + * + * @Author zhangyue + * @Date 2026-03-20 16:16:05 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class SafetyEnvironmentalInspectionAuditDefendCmd extends Command { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotNull(message = "主键不能为空") + private Long id; + @ApiModelProperty(value = "安全环保检查ID（业务ID）", name = "inspectionId", required = true) + @NotEmpty(message = "安全环保检查ID（业务ID）不能为空") + private String inspectionId; + @ApiModelProperty(value = "辖区单位", name = "departmentId", required = true) + private Long departmentId; + @ApiModelProperty(value = "被检查单位", name = "inspectedCorpinfoId", required = true) + private Long inspectedCorpinfoId; + @ApiModelProperty(value = "重点作业id", name = "keyProjectId", required = true) + private String keyProjectId; + @ApiModelProperty(value = "被检查单位现场负责人", name = "xgfMasterUserId", required = true) + private Long xgfMasterUserId; + @ApiModelProperty(value = "检查来源（1-监管端 2-企业端）", name = "source", required = true) + private Integer source; + @ApiModelProperty(value = "检查类型", name = "type", required = true) + private String type; + @ApiModelProperty(value = "检查类型名称", name = "typeName", required = true) + private String typeName; + @ApiModelProperty(value = "检查场所", name = "place", required = true) + private String place; + @ApiModelProperty(value = "检查开始时间", name = "timeStart", required = true) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime timeStart; + @ApiModelProperty(value = "检查结束时间", name = "timeEnd", required = true) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime timeEnd; + @ApiModelProperty(value = "状态(0-暂存,1-待核实,2-待确认,3-待隐患整改,4-待隐患验收,5-检查归档,6-核实打回,7-被检查申辩)", name = "status", required = true) + private Integer status; + @ApiModelProperty(value = "关联隐患数", name = "hiddenNumber", required = true) + private Integer hiddenNumber; + @ApiModelProperty(value = "企业ID", name = "corpId", required = true) + private Long corpId; + @ApiModelProperty(value = "企业名称", name = "corpName", required = true) + private String corpName; + @ApiModelProperty(value = "检查人员", name = "inspectionUserList", required = true) + private List inspectionUserList; + @ApiModelProperty(value = "检查情况", name = "inspectionContentList", required = true) + private List inspectionContentList; + @ApiModelProperty(value = "发现隐患", name = "hiddenList", required = true) + private List hiddenList; + + @ApiModelProperty(value = "申辩是否成立 0：未审批、1：通过、2：未通过", name = "isPass", required = true) + private Integer isPass; + + + + @ApiModelProperty(value = "驳回理由内容", name = "rejectContent", required = true) + private String rejectContent; + + @ApiModelProperty(value = "检查人签字", name = "checkSign", required = true) + private String checkSign; + + +} + diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionDefendAddCmd.java b/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionDefendAddCmd.java index 3a37d1b..a4b6a92 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionDefendAddCmd.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionDefendAddCmd.java @@ -24,7 +24,6 @@ import java.time.LocalDateTime; @AllArgsConstructor public class SafetyEnvironmentalInspectionDefendAddCmd extends Command { @ApiModelProperty(value = "申辩id（业务id）", name = "defendId", required = true) - @NotEmpty(message = "申辩id（业务id）不能为空") private String defendId; @ApiModelProperty(value = "安全环保检查ID", name = "inspectionId", required = true) @@ -32,32 +31,28 @@ public class SafetyEnvironmentalInspectionDefendAddCmd extends Command { private String inspectionId; @ApiModelProperty(value = "申辩说明", name = "content", required = true) - @NotEmpty(message = "申辩说明不能为空") private String content; @ApiModelProperty(value = "申辩附件", name = "fileUrl", required = true) - @NotEmpty(message = "申辩附件不能为空") private String fileUrl; @ApiModelProperty(value = "申辩人签字", name = "defendantSign", required = true) - @NotEmpty(message = "申辩人签字不能为空") private String defendantSign; @ApiModelProperty(value = "是否通过0：未审批、1：通过、2：未通过", name = "isPass", required = true) - @NotNull(message = "是否通过0：未审批、1：通过、2：未通过不能为空") private Integer isPass; + + @ApiModelProperty(value = "是否申辩0-否；1-是", name = "isDefend", required = true) + private Integer isDefend; + @ApiModelProperty(value = "驳回理由内容", name = "rejectContent", required = true) - @NotEmpty(message = "驳回理由内容不能为空") private String rejectContent; @ApiModelProperty(value = "检查人签字", name = "checkSign", required = true) - @NotEmpty(message = "检查人签字不能为空") private String checkSign; @ApiModelProperty(value = "检查人签字时间", name = "checkSignTime", required = true) - @NotNull(message = "检查人签字时间不能为空") - @JsonFormat(pattern = "yyyy-MM-dd") private LocalDateTime checkSignTime; } 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 791e040..062105b 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 @@ -3,6 +3,9 @@ package com.zcloud.key.project.dto.inspection; import com.alibaba.cola.dto.PageQuery; import lombok.Data; +import java.time.LocalDate; +import java.util.List; + /** * web-client @@ -23,6 +26,17 @@ public class SafetyEnvironmentalInspectionPageQry extends PageQuery { * - `le`: 小于等于比较查询 * - `ne`: 不等比较查询，对应SQL的!=操作符 */ - private String likeInspectionId; + private String place; + private String createName; + private Long inspectionDepartmentId; + private String timeStart; + private String timeEnd; + private String inspectedCorpinfoName; + private String projectName; + private String inspectionUserName; + private List statusList; + + + } diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionUpdateCmd.java b/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionUpdateCmd.java index e91c1de..71b1c5e 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionUpdateCmd.java @@ -2,6 +2,7 @@ package com.zcloud.key.project.dto.inspection; import com.alibaba.cola.dto.Command; import com.fasterxml.jackson.annotation.JsonFormat; +import com.zcloud.key.project.dto.hidden.HiddenAddCmd; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; @@ -11,6 +12,7 @@ import lombok.NoArgsConstructor; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.time.LocalDateTime; +import java.util.List; /** * web-client @@ -30,48 +32,41 @@ public class SafetyEnvironmentalInspectionUpdateCmd extends Command { @NotEmpty(message = "安全环保检查ID（业务ID）不能为空") private String inspectionId; @ApiModelProperty(value = "辖区单位", name = "departmentId", required = true) - @NotNull(message = "辖区单位不能为空") private Long departmentId; @ApiModelProperty(value = "被检查单位", name = "inspectedCorpinfoId", required = true) - @NotNull(message = "被检查单位不能为空") private Long inspectedCorpinfoId; @ApiModelProperty(value = "重点作业id", name = "keyProjectId", required = true) - @NotEmpty(message = "重点作业id不能为空") private String keyProjectId; @ApiModelProperty(value = "被检查单位现场负责人", name = "xgfMasterUserId", required = true) - @NotNull(message = "被检查单位现场负责人不能为空") private Long xgfMasterUserId; @ApiModelProperty(value = "检查来源（1-监管端 2-企业端）", name = "source", required = true) - @NotNull(message = "检查来源（1-监管端 2-企业端）不能为空") private Integer source; @ApiModelProperty(value = "检查类型", name = "type", required = true) - @NotEmpty(message = "检查类型不能为空") private String type; @ApiModelProperty(value = "检查类型名称", name = "typeName", required = true) - @NotEmpty(message = "检查类型名称不能为空") private String typeName; @ApiModelProperty(value = "检查场所", name = "place", required = true) - @NotEmpty(message = "检查场所不能为空") private String place; @ApiModelProperty(value = "检查开始时间", name = "timeStart", required = true) - @NotNull(message = "检查开始时间不能为空") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime timeStart; @ApiModelProperty(value = "检查结束时间", name = "timeEnd", required = true) - @NotNull(message = "检查结束时间不能为空") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime timeEnd; @ApiModelProperty(value = "状态(0-暂存,1-待核实,2-待确认,3-待隐患整改,4-待隐患验收,5-检查归档,6-核实打回,7-被检查申辩)", name = "status", required = true) - @NotNull(message = "状态(0-暂存,1-待核实,2-待确认,3-待隐患整改,4-待隐患验收,5-检查归档,6-核实打回,7-被检查申辩)不能为空") private Integer status; @ApiModelProperty(value = "关联隐患数", name = "hiddenNumber", required = true) - @NotNull(message = "关联隐患数不能为空") private Integer hiddenNumber; @ApiModelProperty(value = "企业ID", name = "corpId", required = true) - @NotNull(message = "企业ID不能为空") private Long corpId; @ApiModelProperty(value = "企业名称", name = "corpName", required = true) - @NotEmpty(message = "企业名称不能为空") private String corpName; + @ApiModelProperty(value = "检查人员", name = "inspectionUserList", required = true) + private List inspectionUserList; + @ApiModelProperty(value = "检查情况", name = "inspectionContentList", required = true) + private List inspectionContentList; + @ApiModelProperty(value = "发现隐患", name = "hiddenList", required = true) + private List hiddenList; + } diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionUserAddCmd.java b/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionUserAddCmd.java index 7dc05a6..9a5bd01 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionUserAddCmd.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionUserAddCmd.java @@ -47,12 +47,12 @@ public class SafetyEnvironmentalInspectionUserAddCmd extends Command { @NotEmpty(message = "检查人意见（有异议时必填）不能为空") private String userRemarks; - @ApiModelProperty(value = "0-未审批，1-通过，2-不通过", name = "status", required = true) + @ApiModelProperty(value = " 0-未审批，1-通过，2-不通过", name = "status", required = true) @NotNull(message = "0-未审批，1-通过，2-不通过不能为空") private Integer status; - @ApiModelProperty(value = "状态(0-暂存,1-待核实,2-待确认,3-待隐患整改,4-待隐患验收,5-检查归档,6-核实打回,7-被检查申辩)", name = "type", required = true) - @NotNull(message = "状态(0-暂存,1-待核实,2-待确认,3-待隐患整改,4-待隐患验收,5-检查归档,6-核实打回,7-被检查申辩)不能为空") + @ApiModelProperty(value = "操作类型 1-发起 2-检查人核实 3-被检查人确认 4-被检查申辩待处理 5-申辩后待检查人核实 6-申辩后被检查人确认 7-隐患整改 8-隐患验收 9-归档)", name = "type", required = true) + @NotNull(message = "操作类型 1-发起 2-检查人核实 3-被检查人确认 4-被检查申辩待处理 5-申辩后待检查人核实 6-申辩后被检查人确认 7-隐患整改 8-隐患验收 9-归档 不能为空") private Integer type; @ApiModelProperty(value = "签字", name = "signature", required = true) diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionUserUpdateCmd.java b/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionUserUpdateCmd.java index c66ce81..d534240 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionUserUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionUserUpdateCmd.java @@ -45,10 +45,10 @@ public class SafetyEnvironmentalInspectionUserUpdateCmd extends Command { @NotEmpty(message = "检查人意见（有异议时必填）不能为空") private String userRemarks; @ApiModelProperty(value = "0-未审批，1-通过，2-不通过", name = "status", required = true) - @NotNull(message = "0-未审批，1-通过，2-不通过不能为空") + @NotNull(message = " 0-未审批，1-通过，2-不通过不能为空") private Integer status; - @ApiModelProperty(value = "状态(0-暂存,1-待核实,2-待确认,3-待隐患整改,4-待隐患验收,5-检查归档,6-核实打回,7-被检查申辩)", name = "type", required = true) - @NotNull(message = "状态(0-暂存,1-待核实,2-待确认,3-待隐患整改,4-待隐患验收,5-检查归档,6-核实打回,7-被检查申辩)不能为空") + @ApiModelProperty(value = "操作类型 1-发起 2-检查人核实 3-被检查人确认 4-被检查申辩待处理 5-申辩后待检查人核实 6-申辩后被检查人确认 7-隐患整改 8-隐患验收 9-归档)", name = "type", required = true) + @NotNull(message = "操作类型 1-发起 2-检查人核实 3-被检查人确认 4-被检查申辩待处理 5-申辩后待检查人核实 6-申辩后被检查人确认 7-隐患整改 8-隐患验收 9-归档 )不能为空") private Integer type; @ApiModelProperty(value = "签字", name = "signature", required = true) @NotEmpty(message = "签字不能为空") diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionUserVerifyCmd.java b/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionUserVerifyCmd.java new file mode 100644 index 0000000..3fd641d --- /dev/null +++ b/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionUserVerifyCmd.java @@ -0,0 +1,45 @@ +package com.zcloud.key.project.dto.inspection; + +import com.alibaba.cola.dto.Command; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.time.LocalDateTime; + +/** + * web-client + * + * @Author zhangyue + * @Date 2026-03-20 16:52:52 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class SafetyEnvironmentalInspectionUserVerifyCmd extends Command { + + @ApiModelProperty(value = "安全环保检查ID", name = "inspectionId", required = true) + @NotEmpty(message = "安全环保检查ID不能为空") + private String inspectionId; + + @ApiModelProperty(value = "检查人意见（有异议时必填）", name = "userRemarks", required = true) + private String userRemarks; + + @ApiModelProperty(value = " 0-未审批，1-通过，2-不通过", name = "status", required = true) + @NotNull(message = "0-未审批，1-通过，2-不通过不能为空") + private Integer status; + + + @ApiModelProperty(value = "签字", name = "signature", required = true) + @NotEmpty(message = "签字不能为空") + private String signature; + + +} + diff --git a/web-domain/src/main/java/com/zcloud/key/project/domain/model/hidden/HiddenE.java b/web-domain/src/main/java/com/zcloud/key/project/domain/model/hidden/HiddenE.java index 363b004..0fcdcbc 100644 --- a/web-domain/src/main/java/com/zcloud/key/project/domain/model/hidden/HiddenE.java +++ b/web-domain/src/main/java/com/zcloud/key/project/domain/model/hidden/HiddenE.java @@ -1,9 +1,16 @@ package com.zcloud.key.project.domain.model.hidden; +import com.jjb.saas.framework.auth.model.SSOUser; import com.jjb.saas.framework.domain.model.BaseE; +import com.zcloud.gbscommon.utils.Tools; +import com.zcloud.key.project.domain.model.inspection.SafetyEnvironmentalInspectionE; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.util.ObjectUtils; +import javax.validation.constraints.NotNull; import java.time.LocalDateTime; +import java.util.List; /** * web-domain @@ -37,14 +44,27 @@ public class HiddenE extends BaseE { private String hiddenType; //隐患类型名称 private String hiddenTypeName; + // 隐患视频 + private String videoUrl; + //整改类型 1立即整改 2延期整改 private Integer rectificationType; //整改期限(整改截至日期) private LocalDateTime rectificationDeadline; - //整改人部门id + + private Long rectificationCorpId; + + private Long rectificationDepartmentId; - //整改人id + private Long rectificationUserId; + + private Long acceptCorpId; + + + private Long acceptDepartmentId; + + private Long acceptUserId; //乐观锁 private Integer version; //创建人 @@ -69,5 +89,27 @@ public class HiddenE extends BaseE { private Long orgId; //环境 private String env; + + private List hiddenFindUserList; + + public void initSaveList(List hiddenList, + SafetyEnvironmentalInspectionE inspectionInfo, + SSOUser ssoUser) { + hiddenList.stream().forEach( + hidden -> { + if(ObjectUtils.isEmpty(hidden.getHiddenId())){ + hidden.setHiddenId(Tools.get32UUID()); + } + hidden.setForeignKey(inspectionInfo.getInspectionId()); + hidden.setState(1); + hidden.setRectificationCorpId(inspectionInfo.getXgfMasterCorpId()); + hidden.setRectificationDepartmentId(inspectionInfo.getXgfMasterDepartmentId()); + hidden.setRectificationUserId(inspectionInfo.getXgfMasterUserId()); + hidden.setAcceptCorpId(ssoUser.getTenantId()); + hidden.setAcceptDepartmentId(ssoUser.getOrgId()); + hidden.setAcceptUserId(ssoUser.getUserId()); + } + ); + } } diff --git a/web-domain/src/main/java/com/zcloud/key/project/domain/model/hidden/HiddenFindUserE.java b/web-domain/src/main/java/com/zcloud/key/project/domain/model/hidden/HiddenFindUserE.java index 37655f1..72b1460 100644 --- a/web-domain/src/main/java/com/zcloud/key/project/domain/model/hidden/HiddenFindUserE.java +++ b/web-domain/src/main/java/com/zcloud/key/project/domain/model/hidden/HiddenFindUserE.java @@ -1,8 +1,10 @@ package com.zcloud.key.project.domain.model.hidden; import com.jjb.saas.framework.domain.model.BaseE; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotNull; import java.time.LocalDateTime; /** @@ -20,7 +22,13 @@ public class HiddenFindUserE extends BaseE { //隐患主键id private String hiddenId; //安全检查id - private String inspectionId; +// private String inspectionId; + //外键id + private String foreignKey; + + private Long findCorpId; + + private Long findDepartmentId; //发现人id private Long findUserId; //乐观锁 diff --git a/web-domain/src/main/java/com/zcloud/key/project/domain/model/inspection/SafetyEnvironmentalInspectionContentE.java b/web-domain/src/main/java/com/zcloud/key/project/domain/model/inspection/SafetyEnvironmentalInspectionContentE.java index 71c2b33..e336954 100644 --- a/web-domain/src/main/java/com/zcloud/key/project/domain/model/inspection/SafetyEnvironmentalInspectionContentE.java +++ b/web-domain/src/main/java/com/zcloud/key/project/domain/model/inspection/SafetyEnvironmentalInspectionContentE.java @@ -1,7 +1,11 @@ package com.zcloud.key.project.domain.model.inspection; import com.jjb.saas.framework.domain.model.BaseE; +import com.zcloud.gbscommon.utils.Tools; import lombok.Data; +import org.springframework.util.ObjectUtils; + +import java.util.List; /** * web-domain @@ -17,5 +21,17 @@ public class SafetyEnvironmentalInspectionContentE extends BaseE { private String inspectionId; //检查情况内容 private String content; + + public void initSaveList(List contentList, + SafetyEnvironmentalInspectionE inspectionInfo){ + if (contentList != null && contentList.size() > 0){ + for (SafetyEnvironmentalInspectionContentE content : contentList) { + if(ObjectUtils.isEmpty(content.getContentId())){ + content.setContentId(Tools.get32UUID()); + } + content.setInspectionId(inspectionInfo.getInspectionId()); + } + } + } } diff --git a/web-domain/src/main/java/com/zcloud/key/project/domain/model/inspection/SafetyEnvironmentalInspectionDefendE.java b/web-domain/src/main/java/com/zcloud/key/project/domain/model/inspection/SafetyEnvironmentalInspectionDefendE.java index 9c948a1..026c346 100644 --- a/web-domain/src/main/java/com/zcloud/key/project/domain/model/inspection/SafetyEnvironmentalInspectionDefendE.java +++ b/web-domain/src/main/java/com/zcloud/key/project/domain/model/inspection/SafetyEnvironmentalInspectionDefendE.java @@ -1,6 +1,7 @@ package com.zcloud.key.project.domain.model.inspection; import com.jjb.saas.framework.domain.model.BaseE; +import com.zcloud.gbscommon.utils.Tools; import lombok.Data; import java.time.LocalDateTime; @@ -31,5 +32,8 @@ public class SafetyEnvironmentalInspectionDefendE extends BaseE { private String checkSign; //检查人签字时间 private LocalDateTime checkSignTime; + public void init(){ + this.setDefendId(Tools.get32UUID()); + } } diff --git a/web-domain/src/main/java/com/zcloud/key/project/domain/model/inspection/SafetyEnvironmentalInspectionE.java b/web-domain/src/main/java/com/zcloud/key/project/domain/model/inspection/SafetyEnvironmentalInspectionE.java index a2efb0a..a04579f 100644 --- a/web-domain/src/main/java/com/zcloud/key/project/domain/model/inspection/SafetyEnvironmentalInspectionE.java +++ b/web-domain/src/main/java/com/zcloud/key/project/domain/model/inspection/SafetyEnvironmentalInspectionE.java @@ -1,7 +1,11 @@ package com.zcloud.key.project.domain.model.inspection; +import com.jjb.saas.framework.auth.model.SSOUser; import com.jjb.saas.framework.domain.model.BaseE; +import com.zcloud.gbscommon.utils.Tools; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.util.ObjectUtils; import java.time.LocalDateTime; @@ -23,6 +27,10 @@ public class SafetyEnvironmentalInspectionE extends BaseE { private String keyProjectId; //被检查单位现场负责人 private Long xgfMasterUserId; + //被检查单位现场负责人部门 + private Long xgfMasterDepartmentId; + //被检查单位现场负责人企业 + private Long xgfMasterCorpId; //检查来源（1-监管端 2-企业端） private Integer source; //检查类型 @@ -39,9 +47,27 @@ public class SafetyEnvironmentalInspectionE extends BaseE { private Integer status; //关联隐患数 private Integer hiddenNumber; + //是否申辩过 1-是 0-否 + private Integer defendFlag; //企业ID private Long corpId; //企业名称 private String corpName; + + public void init(SSOUser ssoUser){ + this.setCorpId(ssoUser.getTenantId()); + this.setCorpName(ssoUser.getTenantName()); + if (ObjectUtils.isEmpty(this.getInspectionId())){ + this.setInspectionId(Tools.get32UUID()); + } + } + public void initSave(SSOUser ssoUser){ + this.defendFlag = 0; + this.setCorpId(ssoUser.getTenantId()); + this.setCorpName(ssoUser.getTenantName()); + if (ObjectUtils.isEmpty(this.getInspectionId())){ + this.setInspectionId(Tools.get32UUID()); + } + } } diff --git a/web-domain/src/main/java/com/zcloud/key/project/domain/model/inspection/SafetyEnvironmentalInspectionUserE.java b/web-domain/src/main/java/com/zcloud/key/project/domain/model/inspection/SafetyEnvironmentalInspectionUserE.java index fee8c3f..8868008 100644 --- a/web-domain/src/main/java/com/zcloud/key/project/domain/model/inspection/SafetyEnvironmentalInspectionUserE.java +++ b/web-domain/src/main/java/com/zcloud/key/project/domain/model/inspection/SafetyEnvironmentalInspectionUserE.java @@ -1,9 +1,14 @@ package com.zcloud.key.project.domain.model.inspection; +import com.jjb.saas.framework.auth.model.SSOUser; import com.jjb.saas.framework.domain.model.BaseE; +import com.zcloud.gbscommon.utils.Tools; +import com.zcloud.key.project.domain.enums.CorpTypeEnum; import lombok.Data; import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; /** * web-domain @@ -33,5 +38,120 @@ public class SafetyEnvironmentalInspectionUserE extends BaseE { private String signature; //核实时间 private LocalDateTime signatureTime; + + // 初始化检查人核实数据 + public List initSaveList(List insUserList, + SafetyEnvironmentalInspectionE inspectionInfo, + SSOUser ssoUser){ + boolean hasSelf = false; + if(insUserList != null && insUserList.size() > 0){ + for (SafetyEnvironmentalInspectionUserE insUser : insUserList) { + insUser.setInspectionUserId(Tools.get32UUID()); + insUser.setInspectionId(inspectionInfo.getInspectionId()); + insUser.setStatus(0); + insUser.setType(2); + if (ssoUser.getUserId().equals(insUser.getUserId())){ + hasSelf = true; + } + } + } + // 当检查人中不包含自己时，把自己填进去 + if (!hasSelf){ + SafetyEnvironmentalInspectionUserE insUser = new SafetyEnvironmentalInspectionUserE(); + insUser.setInspectionUserId(Tools.get32UUID()); + insUser.setInspectionId(inspectionInfo.getInspectionId()); + insUser.setStatus(0); + insUser.setType(2); + insUser.setCorpId(ssoUser.getTenantId()); + insUser.setDepartmentId(ssoUser.getOrgId()); + insUser.setUserId(ssoUser.getUserId()); + if (insUserList != null){ + insUserList.add(insUser); + } else{ + insUserList = new ArrayList(); + insUserList.add(insUser); + } + + + } + return insUserList; + } + + + // 初始化申辩检查人核实数据 + public List initSaveList(List insUserList, + SafetyEnvironmentalInspectionE inspectionInfo, + SSOUser ssoUser, + Integer type){ + boolean hasSelf = false; + if(insUserList != null && insUserList.size() > 0){ + for (SafetyEnvironmentalInspectionUserE insUser : insUserList) { + insUser.setInspectionUserId(Tools.get32UUID()); + insUser.setInspectionId(inspectionInfo.getInspectionId()); + insUser.setStatus(0); + insUser.setType(type); + if (ssoUser.getUserId().equals(insUser.getUserId())){ + hasSelf = true; + } + } + } + // 当检查人中不包含自己时，把自己填进去 + if (!hasSelf){ + SafetyEnvironmentalInspectionUserE insUser = new SafetyEnvironmentalInspectionUserE(); + insUser.setInspectionUserId(Tools.get32UUID()); + insUser.setInspectionId(inspectionInfo.getInspectionId()); + insUser.setStatus(0); + insUser.setType(type); + insUser.setCorpId(ssoUser.getTenantId()); + insUser.setDepartmentId(ssoUser.getOrgId()); + insUser.setUserId(ssoUser.getUserId()); + if (insUserList != null){ + insUserList.add(insUser); + } else{ + insUserList = new ArrayList(); + insUserList.add(insUser); + } + + + } + return insUserList; + } + + + // 初始化操作人数据 + public void initSave(SafetyEnvironmentalInspectionE inspectionInfo, + SSOUser ssoUser, + Integer status, + Integer type){ + this.setInspectionUserId(Tools.get32UUID()); + this.setInspectionId(inspectionInfo.getInspectionId()); + this.setStatus(status); + this.setType(type); + this.setCorpId(ssoUser.getTenantId()); + this.setDepartmentId(ssoUser.getOrgId()); + this.setUserId(ssoUser.getUserId()); + } + + public void initVerify(SSOUser ssoUser){ + + this.setUserId(ssoUser.getUserId()); + this.setSignatureTime(LocalDateTime.now()); + } + + public void init(String inspectionId, + Integer status, + Integer type, + Long corpId, + Long departmentId, + Long userId){ + this.setInspectionUserId(Tools.get32UUID()); + this.setInspectionId(inspectionId); + this.setStatus(status); + this.setType(type); + this.setCorpId(corpId); + this.setDepartmentId(departmentId); + this.setUserId(userId); + } + } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/gatewayimpl/inspection/SafetyEnvironmentalInspectionDefendGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/key/project/gatewayimpl/inspection/SafetyEnvironmentalInspectionDefendGatewayImpl.java index 9854d45..012275a 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/gatewayimpl/inspection/SafetyEnvironmentalInspectionDefendGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/gatewayimpl/inspection/SafetyEnvironmentalInspectionDefendGatewayImpl.java @@ -24,8 +24,8 @@ public class SafetyEnvironmentalInspectionDefendGatewayImpl implements SafetyEnv @Override public Boolean add(SafetyEnvironmentalInspectionDefendE safetyEnvironmentalInspectionDefendE) { - SafetyEnvironmentalInspectionDefendDO d = new SafetyEnvironmentalInspectionDefendDO(Tools.get32UUID()); - BeanUtils.copyProperties(safetyEnvironmentalInspectionDefendE, d, "${uuid}"); + SafetyEnvironmentalInspectionDefendDO d = new SafetyEnvironmentalInspectionDefendDO(); + BeanUtils.copyProperties(safetyEnvironmentalInspectionDefendE, d); safetyEnvironmentalInspectionDefendRepository.save(d); return true; } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/gatewayimpl/inspection/SafetyEnvironmentalInspectionGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/key/project/gatewayimpl/inspection/SafetyEnvironmentalInspectionGatewayImpl.java index 03146bb..6df145e 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/gatewayimpl/inspection/SafetyEnvironmentalInspectionGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/gatewayimpl/inspection/SafetyEnvironmentalInspectionGatewayImpl.java @@ -27,6 +27,7 @@ public class SafetyEnvironmentalInspectionGatewayImpl implements SafetyEnvironme SafetyEnvironmentalInspectionDO d = new SafetyEnvironmentalInspectionDO(Tools.get32UUID()); BeanUtils.copyProperties(safetyEnvironmentalInspectionE, d, "${uuid}"); safetyEnvironmentalInspectionRepository.save(d); + safetyEnvironmentalInspectionE.setId(d.getId()); return true; } 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 2e54b28..a423cab 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 @@ -7,6 +7,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import javax.validation.constraints.NotNull; import java.time.LocalDateTime; /** @@ -35,6 +36,10 @@ public class HiddenDO extends BaseDO { //隐患级别 @ApiModelProperty(value = "隐患级别") private String hiddenLevel; + + // 隐患视频 + @ApiModelProperty(value = "隐患视频") + private String videoUrl; //隐患级别名称 @ApiModelProperty(value = "隐患级别名称") private String hiddenLevelName; @@ -59,13 +64,27 @@ public class HiddenDO extends BaseDO { //整改期限(整改截至日期) @ApiModelProperty(value = "整改期限(整改截至日期)") private LocalDateTime rectificationDeadline; - //整改人部门id - @ApiModelProperty(value = "整改人部门id") + + @ApiModelProperty(value = "整改人企业id", name = "rectificationCorpId") + private Long rectificationCorpId; + + + @ApiModelProperty(value = "整改人部门id", name = "rectificationDepartmentId") private Long rectificationDepartmentId; - //整改人id - @ApiModelProperty(value = "整改人id") + + @ApiModelProperty(value = "整改人id", name = "rectificationUserId") private Long rectificationUserId; + @ApiModelProperty(value = "验收人企业id", name = "racceptCorpId") + private Long acceptCorpId; + + + @ApiModelProperty(value = "验收人部门id", name = "acceptDepartmentId") + private Long acceptDepartmentId; + + @ApiModelProperty(value = "验收人id", name = "acceptUserId") + private Long acceptUserId; + public HiddenDO(String hiddenId) { this.hiddenId = hiddenId; } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/hidden/HiddenFindUserDO.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/hidden/HiddenFindUserDO.java index 8c01a5a..bb591a1 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/hidden/HiddenFindUserDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/hidden/HiddenFindUserDO.java @@ -7,6 +7,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import javax.validation.constraints.NotNull; + /** * web-infrastructure * @@ -24,9 +26,18 @@ public class HiddenFindUserDO extends BaseDO { //隐患主键id @ApiModelProperty(value = "隐患主键id") private String hiddenId; - //安全检查id - @ApiModelProperty(value = "安全检查id") - private String inspectionId; + // //安全检查id +// @ApiModelProperty(value = "安全检查id") +// private String inspectionId; + //外键id + @ApiModelProperty(value = "外键id") + private String foreignKey; + + @ApiModelProperty(value = "发现人企业id") + private Long findCorpId; + + @ApiModelProperty(value = "发现人部门id") + private Long findDepartmentId; //发现人id @ApiModelProperty(value = "发现人id") private Long findUserId; diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/inspection/SafetyEnvironmentalInspectionDO.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/inspection/SafetyEnvironmentalInspectionDO.java index 33cdd51..42c3ce3 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/inspection/SafetyEnvironmentalInspectionDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/inspection/SafetyEnvironmentalInspectionDO.java @@ -1,5 +1,6 @@ package com.zcloud.key.project.persistence.dataobject.inspection; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.jjb.saas.framework.repository.basedo.BaseDO; import io.swagger.annotations.ApiModelProperty; @@ -56,6 +57,10 @@ public class SafetyEnvironmentalInspectionDO extends BaseDO { //状态(0-暂存,1-待核实,2-待确认,3-待隐患整改,4-待隐患验收,5-检查归档,6-核实打回,7-被检查申辩) @ApiModelProperty(value = "状态(0-暂存,1-待核实,2-待确认,3-待隐患整改,4-待隐患验收,5-检查归档,6-核实打回,7-被检查申辩)") private Integer status; + //是否申辩过 1-是 0-否 + @ApiModelProperty(value = "是否申辩过 1-是 0-否") + private Integer defendFlag; + //关联隐患数 @ApiModelProperty(value = "关联隐患数") private Integer hiddenNumber; @@ -66,6 +71,30 @@ public class SafetyEnvironmentalInspectionDO extends BaseDO { @ApiModelProperty(value = "企业名称") private String corpName; + @ApiModelProperty(value = "重点作业名称") + @TableField(exist = false) + private String projectName; + + @ApiModelProperty(value = "检查人") + @TableField(exist = false) + private String inspectionUserName; + @ApiModelProperty(value = "被检查单位") + @TableField(exist = false) + private String inspectedCorpinfoName; + @ApiModelProperty(value = "被检查单位现场负责人") + @TableField(exist = false) + private String xgfMasterUserName; + @ApiModelProperty(value = "被检查单位现场负责人部门") + @TableField(exist = false) + private Long xgfMasterUserDepartmentId; + @ApiModelProperty(value = "被检查单位现场负责人企业") + @TableField(exist = false) + private Long xgfMasterUserCorpinfoId; + + + + + public SafetyEnvironmentalInspectionDO(String inspectionId) { this.inspectionId = inspectionId; } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/inspection/SafetyEnvironmentalInspectionUserDO.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/inspection/SafetyEnvironmentalInspectionUserDO.java index 5fc34a4..8c454b8 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/inspection/SafetyEnvironmentalInspectionUserDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/inspection/SafetyEnvironmentalInspectionUserDO.java @@ -38,11 +38,11 @@ public class SafetyEnvironmentalInspectionUserDO extends BaseDO { //检查人意见（有异议时必填） @ApiModelProperty(value = "检查人意见（有异议时必填）") private String userRemarks; - //0-未审批，1-通过，2-不通过 + //-1 暂存 0-未审批，1-通过，2-不通过 @ApiModelProperty(value = "0-未审批，1-通过，2-不通过") private Integer status; - //状态(0-暂存,1-待核实,2-待确认,3-待隐患整改,4-待隐患验收,5-检查归档,6-核实打回,7-被检查申辩) - @ApiModelProperty(value = "状态(0-暂存,1-待核实,2-待确认,3-待隐患整改,4-待隐患验收,5-检查归档,6-核实打回,7-被检查申辩)") + //操作类型 1-发起 2-检查人核实 3-被检查人确认 4-被检查申辩待处理 5-申辩后待检查人核实 6-申辩后被检查人确认 7-隐患整改 8-隐患验收 9-归档 + @ApiModelProperty(value = "操作类型 1-发起 2-检查人核实 3-被检查人确认 4-被检查申辩待处理 5-申辩后待检查人核实 6-申辩后被检查人确认 7-隐患整改 8-隐患验收 9-归档") private Integer type; //签字 @ApiModelProperty(value = "签字") 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 ea173be..e6579f4 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 @@ -1,5 +1,6 @@ package com.zcloud.key.project.persistence.mapper.inspection; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionDO; @@ -18,5 +19,8 @@ import java.util.Map; @Mapper public interface SafetyEnvironmentalInspectionMapper extends BaseMapper { IPage selectListPage(IPage page, @Param("params") Map params, String menuPerms); + + + SafetyEnvironmentalInspectionDO getByInspectionId(String inspectionId); } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenFindUserRepository.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenFindUserRepository.java index d94e197..4cb7a00 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenFindUserRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenFindUserRepository.java @@ -4,6 +4,7 @@ import com.alibaba.cola.dto.PageResponse; import com.jjb.saas.framework.repository.repo.BaseRepository; import com.zcloud.key.project.persistence.dataobject.hidden.HiddenFindUserDO; +import java.util.List; import java.util.Map; /** @@ -14,5 +15,9 @@ import java.util.Map; */ public interface HiddenFindUserRepository extends BaseRepository { PageResponse listPage(Map params); + + void batchInsert(List list); + + void batchDelete(Map params); } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenRepository.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenRepository.java index 2b2065a..fe70be4 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenRepository.java @@ -4,6 +4,7 @@ import com.alibaba.cola.dto.PageResponse; import com.jjb.saas.framework.repository.repo.BaseRepository; import com.zcloud.key.project.persistence.dataobject.hidden.HiddenDO; +import java.util.List; import java.util.Map; /** @@ -14,5 +15,13 @@ import java.util.Map; */ public interface HiddenRepository extends BaseRepository { PageResponse listPage(Map params); + + void batchInsert(List list); + + List listAll(Map params); + + List listAllByInspectionId(String inspectionId); + + void deleteBatch(Map params); } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenFindUserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenFindUserRepositoryImpl.java index f86b7d9..060a244 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenFindUserRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenFindUserRepositoryImpl.java @@ -2,17 +2,20 @@ package com.zcloud.key.project.persistence.repository.impl.hidden; import com.alibaba.cola.dto.PageResponse; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jjb.saas.framework.repository.common.PageHelper; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.gbscommon.utils.Query; +import com.zcloud.key.project.persistence.dataobject.hidden.HiddenDO; import com.zcloud.key.project.persistence.dataobject.hidden.HiddenFindUserDO; import com.zcloud.key.project.persistence.mapper.HiddenFindUserMapper; import com.zcloud.key.project.persistence.repository.hidden.HiddenFindUserRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; import java.util.Map; /** @@ -35,5 +38,18 @@ public class HiddenFindUserRepositoryImpl extends BaseRepositoryImpl result = hiddenFindUserMapper.selectPage(iPage, queryWrapper); return PageHelper.pageToResponse(result, result.getRecords()); } + + @Override + public void batchInsert(List list) { + saveBatch(list); + } + @Override + public void batchDelete(Map params) { + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("foreign_key", params.get("eqForeignKey")); + updateWrapper.eq("delete_enum", "FALSE"); + updateWrapper.set("delete_enum", "TRUE"); + hiddenFindUserMapper.update(null, updateWrapper); + } } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenRepositoryImpl.java index 2af528a..98eb1e9 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenRepositoryImpl.java @@ -2,17 +2,20 @@ package com.zcloud.key.project.persistence.repository.impl.hidden; import com.alibaba.cola.dto.PageResponse; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jjb.saas.framework.repository.common.PageHelper; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.gbscommon.utils.Query; import com.zcloud.key.project.persistence.dataobject.hidden.HiddenDO; +import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionUserDO; import com.zcloud.key.project.persistence.mapper.HiddenMapper; import com.zcloud.key.project.persistence.repository.hidden.HiddenRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; import java.util.Map; /** @@ -35,5 +38,39 @@ public class HiddenRepositoryImpl extends BaseRepositoryImpl result = hiddenMapper.selectPage(iPage, queryWrapper); return PageHelper.pageToResponse(result, result.getRecords()); } + + @Override + public void batchInsert(List list) { + saveBatch(list); + } + + @Override + public List listAll(Map params) { + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); + queryWrapper.eq("delete_enum", "FALSE"); + return hiddenMapper.selectList(queryWrapper); + } + + @Override + public List listAllByInspectionId(String inspectionId) { + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("foreign_key",inspectionId); + queryWrapper.eq("delete_enum", "FALSE"); + queryWrapper.orderByDesc("create_time"); + return hiddenMapper.selectList(queryWrapper); + } + + @Override + public void deleteBatch(Map params) { + + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("foreign_key", params.get("eqForeignKey")); + updateWrapper.eq("delete_enum", "FALSE"); + updateWrapper.set("delete_enum", "TRUE"); + hiddenMapper.update(null, updateWrapper); + } } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/inspection/SafetyEnvironmentalInspectionContentRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/inspection/SafetyEnvironmentalInspectionContentRepositoryImpl.java index 88f01ed..976a4a8 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/inspection/SafetyEnvironmentalInspectionContentRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/inspection/SafetyEnvironmentalInspectionContentRepositoryImpl.java @@ -2,17 +2,20 @@ package com.zcloud.key.project.persistence.repository.impl.inspection; import com.alibaba.cola.dto.PageResponse; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jjb.saas.framework.repository.common.PageHelper; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.gbscommon.utils.Query; import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionContentDO; +import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionUserDO; import com.zcloud.key.project.persistence.mapper.inspection.SafetyEnvironmentalInspectionContentMapper; import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionContentRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; import java.util.Map; /** @@ -35,5 +38,28 @@ public class SafetyEnvironmentalInspectionContentRepositoryImpl extends BaseRepo IPage result = safetyEnvironmentalInspectionContentMapper.selectPage(iPage, queryWrapper); return PageHelper.pageToResponse(result, result.getRecords()); } + + @Override + public void batchInsert(List list) { + saveBatch(list); + } + + @Override + public void deleteByInspectionId(String inspectionId) { + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("inspection_id", inspectionId); + updateWrapper.eq("delete_enum", "FALSE"); + updateWrapper.set("delete_enum", "TRUE"); + safetyEnvironmentalInspectionContentMapper.update(null, updateWrapper); + } + + @Override + public List listAllByInspectionId(String inspectionId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("inspection_id", inspectionId); + queryWrapper.eq("delete_enum", "FALSE"); + return safetyEnvironmentalInspectionContentMapper.selectList(queryWrapper); + } + } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/inspection/SafetyEnvironmentalInspectionDefendRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/inspection/SafetyEnvironmentalInspectionDefendRepositoryImpl.java index 8c04184..da117b9 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/inspection/SafetyEnvironmentalInspectionDefendRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/inspection/SafetyEnvironmentalInspectionDefendRepositoryImpl.java @@ -2,6 +2,7 @@ package com.zcloud.key.project.persistence.repository.impl.inspection; import com.alibaba.cola.dto.PageResponse; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jjb.saas.framework.repository.common.PageHelper; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; @@ -35,5 +36,16 @@ public class SafetyEnvironmentalInspectionDefendRepositoryImpl extends BaseRepos IPage result = safetyEnvironmentalInspectionDefendMapper.selectPage(iPage, queryWrapper); return PageHelper.pageToResponse(result, result.getRecords()); } + + @Override + public void updateByInspectionId(SafetyEnvironmentalInspectionDefendDO safetyEnvironmentalInspectionDefendDO) { + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("inspection_id", safetyEnvironmentalInspectionDefendDO.getInspectionId()); + updateWrapper.set("is_pass", safetyEnvironmentalInspectionDefendDO.getIsPass()); + updateWrapper.set("reject_content", safetyEnvironmentalInspectionDefendDO.getRejectContent()); + updateWrapper.set("check_sign", safetyEnvironmentalInspectionDefendDO.getCheckSign()); + updateWrapper.set("check_sign_time", safetyEnvironmentalInspectionDefendDO.getCheckSignTime()); + safetyEnvironmentalInspectionDefendMapper.update(null, updateWrapper); + } } 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 1d99e68..c72eedb 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 @@ -2,6 +2,7 @@ package com.zcloud.key.project.persistence.repository.impl.inspection; import com.alibaba.cola.dto.PageResponse; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jjb.saas.framework.repository.common.PageHelper; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; @@ -29,11 +30,31 @@ public class SafetyEnvironmentalInspectionRepositoryImpl extends BaseRepositoryI @Override public PageResponse listPage(Map params) { IPage iPage = new Query().getPage(params); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); - queryWrapper.orderByDesc("create_time"); - IPage result = safetyEnvironmentalInspectionMapper.selectPage(iPage, queryWrapper); + IPage result = safetyEnvironmentalInspectionMapper.selectListPage(iPage, params, null); return PageHelper.pageToResponse(result, result.getRecords()); } + + @Override + public void updateStatus(String inspectionId, Integer status) { + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("inspection_id", inspectionId); + updateWrapper.set("status", status); + safetyEnvironmentalInspectionMapper.update(null, updateWrapper); + + } + + @Override + public void updateStatus(String inspectionId, Integer status, Integer defendFlag) { + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("inspection_id", inspectionId); + updateWrapper.set("status", status); + updateWrapper.set("defend_flag", defendFlag); + safetyEnvironmentalInspectionMapper.update(null, updateWrapper); + } + + @Override + public SafetyEnvironmentalInspectionDO getByInspectionId(String inspectionId) { + return safetyEnvironmentalInspectionMapper.getByInspectionId(inspectionId); + } } 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 2c2e9b8..80e3f7f 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 @@ -2,17 +2,21 @@ package com.zcloud.key.project.persistence.repository.impl.inspection; import com.alibaba.cola.dto.PageResponse; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jjb.saas.framework.repository.common.PageHelper; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.gbscommon.utils.Query; +import com.zcloud.key.project.domain.model.inspection.SafetyEnvironmentalInspectionUserE; import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionUserDO; import com.zcloud.key.project.persistence.mapper.inspection.SafetyEnvironmentalInspectionUserMapper; import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionUserRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.util.ObjectUtils; +import java.util.List; import java.util.Map; /** @@ -35,5 +39,81 @@ public class SafetyEnvironmentalInspectionUserRepositoryImpl extends BaseReposit IPage result = safetyEnvironmentalInspectionUserMapper.selectPage(iPage, queryWrapper); return PageHelper.pageToResponse(result, result.getRecords()); } + + @Override + public void batchInsert(List list) { + saveBatch(list); + } + + @Override + public void deleteByInspectionId(String inspectionId, Integer type) { + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("inspection_id", inspectionId); + if (!ObjectUtils.isEmpty(type)){ + updateWrapper.eq("type",type); + } + updateWrapper.eq("delete_enum", "FALSE"); + updateWrapper.set("delete_enum", "TRUE"); + safetyEnvironmentalInspectionUserMapper.update(null, updateWrapper); + } + + @Override + public List listAllByInspectionId(String inspectionId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("inspection_id", inspectionId); + queryWrapper.eq("delete_enum", "FALSE"); + queryWrapper.orderByDesc("create_time"); + return safetyEnvironmentalInspectionUserMapper.selectList(queryWrapper); + } + + @Override + public List listAllByInspectionId(String inspectionId, Integer type) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("inspection_id", inspectionId); + queryWrapper.eq("delete_enum", "FALSE"); + queryWrapper.orderByDesc("create_time"); + queryWrapper.eq("type", type); + return safetyEnvironmentalInspectionUserMapper.selectList(queryWrapper); + } + + @Override + public void verifyEdit(SafetyEnvironmentalInspectionUserDO inspectionUserDO) { + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("inspection_id", inspectionUserDO.getInspectionId()); + updateWrapper.eq("user_id", inspectionUserDO.getUserId()); + updateWrapper.eq("type", 2); + updateWrapper.eq("delete_enum", "FALSE"); + updateWrapper.set("user_remarks", inspectionUserDO.getUserRemarks()); + updateWrapper.set("status", inspectionUserDO.getStatus()); + updateWrapper.set("signature", inspectionUserDO.getSignature()); + updateWrapper.set("signature_time", inspectionUserDO.getSignatureTime()); + safetyEnvironmentalInspectionUserMapper.update(null, updateWrapper); + } + + @Override + public void editUserInfo(SafetyEnvironmentalInspectionUserDO inspectionUserDO) { + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("inspection_id", inspectionUserDO.getInspectionId()); + updateWrapper.eq("user_id", inspectionUserDO.getUserId()); + updateWrapper.eq("type", inspectionUserDO.getType()); + updateWrapper.eq("delete_enum", "FALSE"); + updateWrapper.set("status", inspectionUserDO.getStatus()); + updateWrapper.set("signature_time", inspectionUserDO.getSignatureTime()); + safetyEnvironmentalInspectionUserMapper.update(null, updateWrapper); + } + + @Override + public Long countByInspectionId(String inspectionId, Integer status, Integer type) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("inspection_id", inspectionId); + queryWrapper.eq("delete_enum", "FALSE"); + if (!ObjectUtils.isEmpty(type)){ + queryWrapper.eq("type", type); + } + if (!ObjectUtils.isEmpty(status)){ + queryWrapper.eq("status", status); + } + return safetyEnvironmentalInspectionUserMapper.selectCount(queryWrapper); + } } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/inspection/SafetyEnvironmentalInspectionContentRepository.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/inspection/SafetyEnvironmentalInspectionContentRepository.java index b827e3b..6f92a1f 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/inspection/SafetyEnvironmentalInspectionContentRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/inspection/SafetyEnvironmentalInspectionContentRepository.java @@ -4,6 +4,7 @@ import com.alibaba.cola.dto.PageResponse; import com.jjb.saas.framework.repository.repo.BaseRepository; import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionContentDO; +import java.util.List; import java.util.Map; /** @@ -14,5 +15,11 @@ import java.util.Map; */ public interface SafetyEnvironmentalInspectionContentRepository extends BaseRepository { PageResponse listPage(Map params); + + void batchInsert(List list); + + void deleteByInspectionId(String inspectionId); + + List listAllByInspectionId(String inspectionId); } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/inspection/SafetyEnvironmentalInspectionDefendRepository.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/inspection/SafetyEnvironmentalInspectionDefendRepository.java index bb8077a..e10a69b 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/inspection/SafetyEnvironmentalInspectionDefendRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/inspection/SafetyEnvironmentalInspectionDefendRepository.java @@ -14,5 +14,7 @@ import java.util.Map; */ public interface SafetyEnvironmentalInspectionDefendRepository extends BaseRepository { PageResponse listPage(Map params); + + void updateByInspectionId(SafetyEnvironmentalInspectionDefendDO safetyEnvironmentalInspectionDefendDO); } 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 d3dc2a9..6473414 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 @@ -3,6 +3,7 @@ package com.zcloud.key.project.persistence.repository.inspection; import com.alibaba.cola.dto.PageResponse; import com.jjb.saas.framework.repository.repo.BaseRepository; import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionDO; +import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionUserDO; import java.util.Map; @@ -14,5 +15,10 @@ import java.util.Map; */ public interface SafetyEnvironmentalInspectionRepository extends BaseRepository { PageResponse listPage(Map params); + + void updateStatus(String inspectionId, Integer status); + void updateStatus(String inspectionId, Integer status, Integer defendFlag); + + SafetyEnvironmentalInspectionDO getByInspectionId(String inspectionId); } 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 176dc50..8e8898d 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 @@ -3,7 +3,9 @@ package com.zcloud.key.project.persistence.repository.inspection; import com.alibaba.cola.dto.PageResponse; import com.jjb.saas.framework.repository.repo.BaseRepository; import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionUserDO; +import io.swagger.models.auth.In; +import java.util.List; import java.util.Map; /** @@ -14,5 +16,21 @@ import java.util.Map; */ public interface SafetyEnvironmentalInspectionUserRepository extends BaseRepository { PageResponse listPage(Map params); + + void batchInsert(List list); + + void deleteByInspectionId(String inspectionId, Integer type); + + List listAllByInspectionId(String inspectionId); + + + + List listAllByInspectionId(String inspectionId, Integer type); + void verifyEdit(SafetyEnvironmentalInspectionUserDO inspectionUserDO); + + void editUserInfo(SafetyEnvironmentalInspectionUserDO inspectionUserDO); + + Long countByInspectionId(String inspectionId, Integer status, Integer type); + } diff --git a/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionMapper.xml b/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionMapper.xml index 9a5a006..08eea1d 100644 --- a/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionMapper.xml @@ -7,7 +7,6 @@ select i.*, kp.project_name, - creu.name create_name, GROUP_CONCAT(DISTINCT iuu.name) inspection_user_name, indc.corp_name inspected_corpinfo_name, xmu.name xgf_master_user_name @@ -15,7 +14,19 @@ safety_environmental_inspection i left join key_project kp on kp.key_project_id = i.key_project_id left join user creu on creu.id = i.create_id - left join safety_environmental_inspection_user iu on iu.inspection_id = i.inspection_id and iu.type = 1 and iu.delete_enum = 'FALSE' + left join ( + SELECT + inspection_id, + user_id, + type, + ROW_NUMBER() OVER ( + PARTITION BY inspection_id + ORDER BY type DESC + ) AS rn + FROM safety_environmental_inspection_user + WHERE delete_enum = 'FALSE' + AND type IN (2, 5) + ) iu on iu.inspection_id = i.inspection_id AND iu.rn = 1 left join user iuu on iuu.id = iu.user_id left join corp_info indc on indc.id = i.inspected_corpinfo_id left join user xmu on xmu.id = i.xgf_master_user_id @@ -35,9 +46,6 @@ and i.time_start <= #{params.timeEnd} - - and i.time_start <= #{params.timeEnd} - and indc.corp_name LIKE CONCAT('%', #{params.inspectedCorpinfoName}, '%') @@ -53,5 +61,19 @@ CASE WHEN i.status = 6 THEN 0 ELSE 1 END, i.create_time desc + + + diff --git a/web-infrastructure/src/main/resources/mybatis/RiskPointMapper.xml b/web-infrastructure/src/main/resources/mybatis/RiskPointMapper.xml deleted file mode 100644 index 1e8ff08..0000000 --- a/web-infrastructure/src/main/resources/mybatis/RiskPointMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - -