From 8b825a12d64065dd9d8054e5247e374f6cec5390 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期三, 06 九月 2023 18:03:30 +0800
Subject: [PATCH] 设备台账字段增加查询条件增加

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java |   78 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 77 insertions(+), 1 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java
index a21d417..e5e5261 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java
@@ -6,11 +6,16 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
 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.common.system.vo.LoginUser;
+import org.jeecg.modules.eam.entity.DailyMaintenanceOrder;
+import org.jeecg.modules.eam.entity.FinishTransferOrder;
 import org.jeecg.modules.eam.entity.PrecisionInspection;
+import org.jeecg.modules.eam.service.IDailyMaintenanceOrderService;
 import org.jeecg.modules.eam.service.IPrecisionInspectionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -19,8 +24,10 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
- /**
+/**
  * @Description: mom_eam_precision_inspection
  * @Author: jeecg-boot
  * @Date:   2023-09-04
@@ -33,6 +40,9 @@
 public class PrecisionInspectionController extends JeecgController<PrecisionInspection, IPrecisionInspectionService> {
 	@Autowired
 	private IPrecisionInspectionService precisionInspectionService;
+
+	@Autowired
+	private IDailyMaintenanceOrderService dailyMaintenanceOrderService;
 	
 	/**
 	 * 鍒嗛〉鍒楄〃鏌ヨ
@@ -158,4 +168,70 @@
         return super.importExcel(request, response, PrecisionInspection.class);
     }
 
+	/**
+	 * 鏃ュ父鐐规
+	 * qsw 2023-4-26
+	 */
+	@GetMapping("getPrecisionInspectionList")
+	public Result<?> getPrecisionInspectionList(@RequestParam(name = "maintenanceOrderId", required = true) String maintenanceOrderId) {
+		List<Map<String, Object>> precisionInspectionList = precisionInspectionService.getPrecisionInspectionList(maintenanceOrderId);
+		return Result.ok(precisionInspectionList);
+	}
+
+
+	/**
+	 * 璁惧绮惧害妫�楠屾祦绋�
+	 */
+	@RequestMapping(value = "/precisionInspection", method = {RequestMethod.PUT, RequestMethod.POST})
+	public Result<String> precisionInspection(@RequestBody PrecisionInspection precisionInspection) {
+		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		String userId = sysUser.getId();
+
+		PrecisionInspection preInspection = precisionInspectionService.getById(precisionInspection.getId());
+		DailyMaintenanceOrder maintenanceOrder = dailyMaintenanceOrderService.getById(preInspection.getMaintenanceOrderId());
+		String precisionInspectionStatus = maintenanceOrder.getPrecisionInspectionStatus();
+
+			if ("0".equals(precisionInspectionStatus)){
+			preInspection.setPrecisionInspectionUser(userId);
+			precisionInspectionService.updateById(preInspection);
+
+			maintenanceOrder.setPrecisionInspectionStatus("1");
+			dailyMaintenanceOrderService.updateById(maintenanceOrder);
+		}else if("1".equals(precisionInspectionStatus)){
+			preInspection.setRepairDirectorUser(userId);
+			precisionInspectionService.updateById(preInspection);
+
+			maintenanceOrder.setPrecisionInspectionStatus("2");
+			dailyMaintenanceOrderService.updateById(maintenanceOrder);
+		}else if("2".equals(precisionInspectionStatus)){
+			preInspection.setEachTolerance(precisionInspection.getEachTolerance());
+			preInspection.setPartTolerance(precisionInspection.getPartTolerance());
+			preInspection.setEquipmentInspectorUser(userId);
+			precisionInspectionService.updateById(preInspection);
+
+			maintenanceOrder.setPrecisionInspectionStatus("3");
+			dailyMaintenanceOrderService.updateById(maintenanceOrder);
+		} else if("3".equals(precisionInspectionStatus)){
+			preInspection.setSparePart(precisionInspection.getSparePart());
+			preInspection.setProcessPass(precisionInspection.getProcessPass());
+			preInspection.setMeetProcessRequire(precisionInspection.getMeetProcessRequire());
+			preInspection.setUseUnitDirectorUser(userId);
+			precisionInspectionService.updateById(preInspection);
+
+			maintenanceOrder.setPrecisionInspectionStatus("4");
+			dailyMaintenanceOrderService.updateById(maintenanceOrder);
+		}else if("4".equals(precisionInspectionStatus)){
+			preInspection.setEquipmentInspectorSignUser(userId);
+			preInspection.setJudgmentResult(precisionInspection.getJudgmentResult());
+			precisionInspectionService.updateById(preInspection);
+
+			maintenanceOrder.setPrecisionInspectionStatus("5");
+			maintenanceOrder.setStatus("8");
+			dailyMaintenanceOrderService.updateById(maintenanceOrder);
+		}
+
+
+		return Result.OK("瀹℃壒鎴愬姛!");
+	}
+
 }

--
Gitblit v1.9.3