From 60e43e1bc0785a7151fd050b20b04f2047df2727 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期六, 12 七月 2025 10:18:14 +0800
Subject: [PATCH] 点检添加周报校验
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamPrecisionParametersController.java | 4 -
/dev/null | 19 ------
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamPrecisionCheckDetailController.java | 3 -
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamThirdMaintenanceRequest.java | 13 ++--
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/util/DateUtils.java | 35 +++++++----
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java | 72 +++++++++++-------------
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderDetailController.java | 3 -
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java | 13 ++++
8 files changed, 75 insertions(+), 87 deletions(-)
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 de64074..b6dc8c5 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
@@ -1099,8 +1099,8 @@
// 鑾峰彇鏈懆绗竴澶╋紙鍛ㄤ竴锛�
LocalDate firstDayOfWeek = localDate.with(DayOfWeek.MONDAY);
- // 杞崲鍥� java.sql.Date 绫诲瀷
- return java.sql.Date.valueOf(firstDayOfWeek);
+ // 杞崲鍥� Date 绫诲瀷
+ return Date.from(firstDayOfWeek.atStartOfDay(ZoneId.systemDefault()).toInstant());
}
/**
@@ -1116,8 +1116,8 @@
// 鑾峰彇鏈懆绗竴澶╋紙鍛ㄤ竴锛�
LocalDate firstDayOfWeek = localDate.with(DayOfWeek.MONDAY);
- // 杞崲鍥� java.sql.Date 绫诲瀷
- return java.sql.Date.valueOf(firstDayOfWeek);
+ // 杞崲鍥� Date 绫诲瀷
+ return Date.from(firstDayOfWeek.atStartOfDay(ZoneId.systemDefault()).toInstant());
}
/**
@@ -1128,11 +1128,11 @@
// 灏� java.util.Date 杞崲涓� LocalDate
LocalDate localDate = LocalDate.parse(date);
- // 鑾峰彇鏈懆绗竴澶╋紙鍛ㄤ竴锛�
- LocalDate firstDayOfWeek = localDate.with(DayOfWeek.SUNDAY);
+ // 鑾峰彇鏈懆绗竴澶╋紙鍛ㄦ棩锛�
+ LocalDate lastDayOfWeek = localDate.with(DayOfWeek.SUNDAY);
- // 杞崲鍥� java.sql.Date 绫诲瀷
- return java.sql.Date.valueOf(firstDayOfWeek);
+ // 杞崲鍥� Date 绫诲瀷
+ return Date.from(lastDayOfWeek.atStartOfDay(ZoneId.systemDefault()).toInstant());
}
/**
@@ -1144,10 +1144,21 @@
LocalDate localDate = date.toInstant()
.atZone(ZoneId.systemDefault())
.toLocalDate();
- // 鑾峰彇鏈懆绗竴澶╋紙鍛ㄤ竴锛�
- LocalDate firstDayOfWeek = localDate.with(DayOfWeek.SUNDAY);
+ // 鑾峰彇鏈懆绗竴澶╋紙鍛ㄦ棩锛�
+ LocalDate lastDayOfWeek = localDate.with(DayOfWeek.SUNDAY);
- // 杞崲鍥� java.sql.Date 绫诲瀷
- return java.sql.Date.valueOf(firstDayOfWeek);
+ // 杞崲鍥� Date 绫诲瀷
+ return Date.from(lastDayOfWeek.atStartOfDay(ZoneId.systemDefault()).toInstant());
+ }
+
+ public static boolean isSameDay(Date date1, Date date2) {
+ if (date1 == null || date2 == null) {
+ return false;
+ }
+
+ LocalDate localDate1 = date1.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+ LocalDate localDate2 = date2.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+
+ return localDate1.equals(localDate2);
}
}
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 3f9abb0..85cf570 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,11 +11,8 @@
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.jeecg.modules.eam.service.IEamMaintenanceStandardDetailService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamPrecisionCheckDetailController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamPrecisionCheckDetailController.java
index c4245dd..f61539f 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamPrecisionCheckDetailController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamPrecisionCheckDetailController.java
@@ -10,9 +10,6 @@
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.util.TranslateDictTextUtils;
-import org.jeecg.modules.eam.entity.EamEquipmentPrecisionParameters;
-import org.jeecg.modules.eam.entity.EamPrecisionCheckDetail;
-import org.jeecg.modules.eam.service.IEamPrecisionCheckDetailService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamPrecisionParametersController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamPrecisionParametersController.java
index e213f3f..74dddb0 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamPrecisionParametersController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamPrecisionParametersController.java
@@ -7,14 +7,10 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
-import org.jeecg.modules.eam.entity.EamPrecisionParameters;
-import org.jeecg.modules.eam.entity.EamProcessParameters;
-import org.jeecg.modules.eam.service.IEamPrecisionParametersService;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamPrecisionCheckDetail.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamPrecisionCheckDetail.java
deleted file mode 100644
index fcf65a8..0000000
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamPrecisionCheckDetail.java
+++ /dev/null
@@ -1,79 +0,0 @@
-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 io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @Description: 璁惧绮惧害妫�娴嬫槑缁�
- * @Author: jeecg-boot
- * @Date: 2025-05-13
- * @Version: V1.0
- */
-@Data
-@TableName("eam_precision_check_detail")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "eam_precision_check_detail瀵硅薄", description = "璁惧绮惧害妫�娴嬫槑缁�")
-public class EamPrecisionCheckDetail implements Serializable {
-
- /**
- * 涓婚敭
- */
- @TableId(type = IdType.ASSIGN_ID)
- @ApiModelProperty(value = "涓婚敭")
- private String id;
- /**
- * 鍒涘缓浜�
- */
- @ApiModelProperty(value = "鍒涘缓浜�")
- private String createBy;
- /**
- * 鍒涘缓鏃堕棿
- */
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- private Date createTime;
- /**
- * 鏇存柊浜�
- */
- @ApiModelProperty(value = "鏇存柊浜�")
- private String updateBy;
- /**
- * 鏇存柊鏃堕棿
- */
- @ApiModelProperty(value = "鏇存柊鏃堕棿")
- private Date updateTime;
- /**
- * 宸ュ崟ID
- */
- @ApiModelProperty(value = "宸ュ崟ID")
- private String orderId;
- /**
- * 璁惧ID
- */
- @ApiModelProperty(value = "璁惧ID")
- private String equipmentId;
- /**
- * 鍙傛暟id
- */
- @ApiModelProperty(value = "鍙傛暟id")
- private String parameterId;
- /**
- * 鍏佸樊鍊�(mm)
- */
- @ApiModelProperty(value = "鍏佸樊鍊�(mm)")
- private String parameterValue;
- /**
- * 瀹炴祴鍊�
- */
- @ApiModelProperty(value = "瀹炴祴鍊�")
- private java.math.BigDecimal actualValue;
-}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamPrecisionParameters.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamPrecisionParameters.java
deleted file mode 100644
index 4c72d1d..0000000
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamPrecisionParameters.java
+++ /dev/null
@@ -1,61 +0,0 @@
-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 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.jeecgframework.poi.excel.annotation.Excel;
-
-import java.io.Serializable;
-import java.util.Date;
-/**
- * @Description: 绮惧害鍙傛暟缁存姢
- * @Author: jeecg-boot
- * @Date: 2025-03-17
- * @Version: V1.0
- */
-@Data
-@TableName("eam_precision_parameters")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="eam_precision_parameters瀵硅薄", description="绮惧害鍙傛暟缁存姢")
-public class EamPrecisionParameters implements Serializable {
-
- /**涓婚敭*/
- @TableId(type = IdType.ASSIGN_ID)
- @ApiModelProperty(value = "涓婚敭")
- private String id;
- /**鍒涘缓浜�*/
- @ApiModelProperty(value = "鍒涘缓浜�")
- private String createBy;
- /**鍒涘缓鏃堕棿*/
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- private Date createTime;
- /**鏇存柊浜�*/
- @ApiModelProperty(value = "鏇存柊浜�")
- private String updateBy;
- /**鏇存柊鏃堕棿*/
- @ApiModelProperty(value = "鏇存柊鏃堕棿")
- private Date updateTime;
- /**鍒犻櫎鏍囪*/
- @ApiModelProperty(value = "鍒犻櫎鏍囪")
- private Integer delFlag;
- /**鍙傛暟缂栫爜*/
- @Excel(name = "鍙傛暟缂栫爜", width = 25)
- @ApiModelProperty(value = "鍙傛暟缂栫爜")
- private String parameterCode;
- /**妫�娴嬮」鐩�*/
- @Excel(name = "妫�娴嬮」鐩�", width = 25)
- @ApiModelProperty(value = "妫�娴嬮」鐩�")
- private String parameterName;
- /**鍙傛暟鍒嗙被*/
- @Excel(name = "鍙傛暟鍒嗙被", width = 15, dicCode = "precision_parameters_category")
- @ApiModelProperty(value = "鍙傛暟鍒嗙被")
- @Dict(dicCode = "precision_parameters_category")
- private String parameterCategory;
-}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamPrecisionCheckDetailMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamPrecisionCheckDetailMapper.java
deleted file mode 100644
index d95743b..0000000
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamPrecisionCheckDetailMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.jeecg.modules.eam.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.eam.entity.EamPrecisionCheckDetail;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 璁惧绮惧害妫�娴嬫槑缁�
- * @Author: jeecg-boot
- * @Date: 2025-05-13
- * @Version: V1.0
- */
-public interface EamPrecisionCheckDetailMapper extends BaseMapper<EamPrecisionCheckDetail> {
-
-}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamPrecisionParametersMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamPrecisionParametersMapper.java
deleted file mode 100644
index a37cfe2..0000000
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamPrecisionParametersMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.jeecg.modules.eam.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.eam.entity.EamPrecisionParameters;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 绮惧害鍙傛暟缁存姢
- * @Author: jeecg-boot
- * @Date: 2025-03-17
- * @Version: V1.0
- */
-public interface EamPrecisionParametersMapper extends BaseMapper<EamPrecisionParameters> {
-
-}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamPrecisionCheckDetailMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamPrecisionCheckDetailMapper.xml
deleted file mode 100644
index 37a420c..0000000
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamPrecisionCheckDetailMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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.EamPrecisionCheckDetailMapper">
-
-</mapper>
\ No newline at end of file
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamPrecisionParametersMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamPrecisionParametersMapper.xml
deleted file mode 100644
index a1905e7..0000000
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamPrecisionParametersMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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.EamPrecisionParametersMapper">
-
-</mapper>
\ No newline at end of file
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamThirdMaintenanceRequest.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamThirdMaintenanceRequest.java
index 8000851..a8d3c3e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamThirdMaintenanceRequest.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamThirdMaintenanceRequest.java
@@ -7,7 +7,6 @@
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.api.vo.FileUploadResult;
-import org.jeecg.modules.eam.entity.EamPrecisionCheckDetail;
import org.jeecg.modules.eam.entity.EamThirdMaintenanceOrderDetail;
import org.jeecg.modules.flowable.domain.vo.FlowTaskVo;
import org.springframework.format.annotation.DateTimeFormat;
@@ -61,12 +60,12 @@
@ApiModelProperty(value = "鍒犻櫎 淇濆吇椤规槑缁�")
private List<EamThirdMaintenanceOrderDetail> removeDetailList;
- /**鍒楄〃 绮惧害鍙傛暟鏄庣粏*/
- @ApiModelProperty(value = "鍒楄〃 绮惧害鍙傛暟鏄庣粏")
- private List<EamPrecisionCheckDetail> precisionDetailList;
- /**鍒犻櫎 绮惧害鍙傛暟鏄庣粏*/
- @ApiModelProperty(value = "鍒犻櫎 绮惧害鍙傛暟鏄庣粏")
- private List<EamPrecisionCheckDetail> removePrecisionDetailList;
+// /**鍒楄〃 绮惧害鍙傛暟鏄庣粏*/
+// @ApiModelProperty(value = "鍒楄〃 绮惧害鍙傛暟鏄庣粏")
+// private List<EamPrecisionCheckDetail> precisionDetailList;
+// /**鍒犻櫎 绮惧害鍙傛暟鏄庣粏*/
+// @ApiModelProperty(value = "鍒犻櫎 绮惧害鍙傛暟鏄庣粏")
+// private List<EamPrecisionCheckDetail> removePrecisionDetailList;
//纭鎿嶄綔
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamPrecisionCheckDetailService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamPrecisionCheckDetailService.java
deleted file mode 100644
index 6728f04..0000000
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamPrecisionCheckDetailService.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.jeecg.modules.eam.service;
-
-import org.jeecg.modules.eam.entity.EamPrecisionCheckDetail;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * @Description: 璁惧绮惧害妫�娴嬫槑缁�
- * @Author: jeecg-boot
- * @Date: 2025-05-13
- * @Version: V1.0
- */
-public interface IEamPrecisionCheckDetailService extends IService<EamPrecisionCheckDetail> {
-
- /**
- * 鏍规嵁宸ュ崟ID 鏌ヨ 绮惧害淇℃伅
- * @param orderId
- * @return
- */
- List<EamPrecisionCheckDetail> getByOrderId(String orderId);
-
- /**
- * 鏍￠獙鏄惁瀛樺湪绮惧害妫�楠�
- * @param orderId
- * @return
- */
- boolean hasPrecisionCheckDetail(String orderId);
-
-}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamPrecisionParametersService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamPrecisionParametersService.java
deleted file mode 100644
index 428272f..0000000
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamPrecisionParametersService.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.jeecg.modules.eam.service;
-
-import org.jeecg.modules.eam.entity.EamPrecisionParameters;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 绮惧害鍙傛暟缁存姢
- * @Author: jeecg-boot
- * @Date: 2025-03-17
- * @Version: V1.0
- */
-public interface IEamPrecisionParametersService extends IService<EamPrecisionParameters> {
-
-}
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 e90a510..ebddfb4 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
@@ -611,6 +611,19 @@
throw new JeecgBootException("璁惧涓嶅瓨鍦紝璇锋鏌ワ紒");
}
+ // 妫�鏌ュ懆淇濊繃鏈熸椂闂�
+ if (eamInspectionOrderRequest.getTableWeekDetailList() == null || eamInspectionOrderRequest.getTableWeekDetailList().isEmpty()) {
+ List<EamWeekInspectionDetail> weekInspectionDetailList = eamWeekInspectionDetailService.list(new LambdaQueryWrapper<EamWeekInspectionDetail>().eq(EamWeekInspectionDetail::getStandardId, eamInspectionOrderRequest.getStandardId()).between(EamWeekInspectionDetail::getPlanInspectionDate, DateUtils.getFirstDayOfWeek(eamInspectionOrderRequest.getInspectionDate()), DateUtils.getLastDayOfWeek(eamInspectionOrderRequest.getInspectionDate())));
+ if (weekInspectionDetailList != null && !weekInspectionDetailList.isEmpty()) {
+ if (StrUtil.isEmpty(eamInspectionOrderRequest.getOperator())) {
+ Date lastDate = DateUtils.getLastDayOfWeek(eamInspectionOrderRequest.getInspectionDate());
+ if (DateUtils.isSameDay(lastDate, new Date())) {
+ throw new JeecgBootException("鏈懆鐐规鏈畬鎴愶紝璇疯繘琛屽～鎶ワ紒");
+ }
+ }
+ }
+ }
+
// 璁剧疆娴佺▼鍙橀噺
setupProcessVariables(eamInspectionOrderRequest, eamInspectionOrder, user, equipment);
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamPrecisionCheckDetailServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamPrecisionCheckDetailServiceImpl.java
deleted file mode 100644
index cda6eb5..0000000
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamPrecisionCheckDetailServiceImpl.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.jeecg.modules.eam.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.eam.entity.EamPrecisionCheckDetail;
-import org.jeecg.modules.eam.mapper.EamPrecisionCheckDetailMapper;
-import org.jeecg.modules.eam.service.IEamPrecisionCheckDetailService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * @Description: 璁惧绮惧害妫�娴嬫槑缁�
- * @Author: jeecg-boot
- * @Date: 2025-05-13
- * @Version: V1.0
- */
-@Service
-public class EamPrecisionCheckDetailServiceImpl extends ServiceImpl<EamPrecisionCheckDetailMapper, EamPrecisionCheckDetail> implements IEamPrecisionCheckDetailService {
-
- @Resource
- private EamPrecisionCheckDetailMapper eamPrecisionCheckDetailMapper;
-
- @Override
- public List<EamPrecisionCheckDetail> getByOrderId(String orderId) {
- LambdaQueryWrapper<EamPrecisionCheckDetail> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EamPrecisionCheckDetail::getOrderId, orderId);
- return eamPrecisionCheckDetailMapper.selectList(queryWrapper);
- }
-
- @Override
- public boolean hasPrecisionCheckDetail(String orderId) {
- LambdaQueryWrapper<EamPrecisionCheckDetail> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(EamPrecisionCheckDetail::getOrderId, orderId);
- return eamPrecisionCheckDetailMapper.selectCount(wrapper) > 0;
- }
-}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamPrecisionParametersServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamPrecisionParametersServiceImpl.java
deleted file mode 100644
index d9e884b..0000000
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamPrecisionParametersServiceImpl.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.jeecg.modules.eam.service.impl;
-
-import org.jeecg.modules.eam.entity.EamPrecisionParameters;
-import org.jeecg.modules.eam.mapper.EamPrecisionParametersMapper;
-import org.jeecg.modules.eam.service.IEamPrecisionParametersService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 绮惧害鍙傛暟缁存姢
- * @Author: jeecg-boot
- * @Date: 2025-03-17
- * @Version: V1.0
- */
-@Service
-public class EamPrecisionParametersServiceImpl extends ServiceImpl<EamPrecisionParametersMapper, EamPrecisionParameters> implements IEamPrecisionParametersService {
-
-}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
index fdff9fd..0b352c9 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
@@ -9,13 +9,10 @@
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;
@@ -45,7 +42,6 @@
import org.jeecg.modules.system.service.IBaseFactoryService;
import org.jeecg.modules.system.service.IBaseFactoryUserService;
import org.jeecg.modules.system.service.ISysUserService;
-import org.jeecg.modules.system.vo.UserSelector;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -85,8 +81,6 @@
private IEamReportRepairService eamReportRepairService;
@Autowired
private IEamEquipmentExtendService eamEquipmentExtendService;
- @Autowired
- private IEamPrecisionCheckDetailService precisionCheckDetailService;
@Resource
private IBaseFactoryUserService baseFactoryUserService;
@@ -181,38 +175,38 @@
thirdMaintenanceOrderDetailService.saveBatch(request.getTableDetailList());
}
//澶勭悊绮惧害鍙傛暟
- if (CollectionUtil.isNotEmpty(request.getPrecisionDetailList())) {
- request.getPrecisionDetailList().forEach(tableDetail -> {
- tableDetail.setId(null);
- tableDetail.setOrderId(order.getId());
- });
- precisionCheckDetailService.saveBatch(request.getPrecisionDetailList());
- }
+// if (CollectionUtil.isNotEmpty(request.getPrecisionDetailList())) {
+// request.getPrecisionDetailList().forEach(tableDetail -> {
+// tableDetail.setId(null);
+// tableDetail.setOrderId(order.getId());
+// });
+// precisionCheckDetailService.saveBatch(request.getPrecisionDetailList());
+// }
//鍒ゆ柇鏄惁瀛樺湪淇濆吇浜� 濡傛灉瀛樺湪鍒欏惎鍔ㄦ祦绋�
- if (StringUtils.isNotBlank(order.getOperator())) {
- //鍚姩娴佺▼
- flowCommonService.initActBusiness("宸ュ崟鍙�:" + order.getOrderNum() + ";璁惧缂栧彿: " + equipment.getEquipmentCode() + ";瀹夎浣嶇疆" + equipment.getInstallationPosition(),
- order.getId(), "IEamThirdMaintenanceOrderService", "third_maintenance_process", null);
- Map<String, Object> variables = new HashMap<>();
- variables.put("dataId", order.getId());
- if (StrUtil.isEmpty(order.getRemark())) {
- variables.put("organization", "鏂板涓変繚宸ュ崟榛樿鍚姩娴佺▼");
- variables.put("comment", "鏂板涓変繚宸ュ崟榛樿鍚姩娴佺▼");
- } else {
- variables.put("organization", order.getRemark());
- variables.put("comment", order.getRemark());
- }
- variables.put("proofreading", true);
- //骞惰浠诲姟浼氱
- variables.put("maintenance_execution", Collections.singletonList(request.getOperator()));
-// variables.put("precision_check", Collections.singletonList(equipment.getEquipmentManager()));
- Result result = flowDefinitionService.startProcessInstanceByKey("third_maintenance_process", variables);
- if (result != null) {
- //鏇存柊璁惧淇濆吇鐘舵��
- eamEquipmentExtendService.updateEquipmentMaintenanceStatus(order.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_THIRD_MAINTENANCE.name());
- return result.isSuccess();
- }
- }
+// if (StringUtils.isNotBlank(order.getOperator())) {
+// //鍚姩娴佺▼
+// flowCommonService.initActBusiness("宸ュ崟鍙�:" + order.getOrderNum() + ";璁惧缂栧彿: " + equipment.getEquipmentCode() + ";瀹夎浣嶇疆" + equipment.getInstallationPosition(),
+// order.getId(), "IEamThirdMaintenanceOrderService", "third_maintenance_process", null);
+// Map<String, Object> variables = new HashMap<>();
+// variables.put("dataId", order.getId());
+// if (StrUtil.isEmpty(order.getRemark())) {
+// variables.put("organization", "鏂板涓変繚宸ュ崟榛樿鍚姩娴佺▼");
+// variables.put("comment", "鏂板涓変繚宸ュ崟榛樿鍚姩娴佺▼");
+// } else {
+// variables.put("organization", order.getRemark());
+// variables.put("comment", order.getRemark());
+// }
+// variables.put("proofreading", true);
+// //骞惰浠诲姟浼氱
+// variables.put("maintenance_execution", Collections.singletonList(request.getOperator()));
+//// variables.put("precision_check", Collections.singletonList(equipment.getEquipmentManager()));
+// Result result = flowDefinitionService.startProcessInstanceByKey("third_maintenance_process", variables);
+// if (result != null) {
+// //鏇存柊璁惧淇濆吇鐘舵��
+// eamEquipmentExtendService.updateEquipmentMaintenanceStatus(order.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_THIRD_MAINTENANCE.name());
+// return result.isSuccess();
+// }
+// }
return true;
}
@@ -318,8 +312,8 @@
flowCommonService.initActBusiness("宸ュ崟鍙�:" + entity.getOrderNum() + ";璁惧缂栧彿: " + equipment.getEquipmentCode() + ";瀹夎浣嶇疆" + equipment.getInstallationPosition(),
entity.getId(), "IEamThirdMaintenanceOrderService", "third_maintenance_process", null);
Map<String, Object> variables = new HashMap<>();
- boolean equipmentPrecisionFlag = precisionCheckDetailService.hasPrecisionCheckDetail(entity.getId());
- variables.put("equipmentPrecisionFlag", equipmentPrecisionFlag);
+// boolean equipmentPrecisionFlag = precisionCheckDetailService.hasPrecisionCheckDetail(entity.getId());
+// variables.put("equipmentPrecisionFlag", equipmentPrecisionFlag);
variables.put("dataId", entity.getId());
if (StrUtil.isEmpty(entity.getRemark())) {
variables.put("organization", "鏂板涓変繚宸ュ崟榛樿鍚姩娴佺▼");
--
Gitblit v1.9.3