设备送检状态submissionStatus 0送检中、1已返回 增加状态2未开始

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

@@ -146,6 +146,7 @@ public class CmmsSubmissionController extends JeecgController<CmmsSubmission, IC
 				CmmsSubmissionEquipment submissionEquipment = new CmmsSubmissionEquipment();
 				submissionEquipment.setCmmsSubmissionId(cmmsSubmission.getId());
 				submissionEquipment.setEquipmentid(i);
+				submissionEquipment.setSubmissionStatus("2");
 				return submissionEquipment;
 			}).collect(Collectors.toList());
 			submissionEquipmentService.saveBatch(submissionEquipmentList);
@@ -319,10 +320,11 @@ public class CmmsSubmissionController extends JeecgController<CmmsSubmission, IC
 					else if(i.getSubmissionResult().equals("1")) i.setSubmissionResultText("合格");
 					else if(i.getSubmissionResult().equals("2")) i.setSubmissionResultText("禁用");
 			}
-			/**送检状态 0送检中、1已返回*/
+			/**送检状态 0送检中、1已返回  加个状态2未开始*/
 			if(i.getSubmissionStatus()!=null){
 				if(i.getSubmissionStatus().equals("0")) i.setSubmissionStatusText("送检中");
 				else if(i.getSubmissionStatus().equals("1")) i.setSubmissionStatusText("已返回");
+				else if(i.getSubmissionStatus().equals("2")) i.setSubmissionStatusText("未开始");
 			}
 			return i;
 		}).collect(Collectors.toList());

module_cmms/src/main/java/org/jeecg/modules/cmmsSubmissionEquipment/controller/CmmsSubmissionEquipmentController.java

@@ -65,10 +65,11 @@ public class CmmsSubmissionEquipmentController extends JeecgController<CmmsSubmi
 				else if(i.getSubmissionResult().equals("1")) i.setSubmissionResultText("合格");
 				else if(i.getSubmissionResult().equals("2")) i.setSubmissionResultText("禁用");
 			}
-			/**送检状态 0送检中、1已返回*/
+			/**送检状态 0送检中、1已返回  加个状态2未开始*/
 			if(i.getSubmissionStatus()!=null){
 				if(i.getSubmissionStatus().equals("0")) i.setSubmissionStatusText("送检中");
 				else if(i.getSubmissionStatus().equals("1")) i.setSubmissionStatusText("已返回");
+				else if(i.getSubmissionStatus().equals("2")) i.setSubmissionStatusText("未开始");
 			}
 			return i;
 		}).collect(Collectors.toList());

module_cmms/src/main/java/org/jeecg/modules/cmmsSubmissionEquipment/entity/CmmsSubmissionEquipment.java

@@ -70,7 +70,7 @@ public class CmmsSubmissionEquipment implements Serializable {
 	@Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
     private java.lang.String remark;
-	/**送检状态 0送检中、1已返回*/
+	/**送检状态 0送检中、1已返回  增加状态2未开始*/
 	@Excel(name = "送检状态", width = 15, dicCode = "submission_status")
 	@Dict(dicCode = "submission_status")
     @ApiModelProperty(value = "送检状态")

module_cmms/src/main/java/org/jeecg/modules/cmmsSubmissionEquipment/mapper/CmmsSubmissionEquipmentMapper.java

@@ -48,10 +48,14 @@ public interface CmmsSubmissionEquipmentMapper extends BaseMapper<CmmsSubmission
     List<String> equipmentidList(String cmmsSubmissionId);
 
     /**
-     * 根据设备id查询该所有工单所有检测时间、检测结果、有效时间
+     * 根据设备id查询所有工单所有检测时间、检测结果、有效时间
      * */
-    @Select("select id,submission_date,submission_result,submission_effective_date " +
-            "from cmms_submission_equipment " +
-            "order by submission_date desc")
+    @Select(" select cse.id, cse.cmms_submission_id, cse.equipmentid, cse.submission_date, cse.submission_result, " +
+            "       cse.submission_effective_date, cse.team_confirm, cse.remark, cse.submission_status, " +
+            "       cse.submission_return_date, cse.create_by, cse.create_time, cse.update_by, cse.update_time, " +
+            "       cse.sys_org_code " +
+            " from cmms_submission_equipment cse " +
+            " where  equipmentid = #{equipmentId} " +
+            " order by submission_date desc ")
     List<CmmsSubmissionEquipment> getSubmissionEquipmentByEquipmentId(String equipmentId);
 }