维修工单添加、派单相关问题修改

module_cmms/src/main/java/org/jeecg/modules/cmmsRepair/service/impl/CmmsRepairServiceImpl.java

@@ -19,6 +19,8 @@ import org.jeecg.modules.cmmsRepair.service.ICmmsRepairService;
 import org.jeecg.modules.sysUploadFile.entity.SysUploadFile;
 import org.jeecg.modules.sysUploadFile.service.ISysUploadFileService;
 import org.jeecg.modules.system.service.impl.SysBaseApiImpl;
+import org.jeecg.modules.tpmEquipment.entity.TpmEquipment;
+import org.jeecg.modules.tpmEquipment.service.ITpmEquipmentService;
 import org.jeecg.modules.util.AutoCodeUtil;
 import org.jeecg.modules.util.UserConstants;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,7 +56,9 @@ public class CmmsRepairServiceImpl extends ServiceImpl<CmmsRepairMapper, CmmsRep
     @Autowired
     @SuppressWarnings("all")
     private ISysBaseAPI sysBaseAPI;
-
+    @Autowired
+    @SuppressWarnings("all")
+    private ITpmEquipmentService equipmentService;
 
 
     @Override
@@ -64,6 +68,13 @@ public class CmmsRepairServiceImpl extends ServiceImpl<CmmsRepairMapper, CmmsRep
         String username = loginUser.getUsername();
         cmmsRepair.setCreateBy(username);
         cmmsRepair.setCreateTime(DateUtils.getDate());
+        TpmEquipment equipment = equipmentService.getById(cmmsRepair.getEquipmentid());
+        if (ObjectUtil.isNull(cmmsRepair.getEquipmentcode())){
+            cmmsRepair.setEquipmentcode(equipment.getEquipmentcode());
+        }
+        if (ObjectUtil.isNull(cmmsRepair.getEquipmentname())){
+            cmmsRepair.setEquipmentname(equipment.getEquipmentname());
+        }
         if (cmmsRepair.getRepaircode() == null || "".equals(cmmsRepair.getRepaircode())){
             cmmsRepair.setRepaircode(autoCodeUtil.genSerialCode(UserConstants.CMMSREPAIR_CODE, null));
         }
@@ -158,6 +169,11 @@ public class CmmsRepairServiceImpl extends ServiceImpl<CmmsRepairMapper, CmmsRep
             node.setRelid(cmmsRepair.getId());
             node.setCreateBy(username);
             node.setCreateTime(DateUtils.getDate());
+            if ("1".equals(cmmsRepair.getStatus())){
+                LoginUser user = sysBaseAPI.getUserById(cmmsRepair.getNodeList().get(0).getOpinion());
+                node.setOpinion(user.getRealname());
+                node.setHandledate(DateUtils.getDate());
+            }
             cmmsOrderNodeService.save(node);
         }