From 1471d9dba5d6cda6c45758ede2b17089bad11ebd Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 25 Apr 2022 15:49:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=A1=AE=E8=AE=A4=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLawsInventoryEOController.java | 47 ++++++++++----- .../project/enums/OperatorTypeEnum.java | 3 + .../IProjectLawsInventoryEOService.java | 2 + .../ProjectLawsInventoryEOServiceImpl.java | 58 ++++++++++++++++++- .../wkflow/controller/workFlowController.java | 2 +- 5 files changed, 92 insertions(+), 20 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java index ce518e310..a08db7aa8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java @@ -130,22 +130,22 @@ public class ProjectLawsInventoryEOController extends JeroController queryById(@RequestParam(name="id",required=true) String id) { - ProjectLawsInventoryEO projectLawsInventoryEO = projectLawsInventoryEOService.queryById(id); - if(projectLawsInventoryEO==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(projectLawsInventoryEO); - } + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "项目库-法规清单表-通过id查询") + @ApiOperation(value="项目库-法规清单表-通过id查询", notes="项目库-法规清单表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + ProjectLawsInventoryEO projectLawsInventoryEO = projectLawsInventoryEOService.queryById(id); + if(projectLawsInventoryEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(projectLawsInventoryEO); + } /** * 导出excel @@ -206,4 +206,19 @@ public class ProjectLawsInventoryEOController extends JeroController queryProjectLawsInventoryInfoById(@RequestParam Map params) { + JSONObject result = projectLawsInventoryEOService.queryProjectLawsInventoryInfoById(params); + return Result.OK(result); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java index c1ba47c5f..364eb741f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java @@ -14,6 +14,9 @@ public enum OperatorTypeEnum { UPDATE_STATUS("修改状态","updateStatus"), DELETE("删除","delete"), QUERY("查询","query"), + + + TASK_AFFIRM_QUERY("任务确认流程，查询法规清单信息","taskAffirmQuery"), ; String name; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java index 74144b866..059c8587e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java @@ -86,4 +86,6 @@ public interface IProjectLawsInventoryEOService extends IService processCall(JSONObject jsonObject); + + JSONObject queryProjectLawsInventoryInfoById(Map params); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index d800e755a..e25261c97 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -169,9 +169,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().success("调用成功！"); } + + @Override + public JSONObject queryProjectLawsInventoryInfoById(Map params) { + + JSONObject result = new JSONObject(); + String id = (String) params.get("id"); + if(StringUtils.isEmpty(id)){ + throw new JeroBootException("id不能为空"); + } + String cut = (String) params.get("cut"); + String operatorType = (String) params.get("operatorType"); + + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + List projectLawsInventoryEOList = new ArrayList<>(); + ProjectLawsInventoryEO byId = getById(id); + projectLawsInventoryEOList.add(byId); + if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){ + int isProjectRole = checkUserRole(byId.getProjectLibraryId(), currentUser.getId(), id); + dataDispose(projectLawsInventoryEOList,currentUser,isProjectRole,cut); + + result.put("projectLawsInventory",projectLawsInventoryEOList.get(0)); + if (StringUtils.equals(operatorType, OperatorTypeEnum.TASK_AFFIRM_QUERY.getValue())) { + //设计符合性 + Map designMap = new HashMap<>(); + designMap.put("designDeliverableType",projectLawsInventoryEOList.get(0).getDesignDeliverableType()); + designMap.put("designDeliverableTemplateName",projectLawsInventoryEOList.get(0).getDesignDeliverableType()); + designMap.put("designInitiatorName",projectLawsInventoryEOList.get(0).getDesignInitiatorName()); + designMap.put("designDutyName",projectLawsInventoryEOList.get(0).getDesignDutyName()); + designMap.put("designDueDate",projectLawsInventoryEOList.get(0).getDesignDueDate()); + result.put("design",designMap); + //prehomo + Map prehomoMap = new HashMap<>(); + prehomoMap.put("prehomoDeliverableType",projectLawsInventoryEOList.get(0).getPrehomoDeliverableType()); + prehomoMap.put("prehomoDeliverableTemplateName",projectLawsInventoryEOList.get(0).getPrehomoDeliverableTemplateName()); + prehomoMap.put("prehomoInitiatorName",projectLawsInventoryEOList.get(0).getPrehomoInitiatorName()); + prehomoMap.put("prehomoDutyName",projectLawsInventoryEOList.get(0).getPrehomoDutyName()); + prehomoMap.put("prehomoDueDate",projectLawsInventoryEOList.get(0).getPrehomoDueDate()); + result.put("prehomo",prehomoMap); + //验证符合性 + Map verifyMap = new HashMap<>(); + verifyMap.put("verifyDeliverableType",projectLawsInventoryEOList.get(0).getVerifyDeliverableType()); + verifyMap.put("verifyDeliverableTemplateName",projectLawsInventoryEOList.get(0).getVerifyDeliverableTemplateName()); + verifyMap.put("verifyInitiatorName",projectLawsInventoryEOList.get(0).getVerifyInitiatorName()); + verifyMap.put("verifyDutyName",projectLawsInventoryEOList.get(0).getVerifyDutyName()); + verifyMap.put("verifyDueDate",projectLawsInventoryEOList.get(0).getVerifyDueDate()); + result.put("verify",verifyMap); + } + }else { + throw new JeroBootException("未找到该法规清单信息！"); + } + return result; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java index 7dff26dc4..8ddcb3a7b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java @@ -50,7 +50,7 @@ public class workFlowController { @AutoLog(value = "完成任务") @ApiOperation(value="完成任务", notes="完成任务") @PostMapping("/completeTask") - public Result completeTaskByUserId(BusMes busMes){ + public Result completeTaskByUserId(@RequestBody BusMes busMes){ Result str = workFlowFeignClient.completeTaskByUserId(busMes); if(str.getCode() == 500){ str.setSuccess(false);