From f1ec60de737efb5108c177e1618573be2a53f51f Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期二, 21 十一月 2023 10:04:30 +0800
Subject: [PATCH] 签审
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderReportController.java | 152 ++++++++++++++++++++++---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java | 162 +++++++++++++++-----------
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml | 5
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyMaintenanceOrder.java | 2
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java | 4
5 files changed, 232 insertions(+), 93 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
index 43afffa..67eaa4a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
@@ -464,8 +464,8 @@
record.setEquipmentModel(equipment.getModel());
record.setEquipmentSpecification(equipment.getSpecification());
}
- List<Map<String, Object>> precisionParameterList = calibrationOrderService.getPrecisionParameterList(equipmentId);
- record.setPrecisionParameterList(precisionParameterList);
+// List<Map<String, Object>> precisionParameterList = calibrationOrderService.getPrecisionParameterList(equipmentId);
+// record.setPrecisionParameterList(precisionParameterList);
// if("4".equals(status)){
// if("data".equals(managementMode)){
// List<CalibrationOrderDetail> calibrationOrderDetails = calibrationOrderDetailService.lambdaQuery()
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderReportController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderReportController.java
index 7297000..0e1e02e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderReportController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderReportController.java
@@ -5,32 +5,33 @@
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.dto.message.MessageDTO;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.common.system.base.entity.SysUpload;
import org.jeecg.common.system.base.entity.SysUploadRela;
import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.StrUtils;
import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.eam.entity.CalibrationOrder;
-import org.jeecg.modules.eam.entity.CalibrationOrderReport;
-import org.jeecg.modules.eam.entity.Equipment;
-import org.jeecg.modules.eam.entity.EquipmentDocument;
-import org.jeecg.modules.eam.service.ICalibrationOrderReportService;
+import org.jeecg.modules.eam.entity.*;
+import org.jeecg.modules.eam.service.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
-import org.jeecg.modules.eam.service.ICalibrationOrderService;
-import org.jeecg.modules.eam.service.IEamEquipmentService;
+import org.jeecg.modules.system.entity.*;
+import org.jeecg.modules.system.service.*;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -69,6 +70,26 @@
@Autowired
private IEamEquipmentService eamEquipmentService;
+
+ @Autowired
+ private IDailyInspectionStandardService dailyInspectionStandardService;
+
+ @Autowired
+ private IInspectionOrderService inspectionOrderService;
+
+ @Autowired
+ private IDailyMaintenanceOrderService dailyMaintenanceOrderService;
+
+ @Resource
+ private ISysRoleService sysRoleService;
+ @Resource
+ private ISysDictService sysDictService;
+ @Resource
+ private ISysDictItemService sysDictItemService;
+ @Resource
+ private ISysUserRoleService sysUserRoleService;
+ @Resource
+ private ISysUserService sysUserService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -134,21 +155,116 @@
// 鏇存柊涓昏〃涓哄凡瀹屾垚
CalibrationOrder calibrationOrder = calibrationOrderService.getById(calibrationOrderReport.getCalibrationOrderId());
// status 宸插畬鎴�
- calibrationOrder.setStatus("4");
- calibrationOrder.setCalibrationResult(calibrationOrderReport.getJudgmentResult());
- calibrationOrder.setCalibrationTime(new Date());
+ calibrationOrder.setStatus("2");
+// calibrationOrder.setCalibrationResult(calibrationOrderReport.getJudgmentResult());
+// calibrationOrder.setCalibrationTime(new Date());
calibrationOrderService.updateById(calibrationOrder);
- // 鏇存柊璁惧鎶�鏈姸鎬�
- Equipment equipment = eamEquipmentService.getById(calibrationOrder.getEquipmentId());
-
- if (StringUtils.isNotBlank(equipment.getId())) {
- equipment.setTechnologyStatus(calibrationOrderReport.getJudgmentResult());
- eamEquipmentService.updateById(equipment);
- }
-
+// // 鏇存柊璁惧鎶�鏈姸鎬�
+// Equipment equipment = eamEquipmentService.getById(calibrationOrder.getEquipmentId());
+//
+// if (StringUtils.isNotBlank(equipment.getId())) {
+// equipment.setTechnologyStatus(calibrationOrderReport.getJudgmentResult());
+// eamEquipmentService.updateById(equipment);
+// }
return Result.ok("涓婁紶鎴愬姛!");
}
+ /**
+ * 鏍规嵁妫�瀹氱粨鏋� 淇敼璁惧鎶�鏈姸鎬�
+ * @return
+ */
+// @PostMapping(value = "/editEquipmentTechnologyStatus")
+ @RequestMapping(value = "/editEquipmentTechnologyStatus", method = {RequestMethod.PUT,RequestMethod.POST})
+ @Transactional(rollbackFor = {Exception.class})
+ public Result<?> editEquipmentTechnologyStatus(@RequestBody CalibrationOrderReport calibrationOrderReport){
+ String status = calibrationOrderReport.getStatus();
+ CalibrationOrder calibrationOrder = calibrationOrderService.getById(calibrationOrderReport.getId());
+ if("3".equals(status)){//3:宸查┏鍥�
+ calibrationOrder.setStatus("3");
+ calibrationOrder.setRemark(calibrationOrderReport.getRemark());
+ calibrationOrder.setCalibrationResult(calibrationOrderReport.getJudgmentResult());
+ calibrationOrderService.updateById(calibrationOrder);
+ return Result.ok("椹冲洖鎴愬姛!");
+ }else{
+ calibrationOrder.setStatus("4");
+ calibrationOrder.setRemark(calibrationOrderReport.getRemark());
+ calibrationOrder.setCalibrationResult(calibrationOrderReport.getJudgmentResult());
+ calibrationOrder.setCalibrationTime(new Date());
+ calibrationOrderService.updateById(calibrationOrder);
+ // 鏇存柊璁惧鎶�鏈姸鎬�
+ Equipment equipment = eamEquipmentService.getById(calibrationOrder.getEquipmentId());
+
+ if (StringUtils.isNotBlank(equipment.getId())) {
+ equipment.setTechnologyStatus(calibrationOrderReport.getJudgmentResult());
+ eamEquipmentService.updateById(equipment);
+
+ this.equipmentTechnologyStatuAlart(equipment.getNum());
+ }
+ String judgmentResult = calibrationOrderReport.getJudgmentResult();
+ if("disabledScrapping".equals(judgmentResult)){
+ this.cancleAllOrder(equipment.getId());
+ }
+ return Result.ok("璁惧鎶�鏈姸鎬佷慨鏀瑰畬鎴�!");
+ }
+ }
+
+ void equipmentTechnologyStatuAlart(String equipmentNum){
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ SysDict sysDict = sysDictService.getOne(new QueryWrapper<SysDict>().eq("dict_code","info_type"),false);
+ SysDictItem sysDictItem = sysDictItemService.getOne(new QueryWrapper<SysDictItem>().eq("item_text","杩愪繚璁惧绠＄悊鍛�")
+ .eq("dict_id",sysDict.getId()),false);
+ String roleCode = sysDictItem.getItemValue();
+ SysRole sysRole = sysRoleService.getOne(new QueryWrapper<SysRole>().eq("role_code",roleCode),false);
+ List<SysUserRole> sysUserRoles = sysUserRoleService.list(new QueryWrapper<SysUserRole>().eq("role_id",sysRole.getId()));
+ for(SysUserRole sysUserRole:sysUserRoles){
+ SysUser user = sysUserService.getById(sysUserRole.getUserId());
+ String msg = sysUser.getRealname()+"灏嗙粺涓�缂栧彿涓恒��"+equipmentNum+"銆戠殑鎶�鏈姸鎬佷慨鏀逛负宸茬鐢�";
+ MessageDTO messageDTO = new MessageDTO();
+ messageDTO.setTitle("璁惧鍙拌处鎶�鏈姸鎬佷慨鏀�");
+ messageDTO.setContent(msg);
+ messageDTO.setCategory("杩愪繚璁惧绠＄悊鍛�");
+ messageDTO.setFromUser("璁惧鍙拌处鎶�鏈姸鎬佷慨鏀规彁閱掑皬鍔╂墜");
+ messageDTO.setToUser(user.getUsername());
+ sysBaseApi.sendSysAnnouncement(messageDTO);
+ }
+ }
+
+ void cancleAllOrder(String equipmentId){
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ //濡傛灉鎶�鏈姸鎬侀壌瀹� 涓虹鐢紙宸叉彁浜ゆ姤搴燂級 鐘舵�� 瀵瑰簲褰撳墠鐐规鏍囧噯澶辨晥锛屾敼涓虹粺涓�鐨勭偣妫�鏍囧噯(寰愰潤鎻愪緵)锛屽師鐐规宸ュ崟銆佷簩淇濆伐鍗曘�佷笁淇濆伐鍗曞叏閮ㄥ彇娑堬紝
+ List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery()
+ .eq(DailyInspectionStandard::getVersionStatus, "2")
+ .eq(DailyInspectionStandard::getEquipmentId, equipmentId)
+ .eq(DailyInspectionStandard::getDelFlag, "0").list();
+ for (DailyInspectionStandard dailyInspectionStandard : dailyInspectionStandards) {
+ dailyInspectionStandard.setVersionStatus("3");
+ dailyInspectionStandard.setLoseEfficacyPerson(sysUser.getRealname());
+ dailyInspectionStandard.setLoseEfficacyTime(new Date());
+ dailyInspectionStandardService.updateById(dailyInspectionStandard);
+ }
+
+ List<InspectionOrder> inspectionOrders = inspectionOrderService.lambdaQuery()
+ .eq(InspectionOrder::getStatus, "1")
+ .eq(InspectionOrder::getEquipmentId, equipmentId)
+ .eq(InspectionOrder::getDelFlag, "0").list();
+ for (InspectionOrder inspectionOrder : inspectionOrders) {
+ inspectionOrder.setStatus("7");
+ inspectionOrderService.updateById(inspectionOrder);
+ }
+
+ List<DailyMaintenanceOrder> dailyMaintenanceOrders = dailyMaintenanceOrderService.lambdaQuery()
+ .eq(DailyMaintenanceOrder::getStatus, "1")
+ .eq(DailyMaintenanceOrder::getEquipmentId, equipmentId)
+ .eq(DailyMaintenanceOrder::getDelFlag, "0").list();
+ for (DailyMaintenanceOrder dailyMaintenanceOrder : dailyMaintenanceOrders) {
+ dailyMaintenanceOrder.setStatus("7");
+ dailyMaintenanceOrderService.updateById(dailyMaintenanceOrder);
+ }
+
+ }
+
+
+
@PostMapping(value = "/edit")
@Transactional(rollbackFor = {Exception.class})
public Result<?> edit(MultipartHttpServletRequest request, HttpServletResponse response) throws Exception {
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java
index ce8d82b..862676c 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java
@@ -147,17 +147,19 @@
record.put("maintenanceCycles", maintenanceCycles);
List<Map<String, Object>> dailyMaintenanceDetails = dailyMaintenanceOrderService.getDailyMaintenanceDetailByOrderId(id);
- //缁熻宸ユ椂瀹氶
- BigDecimal workingHourQuota = new BigDecimal(0);
- for(Map<String, Object> dailyMaintenanceOrderDetail : dailyMaintenanceDetails){
- if(dailyMaintenanceOrderDetail.get("workingHourQuota") != null){
- Integer wh = (Integer)dailyMaintenanceOrderDetail.get("workingHourQuota");
- BigDecimal workingHour = new BigDecimal(wh);
- workingHourQuota = workingHourQuota.add(workingHour);
- }
- }
- record.put("workingHourQuota",workingHourQuota);
record.put("dailyMaintenanceDetails", dailyMaintenanceDetails);
+
+ //缁熻宸ユ椂瀹氶
+// BigDecimal workingHourQuota = new BigDecimal(0);
+// for(Map<String, Object> dailyMaintenanceOrderDetail : dailyMaintenanceDetails){
+// if(dailyMaintenanceOrderDetail.get("workingHourQuota") != null){
+// Integer wh = (Integer)dailyMaintenanceOrderDetail.get("workingHourQuota");
+// BigDecimal workingHour = new BigDecimal(wh);
+// workingHourQuota = workingHourQuota.add(workingHour);
+// }
+// }
+// record.put("workingHourQuota",workingHourQuota);
+
/**
* 澶嶉�夋 涓嶅彲缂栬緫
*/
@@ -170,41 +172,28 @@
/**
* 缁熻瀹為檯宸ユ椂
*/
- QueryWrapper<MaintenanceOrderActualWorkingHour> actualWorkingHourWrapper = new QueryWrapper<>();
- actualWorkingHourWrapper.eq("maintenance_order_id", id).eq("del_flag", 0);
- actualWorkingHourWrapper.select("sum(actual_working_hour_quota) as actualQuantity");
- Map<String, Object> map = maintenanceOrderActualWorkingHourService.getMap(actualWorkingHourWrapper);
- BigDecimal actualQuantity = new BigDecimal(0);
- if (map != null) {
- actualQuantity = (BigDecimal) map.get("actualQuantity");
- }
- record.put("actualWorkingHourQuota", actualQuantity);
+// QueryWrapper<MaintenanceOrderActualWorkingHour> actualWorkingHourWrapper = new QueryWrapper<>();
+// actualWorkingHourWrapper.eq("maintenance_order_id", id).eq("del_flag", 0);
+// actualWorkingHourWrapper.select("sum(actual_working_hour_quota) as actualQuantity");
+// Map<String, Object> map = maintenanceOrderActualWorkingHourService.getMap(actualWorkingHourWrapper);
+// BigDecimal actualQuantity = new BigDecimal(0);
+// if (map != null) {
+// actualQuantity = (BigDecimal) map.get("actualQuantity");
+// }
+// record.put("actualWorkingHourQuota", actualQuantity);
List<FinishTransferOrder> finishTransferOrders = finishTransferOrderService.lambdaQuery()
.eq(FinishTransferOrder::getMaintenanceOrderId, id)
.eq(FinishTransferOrder::getEquipmentId, equipmentId).list();
for (FinishTransferOrder finishTransferOrder : finishTransferOrders) {
String operateUser = finishTransferOrder.getOperateUser();
- if(StringUtils.isNotBlank(operateUser)){
- SysUser sysUser = sysUserService.getById(operateUser);
- record.put("operateUserName", sysUser.getRealname());
- }
+ record.put("operateUserName", operateUser);
String repairUser = finishTransferOrder.getRepairUser();
- if(StringUtils.isNotBlank(repairUser)){
- SysUser sysUser = sysUserService.getById(repairUser);
- record.put("repairUserName", sysUser.getRealname());
- }
+ record.put("repairUserName", repairUser);
String repairDirectorUser = finishTransferOrder.getRepairDirectorUser();
- if(StringUtils.isNotBlank(repairDirectorUser)){
- SysUser sysUser = sysUserService.getById(repairDirectorUser);
- record.put("repairDirectorUserName", sysUser.getRealname());
- }
+ record.put("repairDirectorUserName", repairDirectorUser);
String equipmentInspectorUser = finishTransferOrder.getEquipmentInspectorUser();
- if(StringUtils.isNotBlank(equipmentInspectorUser)){
- SysUser sysUser = sysUserService.getById(equipmentInspectorUser);
- record.put("equipmentInspectorUserName", sysUser.getRealname());
- }
-
+ record.put("equipmentInspectorUserName", equipmentInspectorUser);
}
}
@@ -229,15 +218,15 @@
List<Map<String, Object>> dailyMaintenanceDetails = dailyMaintenanceOrderService.getDailyMaintenanceDetailByOrderId(id);
//缁熻宸ユ椂瀹氶
- BigDecimal workingHourQuota = new BigDecimal(0);
- for(Map<String, Object> dailyMaintenanceOrderDetail : dailyMaintenanceDetails){
- if(dailyMaintenanceOrderDetail.get("workingHourQuota") != null){
- Integer wh = (Integer)dailyMaintenanceOrderDetail.get("workingHourQuota");
- BigDecimal workingHour = new BigDecimal(wh);
- workingHourQuota = workingHourQuota.add(workingHour);
- }
- }
- record.put("workingHourQuota",workingHourQuota);
+// BigDecimal workingHourQuota = new BigDecimal(0);
+// for(Map<String, Object> dailyMaintenanceOrderDetail : dailyMaintenanceDetails){
+// if(dailyMaintenanceOrderDetail.get("workingHourQuota") != null){
+// Integer wh = (Integer)dailyMaintenanceOrderDetail.get("workingHourQuota");
+// BigDecimal workingHour = new BigDecimal(wh);
+// workingHourQuota = workingHourQuota.add(workingHour);
+// }
+// }
+// record.put("workingHourQuota",workingHourQuota);
record.put("dailyMaintenanceDetails", dailyMaintenanceDetails);
/**
* 澶嶉�夋 涓嶅彲缂栬緫
@@ -251,15 +240,15 @@
/**
* 缁熻瀹為檯宸ユ椂
*/
- QueryWrapper<MaintenanceOrderActualWorkingHour> actualWorkingHourWrapper = new QueryWrapper<>();
- actualWorkingHourWrapper.eq("maintenance_order_id", id).eq("del_flag", 0);
- actualWorkingHourWrapper.select("sum(actual_working_hour_quota) as actualQuantity");
- Map<String, Object> map = maintenanceOrderActualWorkingHourService.getMap(actualWorkingHourWrapper);
- BigDecimal actualQuantity = new BigDecimal(0);
- if (map != null) {
- actualQuantity = (BigDecimal) map.get("actualQuantity");
- }
- record.put("actualWorkingHourQuota", actualQuantity);
+// QueryWrapper<MaintenanceOrderActualWorkingHour> actualWorkingHourWrapper = new QueryWrapper<>();
+// actualWorkingHourWrapper.eq("maintenance_order_id", id).eq("del_flag", 0);
+// actualWorkingHourWrapper.select("sum(actual_working_hour_quota) as actualQuantity");
+// Map<String, Object> map = maintenanceOrderActualWorkingHourService.getMap(actualWorkingHourWrapper);
+// BigDecimal actualQuantity = new BigDecimal(0);
+// if (map != null) {
+// actualQuantity = (BigDecimal) map.get("actualQuantity");
+// }
+// record.put("actualWorkingHourQuota", actualQuantity);
/**
*鑾峰彇鏄惁涓虹倝绫昏澶囨爣璁�
@@ -638,8 +627,8 @@
FinishTransferOrder finishTransferOrder = new FinishTransferOrder();
finishTransferOrder.setEquipmentId(maintenanceOrder.getEquipmentId());
finishTransferOrder.setMaintenanceOrderId(maintenanceOrder.getId());
- finishTransferOrder.setOperateUser(userId);
- finishTransferOrder.setRepairUser(userId);
+// finishTransferOrder.setOperateUser(userId);
+// finishTransferOrder.setRepairUser(userId);
finishTransferOrder.setStatus("1");
finishTransferOrder.setDelFlag(0);
finishTransferOrderService.save(finishTransferOrder);
@@ -736,42 +725,73 @@
@Transactional(rollbackFor = { Exception.class })
public Result<String> approve(@RequestBody DailyMaintenanceOrder dailyMaintenanceOrder) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- String userId = sysUser.getId();
String orderId = dailyMaintenanceOrder.getId();
String maintenanceOrderUda3 = dailyMaintenanceOrder.getMaintenanceOrderUda3();
+ String confirmStatus = dailyMaintenanceOrder.getConfirmStatus();
+
DailyMaintenanceOrder maintenanceOrder = dailyMaintenanceOrderService.getById(orderId);
String equipmentId = maintenanceOrder.getEquipmentId();
- String confirmStatus = maintenanceOrder.getConfirmStatus();
String orderUda3 = maintenanceOrder.getMaintenanceOrderUda3();
+ if(StringUtils.isBlank(orderUda3)){
+ maintenanceOrder.setMaintenanceOrderUda3(maintenanceOrderUda3);
+ }
List<FinishTransferOrder> finishTransferOrders = finishTransferOrderService.lambdaQuery()
.eq(FinishTransferOrder::getMaintenanceOrderId, orderId)
.eq(FinishTransferOrder::getEquipmentId, equipmentId).list();
if(finishTransferOrders.size()>0){
FinishTransferOrder finishTransferOrder = finishTransferOrders.get(0);
- if ("0".equals(confirmStatus)){
- finishTransferOrder.setRepairDirectorUser(userId);
+ if("1".equals(confirmStatus)){
+ finishTransferOrder.setOperateUser(sysUser.getRealname());
finishTransferOrderService.updateById(finishTransferOrder);
- if(StringUtils.isBlank(orderUda3)){
- maintenanceOrder.setMaintenanceOrderUda3(maintenanceOrderUda3);
- }
- maintenanceOrder.setConfirmStatus("1");
+ maintenanceOrder.setConfirmStatus(confirmStatus);
dailyMaintenanceOrderService.updateById(maintenanceOrder);
- }else{
- finishTransferOrder.setEquipmentInspectorUser(userId);
+ }else if("2".equals(confirmStatus)){
+ finishTransferOrder.setEquipmentInspectorUser("");
+ finishTransferOrder.setRepairDirectorUser("");
+ finishTransferOrder.setRepairUser("");
+ finishTransferOrder.setOperateUser("");
finishTransferOrderService.updateById(finishTransferOrder);
- if(StringUtils.isBlank(orderUda3)){
- maintenanceOrder.setMaintenanceOrderUda3(maintenanceOrderUda3);
- }
- maintenanceOrder.setConfirmStatus("2");
+ maintenanceOrder.setConfirmStatus(confirmStatus);
+ dailyMaintenanceOrderService.updateById(maintenanceOrder);
+ }else if("3".equals(confirmStatus)){
+ finishTransferOrder.setRepairUser(sysUser.getRealname());
+ finishTransferOrderService.updateById(finishTransferOrder);
+
+ maintenanceOrder.setConfirmStatus(confirmStatus);
+ dailyMaintenanceOrderService.updateById(maintenanceOrder);
+ }else if("4".equals(confirmStatus)){
+ finishTransferOrder.setEquipmentInspectorUser("");
+ finishTransferOrder.setRepairDirectorUser("");
+ finishTransferOrder.setRepairUser("");
+ finishTransferOrderService.updateById(finishTransferOrder);
+
+ maintenanceOrder.setConfirmStatus(confirmStatus);
+ dailyMaintenanceOrderService.updateById(maintenanceOrder);
+ }else if("5".equals(confirmStatus)){
+ finishTransferOrder.setRepairDirectorUser(sysUser.getRealname());
+ finishTransferOrderService.updateById(finishTransferOrder);
+
+ maintenanceOrder.setConfirmStatus(confirmStatus);
+ dailyMaintenanceOrderService.updateById(maintenanceOrder);
+ }else if("6".equals(confirmStatus)){
+ finishTransferOrder.setRepairDirectorUser("");
+ finishTransferOrderService.updateById(finishTransferOrder);
+
+ maintenanceOrder.setConfirmStatus(confirmStatus);
+ dailyMaintenanceOrderService.updateById(maintenanceOrder);
+ }else if("7".equals(confirmStatus)){
+ finishTransferOrder.setEquipmentInspectorUser(sysUser.getRealname());
+ finishTransferOrderService.updateById(finishTransferOrder);
+
+ maintenanceOrder.setConfirmStatus(confirmStatus);
maintenanceOrder.setStatus("8");
dailyMaintenanceOrderService.updateById(maintenanceOrder);
}
}
-
return Result.OK("瀹℃壒鎴愬姛!");
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyMaintenanceOrder.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyMaintenanceOrder.java
index 93b92a4..7065b79 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyMaintenanceOrder.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyMaintenanceOrder.java
@@ -117,7 +117,7 @@
@ApiModelProperty(value = "澶囨敞")
private String remark;
- @ApiModelProperty(value = "绉讳氦纭鐘舵�侊紙0鏈‘璁わ紝1涓讳换纭锛�2妫�楠屽憳纭锛�")
+ @ApiModelProperty(value = "浜屼繚绉讳氦鍗曠‘璁ょ姸鎬侊紙0鏈‘璁わ紝1鎿嶄綔鍛樼‘璁わ紝2椹冲洖鎿嶄綔鍛橈紝3缁翠慨纭锛�4椹冲洖缁翠慨鍛橈紝5缁翠慨瀹や富浠荤‘璁わ紝6椹冲洖缁翠慨瀹や富浠伙紝7璁惧妫�楠屽憳纭锛�")
private String confirmStatus;
@ApiModelProperty(value = "绮惧害妫�楠屽崟娴佺▼鐘舵�侊紙0鏈‘璁わ紝1绮惧害妫�楠岃�咃紝2缁翠慨瀹や富浠伙紝3璁惧妫�楠屽憳锛�4浣跨敤鍗曚綅鎶�鏈富绠★紝5璁惧妫�楠屽憳锛堢洊绔狅級锛�")
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml
index 40711ef..f9de1a3 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml
@@ -80,10 +80,12 @@
t1.create_time as createTime,
t1.remark,
t1.description,
+ t1.confirm_status as confirmStatus,
t1.precision_inspection_status as precisionInspectionStatus,
t1.maintenance_order_uda3 as receipts,
t12.num as receiptsNum,
- t13.item_text as receiptsName
+ t13.item_text as receiptsName,
+ t14.item_text as confirmStatusName
FROM
mom_eam_daily_maintenance_order t1
LEFT JOIN mom_eam_maintenance_standard t2 ON t1.maintenance_standard_id = t2.id
@@ -98,6 +100,7 @@
left join (SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_type') t10 on t10.item_value = t4.maintenance_type
left join sys_file_name t12 on t1.maintenance_order_uda3 = t12.id
left join (SELECT * FROM v_sys_dict WHERE dict_code = 'sys_file_name') t13 on t13.item_value = t12.name
+ left join (SELECT * FROM v_sys_dict WHERE dict_code = 'two_maintenance_devolution_status') t14 on t14.item_value = t1.confirm_status
WHERE t1.del_flag = 0 and t2.del_flag = 0 and t3.del_flag = 0 and t4.del_flag = 0 and t4.maintenance_type =#{params.maintenanceType}
<if test="params.num != null and params.num != ''">
and t1.num like concat('%',#{params.num},'%')
--
Gitblit v1.9.3