fix反馈； 修改送检工单状态

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

@@ -59,6 +59,24 @@ public class CmmsSubmissionController extends JeecgController<CmmsSubmission, IC
 	private ICmmsOrderNodeService cmmsOrderNodeService;
 
 	/**
+	 *  修改送检工单状态
+	 */
+	@AutoLog(value = "修改送检工单状态")
+	@ApiOperation(value="修改送检工单状态", notes="修改送检工单状态")
+	//@RequiresPermissions("org.jeecg.modules:cmms_submission:edit")
+	@RequestMapping(value = "/editSJStatus", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> editSJStatus(@RequestBody CmmsSubmission cmmsSubmission){
+		cmmsSubmissionService.updateById(cmmsSubmission);
+
+		CmmsOrderNode cmmsOrderNode = new CmmsOrderNode();
+		cmmsOrderNode.setRelid(cmmsSubmission.getId());
+		cmmsOrderNode.setNodename(cmmsSubmission.getSubmissionGdstatus());
+		cmmsOrderNodeService.save(cmmsOrderNode);
+
+		return Result.OK("编辑成功!");
+	}
+
+	/**
 	 * 分页列表查询
 	 *
 	 * @param cmmsSubmission

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

@@ -11,8 +11,11 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.cmmsSubmission.vo.CmmsSubmissionXQVO;
 import org.jeecg.modules.cmmsSubmissionEquipment.entity.CmmsSubmissionEquipment;
 import org.jeecg.modules.cmmsSubmissionEquipment.service.ICmmsSubmissionEquipmentService;
+import org.jeecg.modules.sysUploadFile.entity.SysUploadFile;
+import org.jeecg.modules.sysUploadFile.service.ISysUploadFileService;
 import org.jeecg.modules.tpmEquipment.entity.TpmEquipment;
 import org.jeecg.modules.tpmEquipment.service.ITpmEquipmentService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +30,7 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 送检工单设备表
@@ -41,23 +45,35 @@ import java.util.Optional;
 public class CmmsSubmissionEquipmentController extends JeecgController<CmmsSubmissionEquipment, ICmmsSubmissionEquipmentService> {
 	@Autowired
 	private ICmmsSubmissionEquipmentService cmmsSubmissionEquipmentService;
-	 @Autowired
-	 private ITpmEquipmentService equipmentService;
+	@Autowired
+	private ITpmEquipmentService equipmentService;
+	@Autowired
+	private ISysUploadFileService sysUploadFileService;
 
 
 	/**
-	 *  反馈——批量编辑
+	 *  反馈——编辑
 	 *
-	 * @param list
+	 * @param cmmsSubmissionXQVO
 	 * @return
 	 */
-	@AutoLog(value = "送检工单设备表-反馈——批量编辑")
-	@ApiOperation(value="送检工单设备表-反馈——批量编辑", notes="送检工单设备表-反馈——批量编辑")
+	@AutoLog(value = "送检工单设备表-反馈——编辑")
+	@ApiOperation(value="送检工单设备表-反馈——编辑", notes="送检工单设备表-反馈——编辑")
 	//@RequiresPermissions("org.jeecg.modules:cmms_submission_equipment:edit")
 	@RequestMapping(value = "/fk", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> fk(@RequestBody List<CmmsSubmissionEquipment> list) {
-		for (CmmsSubmissionEquipment cmmsSubmissionEquipment:list){
+	public Result<String> fk(@RequestBody CmmsSubmissionXQVO cmmsSubmissionXQVO) {
+
+		/**上传的图片*/
+		sysUploadFileService.deleteFileByRelId(cmmsSubmissionXQVO.getId());
+		List<SysUploadFile> uploadFileList = cmmsSubmissionXQVO.getUploadFileList();
+		if(uploadFileList!=null && uploadFileList.size()>0){
+			uploadFileList.stream().map(i->i.setRelid(cmmsSubmissionXQVO.getId())).collect(Collectors.toList());
+			sysUploadFileService.saveBatch(uploadFileList);
+		}
 
+		/**批量修改送检工单设备*/
+		List<CmmsSubmissionEquipment> list = cmmsSubmissionXQVO.getSubmissionEquipmentList();
+		for (CmmsSubmissionEquipment cmmsSubmissionEquipment:list){
 			TpmEquipment equipment = equipmentService.getById(cmmsSubmissionEquipment.getEquipmentid());
 			if(equipment!=null){
 				/**有效日期（根据检定日期和周期、周期单位计算出来）*/
@@ -85,7 +101,6 @@ public class CmmsSubmissionEquipmentController extends JeecgController<CmmsSubmi
 					}
 				}
 			}
-
 			cmmsSubmissionEquipmentService.updateById(cmmsSubmissionEquipment);
 
 			/**根据送检状态修改设备管理状态
@@ -108,6 +123,7 @@ public class CmmsSubmissionEquipmentController extends JeecgController<CmmsSubmi
 			}
 			equipmentService.updateById(equipment);
 		}
+
 		return Result.OK("编辑成功!");
 	}