fix送检工单新增、有效日期计算

module_cmms/src/main/java/org/jeecg/modules/cmmsOrderNode/convert/CmmsOrderNodeConvert.java

@@ -0,0 +1,18 @@
+package org.jeecg.modules.cmmsOrderNode.convert;
+
+import org.jeecg.modules.cmmsOrderNode.entity.CmmsOrderNode;
+import org.mapstruct.Mapper;
+import org.mapstruct.ReportingPolicy;
+import org.mapstruct.factory.Mappers;
+import org.springframework.util.CollectionUtils;
+
+import java.util.stream.Collectors;
+
+@Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE,imports ={ CollectionUtils.class, Collectors.class})
+public interface CmmsOrderNodeConvert {
+
+    CmmsOrderNodeConvert INSTANCE = Mappers.getMapper(CmmsOrderNodeConvert.class);
+
+    CmmsOrderNode convert(String relid, String nodename);
+
+}

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

@@ -9,8 +9,12 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.aspect.annotation.PermissionData;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.cmmsOrderNode.convert.CmmsOrderNodeConvert;
+import org.jeecg.modules.cmmsOrderNode.entity.CmmsOrderNode;
+import org.jeecg.modules.cmmsOrderNode.service.ICmmsOrderNodeService;
 import org.jeecg.modules.cmmsSubmission.convert.CmmsSubmissionConvert;
 import org.jeecg.modules.cmmsSubmission.dto.CmmsSubmissionAddDTO;
 import org.jeecg.modules.cmmsSubmission.dto.CmmsSubmissionUpdateDTO;
@@ -49,6 +53,8 @@ public class CmmsSubmissionController extends JeecgController<CmmsSubmission, IC
 	private ICmmsSubmissionEquipmentService submissionEquipmentService;
 	@Autowired
 	private ISysUploadFileService sysUploadFileService;
+	@Autowired
+	private ICmmsOrderNodeService cmmsOrderNodeService;
 
 	/**
 	 * 分页列表查询
@@ -108,18 +114,10 @@ public class CmmsSubmissionController extends JeecgController<CmmsSubmission, IC
 			}).collect(Collectors.toList());
 			submissionEquipmentService.saveBatch(submissionEquipmentList);
 		}
-		/**上传文件地址集合*/
-		String files = dto.getFiles();
-		if(files!=null && !files.equals("")){
-			List<String> fileList = Arrays.asList(files.split(","));
-			List<SysUploadFile> sysUploadFileList = fileList.stream().map(i->{
-				SysUploadFile sysUploadFile = new SysUploadFile();
-				sysUploadFile.setRelid(cmmsSubmission.getId());
-				sysUploadFile.setUrl(i);
-				return sysUploadFile;
-			}).collect(Collectors.toList());
-			sysUploadFileService.saveBatch(sysUploadFileList);
-		}
+
+		/**新增一条节点*/
+		CmmsOrderNode cmmsOrderNode = CmmsOrderNodeConvert.INSTANCE.convert(cmmsSubmission.getId(),"未开始");
+		cmmsOrderNodeService.save(cmmsOrderNode);
 
 		return Result.OK("添加成功！");
 	}
@@ -173,10 +171,10 @@ public class CmmsSubmissionController extends JeecgController<CmmsSubmission, IC
 
 			if(elementsToAdd!=null && elementsToAdd.size()>0){
 				List<CmmsSubmissionEquipment> elementsToAddList = elementsToAdd.stream().map(i->{
-					CmmsSubmissionEquipment equipment = new CmmsSubmissionEquipment();
-					equipment.setEquipmentid(i);
-					equipment.setCmmsSubmissionId(dto.getId());
-					return equipment;
+					CmmsSubmissionEquipment submissionEquipment = new CmmsSubmissionEquipment();
+					submissionEquipment.setEquipmentid(i);
+					submissionEquipment.setCmmsSubmissionId(dto.getId());
+					return submissionEquipment;
 				}).collect(Collectors.toList());
 				submissionEquipmentService.saveBatch(elementsToAddList);
 			}

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

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

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

@@ -61,24 +61,27 @@ public class CmmsSubmissionEquipmentController extends JeecgController<CmmsSubmi
 			TpmEquipment equipment = equipmentService.getById(cmmsSubmissionEquipment.getEquipmentid());
 			if(equipment!=null){
 				/**有效日期（根据检定日期和周期、周期单位计算出来）*/
-				Date jdDate = Optional.ofNullable(cmmsSubmissionEquipment.getSubmissionDate()).orElse(new Date());
-				if(equipment.getCycleUnit()!=null && !equipment.getCycleUnit().equals("") && equipment.getEquipmentCycle()!=null){
-					LocalDateTime dateTime = jdDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
-					int cycle = equipment.getEquipmentCycle();
-					String cycleUnit = equipment.getCycleUnit();
+//				Date jdDate = Optional.ofNullable(cmmsSubmissionEquipment.getSubmissionDate()).orElse(new Date());
+				Date jdDate = cmmsSubmissionEquipment.getSubmissionDate();
+				if(jdDate!=null){
+					if(equipment.getCycleUnit()!=null && !equipment.getCycleUnit().equals("") && equipment.getEquipmentCycle()!=null){
+						LocalDateTime dateTime = jdDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+						int cycle = equipment.getEquipmentCycle();
+						String cycleUnit = equipment.getCycleUnit();
 
-					if(cycleUnit.equals("0")){ //0年、1月、2日
-						LocalDateTime effectiveLocalDate = dateTime.plusYears(cycle);
-						Date effectiveDate = Date.from(effectiveLocalDate.atZone(ZoneId.systemDefault()).toInstant());
-						cmmsSubmissionEquipment.setSubmissionEffectiveDate(effectiveDate);
-					}else if(cycleUnit.equals("1")){
-						LocalDateTime effectiveLocalDate = dateTime.plusMonths(cycle);
-						Date effectiveDate = Date.from(effectiveLocalDate.atZone(ZoneId.systemDefault()).toInstant());
-						cmmsSubmissionEquipment.setSubmissionEffectiveDate(effectiveDate);
-					}else if(cycleUnit.equals("2")){
-						LocalDateTime effectiveLocalDate = dateTime.plusDays(cycle);
-						Date effectiveDate = Date.from(effectiveLocalDate.atZone(ZoneId.systemDefault()).toInstant());
-						cmmsSubmissionEquipment.setSubmissionEffectiveDate(effectiveDate);
+						if(cycleUnit.equals("0")){ //0年、1月、2日
+							LocalDateTime effectiveLocalDate = dateTime.plusYears(cycle);
+							Date effectiveDate = Date.from(effectiveLocalDate.atZone(ZoneId.systemDefault()).toInstant());
+							cmmsSubmissionEquipment.setSubmissionEffectiveDate(effectiveDate);
+						}else if(cycleUnit.equals("1")){
+							LocalDateTime effectiveLocalDate = dateTime.plusMonths(cycle);
+							Date effectiveDate = Date.from(effectiveLocalDate.atZone(ZoneId.systemDefault()).toInstant());
+							cmmsSubmissionEquipment.setSubmissionEffectiveDate(effectiveDate);
+						}else if(cycleUnit.equals("2")){
+							LocalDateTime effectiveLocalDate = dateTime.plusDays(cycle);
+							Date effectiveDate = Date.from(effectiveLocalDate.atZone(ZoneId.systemDefault()).toInstant());
+							cmmsSubmissionEquipment.setSubmissionEffectiveDate(effectiveDate);
+						}
 					}
 				}
 			}