送检工单编码

module_base/src/main/java/org/jeecg/modules/util/UserConstants.java

@@ -112,6 +112,9 @@ public class UserConstants
     // 区域编码规则
     public static final String EMSSPACE_CODE="EMSSPACE_CODE";
 
+    // 送检工单编码规则
+    public static final String CMMSSJGD_CODE="CMMSSJGD_CODE";
+
 
 
     public static final String TASK_CODE="TASK_CODE";

module_cmms/src/main/java/org/jeecg/modules/cmmsSubmission/controller/CmmsSubmissionController.java

@@ -27,6 +27,8 @@ import org.jeecg.modules.cmmsSubmissionEquipment.service.ICmmsSubmissionEquipmen
 import org.jeecg.modules.cmmsSubmissionEquipment.vo.CmmsSubmissionEquipmentXQVO;
 import org.jeecg.modules.sysUploadFile.entity.SysUploadFile;
 import org.jeecg.modules.sysUploadFile.service.ISysUploadFileService;
+import org.jeecg.modules.util.AutoCodeUtil;
+import org.jeecg.modules.util.UserConstants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -57,6 +59,8 @@ public class CmmsSubmissionController extends JeecgController<CmmsSubmission, IC
 	private ISysUploadFileService sysUploadFileService;
 	@Autowired
 	private ICmmsOrderNodeService cmmsOrderNodeService;
+	@Autowired
+	private AutoCodeUtil autoCodeUtil;
 
 	/**
 	 *  修改送检工单状态
@@ -120,6 +124,9 @@ public class CmmsSubmissionController extends JeecgController<CmmsSubmission, IC
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody CmmsSubmissionAddDTO dto) {
 		CmmsSubmission cmmsSubmission = CmmsSubmissionConvert.INSTANCE.convert(dto);
+		if (cmmsSubmission.getSjcode() == null || "".equals(cmmsSubmission.getSjcode())) {
+			cmmsSubmission.setSjcode(autoCodeUtil.genSerialCode(UserConstants.CMMSSJGD_CODE, null));
+		}
 		cmmsSubmissionService.save(cmmsSubmission);
 
 		/**设备集合*/

module_cmms/src/main/java/org/jeecg/modules/cmmsSubmission/dto/CmmsSubmissionAddDTO.java

@@ -12,6 +12,10 @@ public class CmmsSubmissionAddDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
 
+    /**送检工单编号*/
+    @Excel(name = "送检工单编号", width = 15)
+    @ApiModelProperty(value = "送检工单编号")
+    private java.lang.String sjcode;
     /**送检负责人*/
     @Excel(name = "送检负责人", width = 15)
     @ApiModelProperty(value = "送检负责人")

module_cmms/src/main/java/org/jeecg/modules/cmmsSubmission/dto/CmmsSubmissionUpdateDTO.java

@@ -17,6 +17,10 @@ public class CmmsSubmissionUpdateDTO  implements Serializable {
     @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
     private java.lang.String id;
+    /**送检工单编号*/
+    @Excel(name = "送检工单编号", width = 15)
+    @ApiModelProperty(value = "送检工单编号")
+    private java.lang.String sjcode;
     /**送检负责人*/
     @Excel(name = "送检负责人", width = 15)
     @ApiModelProperty(value = "送检负责人")

module_cmms/src/main/java/org/jeecg/modules/cmmsSubmission/entity/CmmsSubmission.java

@@ -36,10 +36,14 @@ public class CmmsSubmission implements Serializable {
 	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
     private java.lang.String id;
+    /**送检工单编号*/
+    @Excel(name = "送检工单编号", width = 15)
+    @ApiModelProperty(value = "送检工单编号")
+    private java.lang.String sjcode;
 	/**送检负责人*/
 	@Excel(name = "送检负责人", width = 15)
     @ApiModelProperty(value = "送检负责人")
-    @Dict(dictTable = "sys_user", dicText = "username", dicCode = "id")
+    @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
     private java.lang.String verificatePerson;
 	/**检定方式*/
 	@Excel(name = "检定方式", width = 15, dicCode = "verificate_method")

module_cmms/src/main/java/org/jeecg/modules/cmmsSubmission/vo/CmmsSubmissionQueryVO.java

@@ -19,10 +19,14 @@ public class CmmsSubmissionQueryVO  implements Serializable {
     @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
     private java.lang.String id;
+    /**送检工单编号*/
+    @Excel(name = "送检工单编号", width = 15)
+    @ApiModelProperty(value = "送检工单编号")
+    private java.lang.String sjcode;
     /**送检负责人*/
     @Excel(name = "送检负责人", width = 15)
     @ApiModelProperty(value = "送检负责人")
-    @Dict(dictTable = "sys_user", dicText = "username", dicCode = "id")
+    @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
     private java.lang.String verificatePerson;
     /**检定方式*/
     @Excel(name = "检定方式", width = 15, dicCode = "verificate_method")

module_cmms/src/main/java/org/jeecg/modules/cmmsSubmission/vo/CmmsSubmissionXQVO.java

@@ -24,6 +24,10 @@ public class CmmsSubmissionXQVO implements Serializable {
     @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
     private java.lang.String id;
+    /**送检工单编号*/
+    @Excel(name = "送检工单编号", width = 15)
+    @ApiModelProperty(value = "送检工单编号")
+    private java.lang.String sjcode;
     /**送检负责人*/
     @Excel(name = "送检负责人", width = 15)
     @ApiModelProperty(value = "送检负责人")