diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/common/EsInspectCommon.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/common/EsInspectCommon.java new file mode 100644 index 00000000..5b9c8b4b --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/common/EsInspectCommon.java @@ -0,0 +1,62 @@ +package com.jero.modules.activiti.process.esinspect.common; + +/** + * @ClassName: EsInspectCpmmon + * @Description: + * @Author: yjz + * @Date: 2023-11-09 13:47 + * @Version: 1.0 + **/ +public class EsInspectCommon { + private EsInspectCommon(){ + + } + + /** + * 企标稽查流程key + */ + public static final String KEY = "inspect_process"; + + /** + * 企标稽查流程name + */ + public static final String NAME = "企业稽查流程"; + + /** + * 企标稽查流程节点: 1:稽查负责人发起,2:负责人主管级领导审批,3:稽查负责人上传稽查报告和整改计划,4:负责人主管级领导审批,5:相关人员会签 + */ + public static final String PROCESS_NODE_1 = "responsible_start"; + /** + * 企标稽查流程节点: 1:稽查负责人发起,2:负责人主管级领导审批,3:稽查负责人上传稽查报告和整改计划,4:负责人主管级领导审批,5:相关人员会签 + */ + public static final String PROCESS_NODE_2 = "leader_approval"; + /** + * 企标稽查流程节点: 1:稽查负责人发起,2:负责人主管级领导审批,3:稽查负责人上传稽查报告和整改计划,4:负责人主管级领导审批,5:相关人员会签 + */ + public static final String PROCESS_NODE_3 = "responsible_upload"; + /** + * 企标稽查流程节点: 1:稽查负责人发起,2:负责人主管级领导审批,3:稽查负责人上传稽查报告和整改计划,4:负责人主管级领导审批,5:相关人员会签 + */ + public static final String PROCESS_NODE_4 = "leader_approval_again"; + /** + * 企标稽查流程节点: 1:稽查负责人发起,2:负责人主管级领导审批,3:稽查负责人上传稽查报告和整改计划,4:负责人主管级领导审批,5:相关人员会签 + */ + public static final String PROCESS_NODE_5 = "involve_countersign"; + + /** + * 稽查状态: 1:进行中，2：稽查中，3：已完成，4：拖期 + */ + public static final String INSPECT_STATUS_1 = "1"; + /** + * 稽查状态: 1:进行中，2：稽查中，3：已完成，4：拖期 + */ + public static final String INSPECT_STATUS_2 = "2"; + /** + * 稽查状态: 1:进行中，2：稽查中，3：已完成，4：拖期 + */ + public static final String INSPECT_STATUS_3 = "3"; + /** + * 稽查状态: 1:进行中，2：稽查中，3：已完成，4：拖期 + */ + public static final String INSPECT_STATUS_4 = "4"; +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/mapper/xml/ProcessEsInspectMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/mapper/xml/ProcessEsInspectMapper.xml index 1ef22036..4ba90a8c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/mapper/xml/ProcessEsInspectMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/mapper/xml/ProcessEsInspectMapper.xml @@ -19,6 +19,8 @@ pesi.del_flag, pesi.project_id, pesi.inspect_id, + pesi.complete_date, + pesi.actual_inspect_user, lesi.id, lesi.create_by, lesi.create_time, diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java index c7e9177b..ccaf30a5 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java @@ -11,13 +11,23 @@ import com.jero.modules.activiti.enums.FinishFlagEnum; import com.jero.modules.activiti.process.common.entity.ProcessDraft; import com.jero.modules.activiti.process.common.enums.ProcessType; import com.jero.modules.activiti.process.common.service.ProcessDraftService; +import com.jero.modules.activiti.process.esinspect.common.EsInspectCommon; import com.jero.modules.activiti.process.esinspect.service.IEsInspectFlowService; +import com.jero.modules.activiti.process.esinspect.service.IProcessEsInspectService; import com.jero.modules.activiti.process.esinspect.vo.EsInspectFlowVO; -import com.jero.modules.activiti.process.esinspectplan.common.EsInspectPlanCommon; +import com.jero.modules.activiti.process.esinspect.vo.ProcessEsInspectVO; import com.jero.modules.activiti.service.ProcessAllService; import com.jero.modules.activiti.service.ProcessApprovalRecordService; import com.jero.modules.activiti.service.ProcessNodeLinkService; -import com.jero.modules.activiti.service.ProcessNodeService; +import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectContent; +import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectRectifyPlan; +import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectReport; +import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectContentService; +import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectRectifyPlanService; +import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectReportService; +import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectService; +import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; +import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; import lombok.extern.slf4j.Slf4j; import org.activiti.engine.ProcessEngine; import org.activiti.engine.ProcessEngines; @@ -51,18 +61,33 @@ public class EsInspectFlowServiceImpl implements IEsInspectFlowService { private final ProcessAllService processAllService; private final ProcessApprovalRecordService processApprovalRecordService; private final ProcessDraftService processDraftService; - private final ProcessNodeService processNodeService; private final ProcessNodeLinkService processNodeLinkService; + private final IProcessEsInspectService processEsInspectService; + private final ILawsEnterpriseStandardService lawsEnterpriseStandardService; + private final EnterpriseStandardInspectService enterpriseStandardInspectService; + private final EnterpriseStandardInspectContentService enterpriseStandardInspectContentService; + private final EnterpriseStandardInspectRectifyPlanService enterpriseStandardInspectRectifyPlanService; + private final EnterpriseStandardInspectReportService enterpriseStandardInspectReportService; public EsInspectFlowServiceImpl(ProcessAllService processAllService, ProcessApprovalRecordService processApprovalRecordService, ProcessDraftService processDraftService, - ProcessNodeService processNodeService, - ProcessNodeLinkService processNodeLinkService) { + ProcessNodeLinkService processNodeLinkService, + IProcessEsInspectService processEsInspectService, + ILawsEnterpriseStandardService lawsEnterpriseStandardService, + EnterpriseStandardInspectService enterpriseStandardInspectService, + EnterpriseStandardInspectContentService enterpriseStandardInspectContentService, + EnterpriseStandardInspectRectifyPlanService enterpriseStandardInspectRectifyPlanService, + EnterpriseStandardInspectReportService enterpriseStandardInspectReportService) { this.processAllService = processAllService; this.processApprovalRecordService = processApprovalRecordService; this.processDraftService = processDraftService; - this.processNodeService = processNodeService; this.processNodeLinkService = processNodeLinkService; + this.processEsInspectService = processEsInspectService; + this.lawsEnterpriseStandardService = lawsEnterpriseStandardService; + this.enterpriseStandardInspectService = enterpriseStandardInspectService; + this.enterpriseStandardInspectContentService = enterpriseStandardInspectContentService; + this.enterpriseStandardInspectRectifyPlanService = enterpriseStandardInspectRectifyPlanService; + this.enterpriseStandardInspectReportService = enterpriseStandardInspectReportService; } ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine(); @@ -80,7 +105,7 @@ public class EsInspectFlowServiceImpl implements IEsInspectFlowService { // 根据流程key启动流程 同时 设置审批人员参数 ProcessInstance processInstance = runtimeService - .startProcessInstanceByKey(EsInspectPlanCommon.KEY, map); + .startProcessInstanceByKey(EsInspectCommon.KEY, map); // 再次设置map runtimeService.setVariables(processInstance.getId(), map); @@ -212,7 +237,84 @@ public class EsInspectFlowServiceImpl implements IEsInspectFlowService { @Override public void flowApproval(EsInspectFlowVO esInspectFlowVO) { + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + // 流程信息 + ProcessAll processAll = esInspectFlowVO.getProcessAll(); + // 流程审批信息 + ProcessApprovalRecord processApprovalRecord = esInspectFlowVO.getProcessApprovalRecord(); + // map（参数） + Map map = esInspectFlowVO.getMap(); + // 更新流程审批信息 + processApprovalRecordService.update( + new LambdaUpdateWrapper() + .eq(ProcessApprovalRecord::getUserId, loginUser.getId()) + .eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId()) + .set(StringUtils.isNotBlank(processApprovalRecord.getCommitText()), + ProcessApprovalRecord::getCommitText, processApprovalRecord.getCommitText()) + .set(ProcessApprovalRecord::getCommitFlag, processApprovalRecord.getCommitFlag()) + .set(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.COMPLETE.getValue())); + + Task task = taskService.createTaskQuery().taskId(processAll.getTaskId()).singleResult(); + if (task!= null) { + // 完成任务 + taskService.complete(task.getId(), map); + // 判断是否是最后一个节点 + if (isLastNode(processAll.getProcessInstanceId())){ + // 企标稽查计划 生成数据 保存企标库 + saveDataToInspect(processAll.getProjectId()); + } + } + } + + private void saveDataToInspect(String projectId) { + ProcessEsInspectVO processEsInspectVO = new ProcessEsInspectVO(); + processEsInspectVO.setProjectId(projectId); + // 通过项目id查询企标稽查流程业务表信息 + List processEsInspectVOList = processEsInspectService.queryByList(processEsInspectVO); + for (ProcessEsInspectVO esInspectVO : processEsInspectVOList) { + // 企标稽查id + String inspectId = esInspectVO.getInspectId(); + // 查询企标信息 + LawsEnterpriseStandard lawsEnterpriseStandard = lawsEnterpriseStandardService.getOne( + new LambdaQueryWrapper().eq(LawsEnterpriseStandard::getStandardNumber, esInspectVO.getInspectNo()), false); + + // 查询稽查内容 + List enterpriseStandardInspectContentList = enterpriseStandardInspectContentService.list( + new LambdaQueryWrapper() + .eq(EnterpriseStandardInspectContent::getProcessEsInspectId, esInspectVO.getId())); + // 查询稽查报告 + List enterpriseStandardInspectReportList = enterpriseStandardInspectReportService.list( + new LambdaQueryWrapper() + .eq(EnterpriseStandardInspectReport::getProcessEsInspectId, esInspectVO.getId())); + // 查询整改计划 + List enterpriseStandardInspectRectifyPlanList = enterpriseStandardInspectRectifyPlanService.list( + new LambdaQueryWrapper() + .eq(EnterpriseStandardInspectRectifyPlan::getProcessEsInspectId, esInspectVO.getId())); + + if (!Objects.isNull(lawsEnterpriseStandard)){ + // 保存稽查内容 + enterpriseStandardInspectContentList.forEach(enterpriseStandardInspectContent -> { + enterpriseStandardInspectContent.setId(String.valueOf(SnowflakeUtils.snowflake())); + enterpriseStandardInspectContent.setStandardId(lawsEnterpriseStandard.getId()); + }); + enterpriseStandardInspectContentService.saveBatch(enterpriseStandardInspectContentList); + } + + // 保存稽查报告 + enterpriseStandardInspectReportList.forEach(enterpriseStandardInspectReport -> { + enterpriseStandardInspectReport.setId(String.valueOf(SnowflakeUtils.snowflake())); + enterpriseStandardInspectReport.setInspectId(inspectId); + }); + enterpriseStandardInspectReportService.saveBatch(enterpriseStandardInspectReportList); + + // 保存整改计划 + enterpriseStandardInspectRectifyPlanList.forEach(enterpriseStandardInspectRectifyPlan -> { + enterpriseStandardInspectRectifyPlan.setId(String.valueOf(SnowflakeUtils.snowflake())); + enterpriseStandardInspectRectifyPlan.setInspectId(inspectId); + }); + enterpriseStandardInspectRectifyPlanService.saveBatch(enterpriseStandardInspectRectifyPlanList); + } } @Override @@ -225,4 +327,14 @@ public class EsInspectFlowServiceImpl implements IEsInspectFlowService { // 转办 taskService.setAssignee(taskId, userId); } + + public boolean isLastNode(String processInstanceId) { + // 查询流程实例状态 + ProcessInstance processInstance = runtimeService.createProcessInstanceQuery() + .processInstanceId(processInstanceId) + .singleResult(); + + // 如果流程实例为null，表示流程已结束 + return processInstance == null; + } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/ProcessEsInspectServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/ProcessEsInspectServiceImpl.java index 6fa3b63e..900fdc5f 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/ProcessEsInspectServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/ProcessEsInspectServiceImpl.java @@ -10,6 +10,9 @@ import com.jero.modules.activiti.process.esinspect.entity.ProcessEsInspect; import com.jero.modules.activiti.process.esinspect.mapper.ProcessEsInspectMapper; import com.jero.modules.activiti.process.esinspect.service.IProcessEsInspectService; import com.jero.modules.activiti.process.esinspect.vo.ProcessEsInspectVO; +import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectContentService; +import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectRectifyPlanService; +import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectReportService; import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; @@ -31,9 +34,18 @@ import java.util.List; public class ProcessEsInspectServiceImpl extends ServiceImpl implements IProcessEsInspectService { private final ProcessEsInspectMapper processEsInspectMapper; + private final EnterpriseStandardInspectContentService enterpriseStandardInspectContentService; + private final EnterpriseStandardInspectRectifyPlanService enterpriseStandardInspectRectifyPlanService; + private final EnterpriseStandardInspectReportService enterpriseStandardInspectReportService; - public ProcessEsInspectServiceImpl(ProcessEsInspectMapper processEsInspectMapper) { + public ProcessEsInspectServiceImpl(ProcessEsInspectMapper processEsInspectMapper, + EnterpriseStandardInspectContentService enterpriseStandardInspectContentService, + EnterpriseStandardInspectRectifyPlanService enterpriseStandardInspectRectifyPlanService, + EnterpriseStandardInspectReportService enterpriseStandardInspectReportService) { this.processEsInspectMapper = processEsInspectMapper; + this.enterpriseStandardInspectContentService = enterpriseStandardInspectContentService; + this.enterpriseStandardInspectRectifyPlanService = enterpriseStandardInspectRectifyPlanService; + this.enterpriseStandardInspectReportService = enterpriseStandardInspectReportService; } @@ -88,9 +100,9 @@ public class ProcessEsInspectServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper() .eq(ProcessEsInspectPlanOpinion::getInspectPlanId, processEsInspectPlan.getId()); - if (StringUtils.isNotBlank(processEsInspectPlan.getNodeId()) && "Activity_0mnt8n8".equals(processEsInspectPlan.getNodeId())){ + if (StringUtils.isNotBlank(processEsInspectPlan.getNodeId()) && EsInspectPlanCommon.PROCESS_NODE_2.equals(processEsInspectPlan.getNodeId())){ queryWrapper.eq(ProcessEsInspectPlanOpinion::getCreateBy, loginUser.getUsername()); } List opinionList = iProcessEsInspectPlanOpinionService.list(queryWrapper); @@ -128,7 +129,7 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq(StringUtils.isNotBlank(processEsInspectPlan.getProjectId()), "project_id", processEsInspectPlan.getProjectId()); - if (StringUtils.isNotBlank(processEsInspectPlan.getNodeId()) && "Activity_0mnt8n8".equals(processEsInspectPlan.getNodeId())){ + if (StringUtils.isNotBlank(processEsInspectPlan.getNodeId()) && EsInspectPlanCommon.PROCESS_NODE_2.equals(processEsInspectPlan.getNodeId())){ queryWrapper.and(qw -> qw.like("object_of_consultation", loginUser.getId()) .or().eq("create_by", loginUser.getUsername())); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectContentController.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectContentController.java index 3e906d83..0f68242a 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectContentController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectContentController.java @@ -1,24 +1,25 @@ package com.jero.modules.laws.enterprise.controller; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import javax.servlet.http.HttpServletRequest; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectContent; import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectContentService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import com.jero.common.aspect.annotation.AutoLog; -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.T; + +import javax.servlet.http.HttpServletRequest; +import java.util.Arrays; +import java.util.List; +import java.util.Map; /** @@ -71,7 +72,20 @@ public class EnterpriseStandardInspectContentController extends JeroController> queryList(@ApiParam("企标稽查流程id") String processEsInspectId) { + return Result.OK(enterpriseStandardInspectContentService.queryClauseByEsInspectId(processEsInspectId)); + } + + /** * 添加 * * @param enterpriseStandardInspectContent diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectReportController.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectReportController.java index 34ff0c78..3afcd776 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectReportController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectReportController.java @@ -1,25 +1,27 @@ package com.jero.modules.laws.enterprise.controller; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.system.base.controller.JeroController; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectReport; import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectReportService; -import com.baomidou.mybatisplus.core.metadata.IPage; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; -import com.jero.common.system.base.controller.JeroController; +import org.apache.commons.lang3.StringUtils; +import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import com.jero.common.aspect.annotation.AutoLog; -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.T; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; +import java.util.Map; /** @@ -71,6 +73,19 @@ public class EnterpriseStandardInspectReportController extends JeroController> queryByInspectContentId(@ApiParam("企标稽查内容id") String inspectContentId) { + return Result.OK(EnterpriseStandardInspectReportService.queryByInspectContentId(inspectContentId)); + } + /** * 添加 * diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectContent.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectContent.java index cd87fc9f..9e98816e 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectContent.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectContent.java @@ -87,6 +87,11 @@ public class EnterpriseStandardInspectContent implements Serializable { @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name") private String rectificationDepartment; + /** 企标稽查流程id */ + @ApiModelProperty(value = "企标稽查流程id") + private String processEsInspectId; + + @JSONField(name = "rectificationDepartment_dictText") @TableField(exist = false) @ApiModelProperty(value = "整改部门手动翻译字段") diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectRectifyPlan.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectRectifyPlan.java index b82d261c..f51d68e0 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectRectifyPlan.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectRectifyPlan.java @@ -4,9 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.util.Date; - import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -15,6 +12,9 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.jeecgframework.poi.excel.annotation.Excel; +import java.io.Serializable; +import java.util.Date; + /** * * @TableName laws_enterprise_standard_inspect_rectify_plan @@ -111,6 +111,14 @@ public class EnterpriseStandardInspectRectifyPlan implements Serializable { @ApiModelProperty(value = "整改状态") private String rectifyStatus; + /** 企标稽查流程id */ + @ApiModelProperty(value = "企标稽查流程id") + private String processEsInspectId; + + /** 企标稽查内容id */ + @ApiModelProperty(value = "企标稽查内容id") + private String inspectContentId; + @TableField(exist = false) private static final long serialVersionUID = 1980978879087908791L; } \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectReport.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectReport.java index 496fd3af..00b6c8d9 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectReport.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectReport.java @@ -79,6 +79,14 @@ public class EnterpriseStandardInspectReport implements Serializable { @ApiModelProperty(value = "附件") private String attachment; + /** 企标稽查流程id */ + @ApiModelProperty(value = "企标稽查流程id") + private String processEsInspectId; + + /** 企标稽查内容id */ + @ApiModelProperty(value = "企标稽查内容id") + private String inspectContentId; + /**依据条款*/ @TableField(exist = false) @ApiModelProperty(value = "依据条款") diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectContentService.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectContentService.java index 9ae9305f..7acffa57 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectContentService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectContentService.java @@ -1,8 +1,8 @@ package com.jero.modules.laws.enterprise.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectContent; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectContent; import javax.servlet.http.HttpServletRequest; import java.util.List; @@ -14,6 +14,12 @@ import java.util.List; */ public interface EnterpriseStandardInspectContentService extends IService { + /** + * 企标稽查内容-通过企标稽查流程id查询稽查内容 + * @param processEsInspectId + * @return + */ + List queryClauseByEsInspectId(String processEsInspectId); /** * 分页查询 * diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectReportService.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectReportService.java index 31b1665b..e6d87459 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectReportService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectReportService.java @@ -83,4 +83,11 @@ public interface EnterpriseStandardInspectReportService extends IService queryByInspectContentId(String inspectContentId); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectContentServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectContentServiceImpl.java index 020a5503..1ea75700 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectContentServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectContentServiceImpl.java @@ -1,20 +1,21 @@ package com.jero.modules.laws.enterprise.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.exception.JeroBootException; +import com.jero.common.system.query.QueryGenerator; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectContent; import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardInspectContentMapper; import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectContentService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.jero.common.exception.JeroBootException; -import java.util.List; -import java.util.Date; -import com.jero.common.system.query.QueryGenerator; -import javax.servlet.http.HttpServletRequest; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import javax.servlet.http.HttpServletRequest; +import java.util.Date; +import java.util.List; /** * @Description: 企标稽查内容 @@ -56,6 +57,11 @@ public class EnterpriseStandardInspectContentServiceImpl extends ServiceImpl queryClauseByEsInspectId(String processEsInspectId) { + return list(new LambdaQueryWrapper() + .eq(EnterpriseStandardInspectContent::getProcessEsInspectId, processEsInspectId)); + } /** * 保存 * @@ -64,6 +70,7 @@ public class EnterpriseStandardInspectContentServiceImpl extends ServiceImpl() + .eq(EnterpriseStandardInspectReport::getInspectContentId, enterpriseStandardInspectReport.getInspectContentId())); + if (count > 0){ + if (LanguageEnum.CN.getValue().equals(MessageUtils.getLanguage().getValue())){ + throw new JeroBootException("该章节条款已存在!"); + }else { + throw new JeroBootException("This section clause already exists!"); + } + } Date now = new Date(); - EnterpriseStandardInspectReport.setCreateTime(now); - EnterpriseStandardInspectReport.setUpdateTime(now); - save(EnterpriseStandardInspectReport); + enterpriseStandardInspectReport.setCreateTime(now); + enterpriseStandardInspectReport.setUpdateTime(now); + save(enterpriseStandardInspectReport); } /** * 更新 * - * @param EnterpriseStandardInspectReport + * @param enterpriseStandardInspectReport * @return */ @Override - public void editById(EnterpriseStandardInspectReport EnterpriseStandardInspectReport) { + public void editById(EnterpriseStandardInspectReport enterpriseStandardInspectReport) { + // 企标稽查内容唯一性校验 + int count = count(new LambdaQueryWrapper() + .eq(EnterpriseStandardInspectReport::getInspectContentId, enterpriseStandardInspectReport.getInspectContentId()) + .ne(EnterpriseStandardInspectReport::getId, enterpriseStandardInspectReport.getId())); + if (count > 0){ + if (LanguageEnum.CN.getValue().equals(MessageUtils.getLanguage().getValue())){ + throw new JeroBootException("该章节条款已存在!"); + }else { + throw new JeroBootException("This section clause already exists!"); + } + } Date now = new Date(); - EnterpriseStandardInspectReport.setUpdateTime(now); - saveOrUpdate(EnterpriseStandardInspectReport); + enterpriseStandardInspectReport.setUpdateTime(now); + saveOrUpdate(enterpriseStandardInspectReport); } /** @@ -128,6 +151,12 @@ public class EnterpriseStandardInspectReportServiceImpl extends ServiceImpl queryByInspectContentId(String inspectContentId) { + return list(new LambdaQueryWrapper() + .eq(EnterpriseStandardInspectReport::getInspectContentId, inspectContentId)); + } }