From 286375a43369462cd75147271949cf819916912f Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期五, 12 一月 2024 16:39:17 +0800
Subject: [PATCH] 问题项修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/TechnologyStatus.java | 28 +++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyInspectionStandardMapper.xml | 3
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardMapper.xml | 4
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java | 20 +++++-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionParametersTemplateController.java | 2
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/TechnologyStatusMapper.xml | 7 ++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 49 ++++++++++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/TechnologyStatusController.java | 44 ++++++++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java | 11 +++
9 files changed, 161 insertions(+), 7 deletions(-)
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 d36ced6..f1f3bd7 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
@@ -1,6 +1,7 @@
package org.jeecg.modules.eam.controller;
import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -201,13 +202,17 @@
.eq(FinishTransferOrder::getEquipmentId, equipmentId).list();
for (FinishTransferOrder finishTransferOrder : finishTransferOrders) {
String operateUser = finishTransferOrder.getOperateUser();
- record.put("operateUserName", operateUser);
+// record.put("operateUserName", operateUser+"/"+finishTransferOrder.getTransferOrderUda1());
+ record.put("operateUserName",(StringUtils.isBlank(operateUser) ? "":operateUser+"/"+finishTransferOrder.getTransferOrderUda1()));
String repairUser = finishTransferOrder.getRepairUser();
- record.put("repairUserName", repairUser);
+// record.put("repairUserName", repairUser+"/"+finishTransferOrder.getTransferOrderUda2());
+ record.put("repairUserName",(StringUtils.isBlank(repairUser) ? "":repairUser+"/"+finishTransferOrder.getTransferOrderUda2()));
String repairDirectorUser = finishTransferOrder.getRepairDirectorUser();
- record.put("repairDirectorUserName", repairDirectorUser);
+// record.put("repairDirectorUserName", repairDirectorUser+"/"+finishTransferOrder.getTransferOrderUda3());
+ record.put("repairDirectorUserName",(StringUtils.isBlank(repairDirectorUser) ? "":repairDirectorUser+"/"+finishTransferOrder.getTransferOrderUda3()));
String equipmentInspectorUser = finishTransferOrder.getEquipmentInspectorUser();
- record.put("equipmentInspectorUserName", equipmentInspectorUser);
+// record.put("equipmentInspectorUserName", equipmentInspectorUser+"/"+finishTransferOrder.getTransferOrderUda4());
+ record.put("equipmentInspectorUserName",(StringUtils.isBlank(equipmentInspectorUser) ? "":equipmentInspectorUser+"/"+finishTransferOrder.getTransferOrderUda4()));
}
}
@@ -788,6 +793,7 @@
FinishTransferOrder finishTransferOrder = finishTransferOrders.get(0);
if("1".equals(confirmStatus)){
finishTransferOrder.setOperateUser(sysUser.getRealname());
+ finishTransferOrder.setTransferOrderUda1(DateUtils.now());
finishTransferOrderService.updateById(finishTransferOrder);
maintenanceOrder.setConfirmStatus(confirmStatus);
@@ -799,6 +805,7 @@
finishTransferOrder.setRepairDirectorUser("");
finishTransferOrder.setRepairUser("");
finishTransferOrder.setOperateUser("");
+ finishTransferOrder.setTransferOrderUda1("");
finishTransferOrderService.updateById(finishTransferOrder);
maintenanceOrder.setConfirmStatus(confirmStatus);
@@ -807,6 +814,7 @@
this.twoMaintenanceAlert(confirmStatus,"浜屼繚绉讳氦鍗曟搷浣滀汉鍛�",maintenanceOrder.getNum());
}else if("3".equals(confirmStatus)){
finishTransferOrder.setRepairUser(sysUser.getRealname());
+ finishTransferOrder.setTransferOrderUda2(DateUtils.now());
finishTransferOrderService.updateById(finishTransferOrder);
maintenanceOrder.setConfirmStatus(confirmStatus);
@@ -817,6 +825,7 @@
finishTransferOrder.setEquipmentInspectorUser("");
finishTransferOrder.setRepairDirectorUser("");
finishTransferOrder.setRepairUser("");
+ finishTransferOrder.setTransferOrderUda2("");
finishTransferOrderService.updateById(finishTransferOrder);
maintenanceOrder.setConfirmStatus(confirmStatus);
@@ -825,6 +834,7 @@
this.twoMaintenanceAlert(confirmStatus,"浜屼繚绉讳氦鍗曠淮淇汉鍛�",maintenanceOrder.getNum());
}else if("5".equals(confirmStatus)){
finishTransferOrder.setRepairDirectorUser(sysUser.getRealname());
+ finishTransferOrder.setTransferOrderUda3(DateUtils.now());
finishTransferOrderService.updateById(finishTransferOrder);
maintenanceOrder.setConfirmStatus(confirmStatus);
@@ -833,6 +843,7 @@
this.twoMaintenanceAlert(confirmStatus,"浜屼繚绉讳氦鍗曟楠屽憳",maintenanceOrder.getNum());
}else if("6".equals(confirmStatus)){
finishTransferOrder.setRepairDirectorUser("");
+ finishTransferOrder.setTransferOrderUda3("");
finishTransferOrderService.updateById(finishTransferOrder);
maintenanceOrder.setConfirmStatus(confirmStatus);
@@ -841,6 +852,7 @@
this.twoMaintenanceAlert(confirmStatus,"浜屼繚绉讳氦鍗曠淮淇涓讳换",maintenanceOrder.getNum());
}else if("7".equals(confirmStatus)){
finishTransferOrder.setEquipmentInspectorUser(sysUser.getRealname());
+ finishTransferOrder.setTransferOrderUda4(DateUtils.now());
finishTransferOrderService.updateById(finishTransferOrder);
maintenanceOrder.setConfirmStatus(confirmStatus);
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
index e9fd024..3ba20b8 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
@@ -195,6 +195,55 @@
return Result.OK(pageList);
}
+ @ApiOperation(value="mom_eam_equipment-鍒嗛〉鍒楄〃鏌ヨ", notes="mom_eam_equipment-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/showEquipmentList")
+ public Result<IPage<Equipment>> showEquipmentList(Equipment equipment,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<Equipment> queryWrapper = new QueryWrapper<>();
+ if(StringUtils.isNotBlank(equipment.getNum())){
+ queryWrapper.like("num",equipment.getNum());
+ }
+ if(StringUtils.isNotBlank(equipment.getName())){
+ queryWrapper.like("name",equipment.getName());
+ }
+ queryWrapper.eq("equipment_status","1");
+ queryWrapper.in("technology_status","qualified","limitedUse");
+ queryWrapper.eq("status","1");
+ queryWrapper.eq("del_flag",0);
+ queryWrapper.orderByDesc("create_time");
+
+ Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
+ IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ @ApiOperation(value="mom_eam_equipment-鍒嗛〉鍒楄〃鏌ヨ", notes="mom_eam_equipment-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/findEquipmentList")
+ public Result<IPage<Equipment>> findEquipmentList(Equipment equipment,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<Equipment> queryWrapper = new QueryWrapper<>();
+ if(StringUtils.isNotBlank(equipment.getNum())){
+ queryWrapper.like("num",equipment.getNum());
+ }
+ if(StringUtils.isNotBlank(equipment.getName())){
+ queryWrapper.like("name",equipment.getName());
+ }
+ queryWrapper.eq("equipment_status","1");
+ queryWrapper.in("technology_status","qualified","limitedUse");
+ queryWrapper.in("equipment_importance_id","A","B","C");
+ queryWrapper.eq("status","1");
+ queryWrapper.eq("del_flag",0);
+ queryWrapper.orderByDesc("create_time");
+
+ Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
+ IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
/**
* 璁惧淇濅慨 鑾峰彇璁惧鍒楄〃缁勪欢
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 3a6f19e..31ca3f5 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
@@ -50,6 +50,9 @@
@Autowired
private IEamEquipmentService equipmentService;
+
+ @Autowired
+ private IPrecisionParametersTemplateDetailService precisionParametersTemplateDetailService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -188,6 +191,14 @@
String precisionParametersId = precisionInspectionDetail.getPrecisionParametersId();
PrecisionParameters precisionParameters = precisionParametersService.getById(precisionParametersId);
precisionInspectionDetail.setPrecisionParametersName(precisionParameters.getName());
+
+ List<PrecisionParametersTemplateDetail> list = precisionParametersTemplateDetailService.lambdaQuery()
+ .eq(PrecisionParametersTemplateDetail::getPrecisionParametersId, precisionParametersId)
+ .eq(PrecisionParametersTemplateDetail::getDelFlag, "0").list();
+ if(list.size()>0){
+ precisionInspectionDetail.setTolerance(list.get(0).getTolerance());
+ }
+
}
map.put("precisionInspectionDetails",precisionInspectionDetails);
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionParametersTemplateController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionParametersTemplateController.java
index bab6efc..4b00c90 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionParametersTemplateController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionParametersTemplateController.java
@@ -194,11 +194,13 @@
*/
@ApiOperation(value = "绮惧害鍙傛暟妯℃澘-娣诲姞", notes = "绮惧害鍙傛暟妯℃澘-娣诲姞")
@PostMapping(value = "/addNew")
+ @Transactional(rollbackFor = { Exception.class })
public Result<?> addNew(@RequestBody PrecisionParametersTemplate precisionParametersTemplate) {
precisionParametersTemplateService.save(precisionParametersTemplate);
String id= precisionParametersTemplate.getId();
List<PrecisionParametersTemplateDetail> details = precisionParametersTemplate.getPrecisionParametersTemplateDetailList();
for(PrecisionParametersTemplateDetail precisionParametersTemplateDetail:details){
+ precisionParametersTemplateDetail.setId("");
precisionParametersTemplateDetail.setPrecisionParametersTemplateId(id);
}
precisionParametersTemplateDetailService.saveBatch(details);
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/TechnologyStatusController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/TechnologyStatusController.java
index c99d442..d9a1b64 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/TechnologyStatusController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/TechnologyStatusController.java
@@ -191,6 +191,50 @@
@GetMapping("getTechnologyStatus")
public Result<?> getTechnologyStatus(@RequestParam(name = "orderId", required = true) String orderId) {
List<Map<String, Object>> technologyStatusList = technologyStatusService.getTechnologyStatusList(orderId);
+ for (Map<String, Object> map : technologyStatusList) {
+ String result_8 = (String)map.get("result_8");
+ if("0".equals(result_8)){
+ map.put("hidden1Switch",false);
+ }else{
+ map.put("hidden1Switch",true);
+ }
+ String result_9 = (String)map.get("result_9");
+ if("0".equals(result_9)){
+ map.put("hidden2Switch",false);
+ }else{
+ map.put("hidden2Switch",true);
+ }
+ String result_10 = (String)map.get("result_10");
+ if("0".equals(result_10)){
+ map.put("hidden3Switch",false);
+ }else{
+ map.put("hidden3Switch",true);
+ }
+ String result_11 = (String)map.get("result_11");
+ if("0".equals(result_11)){
+ map.put("hidden4Switch",false);
+ }else{
+ map.put("hidden4Switch",true);
+ }
+ String result_12 = (String)map.get("result_12");
+ if("0".equals(result_12)){
+ map.put("hidden5Switch",false);
+ }else{
+ map.put("hidden5Switch",true);
+ }
+ String result_13 = (String)map.get("result_13");
+ if("0".equals(result_13)){
+ map.put("hidden6Switch",false);
+ }else{
+ map.put("hidden6Switch",true);
+ }
+ String result_14 = (String)map.get("result_14");
+ if("0".equals(result_14)){
+ map.put("hidden7Switch",false);
+ }else{
+ map.put("hidden7Switch",true);
+ }
+ }
return Result.ok(technologyStatusList);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/TechnologyStatus.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/TechnologyStatus.java
index 9be5f4b..847c62d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/TechnologyStatus.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/TechnologyStatus.java
@@ -80,6 +80,34 @@
@Excel(name = "result_7", width = 15)
@ApiModelProperty(value = "result_7")
private java.lang.String result_7;
+ /**result_8*/
+ @Excel(name = "result_8", width = 15)
+ @ApiModelProperty(value = "result_8")
+ private java.lang.String result_8;
+ /**result_9*/
+ @Excel(name = "result_9", width = 15)
+ @ApiModelProperty(value = "result_9")
+ private java.lang.String result_9;
+ /**result_10*/
+ @Excel(name = "result_10", width = 15)
+ @ApiModelProperty(value = "result_10")
+ private java.lang.String result_10;
+ /**result_11*/
+ @Excel(name = "result_11", width = 15)
+ @ApiModelProperty(value = "result_11")
+ private java.lang.String result_11;
+ /**result_12*/
+ @Excel(name = "result_12", width = 15)
+ @ApiModelProperty(value = "result_12")
+ private java.lang.String result_12;
+ /**result_13*/
+ @Excel(name = "result_13", width = 15)
+ @ApiModelProperty(value = "result_13")
+ private java.lang.String result_13;
+ /**result_14*/
+ @Excel(name = "result_14", width = 15)
+ @ApiModelProperty(value = "result_14")
+ private java.lang.String result_14;
/**delFlag*/
@Excel(name = "delFlag", width = 15)
@ApiModelProperty(value = "delFlag")
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyInspectionStandardMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyInspectionStandardMapper.xml
index 7192fef..9f94cf3 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyInspectionStandardMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyInspectionStandardMapper.xml
@@ -32,7 +32,8 @@
t1.write_person as writePerson,
t1.audit_person as auditPerson,
t1.approval_person as approvalPerson,
- t1.lose_efficacy_person as loseEfficacyPerson
+ t1.lose_efficacy_person as loseEfficacyPerson,
+ t1.dis_uda1 as disUda1
FROM
mom_eam_daily_inspection_standard t1
LEFT JOIN mom_eam_equipment t2 ON t1.equipment_id = t2.id
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardMapper.xml
index ec02478..3588fc9 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardMapper.xml
@@ -29,7 +29,7 @@
left join sys_depart t4 on t2.use_id = t4.id
left join mom_base_team t5 on t2.team_id = t5.id
left join (select * from v_sys_dict where dict_code = 'assign_mode') t6 on t1.assign_mode = t6.item_value
- where t1.del_flag = 0 and t1.type = #{params.type}
+ where t1.del_flag = 0 and t1.type = #{params.type} and t2.technology_status in ('qualified','limitedUse')
<if test="params.useId != null and params.useId != ''">
and t2.use_id = #{params.useId}
</if>
@@ -78,7 +78,7 @@
left join sys_depart t4 on t2.use_id = t4.id
left join mom_base_team t5 on t2.team_id = t5.id
left join (select * from v_sys_dict where dict_code = 'assign_mode') t6 on t1.assign_mode = t6.item_value
- where t1.del_flag = 0 and t1.type = #{params.type} and t2.equipment_importance_id in ('A','B','C')
+ where t1.del_flag = 0 and t1.type = #{params.type} and t2.equipment_importance_id in ('A','B','C') and t2.technology_status in ('qualified','limitedUse')
<if test="params.useId != null and params.useId != ''">
and t2.use_id = #{params.useId}
</if>
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/TechnologyStatusMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/TechnologyStatusMapper.xml
index 9ab33b3..1b005be 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/TechnologyStatusMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/TechnologyStatusMapper.xml
@@ -16,6 +16,13 @@
ISNULL( t1.result_5, 0 ) AS result_5,
ISNULL( t1.result_6, 0 ) AS result_6,
ISNULL( t1.result_7, 0 ) AS result_7,
+ ISNULL( t1.result_8, 0 ) AS result_8,
+ ISNULL( t1.result_9, 0 ) AS result_9,
+ ISNULL( t1.result_10, 0 ) AS result_10,
+ ISNULL( t1.result_11, 0 ) AS result_11,
+ ISNULL( t1.result_12, 0 ) AS result_12,
+ ISNULL( t1.result_13, 0 ) AS result_13,
+ ISNULL( t1.result_14, 0 ) AS result_14,
t1.receipts,
t2.num AS receiptsNum,
t3.item_text AS receiptsName,
--
Gitblit v1.9.3