diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IpowerApplyActServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IpowerApplyActServiceImpl.java index 4e02fa3..56ff25a 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IpowerApplyActServiceImpl.java +++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IpowerApplyActServiceImpl.java @@ -71,7 +71,6 @@ public class IpowerApplyActServiceImpl extends ServiceImpl labelList = new ArrayList<>(); + for (String label : ttReportManageAct.getLabelList()) { + JSONArray objects = JSONObject.parseArray(label); + String lastLabel =(String)objects.get(objects.size()-1); + ReportLabelEntity reportLabelEntity = new ReportLabelEntity(com.adc.da.util.utils.UUID.randomUUID10() + ,ttReportManageAct.getDataId(), label,lastLabel); + labelList.add(reportLabelEntity); + } + iReportLabelService.saveBatch(labelList); + } } return reportId; } diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java index 91315fa..8913918 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java @@ -492,8 +492,8 @@ public class TodoTaskController { BusProcessNewVO busProcessNewVO = this.queryDetailDate(busProcessNew, prcType); //审批数据 List busProcessApproves1 = busProcessApproveMapper.selectEoByDataId(busProcessNewVO.getDataId()); - BusProcessApprove busProcessApprove = busProcessApproves1.get(0); - if (busProcessApprove!=null){ + if (CollectionUtils.isNotEmpty(busProcessApproves1)){ + BusProcessApprove busProcessApprove = busProcessApproves1.get(0); String approveJson = busProcessApprove.getFromValsJson(); busProcessNewVO.setSubmitJson(approveJson); } @@ -605,7 +605,8 @@ public class TodoTaskController { public Wrapper saveTaskFirst(@RequestBody ApproveDataVO approveDataVO) { String dataJson = approveDataVO.getDataJson(); String submitJson = approveDataVO.getSubmitJson(); - String reportId = approveDataVO.getReportId(); +// String reportId = approveDataVO.getReportId(); + String reportId = UUID.randomUUID().toString().replace("-",""); String saveId = null; String dataId = null; if (approveDataVO.getId() != null && !approveDataVO.getId().equals("")) { @@ -658,19 +659,105 @@ public class TodoTaskController { //存储审批数据 if (StringUtils.isNotEmpty(submitJson)){ List busProcessApproves = busProcessApproveMapper.selectEoByDataId(dataId); - BusProcessApprove busProcessApprove = busProcessApproves.get(0); - if (busProcessApprove == null){ + BusProcessApprove busProcessApprove = new BusProcessApprove(); + if(CollectionUtils.isNotEmpty(busProcessApproves)){ + busProcessApprove = busProcessApproves.get(0); + busProcessApprove.setFromValsJson(submitJson); + }else { busProcessApprove = new BusProcessApprove(); busProcessApprove.setDataId(dataId); busProcessApprove.setCreateDate(new Date()); + busProcessApprove.setFromValsJson(submitJson); busProcessApprove.setCreateUserId(approveDataVO.getCreateUser()); } - busProcessApprove.setFromValsJson(submitJson); ibusProcessApproveService.saveOrUpdate(busProcessApprove); } return WrapMapper.ok(saveId); } + + /** + * 批量保存任务第一步 + */ + @ApiOperation(value = "批量保存任务第一步") + @PostMapping("/batchSaveTaskFirst") + public Wrapper batchSaveTaskFirst(@RequestBody List approveDataVOList) { + StringBuilder saveIdList = new StringBuilder(); + for (ApproveDataVO approveDataVO : approveDataVOList) { + String dataJson = approveDataVO.getDataJson(); + String submitJson = approveDataVO.getSubmitJson(); +// String reportId = approveDataVO.getReportId(); + String reportId = UUID.randomUUID().toString().replace("-",""); + String saveId = null; + String dataId = null; + if (approveDataVO.getId() != null && !approveDataVO.getId().equals("")) { + saveId = approveDataVO.getId(); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("CREAT_USER", approveDataVO.getCreateUser()); + queryWrapper.eq("PRC_TYPE", approveDataVO.getPrcType()); + queryWrapper.eq("ID", approveDataVO.getId()); + queryWrapper.isNull("PRC_ID"); + List list = iBusProcessNameService.list(queryWrapper); + if (list != null && list.size() > 0) { + BusProcessName busProcessName = list.get(0); + busProcessName.setPrcName(approveDataVO.getPrcName()); + busProcessName.setSubmitStatus(SubmitStatusEnum.DRAFT.getValue()); + if (StringUtils.isNotEmpty(dataJson)){ + //根据业务情况 对业务数据进行saveOrupdate + dataId = activitDefineService.saveOrUpdateDate(approveDataVO.getPrcType(), dataJson, null, + null,reportId); + busProcessName.setDataId(dataId); + } + iBusProcessNameService.saveOrUpdate(busProcessName); + } + } else { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String time = sdf.format(new Date()); + BusProcessName busProcessName = new BusProcessName(); + if (StringUtils.isNotEmpty(dataJson)) { + //根据业务情况 对业务数据进行saveOrupdate + dataId = activitDefineService.saveOrUpdateDate(approveDataVO.getPrcType(), dataJson, + approveDataVO.getTaskId(),"",reportId); + busProcessName.setDataId(dataId); + } + busProcessName.setPrcType(approveDataVO.getPrcType()); + busProcessName.setPrcName(approveDataVO.getPrcName()); + busProcessName.setCreatUser(approveDataVO.getCreateUser()); + busProcessName.setCreatTime(time); + busProcessName.setCreatUserName(approveDataVO.getCreateUserName()); + busProcessName.setSubmitStatus(SubmitStatusEnum.DRAFT.getValue()); + iBusProcessNameService.save(busProcessName); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("CREAT_TIME", time); + queryWrapper.eq("CREATE_USER_NAME", approveDataVO.getCreateUserName()); + queryWrapper.eq("PRC_TYPE", approveDataVO.getPrcType()); + queryWrapper.eq("CREAT_USER", approveDataVO.getCreateUser()); +// BusProcessName one = iBusProcessNameService.getOne(queryWrapper); + saveId = busProcessName.getId(); + saveIdList.append(","+saveId); + } + //存储审批数据 + if (StringUtils.isNotEmpty(submitJson)){ + List busProcessApproves = busProcessApproveMapper.selectEoByDataId(dataId); + BusProcessApprove busProcessApprove = new BusProcessApprove(); + if(CollectionUtils.isNotEmpty(busProcessApproves)){ + busProcessApprove = busProcessApproves.get(0); + busProcessApprove.setFromValsJson(submitJson); + }else { + busProcessApprove = new BusProcessApprove(); + busProcessApprove.setDataId(dataId); + busProcessApprove.setCreateDate(new Date()); + busProcessApprove.setFromValsJson(submitJson); + busProcessApprove.setCreateUserId(approveDataVO.getCreateUser()); + } + ibusProcessApproveService.saveOrUpdate(busProcessApprove); + } + } + String saveIdstring = saveIdList.substring(1, saveIdList.length()); + return WrapMapper.ok(saveIdstring); + } + /** * 查询任务第一步 * diff --git a/report-activity/src/main/java/com/adc/da/wkflow/enums/FlowTypeEnum.java b/report-activity/src/main/java/com/adc/da/wkflow/enums/FlowTypeEnum.java index 1260b2c..dd8fae6 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/enums/FlowTypeEnum.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/enums/FlowTypeEnum.java @@ -9,6 +9,7 @@ public enum FlowTypeEnum { YLXZSQ("2","预览+下载申请","QXSQ","预览+下载申请",""), XZSQ("3","下载申请","QXSQ","下载申请",""), SCBGLC("4","上传审批","SCBG","上传审批",""), + BJBGLC("5","编辑报告","BJBG","编辑报告",""), ; private String value; diff --git a/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/reEditAfter.java b/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/reEditAfter.java index 6f1403b..cbb373c 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/reEditAfter.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/reEditAfter.java @@ -58,11 +58,5 @@ public class reEditAfter implements TaskListener { //审批人 delegateTask.setVariable("oneApprove",object.getString("oneApprove")); delegateTask.setVariable("twoApprove",object.getString("twoApprove")); - // 1: 同意 2：退回 - delegateTask.setVariable("flag",s); - if ("1".equals(s)){ - iPowerApplyService.saveBatch(powerApplyActs); - } - } } diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.class b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.class index 5a316fb..dea57ad 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.class and b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.class differ diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController$1.class b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController$1.class index 540bb6b..8d86da8 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController$1.class and b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController$1.class differ diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController.class b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController.class index 6023ef9..06a7bf9 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController.class and b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController.class differ