zcloud_gbs
/
zcloud_gbs_key_project
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加隐患验收和整改功能

main
zhangyue 2026-04-01 11:49:37 +08:00
parent 477a94eb85
commit ad8633449a
42 changed files with 617 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
web-adapter/src/main/java/com/zcloud/key/project/web/hidden/HiddenAcceptRecordController.java
View File

@ -8,6 +8,7 @@ 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.hidden.HiddenAcceptRecordServiceI;
import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordAcceptCmd;
import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordAddCmd;
import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordPageQry;
import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordUpdateCmd;
@ -78,5 +79,11 @@ public class HiddenAcceptRecordController {
hiddenAcceptRecordService.edit(hiddenAcceptRecordUpdateCmd);
return SingleResponse.buildSuccess();
}
@ApiOperation("验收")
@PostMapping("/accept")
public SingleResponse accept(@Validated @RequestBody HiddenAcceptRecordAcceptCmd cmd) {
hiddenAcceptRecordService.accept(cmd);
return SingleResponse.buildSuccess();
}
}

3
web-adapter/src/main/java/com/zcloud/key/project/web/hidden/HiddenController.java
View File

@ -55,7 +55,7 @@ public class HiddenController {
@ApiOperation("详情")
@GetMapping("/{id}")
public SingleResponse<HiddenCO> getInfoById(@PathVariable("id") Long id) {
return SingleResponse.of(new HiddenCO());
return hiddenService.getInfoById(id);
}
@ApiOperation("删除")
@ -78,5 +78,6 @@ public class HiddenController {
hiddenService.edit(hiddenUpdateCmd);
return SingleResponse.buildSuccess();
}
}

9
web-adapter/src/main/java/com/zcloud/key/project/web/hidden/HiddenRectificationRecordController.java
View File

@ -78,5 +78,14 @@ public class HiddenRectificationRecordController {
hiddenRectificationRecordService.edit(hiddenRectificationRecordUpdateCmd);
return SingleResponse.buildSuccess();
}
@ApiOperation("隐患整改")
@PostMapping("/rectification")
public SingleResponse rectification(@Validated @RequestBody HiddenRectificationRecordUpdateCmd hiddenRectificationRecordUpdateCmd) {
hiddenRectificationRecordService.rectification(hiddenRectificationRecordUpdateCmd);
return SingleResponse.buildSuccess();
}
}

76
web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenAcceptRecordUpdateExe.java
View File

@ -1,14 +1,32 @@
package com.zcloud.key.project.command.hidden;
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.domain.gateway.hidden.HiddenAcceptRecordGateway;
import com.zcloud.key.project.domain.gateway.inspection.SafetyEnvironmentalInspectionUserGateway;
import com.zcloud.key.project.domain.model.hidden.HiddenAcceptRecordE;
import com.zcloud.key.project.domain.model.inspection.SafetyEnvironmentalInspectionUserE;
import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordAcceptCmd;
import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordUpdateCmd;
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.SafetyEnvironmentalInspectionRepository;
import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionUserRepository;
import io.swagger.models.auth.In;
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.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* web-app
@ -20,6 +38,10 @@ import org.springframework.transaction.annotation.Transactional;
@AllArgsConstructor
public class HiddenAcceptRecordUpdateExe {
private final HiddenAcceptRecordGateway hiddenAcceptRecordGateway;
private final HiddenRepository hiddenRepository;
private final SafetyEnvironmentalInspectionRepository safetyEnvironmentalInspectionRepository;
private final SafetyEnvironmentalInspectionUserRepository safetyEnvironmentalInspectionUserRepository;
private final SafetyEnvironmentalInspectionUserGateway safetyEnvironmentalInspectionUserGateway;
@Transactional(rollbackFor = Exception.class)
public void execute(HiddenAcceptRecordUpdateCmd hiddenAcceptRecordUpdateCmd) {
@ -30,5 +52,59 @@ public class HiddenAcceptRecordUpdateExe {
throw new BizException("修改失败");
}
}
@Transactional(rollbackFor = Exception.class)
public void acceptExecute(HiddenAcceptRecordAcceptCmd cmd) {
// 生成验收记录
HiddenAcceptRecordE hiddenAcceptRecordE = new HiddenAcceptRecordE();
BeanUtils.copyProperties(cmd, hiddenAcceptRecordE);
SSOUser ssoUser = AuthContext.getCurrentUser();
hiddenAcceptRecordE.init(ssoUser);
boolean res = hiddenAcceptRecordGateway.add(hiddenAcceptRecordE);
// 修改隐患状态
Integer hiddenState = 3;
if (cmd.getState() == 0){
hiddenState = 4;
}
hiddenRepository.updateState(cmd.getHiddenId(), hiddenState);
if (cmd.getState() == 1){ // 验收通过
// 判断隐患是否全部验收完成，
List<Integer> stateList = new ArrayList<>();
stateList.add(1);
stateList.add(2);
stateList.add(4);
Long count = hiddenRepository.countByForeignKey(cmd.getForeignKey(), stateList);
if(count == 0) {
// 修改安全环保检查隐患验收操作记录为完成
SafetyEnvironmentalInspectionUserDO inspectionUserDO = new SafetyEnvironmentalInspectionUserDO();
inspectionUserDO.setInspectionId(cmd.getForeignKey());
inspectionUserDO.setUserId(ssoUser.getUserId());
inspectionUserDO.setType(8);
inspectionUserDO.setStatus(1);
inspectionUserDO.setSignatureTime(LocalDateTime.now());
safetyEnvironmentalInspectionUserRepository.editUserInfo(inspectionUserDO);
// 生成安全环保检查归档操作记录（直接完成）
SafetyEnvironmentalInspectionUserE inspectionUserFileE = new SafetyEnvironmentalInspectionUserE();
inspectionUserFileE.init(cmd.getForeignKey(), 1, 9, ssoUser.getTenantId(), ssoUser.getOrgId(), ssoUser.getUserId());
safetyEnvironmentalInspectionUserGateway.add(inspectionUserFileE);
// 如果是修改安全环保检查状态为归档
safetyEnvironmentalInspectionRepository.updateStatus(cmd.getForeignKey(), 5);
}
} else if (cmd.getState() == 0){ // 验收未通过
// 将修改安全环保检查隐患整改操作记录改为未完成
SafetyEnvironmentalInspectionUserDO inspectionUserDO = new SafetyEnvironmentalInspectionUserDO();
inspectionUserDO.setInspectionId(cmd.getForeignKey());
inspectionUserDO.setUserId(ssoUser.getUserId());
inspectionUserDO.setType(7);
inspectionUserDO.setStatus(0);
inspectionUserDO.setSignatureTime(null);
safetyEnvironmentalInspectionUserRepository.editUserInfo(inspectionUserDO);
}
if (!res) {
throw new BizException("修改失败");
}
}
}

50
web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenRectificationRecordUpdateExe.java
View File

@ -1,14 +1,26 @@
package com.zcloud.key.project.command.hidden;
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.hidden.HiddenRectificationRecordGateway;
import com.zcloud.key.project.domain.gateway.inspection.SafetyEnvironmentalInspectionUserGateway;
import com.zcloud.key.project.domain.model.hidden.HiddenRectificationRecordE;
import com.zcloud.key.project.domain.model.inspection.SafetyEnvironmentalInspectionUserE;
import com.zcloud.key.project.dto.hidden.HiddenRectificationRecordUpdateCmd;
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.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.ArrayList;
import java.util.List;
/**
* web-app
@ -20,6 +32,10 @@ import org.springframework.transaction.annotation.Transactional;
@AllArgsConstructor
public class HiddenRectificationRecordUpdateExe {
private final HiddenRectificationRecordGateway hiddenRectificationRecordGateway;
private final HiddenRepository hiddenRepository;
private final SafetyEnvironmentalInspectionRepository safetyEnvironmentalInspectionRepository;
private final SafetyEnvironmentalInspectionUserRepository safetyEnvironmentalInspectionUserRepository;
private final SafetyEnvironmentalInspectionUserGateway safetyEnvironmentalInspectionUserGateway;
@Transactional(rollbackFor = Exception.class)
public void execute(HiddenRectificationRecordUpdateCmd hiddenRectificationRecordUpdateCmd) {
@ -30,5 +46,39 @@ public class HiddenRectificationRecordUpdateExe {
throw new BizException("修改失败");
}
}
@Transactional(rollbackFor = Exception.class)
public void rectificationExecute(HiddenRectificationRecordUpdateCmd cmd) {
HiddenRectificationRecordE hiddenRectificationRecordE = new HiddenRectificationRecordE();
SSOUser ssoUser = AuthContext.getCurrentUser();
BeanUtils.copyProperties(cmd, hiddenRectificationRecordE);
hiddenRectificationRecordE.init(ssoUser);
boolean res = hiddenRectificationRecordGateway.add(hiddenRectificationRecordE);
hiddenRepository.updateState(cmd.getHiddenId(), 2);
// 增加安全环保检查隐患验收操作记录
Long acceptCount = safetyEnvironmentalInspectionUserRepository.countByInspectionId(cmd.getForeignKey(), null, 8);
if (acceptCount == 0){
SafetyEnvironmentalInspectionUserE inspectionUserAcceptE = new SafetyEnvironmentalInspectionUserE();
inspectionUserAcceptE.init(cmd.getForeignKey(), 0, 8, ssoUser.getTenantId(), ssoUser.getOrgId(), ssoUser.getUserId());
safetyEnvironmentalInspectionUserGateway.add(inspectionUserAcceptE);
}
// 判断隐患是否全部整改完成，
List<Integer> stateList = new ArrayList<>();
stateList.add(1);
stateList.add(4);
Long count = hiddenRepository.countByForeignKey(cmd.getForeignKey(), stateList);
if (count == 0){// 全部整改完成
// 修改安全环保检查隐患整改操作记录为完成
SafetyEnvironmentalInspectionUserDO inspectionUserDO = new SafetyEnvironmentalInspectionUserDO();
inspectionUserDO.setInspectionId(cmd.getForeignKey());
inspectionUserDO.setUserId(ssoUser.getUserId());
inspectionUserDO.setType(7);
inspectionUserDO.setStatus(1);
inspectionUserDO.setSignatureTime(LocalDateTime.now());
safetyEnvironmentalInspectionUserRepository.editUserInfo(inspectionUserDO);
}
if (!res) {
throw new BizException("修改失败");
}
}
}

11
web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionDefendAddExe.java
View File

@ -10,6 +10,7 @@ import com.zcloud.key.project.domain.model.inspection.SafetyEnvironmentalInspect
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.SafetyEnvironmentalInspectionDefendDO;
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;
@ -17,6 +18,7 @@ import lombok.AllArgsConstructor;
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.List;
@ -57,11 +59,16 @@ public class SafetyEnvironmentalInspectionDefendAddExe {
SafetyEnvironmentalInspectionDefendE safetyEnvironmentalInspectionDefendE = new SafetyEnvironmentalInspectionDefendE();
BeanUtils.copyProperties(cmd, safetyEnvironmentalInspectionDefendE);
safetyEnvironmentalInspectionDefendE.init();
SafetyEnvironmentalInspectionDO inspectionDO = safetyEnvironmentalInspectionRepository.getByInspectionId(cmd.getInspectionId());
Integer type = 3;
if (inspectionDO != null && !ObjectUtils.isEmpty(inspectionDO.getDefendFlag()) && inspectionDO.getDefendFlag() == 1){
type = 6;
}
// 判断是否申辩
SafetyEnvironmentalInspectionUserDO safetyEnvironmentalInspectionUserDO = new SafetyEnvironmentalInspectionUserDO();
safetyEnvironmentalInspectionUserDO.setInspectionId(cmd.getInspectionId());
safetyEnvironmentalInspectionUserDO.setUserId(ssoUser.getUserId());
safetyEnvironmentalInspectionUserDO.setType(3);
safetyEnvironmentalInspectionUserDO.setType(type);
safetyEnvironmentalInspectionUserDO.setSignatureTime(LocalDateTime.now());
if(cmd.getIsDefend() == 1){ // 申辩
// 将确认人改为不通过
@ -82,7 +89,7 @@ public class SafetyEnvironmentalInspectionDefendAddExe {
safetyEnvironmentalInspectionUserDO.setStatus(1);
safetyEnvironmentalInspectionUserRepository.editUserInfo(safetyEnvironmentalInspectionUserDO);
SafetyEnvironmentalInspectionDO inspectionDO = safetyEnvironmentalInspectionRepository.getByInspectionId(cmd.getInspectionId());
if(inspectionDO.getHiddenNumber() > 0){
// 有隐患，将安全环保检查状态改为3-待隐患整改
safetyEnvironmentalInspectionRepository.updateStatus(cmd.getInspectionId(), 3);

15
web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionUserUpdateExe.java
View File

@ -12,10 +12,12 @@ import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmen
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 io.swagger.models.auth.In;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
/**
@ -49,19 +51,24 @@ public class SafetyEnvironmentalInspectionUserUpdateExe {
inspectionUserE.initVerify(ssoUser);
SafetyEnvironmentalInspectionUserDO inspectionUserDO = new SafetyEnvironmentalInspectionUserDO();
BeanUtils.copyProperties(inspectionUserE, inspectionUserDO);
SafetyEnvironmentalInspectionDO inspectionDO = safetyEnvironmentalInspectionRepository.getByInspectionId(cmd.getInspectionId());
// 没有申辩过的安全环保检查 safetyEnvironmentalInspectionUser 下一步type 是2 否则 下一步type是
Integer type = 2;
if (inspectionDO != null && !ObjectUtils.isEmpty(inspectionDO.getDefendFlag()) && inspectionDO.getDefendFlag() == 1){
type = 5;
}
inspectionUserDO.setType(type);
// 修改自己的检查信息
safetyEnvironmentalInspectionUserRepository.verifyEdit(inspectionUserDO);
if (cmd.getStatus() == 1){ // 如果通过
// 查询是否所有人都核实，
Long count = safetyEnvironmentalInspectionUserRepository.countByInspectionId(inspectionUserE.getInspectionId(), 0, 2);
Long count = safetyEnvironmentalInspectionUserRepository.countByInspectionId(inspectionUserE.getInspectionId(), 0, type);
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());
affirmUser.init(cmd.getInspectionId(), 0, type+1, inspectionDO.getXgfMasterUserCorpinfoId(), inspectionDO.getXgfMasterUserDepartmentId(), inspectionDO.getXgfMasterUserId());
safetyEnvironmentalInspectionUserGateway.add(affirmUser);
}
} else if (cmd.getStatus() == 2){ // 如果不通过

7
web-app/src/main/java/com/zcloud/key/project/command/query/hidden/HiddenQueryExe.java
View File

@ -1,10 +1,11 @@
package com.zcloud.key.project.command.query.hidden;
import com.alibaba.cola.dto.PageResponse;
import com.alibaba.cola.dto.SingleResponse;
import com.zcloud.gbscommon.utils.PageQueryHelper;
import com.zcloud.key.project.command.convertor.hidden.HiddenCoConvertor;
import com.zcloud.key.project.dto.hidden.HiddenPageQry;
import com.zcloud.key.project.dto.clientobject.hidden.HiddenCO;
import com.zcloud.key.project.dto.hidden.HiddenPageQry;
import com.zcloud.key.project.persistence.dataobject.hidden.HiddenDO;
import com.zcloud.key.project.persistence.repository.hidden.HiddenRepository;
import lombok.AllArgsConstructor;
@ -38,5 +39,9 @@ public class HiddenQueryExe {
List<HiddenCO> examCenterCOS = hiddenCoConvertor.converDOsToCOs(pageResponse.getData());
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
}
public SingleResponse<HiddenCO> getInfoByIdExecute(Long id) {
HiddenDO hiddenDO = hiddenRepository.getInfoById(id);
return null;
}
}

9
web-app/src/main/java/com/zcloud/key/project/command/query/inspection/SafetyEnvironmentalInspectionQueryExe.java
View File

@ -21,6 +21,7 @@ import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmen
import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionUserRepository;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;
import java.util.List;
import java.util.Map;
@ -50,8 +51,12 @@ public class SafetyEnvironmentalInspectionQueryExe {
* @return
*/
public SafetyEnvironmentalInspectionCO queryById(Long id) {
SafetyEnvironmentalInspectionDO inspectionDO = safetyEnvironmentalInspectionRepository.getById(id);
List<SafetyEnvironmentalInspectionUserDO> inspectionUserDOs = safetyEnvironmentalInspectionUserRepository.listAllByInspectionId(inspectionDO.getInspectionId());
SafetyEnvironmentalInspectionDO inspectionDO = safetyEnvironmentalInspectionRepository.getInfoById(id);
Integer type = 2;
if (!ObjectUtils.isEmpty(inspectionDO.getDefendFlag()) && inspectionDO.getDefendFlag() == 1){
type = 5;
}
List<SafetyEnvironmentalInspectionUserDO> inspectionUserDOs = safetyEnvironmentalInspectionUserRepository.listAllByInspectionId(inspectionDO.getInspectionId(), type);
List<SafetyEnvironmentalInspectionContentDO> inspectionContentDOs = safetyEnvironmentalInspectionContentRepository.listAllByInspectionId(inspectionDO.getInspectionId());
List<HiddenDO> hiddenDOs = hiddenRepository.listAllByInspectionId(inspectionDO.getInspectionId());
List<SafetyEnvironmentalInspectionUserCO> inspectionUserCOS = safetyEnvironmentalInspectionUserCoConvertor.converDOsToCOs(inspectionUserDOs);

7
web-app/src/main/java/com/zcloud/key/project/service/hidden/HiddenAcceptRecordServiceImpl.java
View File

@ -7,6 +7,7 @@ import com.zcloud.key.project.command.hidden.HiddenAcceptRecordAddExe;
import com.zcloud.key.project.command.hidden.HiddenAcceptRecordRemoveExe;
import com.zcloud.key.project.command.hidden.HiddenAcceptRecordUpdateExe;
import com.zcloud.key.project.command.query.hidden.HiddenAcceptRecordQueryExe;
import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordAcceptCmd;
import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordAddCmd;
import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordPageQry;
import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordUpdateCmd;
@ -46,6 +47,12 @@ public class HiddenAcceptRecordServiceImpl implements HiddenAcceptRecordServiceI
hiddenAcceptRecordUpdateExe.execute(hiddenAcceptRecordUpdateCmd);
}
@Override
public void accept(HiddenAcceptRecordAcceptCmd cmd) {
hiddenAcceptRecordUpdateExe.acceptExecute(cmd);
}
@Override
public void remove(Long id) {
hiddenAcceptRecordRemoveExe.execute(id);

5
web-app/src/main/java/com/zcloud/key/project/service/hidden/HiddenRectificationRecordServiceImpl.java
View File

@ -46,6 +46,11 @@ public class HiddenRectificationRecordServiceImpl implements HiddenRectification
hiddenRectificationRecordUpdateExe.execute(hiddenRectificationRecordUpdateCmd);
}
@Override
public void rectification(HiddenRectificationRecordUpdateCmd cmd) {
hiddenRectificationRecordUpdateExe.rectificationExecute(cmd);
}
@Override
public void remove(Long id) {
hiddenRectificationRecordRemoveExe.execute(id);

5
web-app/src/main/java/com/zcloud/key/project/service/hidden/HiddenServiceImpl.java
View File

@ -55,5 +55,10 @@ public class HiddenServiceImpl implements HiddenServiceI {
public void removeBatch(Long[] ids) {
hiddenRemoveExe.execute(ids);
}
@Override
public SingleResponse<HiddenCO> getInfoById(Long id) {
return hiddenQueryExe.getInfoByIdExecute(id);
}
}

2
web-client/src/main/java/com/zcloud/key/project/api/hidden/HiddenAcceptRecordServiceI.java
View File

@ -2,6 +2,7 @@ package com.zcloud.key.project.api.hidden;
import com.alibaba.cola.dto.PageResponse;
import com.alibaba.cola.dto.SingleResponse;
import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordAcceptCmd;
import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordAddCmd;
import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordPageQry;
import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordUpdateCmd;
@ -19,6 +20,7 @@ public interface HiddenAcceptRecordServiceI {
SingleResponse<HiddenAcceptRecordCO> add(HiddenAcceptRecordAddCmd cmd);
void edit(HiddenAcceptRecordUpdateCmd cmd);
void accept(HiddenAcceptRecordAcceptCmd cmd);
void remove(Long id);

2
web-client/src/main/java/com/zcloud/key/project/api/hidden/HiddenRectificationRecordServiceI.java
View File

@ -20,6 +20,8 @@ public interface HiddenRectificationRecordServiceI {
void edit(HiddenRectificationRecordUpdateCmd cmd);
void rectification(HiddenRectificationRecordUpdateCmd cmd);
void remove(Long id);
void removeBatch(Long[] ids);

3
web-client/src/main/java/com/zcloud/key/project/api/hidden/HiddenServiceI.java
View File

@ -20,8 +20,11 @@ public interface HiddenServiceI {
void edit(HiddenUpdateCmd cmd);
void remove(Long id);
void removeBatch(Long[] ids);
SingleResponse<HiddenCO> getInfoById(Long id);
}

9
web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenAcceptRecordCO.java
View File

@ -24,9 +24,12 @@ public class HiddenAcceptRecordCO extends ClientObject {
//隐患主键id
@ApiModelProperty(value = "隐患主键id")
private String hiddenId;
//安全检查id
@ApiModelProperty(value = "安全检查id")
private String inspectionId;
//外键id
@ApiModelProperty(value = "外键id")
private String foreignKey;
//是否合格 0-否 1-是
@ApiModelProperty(value = "是否合格 0-否 1-是")
private Integer state;
//验收人部门id
@ApiModelProperty(value = "验收人部门id")
private Long acceptDepartmentId;

3
web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenRectificationRecordCO.java
View File

@ -24,6 +24,9 @@ public class HiddenRectificationRecordCO extends ClientObject {
//隐患主键id
@ApiModelProperty(value = "隐患主键id")
private String hiddenId;
//来源ID外键
@ApiModelProperty(value = "来源ID外键")
private String foreignKey;
//安全检查id
@ApiModelProperty(value = "安全检查id")
private String inspectionId;

23
web-client/src/main/java/com/zcloud/key/project/dto/clientobject/inspection/SafetyEnvironmentalInspectionCO.java
View File

@ -1,6 +1,7 @@
package com.zcloud.key.project.dto.clientobject.inspection;
import com.alibaba.cola.dto.ClientObject;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.zcloud.key.project.dto.clientobject.hidden.HiddenCO;
import com.zcloud.key.project.dto.hidden.HiddenAddCmd;
@ -54,11 +55,11 @@ public class SafetyEnvironmentalInspectionCO extends ClientObject {
private String place;
//检查开始时间
@ApiModelProperty(value = "检查开始时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime timeStart;
//检查结束时间
@ApiModelProperty(value = "检查结束时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime timeEnd;
//状态(0-暂存,1-待核实,2-待确认,3-待隐患整改,4-待隐患验收,5-检查归档,6-核实打回,7-被检查申辩)
@ApiModelProperty(value = "状态(0-暂存,1-待核实,2-待确认,3-待隐患整改,4-待隐患验收,5-检查归档,6-核实打回,7-被检查申辩)")
@ -76,6 +77,20 @@ public class SafetyEnvironmentalInspectionCO extends ClientObject {
@ApiModelProperty(value = "企业名称")
private String corpName;
@ApiModelProperty(value = "检查人")
private String inspectionUserName;
@ApiModelProperty(value = "被检查单位")
private String inspectedCorpinfoName;
@ApiModelProperty(value = "被检查单位现场负责人")
private String xgfMasterUserName;
@ApiModelProperty(value = "被检查单位现场负责人部门")
private Long xgfMasterUserDepartmentId;
@ApiModelProperty(value = "被检查单位现场负责人企业")
private Long xgfMasterUserCorpinfoId;
@ApiModelProperty(value = "辖区单位名称")
private String areaDepartmentName;
@ApiModelProperty(value = "重点作业名称")
private String projectName;
@ApiModelProperty(value = "检查人员", name = "inspectionUserList", required = true)
private List<SafetyEnvironmentalInspectionUserCO> inspectionUserList;
@ -91,11 +106,11 @@ public class SafetyEnvironmentalInspectionCO extends ClientObject {
//创建时间
@ApiModelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
//更新时间
@ApiModelProperty(value = "更新时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
//创建人ID
@ApiModelProperty(value = "创建人ID")

16
web-client/src/main/java/com/zcloud/key/project/dto/clientobject/inspection/SafetyEnvironmentalInspectionUserCO.java
View File

@ -1,6 +1,7 @@
package com.zcloud.key.project.dto.clientobject.inspection;
import com.alibaba.cola.dto.ClientObject;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -32,6 +33,15 @@ public class SafetyEnvironmentalInspectionUserCO extends ClientObject {
//检查人部门id
@ApiModelProperty(value = "检查人部门id")
private Long departmentId;
//检查人企业名称
@ApiModelProperty(value = "检查人企业名称")
private String corpName;
//检查人部门名称
@ApiModelProperty(value = "检查人部门名称")
private String departmentName;
//检查人名称
@ApiModelProperty(value = "检查人名称")
private String userName;
//检查人人员id
@ApiModelProperty(value = "检查人人员id")
private Long userId;
@ -49,15 +59,15 @@ public class SafetyEnvironmentalInspectionUserCO extends ClientObject {
private String signature;
//核实时间
@ApiModelProperty(value = "核实时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime signatureTime;
//创建时间
@ApiModelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
//更新时间
@ApiModelProperty(value = "更新时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
//创建人ID
@ApiModelProperty(value = "创建人ID")

50
web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenAcceptRecordAcceptCmd.java Normal file
View File

@ -0,0 +1,50 @@
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;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.time.LocalDateTime;
/**
* web-client
*
* @Author zhaokai
* @Date 2026-03-20 11:33:08
*/
@EqualsAndHashCode(callSuper = true)
@Data
@NoArgsConstructor
@AllArgsConstructor
public class HiddenAcceptRecordAcceptCmd extends Command {
@ApiModelProperty(value = "业务主键id", name = "hiddenAcceptRecordId", required = true)
private String hiddenAcceptRecordId;
@ApiModelProperty(value = "隐患主键id", name = "hiddenId", required = true)
@NotEmpty(message = "隐患主键id不能为空")
private String hiddenId;
@ApiModelProperty(value = "是否合格 0-否 1-是", name = "state", required = true)
@NotNull(message = "是否合格不能为空")
private Integer state;
@ApiModelProperty(value = "外键id", name = "inspectionId", required = true)
private String foreignKey;
@ApiModelProperty(value = "验收人部门id", name = "acceptDepartmentId", required = true)
private Long acceptDepartmentId;
@ApiModelProperty(value = "验收人id", name = "acceptUserId", required = true)
private Long acceptUserId;
@ApiModelProperty(value = "验收时间", name = "acceptTime", required = true)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime acceptTime;
@ApiModelProperty(value = "打回意见", name = "打回意见", required = true)
private String rejectOpinion;
}

11
web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenPageQry.java
View File

@ -3,6 +3,8 @@ package com.zcloud.key.project.dto.hidden;
import com.alibaba.cola.dto.PageQuery;
import lombok.Data;
import java.util.List;
/**
* web-client
@ -24,5 +26,14 @@ public class HiddenPageQry extends PageQuery {
* - `ne`: 不等比较查询，对应SQL的!=操作符
*/
private String likeHiddenId;
private String hiddenDesc;
private Integer source;
private String startTime;
private String endTime;
private String projectName;
private String hiddenFindUserName;
private List<Integer> stateList;
}

21
web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenRectificationRecordUpdateCmd.java
View File

@ -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;
@ -22,26 +23,18 @@ import java.time.LocalDateTime;
@NoArgsConstructor
@AllArgsConstructor
public class HiddenRectificationRecordUpdateCmd extends Command {
@ApiModelProperty(value = "主键", name = "id", required = true)
@NotNull(message = "主键不能为空")
private Long id;
@ApiModelProperty(value = "业务主键id", name = "hiddenRectificationRecordId", required = true)
@NotEmpty(message = "业务主键id不能为空")
private String hiddenRectificationRecordId;
@ApiModelProperty(value = "外键id", name = "foreignKey", required = true)
private String foreignKey;
@ApiModelProperty(value = "隐患主键id", name = "hiddenId", required = true)
@NotEmpty(message = "隐患主键id不能为空")
private String hiddenId;
@ApiModelProperty(value = "安全检查id", name = "inspectionId", required = true)
@NotEmpty(message = "安全检查id不能为空")
private String inspectionId;
@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 = "整改时间", name = "rectificationTime", required = true)
@NotEmpty(message = "整改时间不能为空")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@NotNull(message = "整改时间不能为空")
private LocalDateTime rectificationTime;
@ApiModelProperty(value = "整改描述", name = "rectificationDesc", required = true)
@NotEmpty(message = "整改描述不能为空")

4
web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionAddCmd.java
View File

@ -57,16 +57,14 @@ public class SafetyEnvironmentalInspectionAddCmd extends Command {
private String place;
@ApiModelProperty(value = "检查开始时间", name = "timeStart", required = true)
@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 HH:mm:ss")
private LocalDateTime timeEnd;
@ApiModelProperty(value = "状态(0-暂存,1-待核实,2-待确认,3-待隐患整改,4-待隐患验收,5-检查归档,6-核实打回,7-被检查申辩)", name = "status", required = true)
@ApiModelProperty(value = "状态(0-暂存,1-待核实,2-待确认,3-待隐患处理,5-检查归档,6-核实打回,7-被检查申辩)", name = "status", required = true)
private Integer status;
@ApiModelProperty(value = "关联隐患数", name = "hiddenNumber", required = true)

2
web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionUpdateCmd.java
View File

@ -53,7 +53,7 @@ public class SafetyEnvironmentalInspectionUpdateCmd extends Command {
@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)
@ApiModelProperty(value = "状态(0-暂存,1-待核实,2-待确认,3-待隐患处理,5-检查归档,6-核实打回,7-被检查申辩)", name = "status", required = true)
private Integer status;
@ApiModelProperty(value = "关联隐患数", name = "hiddenNumber", required = true)
private Integer hiddenNumber;

20
web-domain/src/main/java/com/zcloud/key/project/domain/model/hidden/HiddenAcceptRecordE.java
View File

@ -1,7 +1,10 @@
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 lombok.Data;
import org.springframework.util.ObjectUtils;
import java.time.LocalDateTime;
@ -19,8 +22,10 @@ public class HiddenAcceptRecordE extends BaseE {
private String hiddenAcceptRecordId;
//隐患主键id
private String hiddenId;
//安全检查id
private String inspectionId;
//外键id
private String foreignKey;
//是否合格 0-否 1-是
private Integer state;
//验收人部门id
private Long acceptDepartmentId;
//验收人id
@ -51,5 +56,16 @@ public class HiddenAcceptRecordE extends BaseE {
private Long orgId;
//环境
private String env;
public void init(SSOUser ssoUser){
if (ObjectUtils.isEmpty(this.hiddenAcceptRecordId)){
this.setHiddenAcceptRecordId(Tools.get32UUID());
}
if(ObjectUtils.isEmpty(this.acceptTime)){
this.setAcceptTime(LocalDateTime.now());
}
this.setAcceptDepartmentId(ssoUser.getOrgId());
this.setAcceptUserId(ssoUser.getUserId());
}
}

14
web-domain/src/main/java/com/zcloud/key/project/domain/model/hidden/HiddenRectificationRecordE.java
View File

@ -1,7 +1,10 @@
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 lombok.Data;
import org.springframework.util.ObjectUtils;
import java.time.LocalDateTime;
@ -19,6 +22,8 @@ public class HiddenRectificationRecordE extends BaseE {
private String hiddenRectificationRecordId;
//隐患主键id
private String hiddenId;
//隐患主键id
private String foreignKey;
//安全检查id
private String inspectionId;
//整改人部门id
@ -53,5 +58,14 @@ public class HiddenRectificationRecordE extends BaseE {
private Long orgId;
//环境
private String env;
public void init(SSOUser ssoUser){
if (ObjectUtils.isEmpty(this.hiddenRectificationRecordId)){
this.setHiddenRectificationRecordId(Tools.get32UUID());
}
this.setRectificationDepartmentId(ssoUser.getOrgId());
this.setRectificationUserId(ssoUser.getUserId());
}
}

9
web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/hidden/HiddenAcceptRecordDO.java
View File

@ -26,9 +26,12 @@ public class HiddenAcceptRecordDO extends BaseDO {
//隐患主键id
@ApiModelProperty(value = "隐患主键id")
private String hiddenId;
//安全检查id
@ApiModelProperty(value = "安全检查id")
private String inspectionId;
//外键id
@ApiModelProperty(value = "外键id")
private String foreignKey;
//是否合格 0-否 1-是
@ApiModelProperty(value = "是否合格 0-否 1-是")
private Integer state;
//验收人部门id
@ApiModelProperty(value = "验收人部门id")
private Long acceptDepartmentId;

16
web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/hidden/HiddenDO.java
View File

@ -1,5 +1,6 @@
package com.zcloud.key.project.persistence.dataobject.hidden;
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;
@ -85,6 +86,21 @@ public class HiddenDO extends BaseDO {
@ApiModelProperty(value = "验收人id", name = "acceptUserId")
private Long acceptUserId;
//整改人姓名
@ApiModelProperty(value = "整改人姓名")
@TableField(exist = false)
private String rectificationUserName;
//发现人姓名
@ApiModelProperty(value = "发现人姓名")
@TableField(exist = false)
private String hiddenFindUserName;
//重点作业名称
@ApiModelProperty(value = "重点作业名称")
@TableField(exist = false)
private String projectName;
public HiddenDO(String hiddenId) {
this.hiddenId = hiddenId;
}

3
web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/hidden/HiddenRectificationRecordDO.java
View File

@ -26,6 +26,9 @@ public class HiddenRectificationRecordDO extends BaseDO {
//隐患主键id
@ApiModelProperty(value = "隐患主键id")
private String hiddenId;
//来源ID外键
@ApiModelProperty(value = "来源ID外键")
private String foreignKey;
//安全检查id
@ApiModelProperty(value = "安全检查id")
private String inspectionId;

3
web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/inspection/SafetyEnvironmentalInspectionDO.java
View File

@ -90,6 +90,9 @@ public class SafetyEnvironmentalInspectionDO extends BaseDO {
@ApiModelProperty(value = "被检查单位现场负责人企业")
@TableField(exist = false)
private Long xgfMasterUserCorpinfoId;
@ApiModelProperty(value = "辖区单位名称")
@TableField(exist = false)
private String areaDepartmentName;

13
web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/inspection/SafetyEnvironmentalInspectionUserDO.java
View File

@ -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;
@ -32,6 +33,18 @@ public class SafetyEnvironmentalInspectionUserDO extends BaseDO {
//检查人部门id
@ApiModelProperty(value = "检查人部门id")
private Long departmentId;
//检查人企业名称
@ApiModelProperty(value = "检查人企业名称")
@TableField(exist = false)
private String corpName;
//检查人部门名称
@ApiModelProperty(value = "检查人部门名称")
@TableField(exist = false)
private String departmentName;
//检查人名称
@ApiModelProperty(value = "检查人名称")
@TableField(exist = false)
private String userName;
//检查人人员id
@ApiModelProperty(value = "检查人人员id")
private Long userId;

8
web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenMapper.java
View File

@ -1,8 +1,13 @@
package com.zcloud.key.project.persistence.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.zcloud.key.project.persistence.dataobject.hidden.HiddenDO;
import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.Map;
/**
* web-infrastructure
@ -12,6 +17,9 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface HiddenMapper extends BaseMapper<HiddenDO> {
IPage<HiddenDO> selectListPage(IPage<HiddenDO> page, @Param("params") Map<String, Object> params, String menuPerms);
HiddenDO getInfoById(Long id);
}

2
web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/inspection/SafetyEnvironmentalInspectionMapper.java
View File

@ -22,5 +22,7 @@ public interface SafetyEnvironmentalInspectionMapper extends BaseMapper<SafetyEn
SafetyEnvironmentalInspectionDO getByInspectionId(String inspectionId);
SafetyEnvironmentalInspectionDO getInfoById(Long id);
}

6
web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/inspection/SafetyEnvironmentalInspectionUserMapper.java
View File

@ -3,6 +3,10 @@ package com.zcloud.key.project.persistence.mapper.inspection;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionUserDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
* web-infrastructure
@ -13,5 +17,7 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface SafetyEnvironmentalInspectionUserMapper extends BaseMapper<SafetyEnvironmentalInspectionUserDO> {
List<SafetyEnvironmentalInspectionUserDO> selectListByInspectionId(@Param("params") Map<String, Object> params);
}

6
web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenRepository.java
View File

@ -23,5 +23,11 @@ public interface HiddenRepository extends BaseRepository<HiddenDO> {
List<HiddenDO> listAllByInspectionId(String inspectionId);
void deleteBatch(Map<String, Object> params);
void updateState(String hiddenId, Integer state);
Long countByForeignKey(String foreignKey, List<Integer> state);
HiddenDO getInfoById(Long id);
}

34
web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenRepositoryImpl.java
View File

@ -1,5 +1,6 @@
package com.zcloud.key.project.persistence.repository.impl.hidden;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.cola.dto.PageResponse;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@ -14,6 +15,7 @@ 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 org.springframework.util.ObjectUtils;
import java.util.List;
import java.util.Map;
@ -32,10 +34,7 @@ public class HiddenRepositoryImpl extends BaseRepositoryImpl<HiddenMapper, Hidde
@Override
public PageResponse<HiddenDO> listPage(Map<String, Object> params) {
IPage<HiddenDO> iPage = new Query<HiddenDO>().getPage(params);
QueryWrapper<HiddenDO> queryWrapper = new QueryWrapper<>();
queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params);
queryWrapper.orderByDesc("create_time");
IPage<HiddenDO> result = hiddenMapper.selectPage(iPage, queryWrapper);
IPage<HiddenDO> result = hiddenMapper.selectListPage(iPage, params, null);
return PageHelper.pageToResponse(result, result.getRecords());
}
@ -72,5 +71,32 @@ public class HiddenRepositoryImpl extends BaseRepositoryImpl<HiddenMapper, Hidde
updateWrapper.set("delete_enum", "TRUE");
hiddenMapper.update(null, updateWrapper);
}
@Override
public void updateState(String hiddenId, Integer state) {
UpdateWrapper<HiddenDO> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("hidden_id", hiddenId);
updateWrapper.eq("delete_enum", "FALSE");
updateWrapper.set("state", state);
hiddenMapper.update(null, updateWrapper);
}
@Override
public Long countByForeignKey(String foreignKey, List<Integer> stateList) {
QueryWrapper<HiddenDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("foreign_key", foreignKey);
if(stateList != null && stateList.size() > 0){
queryWrapper.in("state", stateList);
}
queryWrapper.eq("delete_enum", "FALSE");
return hiddenMapper.selectCount(queryWrapper);
}
@Override
public HiddenDO getInfoById(Long id) {
return hiddenMapper.getInfoById(id);
}
}

5
web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/inspection/SafetyEnvironmentalInspectionRepositoryImpl.java
View File

@ -56,5 +56,10 @@ public class SafetyEnvironmentalInspectionRepositoryImpl extends BaseRepositoryI
public SafetyEnvironmentalInspectionDO getByInspectionId(String inspectionId) {
return safetyEnvironmentalInspectionMapper.getByInspectionId(inspectionId);
}
@Override
public SafetyEnvironmentalInspectionDO getInfoById(Long id) {
return safetyEnvironmentalInspectionMapper.getInfoById(id);
}
}

16
web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/inspection/SafetyEnvironmentalInspectionUserRepositoryImpl.java
View File

@ -16,6 +16,7 @@ import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -68,12 +69,13 @@ public class SafetyEnvironmentalInspectionUserRepositoryImpl extends BaseReposit
@Override
public List<SafetyEnvironmentalInspectionUserDO> listAllByInspectionId(String inspectionId, Integer type) {
QueryWrapper<SafetyEnvironmentalInspectionUserDO> 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);
Map<String, Object> params = new HashMap<String, Object>();
params.put("inspectionId", inspectionId);
if (!ObjectUtils.isEmpty(type)){
params.put("type", type);
}
return safetyEnvironmentalInspectionUserMapper.selectListByInspectionId(params);
}
@Override
@ -81,7 +83,7 @@ public class SafetyEnvironmentalInspectionUserRepositoryImpl extends BaseReposit
UpdateWrapper updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("inspection_id", inspectionUserDO.getInspectionId());
updateWrapper.eq("user_id", inspectionUserDO.getUserId());
updateWrapper.eq("type", 2);
updateWrapper.eq("type", inspectionUserDO.getType());
updateWrapper.eq("delete_enum", "FALSE");
updateWrapper.set("user_remarks", inspectionUserDO.getUserRemarks());
updateWrapper.set("status", inspectionUserDO.getStatus());

2
web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/inspection/SafetyEnvironmentalInspectionRepository.java
View File

@ -20,5 +20,7 @@ public interface SafetyEnvironmentalInspectionRepository extends BaseRepository<
void updateStatus(String inspectionId, Integer status, Integer defendFlag);
SafetyEnvironmentalInspectionDO getByInspectionId(String inspectionId);
SafetyEnvironmentalInspectionDO getInfoById(Long id);
}

94
web-infrastructure/src/main/resources/mapper/HiddenMapper.xml
View File

@ -3,5 +3,99 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zcloud.key.project.persistence.mapper.HiddenMapper">
<select id="selectListPage" resultType="com.zcloud.key.project.persistence.dataobject.hidden.HiddenDO">
select
h.*,
ru.name as rectification_user_name,
GROUP_CONCAT(DISTINCT hfu.name) hidden_find_user_name,
kp.project_name
from
hidden h
left join user ru on h.rectification_user_id = ru.id
left join hidden_find_user hf on hf.hidden_id = h.hidden_id and hf.delete_enum = 'FALSE'
left join user hfu on hfu.id = hf.find_user_id
left join safety_environmental_inspection i on i.inspection_id = h.foreign_key
left join key_project kp on kp.key_project_id = i.key_project_id
<where>
<if test="params.hiddenDesc != null and params.hiddenDesc != ''">
and h.hidden_desc LIKE CONCAT('%', #{params.hiddenDesc}, '%')
</if>
<if test="params.source != null and params.source != ''">
and h.source = #{params.source}
</if>
<if test="params.startTime != null and params.startTime != ''">
and h.create_time >= #{params.startTime}
</if>
<if test="params.endTime != null and params.endTime != ''">
and h.create_time &lt;= #{params.endTime}
</if>
<if test="params.projectName != null and params.projectName != ''">
and kp.project_name LIKE CONCAT('%', #{params.projectName}, '%')
</if>
<if test="params.stateList != null and params.stateList.size() > 0">
and h.state in
<foreach item="state" collection="params.stateList" separator="," open="(" close=")" index="">
#{state}
</foreach>
</if>
</where>
<if test="params.hiddenFindUserName != null and params.hiddenFindUserName != ''">
HAVING hidden_find_user_name LIKE CONCAT('%', #{params.hiddenFindUserName}, '%')
</if>
GROUP BY h.id
ORDER BY
h.create_time desc
</select>
<select id="getInfoById" resultType="com.zcloud.key.project.persistence.dataobject.hidden.HiddenDO">
select
h.*,
kp.project_name
from
hidden h
left join user ru on h.rectification_user_id = ru.id
left join hidden_find_user hf on hf.hidden_id = h.hidden_id and hf.delete_enum = 'FALSE'
left join user hfu on hfu.id = hf.find_user_id
left join safety_environmental_inspection i on i.inspection_id = h.foreign_key
left join key_project kp on kp.key_project_id = i.key_project_id
<where>
<if test="params.hiddenDesc != null and params.hiddenDesc != ''">
and h.hidden_desc LIKE CONCAT('%', #{params.hiddenDesc}, '%')
</if>
<if test="params.source != null and params.source != ''">
and h.source = #{params.source}
</if>
<if test="params.startTime != null and params.startTime != ''">
and h.create_time >= #{params.startTime}
</if>
<if test="params.endTime != null and params.endTime != ''">
and h.create_time &lt;= #{params.endTime}
</if>
<if test="params.projectName != null and params.projectName != ''">
and kp.project_name LIKE CONCAT('%', #{params.projectName}, '%')
</if>
<if test="params.stateList != null and params.stateList.size() > 0">
and h.state in
<foreach item="state" collection="params.stateList" separator="," open="(" close=")" index="">
#{state}
</foreach>
</if>
</where>
<if test="params.hiddenFindUserName != null and params.hiddenFindUserName != ''">
HAVING hidden_find_user_name LIKE CONCAT('%', #{params.hiddenFindUserName}, '%')
</if>
GROUP BY h.id
ORDER BY
h.create_time desc
</select>
</mapper>

59
web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionMapper.xml
View File

@ -10,6 +10,7 @@
GROUP_CONCAT(DISTINCT iuu.name) inspection_user_name,
indc.corp_name inspected_corpinfo_name,
xmu.name xgf_master_user_name
FROM
safety_environmental_inspection i
left join key_project kp on kp.key_project_id = i.key_project_id
@ -17,6 +18,7 @@
left join (
SELECT
inspection_id,
department_id,
user_id,
type,
ROW_NUMBER() OVER (
@ -32,7 +34,7 @@
left join user xmu on xmu.id = i.xgf_master_user_id
where i.delete_enum = 'FALSE'
<if test="params.place != null and params.place != ''">
and i.place = #{params.place}
and i.place LIKE CONCAT('%', #{params.place}, '%')
</if>
<if test="params.createName != null and params.createName != ''">
and creu.name LIKE CONCAT('%', #{params.createName}, '%')
@ -53,10 +55,17 @@
<if test="params.projectName != null and params.projectName != ''">
and kp.project_name LIKE CONCAT('%', #{params.projectName}, '%')
</if>
<if test="params.statusList != null and params.statusList.size() > 0">
and i.status in
<foreach item="status" collection="params.statusList" separator="," open="(" close=")" index="">
#{status}
</foreach>
</if>
GROUP BY i.id
<if test="params.inspectionUserName != null and params.inspectionUserName != ''">
HAVING inspection_user_name LIKE CONCAT('%', #{params.inspectionUserName}, '%')
</if>
GROUP BY i.id
ORDER BY
CASE WHEN i.status = 6 THEN 0 ELSE 1 END,
i.create_time desc
@ -65,15 +74,47 @@
<select id="getByInspectionId" resultType="com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionDO">
select
i.*,
xmu.name xgf_master_user_name,
xmu.department_id xgf_master_user_department_id,
xmu.corpinfo_id xgf_master_user_corpinfo_id
i.*,
xmu.name xgf_master_user_name,
xmu.department_id xgf_master_user_department_id,
xmu.corpinfo_id xgf_master_user_corpinfo_id
FROM
safety_environmental_inspection i
left join user xmu on xmu.id = i.xgf_master_user_id
safety_environmental_inspection i
left join user xmu on xmu.id = i.xgf_master_user_id
where i.delete_enum = 'FALSE'
and i.inspection_id = #{inspectionId}
and i.inspection_id = #{inspectionId}
</select>
<select id="getInfoById" resultType="com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionDO">
select
i.*,
kp.project_name,
GROUP_CONCAT(DISTINCT iuu.name) inspection_user_name,
indc.corp_name inspected_corpinfo_name,
xmu.name xgf_master_user_name,
ad.name area_department_name
FROM
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 (
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
left join department ad on ad.id = i.department_id
where i.id = #{id}
</select>
</mapper>

21
web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionUserMapper.xml
View File

@ -3,6 +3,25 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zcloud.key.project.persistence.mapper.inspection.SafetyEnvironmentalInspectionUserMapper">
<select id="selectListByInspectionId" resultType="com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionUserDO">
select
iu.*,
ci.corp_name,
d.name department_name,
u.name user_name
from safety_environmental_inspection_user iu
left join corp_info ci on ci.id = iu.corp_id
left join department d on d.id = iu.department_id
left join user u on u.id = iu.user_id
<where>
iu.delete_enum = 'FALSE'
<if test="params.inspectionId != null and params.inspectionId != ''">
and iu.inspection_id = #{params.inspectionId}
</if>
<if test="params.type != null and params.type != ''">
and iu.type = #{params.type}
</if>
</where>
</select>
</mapper>