From 15ae1e3b5cda40a8248a1addf4a64c1e0a9e2b13 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期五, 12 七月 2024 18:02:04 +0800
Subject: [PATCH] 设备管理修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyInspectionStandardMapper.xml | 2
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/OperationCertificateApply.java | 14 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrder.java | 12 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/OperationCertificateApplyController.java | 12
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartRequirement.java | 34 +++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderFaultAnalysisMapper.xml | 4
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderActualWorkHoursMapper.xml | 2
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartRequirementDeatil.java | 17 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java | 4
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml | 1
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/RepairOrderMapper.java | 13 +
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparePartRequirementController.java | 117 ++++++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/OperationCertificate.java | 13 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java | 50 +++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/OperationCertificateController.java | 12
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardDetailMapper.xml | 2
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml | 129 ++++++++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/RepairOrderServiceImpl.java | 30 +++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 23 ++
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUploadController.java | 2
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/MaintenanceStandardDetailMapper.java | 2
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java | 4
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/MaintenanceStandardMapper.java | 2
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IRepairOrderService.java | 10 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/StreamMapper.xml | 2
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/OperationCertificateApplyServiceImpl.java | 16 +
26 files changed, 485 insertions(+), 44 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java
index 4a8bed4..274c2b0 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java
@@ -662,7 +662,9 @@
messageDTO.setContent(msg);
messageDTO.setCategory(roleDictItem);
messageDTO.setFromUser("鑷富缁存姢鐐规鏍囧噯绛惧娑堟伅鎻愰啋鎻愰啋灏忓姪鎵�");
- messageDTO.setToUser(user.getUsername());
+ if(user != null){
+ messageDTO.setToUser(user.getUsername());
+ }
sysBaseApi.sendSysAnnouncement(messageDTO);
}
}
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 f3d82b7..c0be5b7 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
@@ -381,7 +381,9 @@
* 鑻ユ灉鍘熸爣鍑嗗師鍛ㄦ湡鍙戠敓鍙樺寲锛屽垹闄ゅ師宸ュ崟鏄庣粏 閲嶆柊缁存姢
*/
if (!oldMaintenanceStandardId.equals(maintenanceStandardId) || !oldMaintenanceCycleId.equals(maintenanceCycleId)) {
- List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails = dailyMaintenanceOrderDetailService.lambdaQuery().eq(DailyMaintenanceOrderDetail::getDailyMaintenanceOrderId, orderId).eq(DailyMaintenanceOrderDetail::getDelFlag, 0).list();
+ List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails = dailyMaintenanceOrderDetailService
+ .lambdaQuery().eq(DailyMaintenanceOrderDetail::getDailyMaintenanceOrderId, orderId)
+ .eq(DailyMaintenanceOrderDetail::getDelFlag, 0).list();
for (DailyMaintenanceOrderDetail dailyMaintenanceOrderDetail : dailyMaintenanceOrderDetails) {
dailyMaintenanceOrderDetailService.removeById(dailyMaintenanceOrderDetail);
}
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 6308a3a..655df90 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
@@ -252,6 +252,29 @@
}
+ @ApiOperation(value="mom_eam_equipment-鍒嗛〉鍒楄〃鏌ヨ", notes="mom_eam_equipment-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/queryEquipmentList")
+ public Result<IPage<Equipment>> queryEquipmentList(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("use_id",equipment.getUseId());
+ 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);
+ }
+
+
/**
* 璁惧淇濅慨 鑾峰彇璁惧鍒楄〃缁勪欢
* qsw 2023-7-14
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/OperationCertificateApplyController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/OperationCertificateApplyController.java
index 085fe34..8cf04b3 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/OperationCertificateApplyController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/OperationCertificateApplyController.java
@@ -101,22 +101,22 @@
/**
* 缂栬緫
*
- * @param operationCertificateApplyPage
+ * @param operationCertificateApply
* @return
*/
@AutoLog(value = "鎿嶄綔璇佺敵璇疯〃-缂栬緫")
@ApiOperation(value="鎿嶄綔璇佺敵璇疯〃-缂栬緫", notes="鎿嶄綔璇佺敵璇疯〃-缂栬緫")
//@RequiresPermissions("org.jeecg.modules.mdc:mom_eam_operation_certificate_apply:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> edit(@RequestBody OperationCertificateApplyPage operationCertificateApplyPage) {
- OperationCertificateApply operationCertificateApply = new OperationCertificateApply();
- BeanUtils.copyProperties(operationCertificateApplyPage, operationCertificateApply);
+ public Result<String> edit(@RequestBody OperationCertificateApply operationCertificateApply) {
+// OperationCertificateApply operationCertificateApply = new OperationCertificateApply();
+// BeanUtils.copyProperties(operationCertificateApplyPage, operationCertificateApply);
OperationCertificateApply operationCertificateApplyEntity = operationCertificateApplyService.getById(operationCertificateApply.getId());
if(operationCertificateApplyEntity==null) {
return Result.error("鏈壘鍒板搴旀暟鎹�");
}
- operationCertificateApplyService.updateMain(operationCertificateApply, operationCertificateApplyPage.getOperationCertificateApplyDetailList());
- return Result.OK("缂栬緫鎴愬姛!");
+ operationCertificateApplyService.updateMain(operationCertificateApply, operationCertificateApply.getOperationCertificateApplyDetailList());
+ return Result.OK("瀹℃牳鎴愬姛!");
}
/**
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/OperationCertificateController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/OperationCertificateController.java
index 8090999..03411c3 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/OperationCertificateController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/OperationCertificateController.java
@@ -151,22 +151,22 @@
/**
* 缂栬緫
*
- * @param operationCertificatePage
+ * @param operationCertificate
* @return
*/
@AutoLog(value = "鎿嶄綔璇佷功绠＄悊-缂栬緫")
@ApiOperation(value="鎿嶄綔璇佷功绠＄悊-缂栬緫", notes="鎿嶄綔璇佷功绠＄悊-缂栬緫")
//@RequiresPermissions("org.jeecg.modules.mdc:mom_eam_operation_certificate:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> edit(@RequestBody OperationCertificatePage operationCertificatePage) {
- OperationCertificate operationCertificate = new OperationCertificate();
- BeanUtils.copyProperties(operationCertificatePage, operationCertificate);
+ public Result<String> edit(@RequestBody OperationCertificate operationCertificate) {
+// OperationCertificate operationCertificate = new OperationCertificate();
+// BeanUtils.copyProperties(operationCertificatePage, operationCertificate);
OperationCertificate operationCertificateEntity = operationCertificateService.getById(operationCertificate.getId());
if(operationCertificateEntity==null) {
return Result.error("鏈壘鍒板搴旀暟鎹�");
}
- operationCertificateService.updateMain(operationCertificate, operationCertificatePage.getOperationCertificateDetailList());
- return Result.OK("缂栬緫鎴愬姛!");
+ operationCertificateService.updateMain(operationCertificate, operationCertificate.getOperationCertificateDetailList());
+ return Result.OK("鎿嶄綔璇佹墸鍒嗘垚鍔�!");
}
/**
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java
index 63b372f..96a5797 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java
@@ -135,6 +135,16 @@
HttpServletRequest req) {
Page<RepairOrder> page = new Page<RepairOrder>(pageNo, pageSize);
IPage<RepairOrder> pageList = repairOrderService.getRepairOrderList(page, repairOrder);
+ List<RepairOrder> records = pageList.getRecords();
+ for (RepairOrder record : records) {
+ record.setFaultCauseCount("鏁呴殰鍘熷洜缁熻");
+ List<Map<String, Object>> allFaultCause = repairOrderService.getAllFaultCause();
+ record.setAllFaultCause(allFaultCause);
+
+ String equipmentId = record.getEquipmentId();
+ List<Map<String, Object>> faultCause = repairOrderService.getFaultCause(equipmentId);
+ record.setEquipmentFaultCause(faultCause);
+ }
// for(RepairOrder repairOrder1 : pageList.getRecords()){
// if(StringUtils.isNotBlank(repairOrder1.getReportRepairId())){
// EquipmentReportRepair equipmentReportRepair = equipmentReportRepairService.getById(repairOrder1.getReportRepairId());
@@ -364,7 +374,8 @@
repairOrder.getFaultEndTime(),
repairOrder.getCreateStartTime(),
repairOrder.getCreateEndTime(),
- repairOrder.getEquipmentImportanceId());
+ repairOrder.getEquipmentImportanceId(),
+ repairOrder.getFaultCause());
// Step.3 AutoPoi 瀵煎嚭Excel
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
@@ -1812,4 +1823,39 @@
jsonObject.put("data",list);
return jsonObject;
}
-}
+
+
+ /**
+ * 璁惧缁翠慨鏌辩姸鍥�
+ * qsw 2024-7-11
+ */
+ @GetMapping("getFaultCausePie")
+ public Result<?> getFaultCausePie(@RequestParam Map<String, Object> params) {
+ List<Map<String, Object>> faultCausePie = repairOrderService.getFaultCausePie(params);
+ return Result.ok(faultCausePie);
+ }
+
+ /**
+ * 璁惧缁翠慨鎵囧舰鍥�
+ * qsw 2024-7-11
+ */
+ @GetMapping("getFaultCauseBar")
+ public Result<?> getFaultCauseBar(@RequestParam Map<String, Object> params) {
+ List<Map<String, Object>> faultCauseBar = repairOrderService.getFaultCauseBar(params);
+ return Result.ok(faultCauseBar);
+ }
+
+
+ /**
+ * MTPF
+ * qsw 2024-7-11
+ */
+ @GetMapping("getMTPF")
+ public Result<?> getMTPF(@RequestParam("pageNo") Integer pageNo,
+ @RequestParam("pageSize") Integer pageSize,
+ @RequestParam Map<String, Object> params) {
+ IPage<Map<String, Object>> mtpf = repairOrderService.getMTPF(pageNo, pageSize, params);
+ return Result.ok(mtpf);
+ }
+
+ }
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/OperationCertificate.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/OperationCertificate.java
index ae73112..2231bdd 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/OperationCertificate.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/OperationCertificate.java
@@ -3,14 +3,14 @@
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.entity.JeecgEntity;
+import org.jeecgframework.poi.excel.annotation.ExcelCollection;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
@@ -119,4 +119,9 @@
@Excel(name = "鎶�鑳界瓑绾�", width = 15)
@ApiModelProperty(value = "鎶�鑳界瓑绾�")
private String technicalLevel;
+
+ @ExcelCollection(name="鎿嶄綔璇佺鐞嗘槑缁�")
+ @ApiModelProperty(value = "鎿嶄綔璇佺鐞嗘槑缁�")
+ @TableField(exist = false)
+ private List<OperationCertificateDetail> operationCertificateDetailList;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/OperationCertificateApply.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/OperationCertificateApply.java
index fe1ad59..eb712b9 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/OperationCertificateApply.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/OperationCertificateApply.java
@@ -3,14 +3,14 @@
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.entity.JeecgEntity;
+import org.jeecgframework.poi.excel.annotation.ExcelCollection;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
@@ -102,4 +102,10 @@
@Excel(name = "灞炴�у瓧娈�5", width = 15)
@ApiModelProperty(value = "灞炴�у瓧娈�5")
private String uda5;
+
+ @ExcelCollection(name="鎿嶄綔璇佺敵璇锋槑缁嗚〃")
+ @ApiModelProperty(value = "鎿嶄綔璇佺敵璇锋槑缁嗚〃")
+ @TableField(exist = false)
+ private List<OperationCertificateApplyDetail> operationCertificateApplyDetailList;
+
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrder.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrder.java
index affa498..fcf29ab 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrder.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrder.java
@@ -5,6 +5,7 @@
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
+import java.util.Map;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -257,6 +258,8 @@
private String responsibilityName;
@TableField(exist = false)
private String teamName;
+ @TableField(exist = false)
+ private String faultCause;
@TableField(exist = false)
@Dict(dicCode = "specific_equipment")
@@ -309,5 +312,14 @@
@Excel(name = "ABC鏍囪瘑", width = 15,orderNum = "1")
private String equipmentImportanceId;
+ @TableField(exist = false)
+ private List<Map<String, Object>> allFaultCause;
+
+ @TableField(exist = false)
+ private String faultCauseCount;
+
+ @TableField(exist = false)
+ private List<Map<String, Object>> equipmentFaultCause;
+
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/MaintenanceStandardDetailMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/MaintenanceStandardDetailMapper.java
index 314b1a6..4216d6d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/MaintenanceStandardDetailMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/MaintenanceStandardDetailMapper.java
@@ -31,7 +31,7 @@
@Select("select t1.id as value,concat(t1.code, '/', t1.name) as text,concat(t1.code, '/', t1.name) as title from mom_eam_maintenance_cycle t1 where t1.del_flag = '0' and t1.version_status = '2'")
List<MaintenanceCycleVo> getMaintenanceCycle();
- @Select("select t1.id as value,t1.name as text,t1.name as title from mom_eam_maintenance_cycle t1 where t1.del_flag = '0' and t1.version_status = '2' and t1.equipment_importance_id like concat('%',#{importanceFlag},'%')")
+ @Select("select t1.id as value,t1.name as text,t1.name as title from mom_eam_maintenance_cycle t1 where t1.del_flag = '0' and t1.version_status = '2' and t1.equipment_importance_id = #{importanceFlag}")
List<MaintenanceCycleVo> getPeriodicMaintenanceCycle(String importanceFlag);
@Select(" SELECT item_value as value, item_text as text,item_text as title FROM v_sys_dict WHERE dict_code = 'maintenance_method'")
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/MaintenanceStandardMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/MaintenanceStandardMapper.java
index 02a44a9..06169b8 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/MaintenanceStandardMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/MaintenanceStandardMapper.java
@@ -25,6 +25,6 @@
IPage<Map<String, Object>> getMaintenanceStandard3List(IPage<Map> pageData, @Param("params") Map<String,Object> params);
- @Select("select t1.id as value,t1.name as text,t1.name as title from mom_eam_maintenance_cycle t1 where t1.del_flag = '0' and t1.version_status = '2' and t1.maintenance_type = #{maintenanceType} and t1.equipment_importance_id like concat('%',#{importanceFlag},'%')")
+ @Select("select t1.id as value,t1.name as text,t1.name as title from mom_eam_maintenance_cycle t1 where t1.del_flag = '0' and t1.version_status = '2' and t1.maintenance_type = #{maintenanceType} and t1.equipment_importance_id = #{importanceFlag}")
List<MaintenanceCycleVo> getPeriodicMaintenanceCycle(String importanceFlag,String maintenanceType);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/RepairOrderMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/RepairOrderMapper.java
index fae1b4a..8ce2920 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/RepairOrderMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/RepairOrderMapper.java
@@ -43,7 +43,8 @@
@Param("faultEndTime")Date faultEndTime,
@Param("createStartTime")Date createStartTime,
@Param("createEndTime")Date createEndTime,
- @Param("equipmentImportanceId")String equipmentImportanceId
+ @Param("equipmentImportanceId")String equipmentImportanceId,
+ @Param("faultCause")String faultCause
);
@@ -52,4 +53,14 @@
IPage<Map<String, Object>> getMaterialSpareList(IPage<Map> pageData, @Param("num") String num,@Param("status") String status);
+
+ List<Map<String, Object>> getFaultCause(@Param("equipmentId")String equipmentId);
+
+ List<Map<String, Object>> getAllFaultCause();
+
+ List<Map<String, Object>> getFaultCausePie(@Param("params") Map<String,Object> params);
+
+ List<Map<String, Object>> getFaultCauseBar(@Param("params") Map<String,Object> params);
+
+ IPage<Map<String, Object>> getMTPF(IPage<Map> pageData,@Param("params") Map<String,Object> params);
}
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 d9d4034..6c73eb5 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
@@ -52,7 +52,7 @@
and t2.name like concat('%',#{name},'%')
</if>
<if test="versionStatus != 'null' and versionStatus != ''">
- and t1.version_status like concat('%',#{versionStatus},'%')
+ and t1.version_status = #{versionStatus}
</if>
<if test="versionStatus == 'null' ">
and t1.version_status='2'
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
index 8abc46d..66462e6 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
@@ -252,6 +252,7 @@
t1.line_id lineId,
t1.is_meta isMeta,
t1.id showId,
+ t1.is_line isLine,
t1.is_line_equip isLineEquip,
t1.is_judging isJudging,
t1.area_id areaId,
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 9684ed6..e96a4d0 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
@@ -18,7 +18,7 @@
t3.id as maintenanceCycleId,
t3.NAME AS maintenanceCycleName,
t5.NAME AS maintenanceSpecialtyName,
- t7.item_text as maintenanceRole
+ 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
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderActualWorkHoursMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderActualWorkHoursMapper.xml
index 0b4f164..4549cec 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderActualWorkHoursMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderActualWorkHoursMapper.xml
@@ -24,7 +24,7 @@
t2.username username,
t2.realname as realname,
-- t4.name as teamName,
- concat(t6.num, '/', t6.name, '/', t6.model) as equipmentId
+ (t6.num + '/'+ t6.name+ '/'+ t6.model) as equipmentId
FROM mom_eam_repair_order_actual_work_hours t1
LEFT JOIN sys_user t2 on t2.id = t1.user_id
-- LEFT JOIN mom_base_team_class t3 on t3.id = t2.team_class_id
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderFaultAnalysisMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderFaultAnalysisMapper.xml
index ef0e7bf..59ab614 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderFaultAnalysisMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderFaultAnalysisMapper.xml
@@ -22,7 +22,7 @@
t2.name as faultCauseName,
t3.name as faultTypeName,
t4.num as num,
- concat(t5.num, '/', t5.name,'/',t5.model) as equipmentId
+ (t5.num+ '/'+ t5.name+'/'+t5.model) as equipmentId
FROM mom_eam_repair_order_fault_analysis t1
LEFT JOIN mom_eam_fault_cause t2 on t2.id =t1.fault_cause_id
LEFT JOIN mom_eam_fault_type t3 on t3.id =t1.fault_type_id
@@ -46,7 +46,7 @@
t2.name as faultCauseName,
t3.name as faultTypeName,
t4.num as num,
- concat(t5.num, '/', t5.name,'/',t5.model) as equipmentId
+ (t5.num+ '/'+ t5.name+'/'+t5.model) as equipmentId
FROM mom_eam_repair_order_fault_analysis t1
LEFT JOIN mom_eam_fault_cause t2 on t2.id =t1.fault_cause_id
LEFT JOIN mom_eam_fault_type t3 on t3.id =t1.fault_type_id
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 b23c088..f741f23 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
@@ -63,6 +63,7 @@
left join mom_base_supplier t4 on t1.outsourcing_unit = t4.id
left join sys_user t5 on t5.id = t1.responsibility_id
left join mom_base_team t6 on t6.id=t1.team_id
+ left join mom_eam_repair_order_fault_analysis t7 on t7.repair_order_id=t1.id
where t1.del_flag = 0
<if test="id != null and id != ''">
and t1.id = #{id}
@@ -98,7 +99,10 @@
and t2.specific_equipment = #{specificEquipment}
</if>
<if test="equipmentImportanceId != null and equipmentImportanceId != ''">
- and t2. equipment_importance_id = #{equipmentImportanceId}
+ and t2.equipment_importance_id = #{equipmentImportanceId}
+ </if>
+ <if test="faultCause != null and faultCause != ''">
+ and t7.repair_order_fault_analysis_uda2 = #{faultCause}
</if>
<if test="teamId != null and teamId != ''">
and t1.team_id = #{teamId}
@@ -174,4 +178,127 @@
</select>
+
+ <select id="getAllFaultCause" parameterType="Map" resultType="Map">
+ SELECT
+ t1.repair_order_fault_analysis_uda2,
+ COUNT ( t1.repair_order_fault_analysis_uda2 ) AS total,
+ t2.item_text AS faultCause
+ FROM
+ ( SELECT * FROM v_sys_dict WHERE dict_code = 'repair_order_fault_cause' ) t2
+ LEFT JOIN mom_eam_repair_order_fault_analysis t1 ON t1.repair_order_fault_analysis_uda2 = t2.item_value
+ WHERE
+ del_flag = '0'
+ GROUP BY
+ t1.repair_order_fault_analysis_uda2,
+ t2.item_text
+
+ </select>
+
+ <select id="getFaultCause" parameterType="Map" resultType="Map">
+ SELECT
+ t3.item_text as faultCause,
+ count(t4.repair_order_fault_analysis_uda2) as total
+ FROM
+ ( SELECT * FROM v_sys_dict WHERE dict_code = 'repair_order_fault_cause' ) t3
+ LEFT JOIN (
+ SELECT
+ t1.repair_order_fault_analysis_uda2
+ FROM
+ mom_eam_repair_order_fault_analysis t1
+ LEFT JOIN mom_eam_repair_order t2 ON t1.repair_order_id = t2.id
+ WHERE
+ t1.del_flag = 0
+ AND t2.del_flag = 0
+ AND t2.equipment_id = #{equipmentId}
+ ) t4 ON t3.item_value = t4.repair_order_fault_analysis_uda2
+ group by t3.item_text
+ </select>
+
+ <select id="getFaultCausePie" parameterType="Map" resultType="Map">
+ SELECT
+ t3.item_text as x,
+ count(t4.repair_order_fault_analysis_uda2) as y
+ FROM
+ ( SELECT * FROM v_sys_dict WHERE dict_code = 'repair_order_fault_cause' ) t3
+ LEFT JOIN (
+ SELECT
+ t1.repair_order_fault_analysis_uda2
+ FROM
+ mom_eam_repair_order_fault_analysis t1
+ LEFT JOIN mom_eam_repair_order t2 ON t1.repair_order_id = t2.id
+ left join mom_eam_equipment t11 on t2.equipment_id = t11.id
+ WHERE
+ t1.del_flag = 0
+ AND t2.del_flag = 0
+ <if test="params.equipmentNum != null and params.equipmentNum != ''">
+ and t11.num = #{params.equipmentNum}
+ </if>
+ <if test="params.faultStartTime != null">
+ and t2.create_time >= #{params.faultStartTime}
+ </if>
+ <if test="params.faultEndTime != null">
+ and t2.create_time <= #{params.faultEndTime}
+ </if>
+ ) t4 ON t3.item_value = t4.repair_order_fault_analysis_uda2
+ group by t3.item_text
+ </select>
+
+ <select id="getFaultCauseBar" parameterType="Map" resultType="Map">
+ SELECT
+ t3.item_text as item,
+ count(t4.repair_order_fault_analysis_uda2) as count
+ FROM
+ ( SELECT * FROM v_sys_dict WHERE dict_code = 'repair_order_fault_cause' ) t3
+ LEFT JOIN (
+ SELECT
+ t1.repair_order_fault_analysis_uda2
+ FROM
+ mom_eam_repair_order_fault_analysis t1
+ LEFT JOIN mom_eam_repair_order t2 ON t1.repair_order_id = t2.id
+ left join mom_eam_equipment t11 on t2.equipment_id = t11.id
+ WHERE
+ t1.del_flag = 0
+ AND t2.del_flag = 0
+ <if test="params.equipmentNum != null and params.equipmentNum != ''">
+ and t11.num = #{params.equipmentNum}
+ </if>
+ <if test="params.faultStartTime != null">
+ and t2.create_time >= #{params.faultStartTime}
+ </if>
+ <if test="params.faultEndTime != null">
+ and t2.create_time <= #{params.faultEndTime}
+ </if>
+ ) t4 ON t3.item_value = t4.repair_order_fault_analysis_uda2
+ group by t3.item_text
+ </select>
+
+ <select id="getMTPF" parameterType="Map" resultType="Map">
+ SELECT
+ t3.item_text as item,
+ count(t4.repair_order_fault_analysis_uda2) as count
+ FROM
+ ( SELECT * FROM v_sys_dict WHERE dict_code = 'repair_order_fault_cause' ) t3
+ LEFT JOIN (
+ SELECT
+ t1.repair_order_fault_analysis_uda2
+ FROM
+ mom_eam_repair_order_fault_analysis t1
+ LEFT JOIN mom_eam_repair_order t2 ON t1.repair_order_id = t2.id
+ left join mom_eam_equipment t11 on t2.equipment_id = t11.id
+ WHERE
+ t1.del_flag = 0
+ AND t2.del_flag = 0
+ <if test="params.equipmentNum != null and params.equipmentNum != ''">
+ and t11.num = #{params.equipmentNum}
+ </if>
+ <if test="params.faultStartTime != null">
+ and t2.create_time >= #{params.faultStartTime}
+ </if>
+ <if test="params.faultEndTime != null">
+ and t2.create_time <= #{params.faultEndTime}
+ </if>
+ ) t4 ON t3.item_value = t4.repair_order_fault_analysis_uda2
+ group by t3.item_text
+ </select>
</mapper>
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/StreamMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/StreamMapper.xml
index 53b58ee..0951f79 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/StreamMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/StreamMapper.xml
@@ -17,7 +17,7 @@
and t2.area_id = '-1'
</otherwise>
</choose>
-
+ ORDER BY t1.create_time desc
</select>
</mapper>
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IRepairOrderService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IRepairOrderService.java
index 744c7eb..9388993 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IRepairOrderService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IRepairOrderService.java
@@ -52,4 +52,14 @@
public List<EquipmentAvailabilityVo> equipmentAvailability(Map<String, String> query) throws ParseException;
public List<EquipmentAvailabilityVo> getStartRate(Map<String, String> query) throws ParseException;
+
+ List<Map<String, Object>> getFaultCause(String equipmentId);
+
+ List<Map<String, Object>> getAllFaultCause( );
+
+ List<Map<String, Object>> getFaultCausePie(Map<String, Object> params);
+
+ List<Map<String, Object>> getFaultCauseBar(Map<String, Object> params);
+
+ IPage<Map<String, Object>> getMTPF(Integer pageNo, Integer pageSize, Map<String, Object> params);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/OperationCertificateApplyServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/OperationCertificateApplyServiceImpl.java
index 6f1e59b..d222bef 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/OperationCertificateApplyServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/OperationCertificateApplyServiceImpl.java
@@ -4,6 +4,7 @@
import org.jeecg.modules.eam.entity.OperationCertificateApplyDetail;
import org.jeecg.modules.eam.mapper.OperationCertificateApplyDetailMapper;
import org.jeecg.modules.eam.mapper.OperationCertificateApplyMapper;
+import org.jeecg.modules.eam.service.IOperationCertificateApplyDetailService;
import org.jeecg.modules.eam.service.IOperationCertificateApplyService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -26,16 +27,21 @@
private OperationCertificateApplyMapper operationCertificateApplyMapper;
@Autowired
private OperationCertificateApplyDetailMapper operationCertificateApplyDetailMapper;
+
+ @Autowired
+ private IOperationCertificateApplyDetailService operationCertificateApplyDetailService;
@Override
@Transactional(rollbackFor = Exception.class)
public void saveMain(OperationCertificateApply operationCertificateApply, List<OperationCertificateApplyDetail> operationCertificateApplyDetailList) {
- operationCertificateApplyMapper.insert(operationCertificateApply);
+// operationCertificateApplyMapper.insert(operationCertificateApply);
+ super.save(operationCertificateApply);
if(operationCertificateApplyDetailList!=null && operationCertificateApplyDetailList.size()>0) {
for(OperationCertificateApplyDetail entity:operationCertificateApplyDetailList) {
//澶栭敭璁剧疆
entity.setOperationCertificateApplyId(operationCertificateApply.getId());
- operationCertificateApplyDetailMapper.insert(entity);
+ operationCertificateApplyDetailService.save(entity);
+// operationCertificateApplyDetailMapper.insert(entity);
}
}
}
@@ -43,7 +49,8 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void updateMain(OperationCertificateApply operationCertificateApply,List<OperationCertificateApplyDetail> operationCertificateApplyDetailList) {
- operationCertificateApplyMapper.updateById(operationCertificateApply);
+// operationCertificateApplyMapper.updateById(operationCertificateApply);
+ super.updateById(operationCertificateApply);
//1.鍏堝垹闄ゅ瓙琛ㄦ暟鎹�
operationCertificateApplyDetailMapper.deleteByMainId(operationCertificateApply.getId());
@@ -53,7 +60,8 @@
for(OperationCertificateApplyDetail entity:operationCertificateApplyDetailList) {
//澶栭敭璁剧疆
entity.setOperationCertificateApplyId(operationCertificateApply.getId());
- operationCertificateApplyDetailMapper.insert(entity);
+// operationCertificateApplyDetailMapper.insert(entity);
+ operationCertificateApplyDetailService.save(entity);
}
}
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/RepairOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/RepairOrderServiceImpl.java
index dfa8be0..1607d57 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/RepairOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/RepairOrderServiceImpl.java
@@ -122,7 +122,35 @@
repairOrder.getFaultEndTime(),
repairOrder.getCreateStartTime(),
repairOrder.getCreateEndTime(),
- repairOrder.getEquipmentImportanceId()));
+ repairOrder.getEquipmentImportanceId(),
+ repairOrder.getFaultCause()
+ ));
+ }
+
+ @Override
+ public List<Map<String, Object>> getFaultCause(String equipmentId) {
+ return this.baseMapper.getFaultCause(equipmentId);
+ }
+
+ @Override
+ public List<Map<String, Object>> getAllFaultCause() {
+ return this.baseMapper.getAllFaultCause();
+ }
+
+ @Override
+ public List<Map<String, Object>> getFaultCausePie( Map<String, Object> params) {
+ return this.baseMapper.getFaultCausePie(params);
+ }
+
+ @Override
+ public List<Map<String, Object>> getFaultCauseBar(Map<String, Object> params) {
+ return this.baseMapper.getFaultCauseBar(params);
+ }
+
+ @Override
+ public IPage<Map<String, Object>> getMTPF(Integer pageNo, Integer pageSize, Map<String, Object> params) {
+ IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
+ return this.baseMapper.getMTPF(pageData,params);
}
@Override
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparePartRequirementController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparePartRequirementController.java
index 3bd209d..08bd777 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparePartRequirementController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparePartRequirementController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -13,7 +14,11 @@
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.eam.entity.DailyInspectionStandard;
+import org.jeecg.modules.eam.entity.DailyInspectionStandardDetail;
+import org.jeecg.modules.eam.entity.Equipment;
import org.jeecg.modules.eam.entity.EquipmentChange;
+import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.spare.entity.*;
import org.jeecg.modules.spare.service.*;
import org.jeecg.modules.spare.vo.SparePartRequirementDeatilPage;
@@ -25,6 +30,7 @@
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -34,10 +40,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* @Description: 澶囦欢闇�姹�
@@ -54,6 +57,9 @@
private ISparePartRequirementService sparePartScrapRequirementService;
@Autowired
private ISparePartRequirementDeatilService sparePartScrapRequirementDetailService;
+
+ @Autowired
+ private IEamEquipmentService equipmentService;
/**
@@ -75,6 +81,30 @@
QueryWrapper<SparePartRequirement> queryWrapper = QueryGenerator.initQueryWrapper(sparePartScrap, req.getParameterMap());
Page<SparePartRequirement> page = new Page<SparePartRequirement>(pageNo, pageSize);
IPage<SparePartRequirement> pageList = sparePartScrapRequirementService.page(page, queryWrapper);
+ for (SparePartRequirement record : pageList.getRecords()) {
+ String equipmentId = record.getEquipmentId();
+ String id = record.getId();
+ List<SparePartRequirementDeatil> sparePartRequirementDeatils = sparePartScrapRequirementDetailService.lambdaQuery()
+ .eq(SparePartRequirementDeatil::getSparePartRequirementId, id).eq(SparePartRequirementDeatil::getDelFlag, 0).list();
+ record.setSparePartRequirementDeatilList(sparePartRequirementDeatils);
+
+ if(StringUtils.isNotBlank(equipmentId)){
+ Equipment equipment = equipmentService.getById(equipmentId);
+ record.setEquipmentNumNameModel(equipment.getNum()+"/"+equipment.getName()+"/"+equipment.getModel());
+ }
+ }
+ return Result.OK(pageList);
+ }
+
+ @ApiOperation(value = "澶囦欢闇�姹�-鍒嗛〉鍒楄〃鏌ヨ", notes = "澶囦欢闇�姹�-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/getSparePartRequirementDetails")
+ public Result<IPage<SparePartRequirementDeatil>> getSparePartRequirementDetails(SparePartRequirementDeatil sparePartRequirementDeatil,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<SparePartRequirementDeatil> queryWrapper = QueryGenerator.initQueryWrapper(sparePartRequirementDeatil, req.getParameterMap());
+ Page<SparePartRequirementDeatil> page = new Page<SparePartRequirementDeatil>(pageNo, pageSize);
+ IPage<SparePartRequirementDeatil> pageList = sparePartScrapRequirementDetailService.page(page, queryWrapper);
return Result.OK(pageList);
}
@@ -92,6 +122,25 @@
SparePartRequirement sparePartRequirement = new SparePartRequirement();
BeanUtils.copyProperties(sparePartRequirementDeatilPage, sparePartRequirement);
sparePartScrapRequirementService.saveMain(sparePartRequirement, sparePartRequirementDeatilPage.getSparePartRequirementDeatilList());
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+
+ /**
+ * 娣�
+ */
+ @AutoLog(value = "澶囦欢闇�姹�-娣诲姞")
+ @ApiOperation(value = "澶囦欢闇�姹�-娣诲姞", notes = "澶囦欢闇�姹�-娣诲姞")
+ @PostMapping(value = "/addNew")
+ public Result<String> addNew(@RequestBody SparePartRequirement sparePartRequirement) {
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ sparePartRequirement.setPerson(sysUser.getRealname());
+ sparePartScrapRequirementService.save(sparePartRequirement);
+ List<SparePartRequirementDeatil> sparePartRequirementDeatilList = sparePartRequirement.getSparePartRequirementDeatilList();
+ for (SparePartRequirementDeatil sparePartRequirementDeatil : sparePartRequirementDeatilList) {
+ sparePartRequirementDeatil.setSparePartRequirementId(sparePartRequirement.getId());
+ sparePartScrapRequirementDetailService.save(sparePartRequirementDeatil);
+ }
return Result.OK("娣诲姞鎴愬姛锛�");
}
@@ -116,6 +165,34 @@
}
+
+ /**
+ * 缂栬緫
+ *
+ */
+ @AutoLog(value = "澶囦欢闇�姹�-缂栬緫")
+ @ApiOperation(value = "澶囦欢闇�姹�-缂栬緫", notes = "澶囦欢闇�姹�-缂栬緫")
+ @RequestMapping(value = "/editNew", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<String> editNew(@RequestBody SparePartRequirement sparePartRequirement) {
+ sparePartScrapRequirementService.updateById(sparePartRequirement);
+ //1.鍒犻櫎澶囦欢鏄庣粏
+ List<SparePartRequirementDeatil> sparePartRequirementDeatils = sparePartScrapRequirementDetailService.lambdaQuery()
+ .eq(SparePartRequirementDeatil::getSparePartRequirementId, sparePartRequirement.getId())
+ .eq(SparePartRequirementDeatil::getDelFlag, 0).list();
+ for (SparePartRequirementDeatil sparePartRequirementDeatil : sparePartRequirementDeatils) {
+ sparePartScrapRequirementDetailService.removeById(sparePartRequirementDeatil);
+ }
+ //2.閲嶆柊鎸佷箙澶囦欢鏄庣粏
+ List<SparePartRequirementDeatil> sparePartRequirementDeatilList = sparePartRequirement.getSparePartRequirementDeatilList();
+ for (SparePartRequirementDeatil sparePartRequirementDeatil : sparePartRequirementDeatilList) {
+ sparePartRequirementDeatil.setId("");
+ sparePartRequirementDeatil.setSparePartRequirementId(sparePartRequirement.getId());
+ sparePartScrapRequirementDetailService.save(sparePartRequirementDeatil);
+ }
+ return Result.OK("缂栬緫鎴愬姛!");
+
+ }
+
/**
* 閫氳繃id鍒犻櫎
*
@@ -127,6 +204,19 @@
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
sparePartScrapRequirementService.delMain(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ @AutoLog(value = "澶囦欢闇�姹�-閫氳繃id鍒犻櫎")
+ @ApiOperation(value = "澶囦欢闇�姹�-閫氳繃id鍒犻櫎", notes = "澶囦欢闇�姹�-閫氳繃id鍒犻櫎")
+ @DeleteMapping(value = "/deleteNew")
+ public Result<String> deleteNew(@RequestParam(name = "id", required = true) String id) {
+ sparePartScrapRequirementService.removeById(id);
+ List<SparePartRequirementDeatil> sparePartRequirementDeatils = sparePartScrapRequirementDetailService.lambdaQuery()
+ .eq(SparePartRequirementDeatil::getSparePartRequirementId, id).list();
+ for (SparePartRequirementDeatil sparePartRequirementDeatil : sparePartRequirementDeatils) {
+ sparePartScrapRequirementDetailService.removeById(sparePartRequirementDeatil);
+ }
return Result.OK("鍒犻櫎鎴愬姛!");
}
@@ -146,6 +236,23 @@
sparePartScrapRequirementService.submit(id);
return Result.OK("鎻愪氦鎴愬姛锛�");
+ }
+
+ /**
+ * 绛惧娴佺▼
+ */
+ @RequestMapping(value = "/auditApproval", method = {RequestMethod.PUT,RequestMethod.POST})
+ @Transactional(rollbackFor = { Exception.class })
+ public Result<String> auditApproval(@RequestBody SparePartRequirement sparePartRequirement) {
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ sparePartRequirement.setAuditPerson(sysUser.getRealname());
+ sparePartRequirement.setAuditTime(new Date());
+ boolean b = sparePartScrapRequirementService.updateById(sparePartRequirement);
+ if (b){
+ return Result.OK("瀹℃牳鎴愬姛!");
+ }else{
+ return Result.error("瀹℃牳澶辫触!");
+ }
}
@@ -342,4 +449,6 @@
return Result.OK("鏂囦欢瀵煎叆澶辫触锛�");
}
+
+
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartRequirement.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartRequirement.java
index 6cba4d9..d9883e8 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartRequirement.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartRequirement.java
@@ -1,15 +1,22 @@
package org.jeecg.modules.spare.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.entity.JeecgEntity;
+import org.jeecg.modules.eam.entity.DailyInspectionStandard;
+import org.jeecg.modules.eam.entity.DailyInspectionStandardDetail;
import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
+import java.util.List;
/**
* @Description: 澶囦欢闇�姹�
@@ -55,7 +62,34 @@
/**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
@Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
@ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
+ @TableLogic
private Integer delFlag = CommonConstant.DEL_FLAG_0;
+ @ApiModelProperty(value = "璇疯喘浜�")
+ private String person;
+
+ @ApiModelProperty(value = "璁惧鍙拌处")
+ private String equipmentId;
+
+ @ApiModelProperty(value = "瀹℃壒浜�")
+ private String auditPerson;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @ApiModelProperty(value = "瀹℃壒鏃堕棿")
+ @Excel(name = "瀹℃壒鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private java.util.Date auditTime;
+
+ @TableField(exist = false)
+ private String equipmentNumNameModel;
+
+ @TableField(exist = false)
+ private List<SparePartRequirementDeatil> sparePartRequirementDeatilList;
+
+// @TableField(exist = false)
+// private List<DailyInspectionStandard> dailyInspectionStandardlist;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartRequirementDeatil.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartRequirementDeatil.java
index 7b38c14..e7ae58f 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartRequirementDeatil.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartRequirementDeatil.java
@@ -1,6 +1,7 @@
package org.jeecg.modules.spare.entity;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
@@ -78,7 +79,23 @@
*/
@Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
@ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
+ @TableLogic
private Integer delFlag = CommonConstant.DEL_FLAG_0;
+ @ApiModelProperty(value = "澶囦欢缂栧彿")
+ private String spartPartNum;
+
+ @ApiModelProperty(value = "澶囦欢鍚嶇О")
+ private String spartPartName;
+
+ @ApiModelProperty(value = "鍨嬪彿")
+ private String spartPartModel;
+
+ @ApiModelProperty(value = "鏁伴噺")
+ private String quantity;
+
+ @ApiModelProperty(value = "鍗曚綅鍚嶇О")
+ private String unitName;
+
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUploadController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUploadController.java
index d83e1fe..e2fe97c 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUploadController.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUploadController.java
@@ -95,7 +95,7 @@
public Result<?> listByType(SysUpload upload, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
QueryWrapper<SysUpload> queryWrapper = QueryGenerator.initQueryWrapper(upload, req.getParameterMap());
- queryWrapper.in("type","inspection","threeMaintenance","twoMaintenance");
+ queryWrapper.in("type","inspection","threeMaintenance","twoMaintenance","equipment");
Page<SysUpload> page = new Page<SysUpload>(pageNo, pageSize);
IPage<SysUpload> pageList = uploadService.page(page, queryWrapper);
return Result.ok(pageList);
--
Gitblit v1.9.3