ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(企标稽查流程): 基础功能

Browse Source
This commit is contained in:
yjz
2023-11-24 14:24:28 +08:00
parent 7d792a5fd0
commit 7913613e44
16 changed files with 362 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/common/EsInspectCommon.java
+62
View File
@@ -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";
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/mapper/xml/ProcessEsInspectMapper.xml
+2
View File
@@ -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,
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java
+119 -7
View File
@@ -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<String, Object> map = esInspectFlowVO.getMap();
// 更新流程审批信息
processApprovalRecordService.update(
new LambdaUpdateWrapper<ProcessApprovalRecord>()
.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<ProcessEsInspectVO> processEsInspectVOList = processEsInspectService.queryByList(processEsInspectVO);
for (ProcessEsInspectVO esInspectVO : processEsInspectVOList) {
// 企标稽查id
String inspectId = esInspectVO.getInspectId();
// 查询企标信息
LawsEnterpriseStandard lawsEnterpriseStandard = lawsEnterpriseStandardService.getOne(
new LambdaQueryWrapper<LawsEnterpriseStandard>().eq(LawsEnterpriseStandard::getStandardNumber, esInspectVO.getInspectNo()), false);
// 查询稽查内容
List<EnterpriseStandardInspectContent> enterpriseStandardInspectContentList = enterpriseStandardInspectContentService.list(
new LambdaQueryWrapper<EnterpriseStandardInspectContent>()
.eq(EnterpriseStandardInspectContent::getProcessEsInspectId, esInspectVO.getId()));
// 查询稽查报告
List<EnterpriseStandardInspectReport> enterpriseStandardInspectReportList = enterpriseStandardInspectReportService.list(
new LambdaQueryWrapper<EnterpriseStandardInspectReport>()
.eq(EnterpriseStandardInspectReport::getProcessEsInspectId, esInspectVO.getId()));
// 查询整改计划
List<EnterpriseStandardInspectRectifyPlan> enterpriseStandardInspectRectifyPlanList = enterpriseStandardInspectRectifyPlanService.list(
new LambdaQueryWrapper<EnterpriseStandardInspectRectifyPlan>()
.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;
}
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/ProcessEsInspectServiceImpl.java
+15 -3
View File
@@ -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<ProcessEsInspectMapper, ProcessEsInspect> 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<ProcessEsInspectMap
*/
@Override
public void editById(ProcessEsInspect processEsInspect) {
Date now = new Date();
Date now = new Date();
processEsInspect.setUpdateTime(now);
saveOrUpdate(processEsInspect);
saveOrUpdate(processEsInspect);
}
/**
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/vo/ProcessEsInspectVO.java
+11 -1
View File
@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
import java.util.Date;
/**
* @ClassName: ProcessEsInspectVO
* @Description:
@@ -21,5 +23,13 @@ public class ProcessEsInspectVO extends EnterpriseStandardInspectVo {
/**企标稽查id*/
@Excel(name = "企标稽查id", width = 15)
@ApiModelProperty(value = "企标稽查id")
private java.lang.String inspect;
private java.lang.String inspectId;
/**实际稽查完成日期*/
@Excel(name = "实际稽查完成日期", width = 15)
@ApiModelProperty(value = "实际稽查完成日期")
private Date completeDate;
/**实际稽查人*/
@Excel(name = "实际稽查人", width = 15)
@ApiModelProperty(value = "实际稽查人")
private java.lang.String actualInspectUser;
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/common/EsInspectPlanCommon.java
+7 -7
View File
@@ -13,33 +13,33 @@ public class EsInspectPlanCommon {
}
/**
* 企标稽查计划key
* 企业稽查计划key
*/
public static final String KEY = "inspect_plan";
/**
* 企标稽查计划key
* 企业稽查计划流name
*/
public static final String NAME = "企业稽查计划";
/**
* 企业稽查计划流程开始节点: 1:稽查联络人发起计划,2:稽查征求意见对象填写意见,3:稽查联络人汇总,4:相关人员会签,5:联络人主管级领导批准
* 企业稽查计划流程节点: 1:稽查联络人发起计划,2:稽查征求意见对象填写意见,3:稽查联络人汇总,4:相关人员会签,5:联络人主管级领导批准
*/
public static final String PROCESS_NODE_1 = "liaisons_start";
/**
* 企业稽查计划流程开始节点: 1:稽查联络人发起计划,2:稽查征求意见对象填写意见,3:稽查联络人汇总,4:相关人员会签,5:联络人主管级领导批准
* 企业稽查计划流程节点: 1:稽查联络人发起计划,2:稽查征求意见对象填写意见,3:稽查联络人汇总,4:相关人员会签,5:联络人主管级领导批准
*/
public static final String PROCESS_NODE_2 = "opinion_fill";
/**
* 企业稽查计划流程开始节点: 1:稽查联络人发起计划,2:稽查征求意见对象填写意见,3:稽查联络人汇总,4:相关人员会签,5:联络人主管级领导批准
* 企业稽查计划流程节点: 1:稽查联络人发起计划,2:稽查征求意见对象填写意见,3:稽查联络人汇总,4:相关人员会签,5:联络人主管级领导批准
*/
public static final String PROCESS_NODE_3 = "liaisons_collect";
/**
* 企业稽查计划流程开始节点: 1:稽查联络人发起计划,2:稽查征求意见对象填写意见,3:稽查联络人汇总,4:相关人员会签,5:联络人主管级领导批准
* 企业稽查计划流程节点: 1:稽查联络人发起计划,2:稽查征求意见对象填写意见,3:稽查联络人汇总,4:相关人员会签,5:联络人主管级领导批准
*/
public static final String PROCESS_NODE_4 = "involve_countersign";
/**
* 企业稽查计划流程开始节点: 1:稽查联络人发起计划,2:稽查征求意见对象填写意见,3:稽查联络人汇总,4:相关人员会签,5:联络人主管级领导批准
* 企业稽查计划流程节点: 1:稽查联络人发起计划,2:稽查征求意见对象填写意见,3:稽查联络人汇总,4:相关人员会签,5:联络人主管级领导批准
*/
public static final String PROCESS_NODE_5 = "leader_approval";
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java
+3 -2
View File
@@ -11,6 +11,7 @@ import com.jero.common.exception.JeroBootException;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.BeanCopyUtils;
import com.jero.common.util.ImportExcelUtil;
import com.jero.modules.activiti.process.esinspectplan.common.EsInspectPlanCommon;
import com.jero.modules.activiti.process.esinspectplan.entity.ProcessEsInspectPlan;
import com.jero.modules.activiti.process.esinspectplan.entity.ProcessEsInspectPlanOpinion;
import com.jero.modules.activiti.process.esinspectplan.mapper.ProcessEsInspectPlanMapper;
@@ -104,7 +105,7 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl<ProcessEsInspec
for (ProcessEsInspectPlan processEsInspectPlan : list) {
LambdaQueryWrapper<ProcessEsInspectPlanOpinion> queryWrapper = new LambdaQueryWrapper<ProcessEsInspectPlanOpinion>()
.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<ProcessEsInspectPlanOpinion> opinionList = iProcessEsInspectPlanOpinionService.list(queryWrapper);
@@ -128,7 +129,7 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl<ProcessEsInspec
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
QueryWrapper<ProcessEsInspectPlan> 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()));
laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectContentController.java
+25 -11
View File
@@ -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<E
return Result.OK(list);
}
/**
/**
* 列表查询
*
* @param processEsInspectId
* @return
*/
@AutoLog(value = "企标稽查内容-通过企标稽查流程id查询稽查内容")
@ApiOperation(value="企标稽查内容-通过企标稽查流程id查询稽查内容", notes="企标稽查内容-通过企标稽查流程id查询稽查内容")
@GetMapping(value = "/queryClauseByEsInspectId")
public Result<List<EnterpriseStandardInspectContent>> queryList(@ApiParam("企标稽查流程id") String processEsInspectId) {
return Result.OK(enterpriseStandardInspectContentService.queryClauseByEsInspectId(processEsInspectId));
}
/**
* 添加
*
* @param enterpriseStandardInspectContent
laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectReportController.java
+27 -12
View File
@@ -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<En
return Result.OK(list);
}
/**
* 企标稽查报告-通过企标稽查内容id查询企标稽查报告
*
* @param inspectContentId
* @return
*/
@AutoLog(value = "企标稽查报告-通过企标稽查内容id查询企标稽查报告")
@ApiOperation(value="企标稽查报告-通过企标稽查内容id查询企标稽查报告", notes="企标稽查报告-通过企标稽查内容id查询企标稽查报告")
@GetMapping(value = "/queryByInspectContentId")
public Result<List<EnterpriseStandardInspectReport>> queryByInspectContentId(@ApiParam("企标稽查内容id") String inspectContentId) {
return Result.OK(EnterpriseStandardInspectReportService.queryByInspectContentId(inspectContentId));
}
/**
* 添加
*
laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectContent.java
+5
View File
@@ -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 = "整改部门手动翻译字段")
laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectRectifyPlan.java
+11 -3
View File
@@ -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;
}
laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectReport.java
+8
View File
@@ -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 = "依据条款")
laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectContentService.java
+7 -1
View File
@@ -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<EnterpriseStandardInspectContent> {
/**
* 企标稽查内容-通过企标稽查流程id查询稽查内容
* @param processEsInspectId
* @return
*/
List<EnterpriseStandardInspectContent> queryClauseByEsInspectId(String processEsInspectId);
/**
* 分页查询
*
laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectReportService.java
+7
View File
@@ -83,4 +83,11 @@ public interface EnterpriseStandardInspectReportService extends IService<Enterpr
* @return
*/
EnterpriseStandardInspectReport queryById(String id);
/**
* 企标稽查报告-通过企标稽查内容id查询企标稽查报告
* @param inspectContentId
* @return
*/
List<EnterpriseStandardInspectReport> queryByInspectContentId(String inspectContentId);
}
laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectContentServiceImpl.java
+13 -6
View File
@@ -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<Ent
return list(QueryGenerator.initQueryWrapper(enterpriseStandardInspectContent, req.getParameterMap()));
}
@Override
public List<EnterpriseStandardInspectContent> queryClauseByEsInspectId(String processEsInspectId) {
return list(new LambdaQueryWrapper<EnterpriseStandardInspectContent>()
.eq(EnterpriseStandardInspectContent::getProcessEsInspectId, processEsInspectId));
}
/**
* 保存
*
@@ -64,6 +70,7 @@ public class EnterpriseStandardInspectContentServiceImpl extends ServiceImpl<Ent
*/
@Override
public void add(EnterpriseStandardInspectContent enterpriseStandardInspectContent) {
// 唯一校验
Date now = new Date();
enterpriseStandardInspectContent.setCreateTime(now);
enterpriseStandardInspectContent.setUpdateTime(now);
laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectReportServiceImpl.java
+40 -11
View File
@@ -1,15 +1,17 @@
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.constant.enums.LanguageEnum;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectReport;
import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardInspectVo;
import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectReportService;
import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardInspectReportMapper;
import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectReportService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -72,28 +74,49 @@ public class EnterpriseStandardInspectReportServiceImpl extends ServiceImpl<Ente
/**
* 保存
*
* @param EnterpriseStandardInspectReport
* @param enterpriseStandardInspectReport
* @return
*/
@Override
public void add(EnterpriseStandardInspectReport EnterpriseStandardInspectReport) {
public void add(EnterpriseStandardInspectReport enterpriseStandardInspectReport) {
// 企标稽查内容唯一性校验
int count = count(new LambdaQueryWrapper<EnterpriseStandardInspectReport>()
.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<EnterpriseStandardInspectReport>()
.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<Ente
public EnterpriseStandardInspectReport queryById(String id) {
return getById(id);
}
@Override
public List<EnterpriseStandardInspectReport> queryByInspectContentId(String inspectContentId) {
return list(new LambdaQueryWrapper<EnterpriseStandardInspectReport>()
.eq(EnterpriseStandardInspectReport::getInspectContentId, inspectContentId));
}
}