From 5445185e5e0dab34d626bed169b45d8e0d532696 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 13 九月 2023 09:17:35 +0800
Subject: [PATCH] 保养、维修实际用料 bug修改，
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderDetailMapper.xml | 3 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceOrderActualMaterialController.java | 16 ++++---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardDetailMapper.xml | 7 ++-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardDetailController.java | 42 ++++++++++----------
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/DailyMaintenanceOrderDetailMapper.java | 2
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderDetailController.java | 2 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml | 2
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyMaintenanceOrderDetailServiceImpl.java | 5 ++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceOrderActualMaterial.java | 2 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceStandardDetail.java | 3 +
10 files changed, 51 insertions(+), 33 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderDetailController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderDetailController.java
index 8c445e1..ba6d648 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderDetailController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderDetailController.java
@@ -9,6 +9,7 @@
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.api.ISysBaseAPI;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.base.entity.SysUpload;
@@ -176,6 +177,7 @@
* 2023-4-25 qsw
*/
@GetMapping(value = "/getDailyMaintenanceOrderDetailList")
+ @PermissionData
public Result<?> getDailyMaintenanceOrderDetailList(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) {
IPage<Map<String, Object>> dailyMaintenanceOrderDetailList = dailyMaintenanceOrderDetailService.getDailyMaintenanceOrderDetailList(pageNo, pageSize, params);
// for (Map<String, Object> record : dailyMaintenanceOrderDetailList.getRecords()) {
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceOrderActualMaterialController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceOrderActualMaterialController.java
index 68bc1a9..22c39b9 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceOrderActualMaterialController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceOrderActualMaterialController.java
@@ -133,18 +133,20 @@
sparePartOutboundDetailService.updateById(sparePartOutboundDetail);
}
}
-
return Result.OK("娣诲姞鎴愬姛锛�");
}
- @PostMapping(value = "/addInit")
+ @PostMapping(value = "/addInit")
public Result<String> addInit(@RequestBody List<MaintenanceOrderActualMaterial> initList){
- boolean b = maintenanceOrderActualMaterialService.saveOrUpdateBatch(initList);
- if(b){
- return Result.OK("淇濆瓨鎴愬姛");
- }
- return Result.error("淇濆瓨澶辫触");
+ for (MaintenanceOrderActualMaterial maintenanceOrderActualMaterial : initList) {
+ boolean b = maintenanceOrderActualMaterialService.save(maintenanceOrderActualMaterial);
+ if(!b){
+ return Result.error("淇濆瓨澶辫触");
+ }
+ }
+ return Result.OK("淇濆瓨鎴愬姛");
}
+
@PostMapping(value = "/lock")
@Transactional(rollbackFor = { Exception.class })
public Result<String> lock(@RequestBody MaintenanceOrderActualMaterial maintenanceOrderActualMaterial){
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardDetailController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardDetailController.java
index 2058084..52c547e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardDetailController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardDetailController.java
@@ -81,27 +81,27 @@
@GetMapping("getMaintenanceStandardList")
public Result<?> getMaintenanceStandardList(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) {
IPage<Map<String, Object>> maintenanceStandardDetails = maintenanceStandardDetailService.getMaintenanceStandardDetailById(pageNo, pageSize, params);
- for (Map<String, Object> detail : maintenanceStandardDetails.getRecords()) {
- //鑾峰彇鏄惁鏈夋棤寮傚父鐓х墖鏁版嵁
-// List<SysUploadRela> sysUploadRelas = uploadRelaService.lambdaQuery().eq(SysUploadRela::getBusId, (String) detail.get("id")).eq(SysUploadRela::getDelFlag, 0).list();
- List<SysUploadRela> sysUploadRelas = sysBaseApi.listByBusIdAndBusType((String) detail.get("id"), null);
- if (sysUploadRelas.size() > 0) {
- detail.put("isNoPhotoFlag", true);
- //List<SysUploadRela> uploadRelas = uploadRelaService.listByBusIdAndBusType((String)detail.get("id"), "daily_maintenance_standard_photo");
- List<SysUploadRela> uploadRelas = sysBaseApi.listByBusIdAndBusType((String) detail.get("id"), "daily_maintenance_standard_photo");
- ;
- SysUpload upload = new SysUpload();
- if (CollectionUtils.isNotEmpty(uploadRelas)) {
- //upload = uploadService.getById(uploadRelas.get(0).getUploadId());
- upload = sysBaseApi.getUploadById(uploadRelas.get(0).getUploadId());
- }
- detail.put("upload", upload);
- } else {
- detail.put("isNoPhotoFlag", false);
- SysUpload upload = new SysUpload();
- detail.put("upload", upload);
- }
- }
+// for (Map<String, Object> detail : maintenanceStandardDetails.getRecords()) {
+// //鑾峰彇鏄惁鏈夋棤寮傚父鐓х墖鏁版嵁
+//// List<SysUploadRela> sysUploadRelas = uploadRelaService.lambdaQuery().eq(SysUploadRela::getBusId, (String) detail.get("id")).eq(SysUploadRela::getDelFlag, 0).list();
+// List<SysUploadRela> sysUploadRelas = sysBaseApi.listByBusIdAndBusType((String) detail.get("id"), null);
+// if (sysUploadRelas.size() > 0) {
+// detail.put("isNoPhotoFlag", true);
+// //List<SysUploadRela> uploadRelas = uploadRelaService.listByBusIdAndBusType((String)detail.get("id"), "daily_maintenance_standard_photo");
+// List<SysUploadRela> uploadRelas = sysBaseApi.listByBusIdAndBusType((String) detail.get("id"), "daily_maintenance_standard_photo");
+// ;
+// SysUpload upload = new SysUpload();
+// if (CollectionUtils.isNotEmpty(uploadRelas)) {
+// //upload = uploadService.getById(uploadRelas.get(0).getUploadId());
+// upload = sysBaseApi.getUploadById(uploadRelas.get(0).getUploadId());
+// }
+// detail.put("upload", upload);
+// } else {
+// detail.put("isNoPhotoFlag", false);
+// SysUpload upload = new SysUpload();
+// detail.put("upload", upload);
+// }
+// }
return Result.ok(maintenanceStandardDetails);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceOrderActualMaterial.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceOrderActualMaterial.java
index 8417a90..4013862 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceOrderActualMaterial.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceOrderActualMaterial.java
@@ -61,6 +61,7 @@
/**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
@Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
@ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
+ @TableLogic
private Integer delFlag = CommonConstant.DEL_FLAG_0;
/**澶囨敞*/
@Excel(name = "澶囨敞", width = 15)
@@ -97,6 +98,7 @@
@Excel(name = "鍑哄簱鍗曟槑缁唅d", width = 15)
@ApiModelProperty(value = "鍑哄簱鍗曟槑缁唅d")
private String outboundOrderDetailId;
+
private String isLock;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceStandardDetail.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceStandardDetail.java
index 4db736e..f0685ad 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceStandardDetail.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceStandardDetail.java
@@ -55,6 +55,9 @@
@ApiModelProperty(value = "绀烘剰鍥�")
private String photo;
+ @ApiModelProperty(value = "淇濆吇缁翠慨瑙掕壊锛坢aintenance缁翠慨浜哄憳锛宱perator鎿嶄綔浜哄憳锛�")
+ private String maintenanceRole;
+
/**绉熸埛id*/
@Excel(name = "绉熸埛id", width = 15)
@ApiModelProperty(value = "绉熸埛id")
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/DailyMaintenanceOrderDetailMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/DailyMaintenanceOrderDetailMapper.java
index 136d128..87fe12b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/DailyMaintenanceOrderDetailMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/DailyMaintenanceOrderDetailMapper.java
@@ -16,6 +16,6 @@
*/
public interface DailyMaintenanceOrderDetailMapper extends BaseMapper<DailyMaintenanceOrderDetail> {
- IPage<Map<String, Object>> getDailyMaintenanceOrderDetailList(IPage<Map> pageData, @Param("params") Map<String,Object> params);
+ IPage<Map<String, Object>> getDailyMaintenanceOrderDetailList(IPage<Map> pageData, @Param("params") Map<String,Object> params,String sql);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderDetailMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderDetailMapper.xml
index 511456e..f6a6677 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderDetailMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderDetailMapper.xml
@@ -27,6 +27,9 @@
<if test="params.dailyMaintenanceOrderId != null and params.dailyMaintenanceOrderId != ''">
and t1.daily_maintenance_order_id = #{params.dailyMaintenanceOrderId}
</if>
+ <if test="sql != '' and sql != null">
+ ${sql}
+ </if>
ORDER BY t1.create_time desc
</select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardDetailMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardDetailMapper.xml
index cf349a3..cb855db 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardDetailMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardDetailMapper.xml
@@ -17,14 +17,15 @@
t2.working_hour_quota AS workingHourQuota,
t3.id as maintenanceCycleId,
t3.NAME AS maintenanceCycleName,
- t5.NAME AS maintenanceSpecialtyName
-
+ t5.NAME AS maintenanceSpecialtyName,
+ t7.item_value as maintenanceRole
FROM
mom_eam_maintenance_standard_detail t1
LEFT JOIN mom_eam_maintenance_project t2 ON t1.maintenance_project_id = t2.id
LEFT JOIN mom_eam_maintenance_cycle t3 ON t1.maintenance_cycle_id = t3.id
LEFT JOIN mom_eam_maintenance_specialty t5 ON t5.id = t2.maintenance_specialty_id
LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_project_method' ) t4 ON t4.item_value = t2.maintenance_method
+ LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_role' ) t7 ON t7.item_value = t1.maintenance_role
WHERE t1.del_flag = 0
<if test="maintenanceStandardId != null and maintenanceStandardId != ''">
and t1.maintenance_standard_id = #{maintenanceStandardId}
@@ -72,6 +73,7 @@
t1.photo photo,
t1.maintenance_require AS maintenanceRequire,
t6.item_text AS maintenanceModeName,
+ t7.item_text as maintenanceRoleName,
t2.id AS maintenanceProjectId,
t2.name,
t2.standard,
@@ -87,6 +89,7 @@
LEFT JOIN mom_eam_maintenance_specialty t5 ON t5.id = t2.maintenance_specialty_id
LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_project_method' ) t4 ON t4.item_value = t2.maintenance_method
LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_method' ) t6 ON t6.item_value = t1.maintenance_mode
+ LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_role' ) t7 ON t7.item_value = t1.maintenance_role
WHERE t1.del_flag = 0
<if test="params.maintenanceStandardId != null and params.maintenanceStandardId != ''">
and t1.maintenance_standard_id = #{params.maintenanceStandardId}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml
index 65a1ea3..2f75400 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml
@@ -104,7 +104,7 @@
LEFT JOIN mom_eam_spare_part t3 on t3.id =t1.spare_part_id
LEFT JOIN mom_base_constructor t4 on t4.id =t3.constructor_id
LEFT JOIN mom_base_unit t5 on t5.id =t1.main_unit_id
- where t1.del_flag = 0 and t1.outbound_main_quantity != 0 and (ISNULL(t1.outbound_main_quantity,0)-ISNULL(t1.use_quantity,0)) != 0
+ where t1.del_flag = 0 and t3.del_flag = 0 and t1.outbound_main_quantity != 0 and (ISNULL(t1.outbound_main_quantity,0)-ISNULL(t1.use_quantity,0)) != 0
<if test="status != null and status != ''">
and t1.status = #{status}
</if>
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyMaintenanceOrderDetailServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyMaintenanceOrderDetailServiceImpl.java
index edb8323..c82ba82 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyMaintenanceOrderDetailServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyMaintenanceOrderDetailServiceImpl.java
@@ -2,7 +2,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.entity.DailyMaintenanceOrderDetail;
+import org.jeecg.modules.eam.entity.MaintenanceStandardDetail;
import org.jeecg.modules.eam.mapper.DailyMaintenanceOrderDetailMapper;
import org.jeecg.modules.eam.service.IDailyMaintenanceOrderDetailService;
import org.springframework.stereotype.Service;
@@ -23,6 +25,7 @@
@Override
public IPage<Map<String, Object>> getDailyMaintenanceOrderDetailList(Integer pageNo, Integer pageSize, Map<String, Object> params) {
IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
- return super.getBaseMapper().getDailyMaintenanceOrderDetailList(pageData,params);
+ String sql = QueryGenerator.installAuthJdbc(MaintenanceStandardDetail.class);
+ return super.getBaseMapper().getDailyMaintenanceOrderDetailList(pageData,params,sql);
}
}
--
Gitblit v1.9.3