Browse Source

fix送检工单操作日志名

LLL 1 year ago
parent
commit
17e5bb7bd8

+ 4 - 2
module_cmms/src/main/java/org/jeecg/modules/cmmsSubmission/controller/CmmsSubmissionController.java

@@ -74,7 +74,9 @@ public class CmmsSubmissionController extends JeecgController<CmmsSubmission, IC
 
 		CmmsOrderNode cmmsOrderNode = new CmmsOrderNode();
 		cmmsOrderNode.setRelid(cmmsSubmission.getId());
-		cmmsOrderNode.setNodename(cmmsSubmission.getSubmissionGdstatus());
+		//送检工单状态(0未开始1进行中1已完成)
+		if(cmmsSubmission.getSubmissionGdstatus().equals("1")) cmmsOrderNode.setNodename("进行中");
+		else if(cmmsSubmission.getSubmissionGdstatus().equals("2")) cmmsOrderNode.setNodename("已完成");
 		cmmsOrderNodeService.save(cmmsOrderNode);
 
 		return Result.OK("编辑成功!");
@@ -143,7 +145,7 @@ public class CmmsSubmissionController extends JeecgController<CmmsSubmission, IC
 		}
 
 		/**新增一条节点*/
-		CmmsOrderNode cmmsOrderNode = CmmsOrderNodeConvert.INSTANCE.convert(cmmsSubmission.getId(),cmmsSubmission.getSubmissionGdstatus());
+		CmmsOrderNode cmmsOrderNode = CmmsOrderNodeConvert.INSTANCE.convert(cmmsSubmission.getId(),"未开始");
 		cmmsOrderNodeService.save(cmmsOrderNode);
 
 		return Result.OK("添加成功!");

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

@@ -59,10 +59,10 @@ public class CmmsSubmission implements Serializable {
 	@Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
     private java.lang.String remark;
-    /**送检工单状态(0未开始1送检中1已完成)*/
+    /**送检工单状态(0未开始1进行中1已完成)*/
     @Excel(name = "送检工单状态", width = 15, dicCode = "submission_gdstatus")
     @Dict(dicCode = "submission_gdstatus")
-    @ApiModelProperty(value = "送检工单状态(0未开始1送检中1已完成)")
+    @ApiModelProperty(value = "送检工单状态(0未开始1进行中1已完成)")
     private java.lang.String submissionGdstatus;
 	/**创建人*/
     @ApiModelProperty(value = "创建人")

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

@@ -42,10 +42,10 @@ public class CmmsSubmissionQueryVO  implements Serializable {
     @Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
     private java.lang.String remark;
-    /**送检工单状态(0未开始1送检中1已完成)*/
+    /**送检工单状态(0未开始1进行中1已完成)*/
     @Excel(name = "送检工单状态", width = 15, dicCode = "submission_gdstatus")
     @Dict(dicCode = "submission_gdstatus")
-    @ApiModelProperty(value = "送检工单状态(0未开始1送检中1已完成)")
+    @ApiModelProperty(value = "送检工单状态(0未开始1进行中1已完成)")
     private java.lang.String submissionGdstatus;
     /**创建人*/
     @ApiModelProperty(value = "创建人")

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

@@ -47,10 +47,10 @@ public class CmmsSubmissionXQVO implements Serializable {
     @Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
     private java.lang.String remark;
-    /**送检工单状态(0未开始1送检中1已完成)*/
+    /**送检工单状态(0未开始1进行中1已完成)*/
     @Excel(name = "送检工单状态", width = 15, dicCode = "submission_gdstatus")
     @Dict(dicCode = "submission_gdstatus")
-    @ApiModelProperty(value = "送检工单状态(0未开始1送检中1已完成)")
+    @ApiModelProperty(value = "送检工单状态(0未开始1进行中1已完成)")
     private java.lang.String submissionGdstatus;
     /**创建人*/
     @ApiModelProperty(value = "创建人")