Merge remote-tracking branch 'origin/master'

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsRepair/controller/CmmsRepairController.java

@@ -209,10 +209,11 @@ public class CmmsRepairController extends JeecgController<CmmsRepair, ICmmsRepai
 	 /**
 	  * 处理
 	  */
+	 @AutoLog(value = "维修工单-派单")
 	 @ApiOperation(value="维修工单-派单", notes="维修工单-派单")
 	 //@RequiresPermissions("@ss.hasPermi('cmms:repairOrder:handle')")
 	 @PutMapping("/repair")
-	 public Result<String> repair(@RequestBody CmmsRepairVo cmmsRepair) throws Exception {
+	 public Result<String> repair(@RequestBody CmmsRepairVo cmmsRepair) {
 		 Subject subject = SecurityUtils.getSubject();
 		 LoginUser loginUser = (LoginUser)subject.getPrincipal();
 		 String username = loginUser.getUsername();
@@ -220,9 +221,9 @@ public class CmmsRepairController extends JeecgController<CmmsRepair, ICmmsRepai
 		 cmmsRepair.setUpdateTime(DateUtils.getDate());
 		 int row = cmmsRepairService.repair(cmmsRepair);
 		 if (row > 0){
-			 return Result.OK("派单成功！");
+			 return Result.OK("操作成功！");
 		 }
-		 return Result.error("派单失败！");
+		 return Result.error("操作失败！");
 	 }
 
 	 /**

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsRepair/entity/CmmsRepair.java

@@ -83,6 +83,7 @@ public class CmmsRepair implements Serializable {
 	/**优先级：0普通，1紧急，2特急*/
 	@Excel(name = "优先级：0普通，1紧急，2特急", width = 15)
     @ApiModelProperty(value = "优先级：0普通，1紧急，2特急")
+    @Dict(dicCode = "repair_priority")
     private java.lang.String priority;
 	/**故障日期*/
 	@Excel(name = "故障日期", width = 15, format = "yyyy-MM-dd")
@@ -115,6 +116,7 @@ public class CmmsRepair implements Serializable {
 	/**状态：0待处理，1维修检查，2设备维修，3维修结束*/
 	@Excel(name = "状态：0待处理，1维修检查，2设备维修，3维修结束", width = 15)
     @ApiModelProperty(value = "状态：0待处理，1维修检查，2设备维修，3维修结束")
+    @Dict(dicCode = "repair_handle_status")
     private java.lang.String status;
 	/**关联ID：巡检、点检、保养的ID*/
 	@Excel(name = "关联ID：巡检、点检、保养的ID", width = 15)
@@ -123,6 +125,7 @@ public class CmmsRepair implements Serializable {
 	/**维修工单状态: 0正常、1冻结、2拒绝*/
 	@Excel(name = "维修工单状态: 0正常、1冻结、2拒绝", width = 15)
     @ApiModelProperty(value = "维修工单状态: 0正常、1冻结、2拒绝")
+    @Dict(dicCode = "repair_order_status")
     private java.lang.String repairstatus;
 
 }

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

@@ -1,6 +1,8 @@
 package org.jeecg.modules.cmmsRepair.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.subject.Subject;
 import org.jeecg.common.system.vo.LoginUser;
@@ -59,10 +61,17 @@ public class CmmsRepairServiceImpl extends ServiceImpl<CmmsRepairMapper, CmmsRep
             cmmsRepair.setRepaircode(autoCodeUtil.genSerialCode(UserConstants.CMMSREPAIR_CODE, null));
         }
 
-        if (cmmsRepair.getId() == null || "".equals(cmmsRepair.getId())){
-            cmmsRepair.setId(UUID.randomUUID().toString());
+        //if (cmmsRepair.getId() == null || "".equals(cmmsRepair.getId())){
+        //    cmmsRepair.setId(UUID.randomUUID().toString());
+        //}
+
+        if(ObjectUtil.isEmpty(cmmsRepair.getStatus()) && ObjectUtil.isEmpty(cmmsRepair.getRepairstatus())){
+            cmmsRepair.setStatus("0");
+            cmmsRepair.setRepairstatus("0");
         }
 
+        boolean b = this.save(cmmsRepair);
+
         CmmsOrderNode cmmsOrderNode = new CmmsOrderNode();
         //cmmsOrderNode.setId(SnowFlakeUtils.snowFlakeId());
         cmmsOrderNode.setNodename("0");
@@ -76,7 +85,7 @@ public class CmmsRepairServiceImpl extends ServiceImpl<CmmsRepairMapper, CmmsRep
         // 附件
         fileService.batchSave(cmmsRepair.getFiles(), cmmsRepair.getId(), "");
 
-        return this.save(cmmsRepair);
+        return b;
     }