From e52750aa24b054fe70551ee2db0c48a0a4e0e79a Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Wed, 8 Jan 2025 14:18:56 +0800 Subject: [PATCH] =?UTF-8?q?2025-01-08=20=E7=BB=B4=E4=BF=AE=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E5=A2=9E=E5=8A=A0=E5=BE=85=E7=A1=AE=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/pms/data/EamWorkOrderData.java | 51 +++++++++++++++++++ .../sys/modules/pms/mapper/EamMapper.java | 2 + .../pms/service/Impl/EamServiceImpl.java | 41 ++++++++------- src/main/resources/mapper/pms/EamMapper.xml | 26 +++++++++- src/main/resources/mapper/pms/QcMapper.xml | 8 +-- 5 files changed, 101 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderData.java b/src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderData.java index 8e8b01ff..a13b7db6 100644 --- a/src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderData.java +++ b/src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderData.java @@ -84,6 +84,57 @@ public class EamWorkOrderData extends QueryPage { @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date lastExecutionDate; + /** + * 维修确认时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date confirmDate; + /** + * 维修确认人 + */ + private String confirmBy; + /** + * 确认结果 + */ + private String confirmResult; + /** + * 确认次数 + */ + private Integer confirmCount; + + public Date getConfirmDate() { + return confirmDate; + } + + public void setConfirmDate(Date confirmDate) { + this.confirmDate = confirmDate; + } + + public String getConfirmBy() { + return confirmBy; + } + + public void setConfirmBy(String confirmBy) { + this.confirmBy = confirmBy; + } + + public String getConfirmResult() { + return confirmResult; + } + + public void setConfirmResult(String confirmResult) { + this.confirmResult = confirmResult; + } + + public Integer getConfirmCount() { + return confirmCount; + } + + public void setConfirmCount(Integer confirmCount) { + this.confirmCount = confirmCount; + } + public Date getLastExecutionDate() { return lastExecutionDate; } diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java index bbc62b2d..5783efe9 100644 --- a/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java +++ b/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java @@ -1245,4 +1245,6 @@ public interface EamMapper { String getResourceByObject(@Param("site") String site, @Param("objectID") String objectID); void updateWorkPlanStatus2(EamWorkOrderInData inData); + + void reportWorkOrder3(EamWorkOrderInData inData); } diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java index 6f3133c2..48cda0a3 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java @@ -1870,7 +1870,7 @@ public class EamServiceImpl implements EamService { if ("A".equals(inData.getFunctionType())) { eamMapper.reportWorkOrder2(inData); } else if ("B".equals(inData.getFunctionType()) ) { - eamMapper.reportWorkOrder(inData); + eamMapper.reportWorkOrder3(inData); } for (int i = 0; i update eam_workOrder - set Status = '待审核', + set Status = '待确认', ActualOperator = #{actualOperator}, ActualDate = #{actualDate}, Remark = #{remark}, @@ -1112,6 +1115,25 @@ where site = #{site} and orderNo = #{orderNo} and FunctionType = #{functionType} and bu_no = #{buNo} + + update eam_workOrder + set Status = '待审核', + ActualOperator = #{actualOperator}, + ActualDate = #{actualDate}, + Remark = #{remark}, + disposal_measures = #{disposalMeasures}, + WorkTime = CASE + WHEN (DATEDIFF(SECOND, reach_date, #{actualDate}) 60) THEN DATEDIFF(SECOND, reach_date, #{actualDate}) / 60.0 + ELSE ceiling(floor(DATEDIFF(SECOND, reach_date, #{actualDate}) * 1.0 / 30) / 2) + END, + result = #{result,jdbcType=VARCHAR}, + checkResult = #{checkResult}, + handling_method = #{handlingMethod}, + fault_reason = #{faultReason}, + preventive_measure = #{preventiveMeasure} + where site = #{site} and orderNo = #{orderNo} and FunctionType = #{functionType} and bu_no = #{buNo} + + update eam_workOrder set Status = '已完工', diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml index 010b2f14..cb89ea07 100644 --- a/src/main/resources/mapper/pms/QcMapper.xml +++ b/src/main/resources/mapper/pms/QcMapper.xml @@ -2489,7 +2489,7 @@ sampling_qty = #{samplingQty,jdbcType=DECIMAL}, unqualified_qty = #{unqualifiedQty,jdbcType=DECIMAL}, submit_date = getDate() - WHERE site = #{site} and inspection_no = #{inspectionNo} and bu_no = #{buNo} + WHERE site = #{site} and bu_no = #{buNo} and inspection_no = #{inspectionNo} @@ -2815,19 +2815,19 @@ DELETE FROM qc_fqc_record - WHERE inspection_no = #{inspectionNo} and site = #{site} and bu_no = #{buNo} + WHERE site = #{site} and bu_no = #{buNo} and inspection_no = #{inspectionNo} DELETE FROM qc_fqc_detailed_record - WHERE inspection_no = #{inspectionNo} and site = #{site} and bu_no = #{buNo} + WHERE site = #{site} and bu_no = #{buNo} and inspection_no = #{inspectionNo} DELETE FROM qc_fqc_sub_detail_record - WHERE inspection_no = #{inspectionNo} and site = #{site} and bu_no = #{buNo} + WHERE site = #{site} and bu_no = #{buNo} and inspection_no = #{inspectionNo}