diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java index cf86d26f..3d1ed97c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java @@ -29,7 +29,6 @@ import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.enmus.ExcelType; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; @@ -42,7 +41,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; -import java.util.concurrent.CompletableFuture; /** * 流程-测试流程(process_demo)表控制层 @@ -65,15 +63,15 @@ public class ProcessStandardComplianceCheckController extends JeroController startProcess(@Validated @RequestBody ProcessInfoVO processInfoVO) { - CompletableFuture.runAsync(() -> sccService.startProcess(processInfoVO)); + public Result startProcess(@RequestBody ProcessInfoVO processInfoVO) { + sccService.startProcess(processInfoVO); return Result.OK(); } @AutoLog(value = "法规符合性排查流程-同意") @ApiOperation(value = "法规符合性排查流程-同意", notes = "法规符合性排查流程-同意") @PostMapping("/agree") - public Result agree(@Validated @RequestBody ProcessInfoVO processInfoVO) { + public Result agree(@RequestBody ProcessInfoVO processInfoVO) { sccService.approveTask(processInfoVO, true); return Result.OK(); } @@ -81,7 +79,7 @@ public class ProcessStandardComplianceCheckController extends JeroController reject(@Validated @RequestBody ProcessInfoVO processInfoVO) { + public Result reject(@RequestBody ProcessInfoVO processInfoVO) { sccService.approveTask(processInfoVO, false); return Result.OK(); } @@ -89,7 +87,7 @@ public class ProcessStandardComplianceCheckController extends JeroController submit(@Validated @RequestBody ProcessInfoVO processInfoVO) { + public Result submit(@RequestBody ProcessInfoVO processInfoVO) { sccService.submit(processInfoVO); return Result.OK(); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/mapper/ProcessStandardComplianceCheckDetailMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/mapper/ProcessStandardComplianceCheckDetailMapper.java index 1b275d00..32738c7f 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/mapper/ProcessStandardComplianceCheckDetailMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/mapper/ProcessStandardComplianceCheckDetailMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jero.modules.activiti.process.standardComplianceCheck.entity.ProcessStandardComplianceCheckDetail; import org.apache.ibatis.annotations.Param; +import java.util.List; import java.util.Queue; /** @@ -15,6 +16,8 @@ import java.util.Queue; public interface ProcessStandardComplianceCheckDetailMapper extends BaseMapper { void batchInsert(@Param("queue") Queue needAddDetailInfoQueue); + + void batchInsertList(@Param("list") List needAddDetailInfoList); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/mapper/xml/ProcessStandardComplianceCheckDetailMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/mapper/xml/ProcessStandardComplianceCheckDetailMapper.xml index 184d1d86..9b4fa4b6 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/mapper/xml/ProcessStandardComplianceCheckDetailMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/mapper/xml/ProcessStandardComplianceCheckDetailMapper.xml @@ -100,4 +100,72 @@ + + INSERT INTO process_standard_compliance_check_detail ( + id, + create_by, + create_time, + update_by, + update_time, + org_code, + process_instance_id, + term_number, + term_title, + term_content, + model, + model_status, + assessor, + result, + description, + material, + valuation_time, + correction_solution, + unsatisfied_require, + correction_period, + correction_cost, + commonality, + commonality_cost, + remark, + auth_dept, + main_check_user, + design_engineer, + check_id, + batch_id + ) + VALUES + + ( + #{item.id}, + #{item.createBy}, + #{item.createTime}, + #{item.updateBy}, + #{item.updateTime}, + #{item.orgCode}, + #{item.processInstanceId}, + #{item.termNumber}, + #{item.termTitle}, + #{item.termContent}, + #{item.model}, + #{item.modelStatus}, + #{item.assessor}, + #{item.result}, + #{item.description}, + #{item.material}, + #{item.valuationTime}, + #{item.correctionSolution}, + #{item.unsatisfiedRequire}, + #{item.correctionPeriod}, + #{item.correctionCost}, + #{item.commonality}, + #{item.commonalityCost}, + #{item.remark}, + #{item.authDept}, + #{item.mainCheckUser}, + #{item.designEngineer}, + #{item.checkId}, + #{item.batchId} + ) + + + diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java index f4cad5d4..e4ec9ccd 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java @@ -220,7 +220,9 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl + this.startNodeDetailBusProcess( + processInstanceId, standardInfo.getId(), businessInfoDTO.getDetailInfoList())); } private void startNodeDetailBusProcess(String processInstanceId, String checkId, List detailInfoList) { @@ -249,7 +251,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl setVariables(ProcessInfoVO businessInfoDTO) {