From c8df02a7b07086e17bacda6cdc015d76ac1f82fe Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 04 九月 2024 17:16:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderProcessVO.java             |   10 +++
 ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml                           |   16 +++++
 ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java                   |   10 +++
 ycl-server/src/main/java/com/ycl/platform/service/impl/ContractResultServiceImpl.java |    8 ++
 ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java      |   29 +++++++++
 ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java  |   12 ++-
 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ReportAuditingRecordVO.java         |   21 +++++++
 ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java        |    7 ++
 ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java                 |    9 +++
 9 files changed, 116 insertions(+), 6 deletions(-)

diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ReportAuditingRecordVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ReportAuditingRecordVO.java
new file mode 100644
index 0000000..eb007b4
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ReportAuditingRecordVO.java
@@ -0,0 +1,21 @@
+package com.ycl.platform.domain.vo;
+
+import com.ycl.platform.base.AbsVo;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author锛歺p
+ * @date锛�2024/9/4 15:34
+ */
+@Data
+public class ReportAuditingRecordVO extends AbsVo {
+
+    private Boolean result;
+
+    private Date beginCreateTime;
+
+    private Date endCreateTime;
+
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderProcessVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderProcessVO.java
index 45a2d84..2e02fa0 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderProcessVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderProcessVO.java
@@ -24,4 +24,14 @@
      */
     private List<WorkOrderAuditingRecord> auditingList;
 
+    /**
+     * 浜嬪墠鎶ュ璇存槑
+     */
+    private String beforeReportMsg;
+
+    /**
+     * 浜嬪悗鎶ュ璇存槑锛氬凡鎶ュ銆佹姤澶囧け鏁堢瓑
+     */
+    private String afterReportMsg;
+
 }
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java
index cdd3141..f95bd46 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java
@@ -3,8 +3,10 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ycl.platform.base.BaseSelect;
+import com.ycl.platform.domain.entity.ReportAuditingRecord;
 import com.ycl.platform.domain.entity.YwPoint;
 import com.ycl.platform.domain.query.YwPointQuery;
+import com.ycl.platform.domain.vo.ReportAuditingRecordVO;
 import com.ycl.platform.domain.vo.YwPointVO;
 import com.ycl.platform.domain.excel.PointExport;
 import org.apache.ibatis.annotations.Mapper;
@@ -94,4 +96,12 @@
      * @return
      */
     List<YwPoint> select(@Param("keyword") String keyword, @Param("unitId") Integer unitId);
+
+    /**
+     * 鑾峰彇鏈�鏂颁竴鏉℃姤澶囩粨鏋�
+     * @param serialNumber
+     * @param reportType
+     * @return
+     */
+    ReportAuditingRecordVO getReportResult(@Param("serialNumber") String serialNumber, @Param("reportType") String reportType);
 }
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java b/ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java
index f0766ce..02d6b0c 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java
@@ -1,10 +1,12 @@
 package com.ycl.platform.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.platform.domain.entity.ReportAuditingRecord;
 import com.ycl.platform.domain.entity.YwPoint;
 import com.ycl.platform.domain.form.BatchEditPointForm;
 import com.ycl.platform.domain.form.YwPointForm;
 import com.ycl.platform.domain.query.YwPointQuery;
+import com.ycl.platform.domain.vo.ReportAuditingRecordVO;
 import com.ycl.system.Result;
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.web.multipart.MultipartFile;
@@ -122,4 +124,11 @@
      * @return
      */
     Result importData(MultipartFile file, Integer unitId, Date startTime, Date endTime, Boolean needUpdateUnit) throws IOException;
+
+    /**
+     * 鑾峰彇鎶ュ鏄惁瀹℃牳閫氳繃锛堟渶鏂颁竴鏉★級
+     * @param reportType
+     * @return
+     */
+    ReportAuditingRecordVO getReportResult(String serialNumber, String reportType);
 }
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractResultServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractResultServiceImpl.java
index 3a38040..aa2682d 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractResultServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractResultServiceImpl.java
@@ -16,6 +16,7 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 鑰冩牳缁撴灉Service涓氬姟灞傚鐞�
@@ -50,7 +51,12 @@
      */
     @Override
     public List<ContractResultVO> selectCheckResultList(ContractResultVO contractResult) {
-        contractResult.setUnitId(Long.valueOf(SecurityUtils.getUnitId()));
+        Integer unitId = SecurityUtils.getUnitId();
+        Long uid = null;
+        if (Objects.nonNull(unitId)) {
+            uid = Long.valueOf(unitId);
+        }
+        contractResult.setUnitId(uid);
         return checkResultMapper.selectCheckResultList(contractResult);
     }
 
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java
index c01af46..f23b814 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java
@@ -16,10 +16,7 @@
 import org.springframework.stereotype.Service;
 
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -45,7 +42,12 @@
      */
     @Override
     public List<ContractScore> selectDefaultScoreList(ContractScore contractScore) {
-        contractScore.setUnitId(Long.valueOf(SecurityUtils.getUnitId()));
+        Integer unitId = SecurityUtils.getUnitId();
+        Long uid = null;
+        if (Objects.nonNull(unitId)) {
+            uid = Long.valueOf(unitId);
+        }
+        contractScore.setUnitId(uid);
         return contractScoreMapper.selectDefaultScoreList(contractScore);
     }
 
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
index 14ddb2e..4c26051 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -744,6 +744,12 @@
 
     @Override
     public Result processImg(String workOrderNo) {
+        WorkOrder workOrder = new LambdaQueryChainWrapper<>(baseMapper)
+                .eq(WorkOrder::getWorkOrderNo, workOrderNo)
+                .one();
+        if (Objects.isNull(workOrder)) {
+            throw new RuntimeException("姝ゅ伐鍗曚笉瀛樺湪");
+        }
         // 杩愮淮璁板綍
         List<WorkOrderYwConditionRecordVO> workOrderYwConditionRecordVOS = this.selectYwConditionByYwId(workOrderNo);
         // 瀹℃牳璁板綍
@@ -751,6 +757,29 @@
         WorkOrderProcessVO process = new WorkOrderProcessVO();
         process.setYwList(workOrderYwConditionRecordVOS);
         process.setAuditingList(workOrderAuditingRecords);
+        // 鏌ヨ鐐逛綅浜嬪墠浜嬪悗鏈�鏂扮殑涓�鏉℃暟鎹槸鍚﹀鏍搁�氳繃
+        ReportAuditingRecordVO beforeRecord = ywPointService.getReportResult(workOrder.getSerialNumber(), "浜嬪墠鎶ュ");
+        ReportAuditingRecordVO afterRecord = ywPointService.getReportResult(workOrder.getSerialNumber(), "浜嬪悗鎶ュ");
+
+        Date now = new Date();
+        if (Objects.nonNull(beforeRecord)) {
+            if (now.before(beforeRecord.getBeginCreateTime())) {
+                process.setBeforeReportMsg("浜嬪墠鎶ュ宸插け鏁�");
+            } else if (now.after(beforeRecord.getEndCreateTime())){
+                process.setBeforeReportMsg("浜嬪墠鎶ュ鏈敓鏁�");
+            } else {
+                process.setBeforeReportMsg("宸蹭簨鍓嶆姤澶�");
+            }
+        }
+        if (Objects.nonNull(afterRecord)) {
+            if (now.before(afterRecord.getBeginCreateTime())) {
+                process.setAfterReportMsg("浜嬪悗鎶ュ宸插け鏁�");
+            } else if (now.after(afterRecord.getEndCreateTime())){
+                process.setAfterReportMsg("浜嬪悗鎶ュ鏈敓鏁�");
+            } else {
+                process.setAfterReportMsg("宸蹭簨鍚庢姤澶�");
+            }
+        }
         return Result.ok().data(process);
     }
 }
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
index 3de5f4e..95a973d 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
@@ -6,12 +6,14 @@
 import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ycl.dataListener.CurrencyDataListener;
+import com.ycl.platform.domain.entity.ReportAuditingRecord;
 import com.ycl.platform.domain.entity.YwPeople;
 import com.ycl.platform.domain.entity.YwPoint;
 import com.ycl.platform.domain.excel.PointExport;
 import com.ycl.platform.domain.form.BatchEditPointForm;
 import com.ycl.platform.domain.form.YwPointForm;
 import com.ycl.platform.domain.query.YwPointQuery;
+import com.ycl.platform.domain.vo.ReportAuditingRecordVO;
 import com.ycl.platform.domain.vo.YwPointVO;
 import com.ycl.platform.mapper.YwPeopleMapper;
 import com.ycl.platform.mapper.YwPointMapper;
@@ -250,6 +252,11 @@
         return Result.ok();
     }
 
+    @Override
+    public ReportAuditingRecordVO getReportResult(String serialNumber, String reportType) {
+        return baseMapper.getReportResult(serialNumber, reportType);
+    }
+
     /**
      * 淇敼鐐逛綅鐨勮繍缁村崟浣�
      *
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
index 881ef95..a4e932f 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
@@ -198,4 +198,20 @@
 
     </select>
 
+    <select id="getReportResult" resultType="com.ycl.platform.domain.vo.ReportAuditingRecordVO">
+        SELECT
+               ar.result, r.begin_create_time, r.end_create_time
+        FROM
+             t_report r
+                 INNER JOIN t_report_auditing_record ar ON r.id = ar.report_id
+                                                               AND ar.deleted = 0
+                                                               AND r.report_type = #{reportType}
+                                                               AND r.deleted = 0
+                                                               AND r.serial_number = #{serialNumber}
+                                                                AND ar.result = 1
+        ORDER BY
+             ar.create_time DESC
+        limit 1
+    </select>
+
 </mapper>

--
Gitblit v1.8.0