From 6ed1b7488cf62d9c35f5fd5fa09cacc896eb520f Mon Sep 17 00:00:00 2001 From: lige <bestlige@outlook.com> Date: 星期三, 22 十一月 2023 13:33:48 +0800 Subject: [PATCH] 备忘录1 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java index 2dd1583..6265564 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java @@ -807,8 +807,11 @@ if (null != tjReservation.getDepartment()) tjOrder.setFirmDeptName(tjReservation.getDepartment()); if (null != tjReservation.getJobNo()) tjOrder.setFirmWorkId(tjReservation.getJobNo()); if (null != tjReservation.getPacId()) tjOrder.setPacId(tjReservation.getPacId()); - if (null != tjReservation.getGroupingId()) tjOrder.setGroupId(tjReservation.getGroupingId()); - if (null != tjReservation.getDepartmentId()) tjOrder.setFirmDeptId(tjReservation.getDepartmentId()); + if (null != tjReservation.getGroupingId()){ + tjOrder.setGroupId(tjReservation.getGroupingId()); + tjOrder.setFirmDeptId(tjReservation.getPacId()); + } +// if (null != tjReservation.getDepartmentId()) tjOrder.setFirmDeptId(tjReservation.getDepartmentId()); tjReservation.setIsExpire(1); tjReservationService.updateById(tjReservation); if (null != tjReservation.getTeamNo()) { @@ -891,7 +894,6 @@ //鍥綋 if ("1".equals(tjOrder.getTjType())) { - tjOrder.setFirmDeptId(tjOrder.getPacId()); asyncService.ttextracted(tjOrder, tjCustomer, sysUser, tjReservation, tjFlowingWater); } @@ -991,7 +993,7 @@ if (null != ppList && ppList.size() > 0) { //寮傛淇濆瓨鏁版嵁搴� // asyncService.addRedisTransitionPac(cusId, pacId, ppList); - asyncService.saveRedisTransitionByPacId(cusId, pacId, proIds); + asyncService.saveRedisTransitionByPacId(cusId, pacId, null); for (TjPackageProject tjPackageProject : ppList) { TjProject project = projectService.getTjProjectById(String.valueOf(tjPackageProject.getProId())); if (null != project) { @@ -1030,9 +1032,7 @@ //鍗曢」 if (null != proIds && proIds.size() > 0) { //寮傛淇濆瓨鏁版嵁搴撹〃 -// asyncService.addRedisTransitionPro(cusId, proIds); asyncService.saveRedisTransitionByPacId(cusId, null, proIds); - for (Long proId : proIds) { List<TbTransition> transitions = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId)); if (null != transitions && transitions.size() > 0) { @@ -1059,8 +1059,10 @@ } tbTransition.setParentProId(tjProject.getProParentId()); if (tjProject.getProParentId() != null) { - final TjProject byId = projectService.getById(tjProject.getProParentId()); - tbTransition.setParentProName(byId.getProName()); + TjProject byId = projectService.getById(tjProject.getProParentId()); + if(null !=byId){ + tbTransition.setParentProName(byId.getProName()); + } } tbTransition.setParentProName(""); -- Gitblit v1.8.0