结单、挂起保存工作负责人

ygtx-gxt/src/main/java/com/ygtx/gxt/service/impl/GxtRepairOrderServiceImpl.java

@@ -804,6 +804,21 @@ public class GxtRepairOrderServiceImpl implements IGxtRepairOrderService
         gxtRepairOrder.setWorkOrderStatus("to_approve");
         gxtRepairOrder.setUpdateBy(SecurityUtils.getUsername());
         gxtRepairOrder.setUpdateTime(DateUtils.getNowDate());
+        // 负责人为空
+        if (null == gxtRepairOrder.getTeamLeaderName() && StringUtils.isEmpty(gxtRepairOrder.getTeamLeaderName())) {
+            gxtRepairOrder.setTeamLeaderId(SecurityUtils.getUserId());
+            gxtRepairOrder.setTeamLeaderName(SecurityUtils.getLoginUser().getUser().getNickName());
+            GxtRepairOrderPerson person = new GxtRepairOrderPerson();
+            person.setUserId(SecurityUtils.getUserId());
+            person.setNickName(SecurityUtils.getLoginUser().getUser().getNickName());
+            person.setIsLeader(1);
+            person.setOrderId(gxtRepairOrder.getId());
+            person.setOrderCode(gxtRepairOrder.getWorkOrderProjectNo());
+            person.setStatus(1);
+            person.setCreateBy(SecurityUtils.getUsername());
+            gxtRepairOrderPersonMapper.insertGxtRepairOrderPerson(person);
+        }
+
         int result = gxtRepairOrderMapper.updateGxtRepairOrder(gxtRepairOrder);
 
         // 记录挂起流转信息
@@ -917,6 +932,21 @@ public class GxtRepairOrderServiceImpl implements IGxtRepairOrderService
         }
         gxtRepairOrder.setUpdateBy(SecurityUtils.getUsername());
         gxtRepairOrder.setUpdateTime(DateUtils.getNowDate());
+        // 负责人为空
+        if (null == gxtRepairOrder.getTeamLeaderName() && StringUtils.isEmpty(gxtRepairOrder.getTeamLeaderName())) {
+            gxtRepairOrder.setTeamLeaderId(SecurityUtils.getUserId());
+            gxtRepairOrder.setTeamLeaderName(SecurityUtils.getLoginUser().getUser().getNickName());
+            GxtRepairOrderPerson person = new GxtRepairOrderPerson();
+            person.setUserId(SecurityUtils.getUserId());
+            person.setNickName(SecurityUtils.getLoginUser().getUser().getNickName());
+            person.setIsLeader(1);
+            person.setOrderId(gxtRepairOrder.getId());
+            person.setOrderCode(gxtRepairOrder.getWorkOrderProjectNo());
+            person.setStatus(1);
+            person.setCreateBy(SecurityUtils.getUsername());
+//                    person.setCreateTime(DateUtils.getNowDate());
+            gxtRepairOrderPersonMapper.insertGxtRepairOrderPerson(person);
+        }
         int result = gxtRepairOrderMapper.updateGxtRepairOrder(gxtRepairOrder);
 
         // 记录结单流转信息
@@ -985,11 +1015,11 @@ public class GxtRepairOrderServiceImpl implements IGxtRepairOrderService
 //                        }
 //                        if(sysUser == null) continue;
                         person.setUserId(sysUser.getUserId());
-//                        if (Objects.equals(sysUser.getUserId(), gxtRepairOrder.getTeamLeaderId())) {
-//                            person.setIsLeader(1);
-//                        } else {
-//                            person.setIsLeader(0);
-//                        }
+                        if (Objects.equals(sysUser.getUserId(), gxtRepairOrder.getTeamLeaderId())) {
+                            person.setIsLeader(1);
+                        } else {
+                            person.setIsLeader(0);
+                        }
                         person.setUserId(sysUser.getUserId());
                         person.setOrderId(gxtRepairOrder.getId());
                         person.setOrderCode(gxtRepairOrder.getWorkOrderProjectNo());

ygtx-gxt/src/main/java/com/ygtx/gxt/service/impl/GxtWorkOrderServiceImpl.java

@@ -578,6 +578,15 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
         if (null == order.getTeamLeaderName() && StringUtils.isEmpty(order.getTeamLeaderName())) {
             order.setTeamLeaderId(SecurityUtils.getUserId());
             order.setTeamLeaderName(SecurityUtils.getLoginUser().getUser().getNickName());
+            GxtWorkOrderPerson person = new GxtWorkOrderPerson();
+            person.setUserId(SecurityUtils.getUserId());
+            person.setNickName(SecurityUtils.getLoginUser().getUser().getNickName());
+            person.setIsLeader(1);
+            person.setOrderId(order.getId());
+            person.setOrderCode(order.getWorkOrderProjectNo());
+            person.setStatus(1);
+            person.setCreateBy(SecurityUtils.getUsername());
+            gxtWorkOrderPersonMapper.insertGxtWorkOrderPerson(person);
         }
 
         int result = gxtWorkOrderMapper.updateGxtWorkOrder(order);
@@ -770,9 +779,19 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
             order.setMisNo(gxtWorkOrder.getMisNo());
             order.setInfoEntry(gxtWorkOrder.getInfoEntry());
             order.setFinalizeMethod(gxtWorkOrder.getFinalizeMethod());
-//            if (null != gxtWorkOrder.getTeamLeaderName() && order.getTeamLeaderName() != gxtWorkOrder.getTeamLeaderName()) {
-//                order.setTeamLeaderName(gxtWorkOrder.getTeamLeaderName());
-//            }
+            if (null == order.getTeamLeaderName() && StringUtils.isEmpty(order.getTeamLeaderName())) {
+                order.setTeamLeaderId(SecurityUtils.getUserId());
+                order.setTeamLeaderName(SecurityUtils.getLoginUser().getUser().getNickName());
+                GxtWorkOrderPerson person = new GxtWorkOrderPerson();
+                person.setUserId(SecurityUtils.getUserId());
+                person.setNickName(SecurityUtils.getLoginUser().getUser().getNickName());
+                person.setIsLeader(1);
+                person.setOrderId(order.getId());
+                person.setOrderCode(order.getWorkOrderProjectNo());
+                person.setStatus(1);
+                person.setCreateBy(SecurityUtils.getUsername());
+                gxtWorkOrderPersonMapper.insertGxtWorkOrderPerson(person);
+            }
 
 
             int result = gxtWorkOrderMapper.updateGxtWorkOrder(order);
@@ -835,11 +854,11 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
 //                    }
 //                    if(sysUser == null) continue;
                             person.setUserId(sysUser.getUserId());
-//                        if (sysUser.getUserId() == order.getTeamLeaderId()) {
-//                            person.setIsLeader(1);
-//                        } else {
-//                            person.setIsLeader(0);
-//                        }
+                            if (sysUser.getUserId() == order.getTeamLeaderId()) {
+                                person.setIsLeader(1);
+                            } else {
+                                person.setIsLeader(0);
+                            }
                             person.setOrderId(id);
                             person.setOrderCode(order.getWorkOrderProjectNo());
                             person.setStatus(1);