From 5cccd878f9be614d1f2f7ff66df5d8762f603281 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期六, 05 七月 2025 17:13:18 +0800
Subject: [PATCH] 点检工单新增编辑
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamWeekInspectionDetail.java | 77 +++++++++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/util/DateUtils.java | 29 +++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamInspectionOrderRequest.java | 5
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekInspectionDetailServiceImpl.java | 16 ++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderDetailController.java | 7
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekInspectionDetailController.java | 51 ++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java | 2
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrderDetail.java | 28 ---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/InspectionItemCategroyEnum.java | 9 +
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java | 43 +----
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamWeekInspectionDetailService.java | 12 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamWeekInspectionDetailMapper.java | 12 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamWeekInspectionDetailMapper.xml | 5
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java | 105 +++++++-----
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java | 25 +-
15 files changed, 304 insertions(+), 122 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/InspectionItemCategroyEnum.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/InspectionItemCategroyEnum.java
new file mode 100644
index 0000000..be5cea7
--- /dev/null
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/InspectionItemCategroyEnum.java
@@ -0,0 +1,9 @@
+package org.jeecg.modules.eam.constant;
+
+/**
+ * 鐐规鍒嗙被
+ */
+public enum InspectionItemCategroyEnum {
+ DAY_INSPECTION, //鏃ョ偣妫�
+ WEEK_INSPECTION //鍛ㄧ偣妫�
+}
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java
index 863aa72..277a3a9 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java
@@ -8,6 +8,7 @@
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
@@ -25,35 +26,9 @@
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="eam_inspection_order瀵硅薄", description="鐐规宸ュ崟")
-public class EamInspectionOrder implements Serializable {
+public class EamInspectionOrder extends JeecgEntity implements Serializable {
private static final long serialVersionUID = 1L;
- /**涓婚敭*/
- @TableId(type = IdType.ASSIGN_ID)
- @ApiModelProperty(value = "涓婚敭")
- private String id;
- /**鍒涘缓浜�*/
- @ApiModelProperty(value = "鍒涘缓浜�")
- @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
- private String createBy;
- /**鍒涘缓鏃堕棿*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- private Date createTime;
- /**鏇存柊浜�*/
- @ApiModelProperty(value = "鏇存柊浜�")
- private String updateBy;
- /**鏇存柊鏃堕棿*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鏇存柊鏃堕棿")
- private Date updateTime;
- /**鍒犻櫎鏍囪*/
- @Excel(name = "鍒犻櫎鏍囪", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鏍囪")
- @TableLogic
- private Integer delFlag;
/**宸ュ崟鍙�*/
@Excel(name = "宸ュ崟鍙�", width = 15)
@ApiModelProperty(value = "宸ュ崟鍙�")
@@ -122,21 +97,19 @@
@Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞-鐐规宸ュ崟鍒涘缓澶囨敞")
private String remark;
- /**鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧*/
- @Excel(name = "鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧-鎵ц鏃�", width = 15)
- @ApiModelProperty(value = "鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧")
- private String imageFiles;
/**鏍囧噯鍚嶇О*/
@ApiModelProperty(value = "鏍囧噯鍚嶇О")
private transient String standardName;
- /**淇濆吇鍛ㄦ湡;鍗曚綅:澶�*/
- @ApiModelProperty(value = "淇濆吇鍛ㄦ湡;鍗曚綅:澶�")
- private transient Integer maintenancePeriod;
- /**璁惧缂栧彿*/
@ApiModelProperty(value = "璁惧缂栧彿")
private transient String equipmentCode;
+ /**鍒犻櫎鏍囪*/
+ @Excel(name = "鍒犻櫎鏍囪", width = 15)
+ @ApiModelProperty(value = "鍒犻櫎鏍囪")
+ @TableLogic
+ private Integer delFlag;
+
@ApiModelProperty(value = "璁惧鍚嶇О")
@TableField(exist = false)
private String equipmentName;
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrderDetail.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrderDetail.java
index 00962c2..c952e82 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrderDetail.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrderDetail.java
@@ -1,19 +1,15 @@
package org.jeecg.modules.eam.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
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 lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
-import java.util.Date;
/**
* @Description: 鐐规宸ュ崟鏄庣粏
@@ -26,29 +22,9 @@
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="eam_inspection_order_detail瀵硅薄", description="鐐规宸ュ崟鏄庣粏")
-public class EamInspectionOrderDetail implements Serializable {
+public class EamInspectionOrderDetail extends JeecgEntity implements Serializable {
private static final long serialVersionUID = 1L;
- /**涓婚敭*/
- @TableId(type = IdType.ASSIGN_ID)
- @ApiModelProperty(value = "涓婚敭")
- private String id;
- /**鍒涘缓浜�*/
- @ApiModelProperty(value = "鍒涘缓浜�")
- private String createBy;
- /**鍒涘缓鏃堕棿*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- private Date createTime;
- /**鏇存柊浜�*/
- @ApiModelProperty(value = "鏇存柊浜�")
- private String updateBy;
- /**鏇存柊鏃堕棿*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鏇存柊鏃堕棿")
- private Date updateTime;
/**宸ュ崟ID*/
@Excel(name = "宸ュ崟ID", width = 15)
@ApiModelProperty(value = "宸ュ崟ID")
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamWeekInspectionDetail.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamWeekInspectionDetail.java
new file mode 100644
index 0000000..744467c
--- /dev/null
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamWeekInspectionDetail.java
@@ -0,0 +1,77 @@
+package org.jeecg.modules.eam.entity;
+
+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 lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.common.system.base.entity.JeecgEntity;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 鍛ㄧ偣妫�宸ュ崟鏄庣粏
+ * @Author: jeecg-boot
+ * @Date: 2025-04-02
+ * @Version: V1.0
+ */
+@Data
+@TableName("eam_week_inspection_detail")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="eam_week_inspection_detail瀵硅薄", description="鍛ㄧ偣妫�宸ュ崟鏄庣粏")
+public class EamWeekInspectionDetail extends JeecgEntity implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**璁惧ID*/
+ @Excel(name = "璁惧ID", width = 15)
+ @ApiModelProperty(value = "璁惧ID")
+ private String equipmentId;
+ /**鏍囧噯ID*/
+ @Excel(name = "淇濆吇鏍囧噯ID", width = 15)
+ @ApiModelProperty(value = "淇濆吇鏍囧噯ID")
+ @Dict(dictTable = "eam_maintenance_standard", dicCode = "id", dicText = "standard_name")
+ private String standardId;
+ /**璁″垝鐐规鏃ユ湡*/
+ @Excel(name = "璁″垝鐐规鏃ユ湡", width = 15, format = "yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "璁″垝鐐规鏃ユ湡")
+ private Date planInspectionDate;
+ /**鐐规缁撴灉*/
+ @Excel(name = "鐐规缁撴灉", width = 15)
+ @ApiModelProperty(value = "鐐规缁撴灉-姝ｅ父-寮傚父")
+ private String inspectionResult;
+ /**寮傚父鎻忚堪*/
+ @Excel(name = "寮傚父鎻忚堪", width = 15)
+ @ApiModelProperty(value = "寮傚父鎻忚堪")
+ private String exceptionDescription;
+ /**寮傚父鏄惁淇濅慨*/
+ @Excel(name = "寮傚父鏄惁鎶ヤ慨", width = 15)
+ @ApiModelProperty(value = "寮傚父鏄惁鎶ヤ慨")
+ private String reportFlag;
+ /**淇濆吇椤瑰簭鍙�*/
+ @ApiModelProperty(value = "淇濆吇椤瑰簭鍙�")
+ private Integer itemCode;
+ /**淇濆吇椤�*/
+ @ApiModelProperty(value = "淇濆吇椤�")
+ private String itemName;
+ /**淇濆吇瑕佹眰*/
+ @ApiModelProperty(value = "淇濆吇瑕佹眰")
+ private String itemDemand;
+
+ public EamWeekInspectionDetail(){}
+
+ public EamWeekInspectionDetail(EamMaintenanceStandardDetail detail) {
+ this.itemCode = detail.getItemCode();
+ this.itemName = detail.getItemName();
+ this.itemDemand = detail.getItemDemand();
+ }
+
+}
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/util/DateUtils.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/util/DateUtils.java
index fd0d32f..efed637 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/util/DateUtils.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/util/DateUtils.java
@@ -9,6 +9,7 @@
import java.time.DayOfWeek;
import java.time.LocalDate;
import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoField;
import java.time.temporal.ChronoUnit;
import java.util.*;
@@ -1086,4 +1087,32 @@
return dateString;
}
+
+ /**
+ * 鑾峰彇鏈懆鐨勭涓�澶╂棩鏈燂紝 鏍煎紡涓猴細yyyy-MM-dd
+ * @return
+ */
+ public static Date getFirstDayOfWeek() {
+ // 鑾峰彇鏈懆绗竴澶╋紙鍛ㄤ竴锛夌殑 LocalDate
+ LocalDate today = LocalDate.now();
+ LocalDate firstDayOfWeek = today.with(DayOfWeek.MONDAY);
+
+ // 濡傛灉闇�瑕佽浆鎹负浼犵粺鐨� Date 绫诲瀷锛堝彲閫夛級
+ java.sql.Date sqlDate = java.sql.Date.valueOf(firstDayOfWeek);
+ return new Date(sqlDate.getTime());
+ }
+
+ /**
+ * 鑾峰彇鏈懆鐨勬渶鍚庝竴澶╂棩鏈燂紝 鏍煎紡涓猴細yyyy-MM-dd
+ * @return
+ */
+ public static Date getLastDayOfWeek() {
+ // 鑾峰彇鏈懆绗竴澶╋紙鍛ㄤ竴锛夌殑 LocalDate
+ LocalDate today = LocalDate.now();
+ LocalDate firstDayOfWeek = today.with(DayOfWeek.SUNDAY);
+
+ // 濡傛灉闇�瑕佽浆鎹负浼犵粺鐨� Date 绫诲瀷锛堝彲閫夛級
+ java.sql.Date sqlDate = java.sql.Date.valueOf(firstDayOfWeek);
+ return new Date(sqlDate.getTime());
+ }
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
index c5a3769..9697509 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
@@ -3,6 +3,7 @@
import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.parser.Feature;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fasterxml.jackson.core.JsonProcessingException;
@@ -15,10 +16,12 @@
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.util.TranslateDictTextUtils;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
+import org.jeecg.modules.eam.constant.InspectionItemCategroyEnum;
import org.jeecg.modules.eam.constant.InspectionStatus;
import org.jeecg.modules.eam.constant.OrderCreationMethodEnum;
import org.jeecg.modules.eam.entity.EamInspectionOrder;
import org.jeecg.modules.eam.entity.EamInspectionOrderDetail;
+import org.jeecg.modules.eam.entity.EamMaintenanceStandardDetail;
import org.jeecg.modules.eam.request.EamInspectionBatchApprovalRequest;
import org.jeecg.modules.eam.request.EamInspectionOrderQuery;
import org.jeecg.modules.eam.request.EamInspectionOrderRequest;
@@ -27,16 +30,13 @@
import org.jeecg.modules.eam.vo.InspectionVo;
import org.jeecg.modules.flowable.domain.vo.WorkTaskDataVo;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* @Description: 鐐规宸ュ崟
@@ -49,15 +49,16 @@
@RequestMapping("/eam/eamInspectionOrder")
@Slf4j
public class EamInspectionOrderController extends JeecgController<EamInspectionOrder, IEamInspectionOrderService> {
- @Autowired
+
+ @Resource
private IEamInspectionOrderService eamInspectionOrderService;
- @Autowired
+ @Resource
private ISysBusinessCodeRuleService businessCodeRuleService;
- @Autowired
+ @Resource
private ObjectMapper objectMapper;
- @Autowired
+ @Resource
private TranslateDictTextUtils translateDictTextUtils;
- @Autowired
+ @Resource
private IEamInspectionOrderDetailService eamInspectionOrderDetailService;
/**
@@ -69,14 +70,12 @@
* @param req
* @return
*/
- //@AutoLog(value = "鐐规宸ュ崟-鍒嗛〉鍒楄〃鏌ヨ")
@ApiOperation(value = "鐐规宸ュ崟-鍒嗛〉鍒楄〃鏌ヨ", notes = "鐐规宸ュ崟-鍒嗛〉鍒楄〃鏌ヨ")
@GetMapping(value = "/list")
public Result<IPage<EamInspectionOrder>> queryPageList(EamInspectionOrderQuery query,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
-// QueryWrapper<EamInspectionOrder> queryWrapper = QueryGenerator.initQueryWrapper(eamInspectionOrder, req.getParameterMap());
Page<EamInspectionOrder> page = new Page<EamInspectionOrder>(pageNo, pageSize);
IPage<EamInspectionOrder> pageList = eamInspectionOrderService.queryPageList(page, query);
return Result.OK(pageList);
@@ -282,7 +281,6 @@
* @param id
* @return
*/
- //@AutoLog(value = "鐐规宸ュ崟-閫氳繃id鏌ヨ")
@ApiOperation(value = "鐐规宸ュ崟-閫氳繃id鏌ヨ", notes = "鐐规宸ュ崟-閫氳繃id鏌ヨ")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
@@ -300,6 +298,7 @@
translateDictTextUtils.translateField("inspectionStatus", eamInspectionOrder.getInspectionStatus(), item, "inspection_status");
translateDictTextUtils.translateField("confirmUser", eamInspectionOrder.getConfirmUser(), item, "sys_user,realname,username");
translateDictTextUtils.translateField("confirmDealType", eamInspectionOrder.getConfirmDealType(), item, "approved_rejected");
+ translateDictTextUtils.translateField("equipmentCode", eamInspectionOrder.getEquipmentId(), item, "eam_equipment,id,equipment_code");
return Result.OK(item);
} catch (JsonProcessingException e) {
return Result.error("鏁版嵁杞瘧澶辫触锛�");
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderDetailController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderDetailController.java
index 931aa4a..3f9abb0 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderDetailController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderDetailController.java
@@ -11,12 +11,15 @@
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.eam.constant.InspectionItemCategroyEnum;
import org.jeecg.modules.eam.entity.EamInspectionOrderDetail;
+import org.jeecg.modules.eam.entity.EamMaintenanceStandardDetail;
import org.jeecg.modules.eam.service.IEamInspectionOrderDetailService;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.jeecg.modules.eam.service.IEamMaintenanceStandardDetailService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
@@ -33,7 +36,7 @@
@RequestMapping("/eam/eamInspectionOrderDetail")
@Slf4j
public class EamInspectionOrderDetailController extends JeecgController<EamInspectionOrderDetail, IEamInspectionOrderDetailService> {
- @Autowired
+ @Resource
private IEamInspectionOrderDetailService eamInspectionOrderDetailService;
/**
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekInspectionDetailController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekInspectionDetailController.java
new file mode 100644
index 0000000..688836a
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekInspectionDetailController.java
@@ -0,0 +1,51 @@
+package org.jeecg.modules.eam.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.modules.eam.constant.InspectionItemCategroyEnum;
+import org.jeecg.modules.eam.entity.EamMaintenanceStandardDetail;
+import org.jeecg.modules.eam.entity.EamWeekInspectionDetail;
+import org.jeecg.modules.eam.service.IEamWeekInspectionDetailService;
+import org.jeecg.modules.eam.util.DateUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @Description: 鍛ㄧ偣妫�宸ュ崟鏄庣粏
+ * @Author: jeecg-boot
+ * @Date: 2025-04-02
+ * @Version: V1.0
+ */
+@Api(tags = "鍛ㄧ偣妫�宸ュ崟鏄庣粏")
+@RestController
+@RequestMapping("/eam/eamWeekInspectionDetail")
+@Slf4j
+public class EamWeekInspectionDetailController extends JeecgController<EamWeekInspectionDetail, IEamWeekInspectionDetailService> {
+
+ @Resource
+ private IEamWeekInspectionDetailService eamWeekInspectionDetailService;
+
+ /**
+ * 鍛ㄧ偣妫�宸ュ崟鏄庣粏鍒楄〃鏌ヨ
+ *
+ * @param standardId
+ * @return
+ */
+ @ApiOperation(value = "鍛ㄧ偣妫�宸ュ崟鏄庣粏-鏃ョ偣妫�瑙勮寖鍒楄〃鏌ヨ", notes = "鍛ㄧ偣妫�宸ュ崟鏄庣粏-鏃ョ偣妫�瑙勮寖鍒楄〃鏌ヨ")
+ @GetMapping(value = "/queryStandardList")
+ public Result<?> queryStandardList(@RequestParam("standardId") String standardId) {
+ LambdaQueryWrapper<EamWeekInspectionDetail> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EamWeekInspectionDetail::getStandardId, standardId);
+ queryWrapper.between(EamWeekInspectionDetail::getPlanInspectionDate, DateUtils.getFirstDayOfWeek(), DateUtils.getLastDayOfWeek());
+ queryWrapper.orderByAsc(EamWeekInspectionDetail::getItemCode);
+ List<EamWeekInspectionDetail> list = eamWeekInspectionDetailService.list(queryWrapper);
+ return Result.OK(list);
+ }
+
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamWeekInspectionDetailMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamWeekInspectionDetailMapper.java
new file mode 100644
index 0000000..77a0c56
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamWeekInspectionDetailMapper.java
@@ -0,0 +1,12 @@
+package org.jeecg.modules.eam.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.eam.entity.EamWeekInspectionDetail;
+
+/**
+ * @Author: Lius
+ * @CreateTime: 2025-07-05
+ * @Description: 鍛ㄧ偣妫�鏄庣粏
+ */
+public interface EamWeekInspectionDetailMapper extends BaseMapper<EamWeekInspectionDetail> {
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamWeekInspectionDetailMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamWeekInspectionDetailMapper.xml
new file mode 100644
index 0000000..9e84a59
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamWeekInspectionDetailMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.eam.mapper.EamWeekInspectionDetailMapper">
+
+</mapper>
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamInspectionOrderRequest.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamInspectionOrderRequest.java
index fcaa20b..3a71c69 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamInspectionOrderRequest.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamInspectionOrderRequest.java
@@ -11,6 +11,7 @@
import org.jeecg.common.api.vo.FileUploadResult;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.modules.eam.entity.EamInspectionOrderDetail;
+import org.jeecg.modules.eam.entity.EamWeekInspectionDetail;
import org.jeecg.modules.flowable.domain.vo.FlowTaskVo;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
@@ -109,6 +110,10 @@
@ApiModelProperty(value = "鍒楄〃 淇濆吇椤规槑缁�")
private List<EamInspectionOrderDetail> tableDetailList;
+ /**鍒楄〃 鍛ㄤ繚鍏婚」鏄庣粏*/
+ @ApiModelProperty(value = "鍒楄〃 鍛ㄤ繚鍏婚」鏄庣粏")
+ private List<EamWeekInspectionDetail> tableWeekDetailList;
+
/**纭鎰忚*/
@ApiModelProperty(value = "纭鎰忚")
private String confirmComment;
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java
index d6dd822..a86ae83 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java
@@ -1,10 +1,12 @@
package org.jeecg.modules.eam.service;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.eam.entity.EamInspectionOrder;
+import org.jeecg.modules.eam.entity.EamMaintenanceStandardDetail;
import org.jeecg.modules.eam.request.EamInspectionOrderQuery;
import org.jeecg.modules.eam.request.EamInspectionOrderRequest;
import org.jeecg.modules.eam.vo.InspectionVo;
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamWeekInspectionDetailService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamWeekInspectionDetailService.java
new file mode 100644
index 0000000..1243991
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamWeekInspectionDetailService.java
@@ -0,0 +1,12 @@
+package org.jeecg.modules.eam.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.eam.entity.EamWeekInspectionDetail;
+
+/**
+ * @Author: Lius
+ * @CreateTime: 2025-07-05
+ * @Description: 鍛ㄧ偣妫�鏄庣粏
+ */
+public interface IEamWeekInspectionDetailService extends IService<EamWeekInspectionDetail> {
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
index 24de739..df387bf 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
@@ -6,15 +6,13 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.flowable.engine.TaskService;
import org.flowable.task.api.Task;
-import org.jeecg.common.api.vo.FileUploadResult;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.constant.DataBaseConstant;
@@ -22,19 +20,20 @@
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
+import org.jeecg.modules.eam.base.entity.BaseFactory;
+import org.jeecg.modules.eam.base.entity.BaseFactoryUser;
+import org.jeecg.modules.eam.base.service.IBaseFactoryService;
+import org.jeecg.modules.eam.base.service.IBaseFactoryUserService;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.EquipmentOperationTagEnum;
+import org.jeecg.modules.eam.constant.InspectionItemCategroyEnum;
import org.jeecg.modules.eam.constant.InspectionStatus;
-import org.jeecg.modules.eam.entity.EamEquipment;
-import org.jeecg.modules.eam.entity.EamInspectionOrder;
-import org.jeecg.modules.eam.entity.EamInspectionOrderDetail;
+import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.mapper.EamInspectionOrderMapper;
import org.jeecg.modules.eam.request.EamInspectionOrderQuery;
import org.jeecg.modules.eam.request.EamInspectionOrderRequest;
-import org.jeecg.modules.eam.service.IEamEquipmentService;
-import org.jeecg.modules.eam.service.IEamInspectionOrderDetailService;
-import org.jeecg.modules.eam.service.IEamInspectionOrderService;
-import org.jeecg.modules.eam.service.IEamReportRepairService;
+import org.jeecg.modules.eam.service.*;
+import org.jeecg.modules.eam.util.DateUtils;
import org.jeecg.modules.eam.vo.InspectionVo;
import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
import org.jeecg.modules.flowable.apithird.business.service.impl.FlowMyBusinessServiceImpl;
@@ -42,14 +41,13 @@
import org.jeecg.modules.flowable.apithird.service.FlowCommonService;
import org.jeecg.modules.flowable.service.IFlowDefinitionService;
import org.jeecg.modules.flowable.service.IFlowTaskService;
-import org.jeecg.modules.system.service.IMdcUserProductionService;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.*;
+import java.util.stream.Collectors;
/**
* @Description: 鐐规宸ュ崟
@@ -62,26 +60,30 @@
@Resource
private EamInspectionOrderMapper eamInspectionOrderMapper;
- @Autowired
+ @Resource
private IEamInspectionOrderDetailService eamInspectionOrderDetailService;
+ @Resource
+ private IEamWeekInspectionDetailService eamWeekInspectionDetailService;
+ @Resource
+ private IBaseFactoryUserService baseFactoryUserService;
+ @Resource
+ private IBaseFactoryService baseFactoryService;
@Resource
private FlowCommonService flowCommonService;
@Resource
private IFlowDefinitionService flowDefinitionService;
- @Autowired
+ @Resource
private IFlowTaskService flowTaskService;
- @Autowired
+ @Resource
private IEamEquipmentService eamEquipmentService;
- @Autowired
+ @Resource
private FlowMyBusinessServiceImpl flowMyBusinessService;
- @Autowired
+ @Resource
private TaskService taskService;
- @Autowired
- private IEamEquipmentService iEamEquipmentService;
- @Autowired
- private IMdcUserProductionService mdcUserProductionService;
- @Autowired
+ @Resource
private IEamReportRepairService eamReportRepairService;
+ @Resource
+ private IEamMaintenanceStandardDetailService eamMaintenanceStandardDetailService;
@Override
public IPage<EamInspectionOrder> queryPageList(Page<EamInspectionOrder> page, EamInspectionOrderQuery query) {
@@ -96,8 +98,14 @@
List<String> equipArr = Arrays.asList(sysUser.getEquipmentIds().split(","));
queryWrapper.in("e.equipment_code", equipArr);
} else {
- //娌℃湁閫夋嫨璁惧锛屾牴鎹溅闂磋繃婊よ澶�
- queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=e.org_id ", sysUser.getId());
+ //娌℃湁閫夋嫨璁惧锛屾牴鎹腑蹇冭繃婊よ澶�
+ List<BaseFactoryUser> baseFactoryUserList=baseFactoryUserService.
+ list(new LambdaQueryWrapper<BaseFactoryUser>().eq(BaseFactoryUser::getUserId,sysUser.getId()));
+ if(!CollectionUtils.isEmpty(baseFactoryUserList)){
+ List<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toList());
+ List<String> factoryCode= baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getFactoryCode).collect(Collectors.toList());
+ queryWrapper.in("e.factory_code", factoryCode);
+ }
}
//鏌ヨ鏉′欢杩囨护
if (query != null) {
@@ -157,6 +165,7 @@
} else {
eamInspectionOrder.setInspectionStatus(InspectionStatus.WAIT_INSPECTION.name());
}
+ eamInspectionOrder.setDelFlag(CommonConstant.DEL_FLAG_0);
save(eamInspectionOrder);
//澶勭悊鏄庣粏鏁版嵁
if (CollectionUtil.isNotEmpty(eamInspectionOrderRequest.getTableDetailList())) {
@@ -165,6 +174,10 @@
tableDetail.setId(null);
});
eamInspectionOrderDetailService.saveBatch(eamInspectionOrderRequest.getTableDetailList());
+ }
+ //澶勭悊鍛ㄧ偣妫�鏄庣粏鏁版嵁
+ if (CollectionUtil.isNotEmpty(eamInspectionOrderRequest.getTableWeekDetailList())) {
+ eamWeekInspectionDetailService.saveOrUpdateBatch(eamInspectionOrderRequest.getTableWeekDetailList());
}
if (StrUtil.isNotBlank(eamInspectionOrderRequest.getOperator())) {
triggerProcess(eamInspectionOrder);
@@ -183,9 +196,9 @@
if (equipment == null) {
return false;
} else {
- eamInspectionOrder.setEquipmentCode(equipment.getEquipmentCode());
+ eamInspectionOrder.setEquipmentId(equipment.getEquipmentCode());
}
- flowCommonService.initActBusiness("宸ュ崟鍙�: " + eamInspectionOrder.getOrderNum() + ";璁惧缂栧彿: " + eamInspectionOrder.getEquipmentCode() + ";瀹夎浣嶇疆: " + equipment.getInstallationPosition(),
+ flowCommonService.initActBusiness("宸ュ崟鍙�: " + eamInspectionOrder.getOrderNum() + ";璁惧缂栧彿: " + eamInspectionOrder.getEquipmentId() + ";瀹夎浣嶇疆: " + equipment.getInstallationPosition(),
eamInspectionOrder.getId(), "IEamInspectionOrderService", "eam_inspection", null);
Map<String, Object> variables = new HashMap<>();
variables.put("dataId", eamInspectionOrder.getId());
@@ -213,16 +226,16 @@
eamInspectionOrder.setInspectionStatus(InspectionStatus.UNDER_INSPECTION.name());
}
super.updateById(eamInspectionOrder);
- //澶勭悊鏄庣粏鏁版嵁
- if (CollectionUtil.isNotEmpty(eamInspectionOrderRequest.getTableDetailList())) {
- eamInspectionOrderRequest.getTableDetailList().forEach(tableDetail -> {
- tableDetail.setOrderId(eamInspectionOrder.getId());
- tableDetail.setCreateTime(new Date());
- });
- //鍒犻櫎鏄庣粏
- eamInspectionOrderDetailService.remove(new QueryWrapper<EamInspectionOrderDetail>().eq("order_id", eamInspectionOrder.getId()));
- eamInspectionOrderDetailService.saveBatch(eamInspectionOrderRequest.getTableDetailList());
- }
+// //澶勭悊鏄庣粏鏁版嵁
+// if (CollectionUtil.isNotEmpty(eamInspectionOrderRequest.getTableDetailList())) {
+// eamInspectionOrderRequest.getTableDetailList().forEach(tableDetail -> {
+// tableDetail.setOrderId(eamInspectionOrder.getId());
+// tableDetail.setCreateTime(new Date());
+// });
+// //鍒犻櫎鏄庣粏
+// eamInspectionOrderDetailService.remove(new QueryWrapper<EamInspectionOrderDetail>().eq("order_id", eamInspectionOrder.getId()));
+// eamInspectionOrderDetailService.saveBatch(eamInspectionOrderRequest.getTableDetailList());
+// }
return true;
}
@@ -417,16 +430,16 @@
// 鐐规瀹屾垚
order.setInspectionStatus(InspectionStatus.WAIT_CONFIRM.name());
order.setOperateTime(new Date());
- if (CollectionUtil.isNotEmpty(request.getFileList())) {
- List<FileUploadResult> fileUploadResultList = request.getFileList();
- ObjectMapper mapper = new ObjectMapper();
- try {
- String referenceFile = mapper.writeValueAsString(fileUploadResultList);
- order.setImageFiles(referenceFile);
- } catch (JsonProcessingException e) {
- log.error("JSON杞崲澶辫触锛�" + e.getMessage(), e);
- }
- }
+// if (CollectionUtil.isNotEmpty(request.getFileList())) {
+// List<FileUploadResult> fileUploadResultList = request.getFileList();
+// ObjectMapper mapper = new ObjectMapper();
+// try {
+// String referenceFile = mapper.writeValueAsString(fileUploadResultList);
+// order.setImageFiles(referenceFile);
+// } catch (JsonProcessingException e) {
+// log.error("JSON杞崲澶辫触锛�" + e.getMessage(), e);
+// }
+// }
eamInspectionOrderDetailService.remove(new QueryWrapper<EamInspectionOrderDetail>().eq("order_id", order.getId()));
eamInspectionOrderDetailService.saveBatch(request.getTableDetailList());
} else if (InspectionStatus.WAIT_CONFIRM.name().equals(order.getInspectionStatus()) && StrUtil.isNotEmpty(request.getConfirmDealType())) {
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekInspectionDetailServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekInspectionDetailServiceImpl.java
new file mode 100644
index 0000000..f64a937
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekInspectionDetailServiceImpl.java
@@ -0,0 +1,16 @@
+package org.jeecg.modules.eam.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.eam.entity.EamWeekInspectionDetail;
+import org.jeecg.modules.eam.mapper.EamWeekInspectionDetailMapper;
+import org.jeecg.modules.eam.service.IEamWeekInspectionDetailService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author: Lius
+ * @CreateTime: 2025-07-05
+ * @Description: 鍛ㄧ偣妫�鏄庣粏
+ */
+@Service
+public class EamWeekInspectionDetailServiceImpl extends ServiceImpl<EamWeekInspectionDetailMapper, EamWeekInspectionDetail> implements IEamWeekInspectionDetailService {
+}
--
Gitblit v1.9.3