From 32c7668426eaccac4b7d2580017e94091f5b9810 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Wed, 8 Dec 2021 18:17:31 +0800
Subject: [PATCH] =?UTF-8?q?20211025=20=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gaotao/modules/base/entity/PartData.java  | 22 +++++++++++++++++++
 .../base/entity/ProductionLineData.java       |  4 ++--
 .../controller/FileUploadController.java      |  2 +-
 src/main/resources/mapper/base/BaseMapper.xml |  6 +++++
 .../shopOrder/ReportFormSearchMapper.xml      | 11 +++++-----
 5 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/base/entity/PartData.java b/src/main/java/com/gaotao/modules/base/entity/PartData.java
index 706ec42..1d37aee 100644
--- a/src/main/java/com/gaotao/modules/base/entity/PartData.java
+++ b/src/main/java/com/gaotao/modules/base/entity/PartData.java
@@ -300,6 +300,12 @@ public class PartData {
 
     private int add;
     private String user;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date date1;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date date2;
 
     public String getPartNo() {
         return partNo;
@@ -780,5 +786,21 @@ public class PartData {
     public void setUser(String user) {
         this.user = user;
     }
+
+    public Date getDate1() {
+        return date1;
+    }
+
+    public void setDate1(Date date1) {
+        this.date1 = date1;
+    }
+
+    public Date getDate2() {
+        return date2;
+    }
+
+    public void setDate2(Date date2) {
+        this.date2 = date2;
+    }
 }
 
diff --git a/src/main/java/com/gaotao/modules/base/entity/ProductionLineData.java b/src/main/java/com/gaotao/modules/base/entity/ProductionLineData.java
index aa017b5..5c23f19 100644
--- a/src/main/java/com/gaotao/modules/base/entity/ProductionLineData.java
+++ b/src/main/java/com/gaotao/modules/base/entity/ProductionLineData.java
@@ -31,8 +31,8 @@ public class ProductionLineData {
     /**
      *
      */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date createdDate;
 
     public String getSite() {
diff --git a/src/main/java/com/gaotao/modules/finishedProduct/controller/FileUploadController.java b/src/main/java/com/gaotao/modules/finishedProduct/controller/FileUploadController.java
index 7184301..cb360c7 100644
--- a/src/main/java/com/gaotao/modules/finishedProduct/controller/FileUploadController.java
+++ b/src/main/java/com/gaotao/modules/finishedProduct/controller/FileUploadController.java
@@ -27,7 +27,7 @@ public class FileUploadController {
     private CRollinfoService cRollinfoService;
 
     /*
-     * @Author sxm
+     * @Author sxm*
      * @Description 导入excel
      * @Date 17:55 2021/10/26
      * @Param [file]
diff --git a/src/main/resources/mapper/base/BaseMapper.xml b/src/main/resources/mapper/base/BaseMapper.xml
index 48349f7..a1ee46c 100644
--- a/src/main/resources/mapper/base/BaseMapper.xml
+++ b/src/main/resources/mapper/base/BaseMapper.xml
@@ -368,6 +368,12 @@
              <if test="active != null and active != ''">
                  AND T.Active  = #{active}
             </if>
+            <if test=" date1 != null ">
+                AND T.CreateDate >= #{date1}
+            </if>
+             <if test=" date2 != null ">
+                AND  #{date2} >=T.CreateDate
+            </if>
         </where>
 
     </select>
diff --git a/src/main/resources/mapper/shopOrder/ReportFormSearchMapper.xml b/src/main/resources/mapper/shopOrder/ReportFormSearchMapper.xml
index 363f899..0af72e8 100644
--- a/src/main/resources/mapper/shopOrder/ReportFormSearchMapper.xml
+++ b/src/main/resources/mapper/shopOrder/ReportFormSearchMapper.xml
@@ -119,10 +119,10 @@
 	X.ScheduleDate AS report_date,
 	X.site,
 	X.ShiftNo,
-	SUM (Cal_TotalActTime) AS Cal_TotalActTime,
-	SUM (Cal_TotalEstTime) AS Cal_TotalEstTime,
-	SUM (Cal_OtherActTime) AS Cal_OtherActTime,
-	(
+	round(SUM (Cal_TotalActTime),2) AS Cal_TotalActTime,
+	round(SUM (Cal_TotalEstTime),2) AS Cal_TotalEstTime,
+	round(SUM (Cal_OtherActTime),2) AS Cal_OtherActTime,
+	round((
 		CASE
 		WHEN SUM (Cal_TotalEstTime) = 0 THEN
 			0.0
@@ -131,7 +131,7 @@
 				SUM (Cal_OtherActTime) + SUM (Cal_TotalActTime)
 			) / SUM (Cal_TotalEstTime)
 		END
-	) * 100.0 AS resouce_efficiency
+	) * 100.0,2) AS resouce_efficiency
 FROM
 	(
 		SELECT
@@ -646,6 +646,7 @@ GROUP BY
                 AND  #{date2} >= t.EnterDate
             </if>
           </where>
+          Order By t.EnterDate Desc
     </select>
     <select id="searchShopOrderAbnormalRecord" resultType="com.gaotao.modules.shopOrder.entity.CExceptionLogData">
         Select T.LogID,T.Site,T.OrderNo,T.ItemNo,T.SeqNo,T.RollNo,T.ActionType_DB,T.ActionType,T.Reason,T.Remark,T.CreatedDate,T.CreatedBy,T.OtherInfo