From d2d49dfcefd4f439c9bede08ade2259c93ad962a Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Thu, 9 Sep 2021 14:16:16 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=AE=BE=E5=A4=87dnc=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E3=80=81=E6=95=85=E9=9A=9C=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ResourceFaultReceiveController.java       |  1 +
 .../equip/model/ResourceFaultReceive.java     | 46 ++++-----
 .../equip/model/ResourceStatusReceive.java    | 94 +------------------
 .../impl/ResourceFaultReceiveServiceImpl.java |  2 +
 .../ResourceStatusReceiveServiceImpl.java     | 35 +------
 .../mapper/ResourceFaultReceiveMapper.xml     | 18 +++-
 .../mapper/ResourceStatusReceiveMapper.xml    | 77 ++-------------
 7 files changed, 48 insertions(+), 225 deletions(-)

diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceFaultReceiveController.java b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceFaultReceiveController.java
index 4d79e3a3..7f980a4a 100644
--- a/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceFaultReceiveController.java
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceFaultReceiveController.java
@@ -71,6 +71,7 @@ public class ResourceFaultReceiveController {
                 .or().like(ResourceFaultReceive::getSite, frontPage.getGlobalQuery())
                 .or().like(ResourceFaultReceive::getResrce, frontPage.getGlobalQuery())
                 .or().like(ResourceFaultReceive::getFaultCode, frontPage.getGlobalQuery())
+                .or().like(ResourceFaultReceive::getDescription, frontPage.getGlobalQuery())
                 .or().like(ResourceFaultReceive::getCreateUser, frontPage.getGlobalQuery())
                 .or().like(ResourceFaultReceive::getModifyUser, frontPage.getGlobalQuery())
     );
diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceFaultReceive.java b/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceFaultReceive.java
index e59fe868..d4baa264 100644
--- a/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceFaultReceive.java
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceFaultReceive.java
@@ -12,11 +12,11 @@ import com.baomidou.mybatisplus.annotation.IdType;
 
 /**
  * <p>
- * 设备故障信息接收表-接口
+ * 
  * </p>
  *
- * @author pavel.Liu
- * @since 2021-07-13
+ * @author pavel.liu
+ * @since 2021-09-09
  */
 
 @TableName("Z_RESOURCE_FAULT_RECEIVE")
@@ -25,49 +25,24 @@ public class ResourceFaultReceive extends Model<ResourceFaultReceive> {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 主键
-     */
    @TableId(value = "HANDLE", type = IdType.INPUT)
    private String handle;
-    /**
-     * 站点
-     */
    @TableField("SITE")
    private String site;
-    /**
-     * 设备编号
-     */
    @TableField("RESRCE")
    private String resrce;
-    /**
-     * 设备故障编码
-     */
    @TableField("FAULT_CODE")
    private String faultCode;
-    /**
-     * 故障接收时间
-     */
+   @TableField("DESCRIPTION")
+   private String description;
    @TableField("FAULT_DATE")
    private LocalDateTime faultDate;
-    /**
-     * 创建人
-     */
    @TableField("CREATE_USER")
    private String createUser;
-    /**
-     * 创建时间
-     */
    @TableField("CREATED_DATE_TIME")
    private LocalDateTime createdDateTime;
-    /**
-     * 修改人
-     */
    @TableField("MODIFY_USER")
    private String modifyUser;
-    /**
-     * 修改时间
-     */
    @TableField("MODIFIED_DATE_TIME")
    private LocalDateTime modifiedDateTime;
 
@@ -104,6 +79,14 @@ public class ResourceFaultReceive extends Model<ResourceFaultReceive> {
       this.faultCode = faultCode;
    }
 
+   public String getDescription() {
+      return description;
+   }
+
+   public void setDescription(String description) {
+      this.description = description;
+   }
+
    public LocalDateTime getFaultDate() {
       return faultDate;
    }
@@ -152,6 +135,8 @@ public static final String RESRCE = "RESRCE";
 
 public static final String FAULT_CODE = "FAULT_CODE";
 
+public static final String DESCRIPTION = "DESCRIPTION";
+
 public static final String FAULT_DATE = "FAULT_DATE";
 
 public static final String CREATE_USER = "CREATE_USER";
@@ -175,6 +160,7 @@ public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME";
          ", site = " + site +
          ", resrce = " + resrce +
          ", faultCode = " + faultCode +
+         ", description = " + description +
          ", faultDate = " + faultDate +
          ", createUser = " + createUser +
          ", createdDateTime = " + createdDateTime +
diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceStatusReceive.java b/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceStatusReceive.java
index 2e3bf6d9..9a6945ec 100644
--- a/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceStatusReceive.java
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceStatusReceive.java
@@ -12,11 +12,11 @@ import com.baomidou.mybatisplus.annotation.IdType;
 
 /**
  * <p>
- * 设备状态表-接口
+ * 
  * </p>
  *
- * @author pavel.Liu
- * @since 2021-07-13
+ * @author pavel.liu
+ * @since 2021-09-09
  */
 
 @TableName("Z_RESOURCE_STATUS_RECEIVE")
@@ -25,64 +25,20 @@ public class ResourceStatusReceive extends Model<ResourceStatusReceive> {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 主键
-     */
    @TableId(value = "HANDLE", type = IdType.INPUT)
    private String handle;
-    /**
-     * 站点
-     */
    @TableField("SITE")
    private String site;
-    /**
-     * 设备编号
-     */
    @TableField("RESRCE")
    private String resrce;
-    /**
-     * 当前状态
-     */
    @TableField("STATUS")
    private String status;
-    /**
-     * 当前状态获取时间
-     */
-   @TableField("DATE_TIME")
-   private LocalDateTime dateTime;
-    /**
-     * 接收的状态
-     */
-   @TableField("CHANGE_STATUS")
-   private String changeStatus;
-    /**
-     * 接收时间
-     */
-   @TableField("CHANGE_DATE_TIME")
-   private LocalDateTime changeDateTime;
-    /**
-     * 间隔时间
-     */
-   @TableField("INTERVAL_TIME")
-   private Double intervalTime;
-    /**
-     * 创建人
-     */
    @TableField("CREATE_USER")
    private String createUser;
-    /**
-     * 创建时间
-     */
    @TableField("CREATED_DATE_TIME")
    private LocalDateTime createdDateTime;
-    /**
-     * 修改人
-     */
    @TableField("MODIFY_USER")
    private String modifyUser;
-    /**
-     * 修改时间
-     */
    @TableField("MODIFIED_DATE_TIME")
    private LocalDateTime modifiedDateTime;
 
@@ -119,38 +75,6 @@ public class ResourceStatusReceive extends Model<ResourceStatusReceive> {
       this.status = status;
    }
 
-   public LocalDateTime getDateTime() {
-      return dateTime;
-   }
-
-   public void setDateTime(LocalDateTime dateTime) {
-      this.dateTime = dateTime;
-   }
-
-   public String getChangeStatus() {
-      return changeStatus;
-   }
-
-   public void setChangeStatus(String changeStatus) {
-      this.changeStatus = changeStatus;
-   }
-
-   public LocalDateTime getChangeDateTime() {
-      return changeDateTime;
-   }
-
-   public void setChangeDateTime(LocalDateTime changeDateTime) {
-      this.changeDateTime = changeDateTime;
-   }
-
-   public Double getIntervalTime() {
-      return intervalTime;
-   }
-
-   public void setIntervalTime(Double intervalTime) {
-      this.intervalTime = intervalTime;
-   }
-
    public String getCreateUser() {
       return createUser;
    }
@@ -191,14 +115,6 @@ public static final String RESRCE = "RESRCE";
 
 public static final String STATUS = "STATUS";
 
-public static final String DATE_TIME = "DATE_TIME";
-
-public static final String CHANGE_STATUS = "CHANGE_STATUS";
-
-public static final String CHANGE_DATE_TIME = "CHANGE_DATE_TIME";
-
-public static final String INTERVAL_TIME = "INTERVAL_TIME";
-
 public static final String CREATE_USER = "CREATE_USER";
 
 public static final String CREATED_DATE_TIME = "CREATED_DATE_TIME";
@@ -220,10 +136,6 @@ public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME";
          ", site = " + site +
          ", resrce = " + resrce +
          ", status = " + status +
-         ", dateTime = " + dateTime +
-         ", changeStatus = " + changeStatus +
-         ", changeDateTime = " + changeDateTime +
-         ", intervalTime = " + intervalTime +
          ", createUser = " + createUser +
          ", createdDateTime = " + createdDateTime +
          ", modifyUser = " + modifyUser +
diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceFaultReceiveServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceFaultReceiveServiceImpl.java
index 6885f20b..e4f10a97 100644
--- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceFaultReceiveServiceImpl.java
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceFaultReceiveServiceImpl.java
@@ -116,6 +116,8 @@ public class ResourceFaultReceiveServiceImpl extends ServiceImpl<ResourceFaultRe
             JSONObject jsonObj = (JSONObject) jsonArray.get(i);
             String faultCode = jsonObj.getString("FAULT_CODE");
             resourceFaultReceive.setFaultCode(faultCode);
+            String description = jsonObj.getString("DESCRIPTION");
+            resourceFaultReceive.setDescription(description);
             String dateTime = jsonObj.getString("DATE_TIME");
             LocalDateTime faultDate = LocalDateTime.parse(dateTime, dataFormatter);
             resourceFaultReceive.setFaultDate(faultDate);
diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceStatusReceiveServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceStatusReceiveServiceImpl.java
index 011618ca..6aee9fd8 100644
--- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceStatusReceiveServiceImpl.java
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceStatusReceiveServiceImpl.java
@@ -100,35 +100,11 @@ public class ResourceStatusReceiveServiceImpl extends ServiceImpl<ResourceStatus
             logger.error("设备状态不能为空！");
             throw BusinessException.build("设备状态不能为空！");
         }
-        LocalDateTime now = LocalDateTime.now();
-        String status = "301";
-        //设备状态转换
-        switch (sendStatus) {
-            case "RUN" :
-                status = "301"; break;
-            case "DOW" :
-                status = "302"; break;
-            case "SEAL" :
-                status = "303"; break;
-            case "FREE" :
-                status = "2"; break;
-            case "REPAIR" :
-                status = "4"; break;
-            default:
-                logger.info("发送的状态编码：" + sendStatus + ",未找到对应的状态！");
-                throw BusinessException.build("发送的状态编码：" + sendStatus + ",未找到对应的状态！");
-        }
 
         // 获取最新数据
         ResourceStatusReceive resourceStatus = resourceStatusReceiveMapper.getOneByMaxCreateDateTime(site,resource);
         if (resourceStatus != null){
-            LocalDateTime oldDate = resourceStatus.getDateTime();
-            resourceStatus.setChangeStatus(status);
-            resourceStatus.setChangeDateTime(dateTime);
-            Duration between = Duration.between(oldDate, dateTime);
-            Long intervalTime = between.toMinutes();
-            resourceStatus.setIntervalTime(intervalTime.doubleValue());
-            resourceStatus.setModifiedDateTime(now);
+            resourceStatus.setModifiedDateTime(dateTime);
             resourceStatus.setModifyUser(user);
             resourceStatusReceiveMapper.updateById(resourceStatus);
         }else{
@@ -139,15 +115,10 @@ public class ResourceStatusReceiveServiceImpl extends ServiceImpl<ResourceStatus
         resourceStatusReceive.setHandle(UUID.randomUUID().toString());
         resourceStatusReceive.setSite(site);
         resourceStatusReceive.setResrce(resource);
-        resourceStatusReceive.setStatus(status);
-        resourceStatusReceive.setDateTime(dateTime);
+        resourceStatusReceive.setStatus(sendStatus);
         resourceStatusReceive.setCreateUser(user);
-        resourceStatusReceive.setCreatedDateTime(now);
+        resourceStatusReceive.setCreatedDateTime(dateTime);
         resourceStatusReceiveMapper.insert(resourceStatusReceive);
-        // 修改设备状态
-        resourceById.setStatusBo(HandleEnum.STATUS.getHandle(site,status));
-        resourceById.setModifiedDateTime(now);
-        resrceService.updateById(resourceById);
         return handle;
     }
 
diff --git a/equip/src/main/resources/mapper/ResourceFaultReceiveMapper.xml b/equip/src/main/resources/mapper/ResourceFaultReceiveMapper.xml
index 1070a125..725d7784 100644
--- a/equip/src/main/resources/mapper/ResourceFaultReceiveMapper.xml
+++ b/equip/src/main/resources/mapper/ResourceFaultReceiveMapper.xml
@@ -8,6 +8,7 @@
         <result column="SITE" property="site" />
         <result column="RESRCE" property="resrce" />
         <result column="FAULT_CODE" property="faultCode" />
+        <result column="DESCRIPTION" property="description" />
         <result column="FAULT_DATE" property="faultDate" />
         <result column="CREATE_USER" property="createUser" />
         <result column="CREATED_DATE_TIME" property="createdDateTime" />
@@ -17,7 +18,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        HANDLE, SITE, RESRCE, FAULT_CODE, FAULT_DATE, CREATE_USER, CREATED_DATE_TIME, MODIFY_USER, MODIFIED_DATE_TIME
+        HANDLE, SITE, RESRCE, FAULT_CODE, DESCRIPTION, FAULT_DATE, CREATE_USER, CREATED_DATE_TIME, MODIFY_USER, MODIFIED_DATE_TIME
     </sql>
 
     <!-- BaseMapper标准查询/修改/删除 -->
@@ -55,6 +56,7 @@
             <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
             <if test="ew.entity.resrce!=null"> AND RESRCE=#{ew.entity.resrce}</if>
             <if test="ew.entity.faultCode!=null"> AND FAULT_CODE=#{ew.entity.faultCode}</if>
+            <if test="ew.entity.description!=null"> AND DESCRIPTION=#{ew.entity.description}</if>
             <if test="ew.entity.faultDate!=null"> AND FAULT_DATE=#{ew.entity.faultDate}</if>
             <if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
             <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
@@ -74,6 +76,7 @@
                 <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
                 <if test="ew.entity.resrce!=null"> AND RESRCE=#{ew.entity.resrce}</if>
                 <if test="ew.entity.faultCode!=null"> AND FAULT_CODE=#{ew.entity.faultCode}</if>
+                <if test="ew.entity.description!=null"> AND DESCRIPTION=#{ew.entity.description}</if>
                 <if test="ew.entity.faultDate!=null"> AND FAULT_DATE=#{ew.entity.faultDate}</if>
                 <if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
                 <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
@@ -101,6 +104,7 @@
                     <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
                     <if test="ew.entity.resrce!=null"> AND RESRCE=#{ew.entity.resrce}</if>
                     <if test="ew.entity.faultCode!=null"> AND FAULT_CODE=#{ew.entity.faultCode}</if>
+                    <if test="ew.entity.description!=null"> AND DESCRIPTION=#{ew.entity.description}</if>
                     <if test="ew.entity.faultDate!=null"> AND FAULT_DATE=#{ew.entity.faultDate}</if>
                     <if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
                     <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
@@ -128,6 +132,7 @@
                     <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
                     <if test="ew.entity.resrce!=null"> AND RESRCE=#{ew.entity.resrce}</if>
                     <if test="ew.entity.faultCode!=null"> AND FAULT_CODE=#{ew.entity.faultCode}</if>
+                    <if test="ew.entity.description!=null"> AND DESCRIPTION=#{ew.entity.description}</if>
                     <if test="ew.entity.faultDate!=null"> AND FAULT_DATE=#{ew.entity.faultDate}</if>
                     <if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
                     <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
@@ -155,6 +160,7 @@
                     <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
                     <if test="ew.entity.resrce!=null"> AND RESRCE=#{ew.entity.resrce}</if>
                     <if test="ew.entity.faultCode!=null"> AND FAULT_CODE=#{ew.entity.faultCode}</if>
+                    <if test="ew.entity.description!=null"> AND DESCRIPTION=#{ew.entity.description}</if>
                     <if test="ew.entity.faultDate!=null"> AND FAULT_DATE=#{ew.entity.faultDate}</if>
                     <if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
                     <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
@@ -182,6 +188,7 @@
                     <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
                     <if test="ew.entity.resrce!=null"> AND RESRCE=#{ew.entity.resrce}</if>
                     <if test="ew.entity.faultCode!=null"> AND FAULT_CODE=#{ew.entity.faultCode}</if>
+                    <if test="ew.entity.description!=null"> AND DESCRIPTION=#{ew.entity.description}</if>
                     <if test="ew.entity.faultDate!=null"> AND FAULT_DATE=#{ew.entity.faultDate}</if>
                     <if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
                     <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
@@ -209,6 +216,7 @@
                     <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
                     <if test="ew.entity.resrce!=null"> AND RESRCE=#{ew.entity.resrce}</if>
                     <if test="ew.entity.faultCode!=null"> AND FAULT_CODE=#{ew.entity.faultCode}</if>
+                    <if test="ew.entity.description!=null"> AND DESCRIPTION=#{ew.entity.description}</if>
                     <if test="ew.entity.faultDate!=null"> AND FAULT_DATE=#{ew.entity.faultDate}</if>
                     <if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
                     <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
@@ -232,6 +240,7 @@
             <if test="site!=null">SITE,</if>
             <if test="resrce!=null">RESRCE,</if>
             <if test="faultCode!=null">FAULT_CODE,</if>
+            <if test="description!=null">DESCRIPTION,</if>
             <if test="faultDate!=null">FAULT_DATE,</if>
             <if test="createUser!=null">CREATE_USER,</if>
             <if test="createdDateTime!=null">CREATED_DATE_TIME,</if>
@@ -243,6 +252,7 @@
             <if test="site!=null">#{site},</if>
             <if test="resrce!=null">#{resrce},</if>
             <if test="faultCode!=null">#{faultCode},</if>
+            <if test="description!=null">#{description},</if>
             <if test="faultDate!=null">#{faultDate},</if>
             <if test="createUser!=null">#{createUser},</if>
             <if test="createdDateTime!=null">#{createdDateTime},</if>
@@ -261,6 +271,7 @@
             #{site},
             #{resrce},
             #{faultCode},
+            #{description},
             #{faultDate},
             #{createUser},
             #{createdDateTime},
@@ -275,6 +286,7 @@
         <if test="et.site!=null">SITE=#{et.site},</if>
         <if test="et.resrce!=null">RESRCE=#{et.resrce},</if>
         <if test="et.faultCode!=null">FAULT_CODE=#{et.faultCode},</if>
+        <if test="et.description!=null">DESCRIPTION=#{et.description},</if>
         <if test="et.faultDate!=null">FAULT_DATE=#{et.faultDate},</if>
         <if test="et.createUser!=null">CREATE_USER=#{et.createUser},</if>
         <if test="et.createdDateTime!=null">CREATED_DATE_TIME=#{et.createdDateTime},</if>
@@ -289,6 +301,7 @@
         SITE=#{et.site},
         RESRCE=#{et.resrce},
         FAULT_CODE=#{et.faultCode},
+        DESCRIPTION=#{et.description},
         FAULT_DATE=#{et.faultDate},
         CREATE_USER=#{et.createUser},
         CREATED_DATE_TIME=#{et.createdDateTime},
@@ -303,6 +316,7 @@
         <if test="et.site!=null">SITE=#{et.site},</if>
         <if test="et.resrce!=null">RESRCE=#{et.resrce},</if>
         <if test="et.faultCode!=null">FAULT_CODE=#{et.faultCode},</if>
+        <if test="et.description!=null">DESCRIPTION=#{et.description},</if>
         <if test="et.faultDate!=null">FAULT_DATE=#{et.faultDate},</if>
         <if test="et.createUser!=null">CREATE_USER=#{et.createUser},</if>
         <if test="et.createdDateTime!=null">CREATED_DATE_TIME=#{et.createdDateTime},</if>
@@ -316,6 +330,7 @@
                     <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
                     <if test="ew.entity.resrce!=null"> AND RESRCE=#{ew.entity.resrce}</if>
                     <if test="ew.entity.faultCode!=null"> AND FAULT_CODE=#{ew.entity.faultCode}</if>
+                    <if test="ew.entity.description!=null"> AND DESCRIPTION=#{ew.entity.description}</if>
                     <if test="ew.entity.faultDate!=null"> AND FAULT_DATE=#{ew.entity.faultDate}</if>
                     <if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
                     <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
@@ -360,6 +375,7 @@
                     <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
                     <if test="ew.entity.resrce!=null"> AND RESRCE=#{ew.entity.resrce}</if>
                     <if test="ew.entity.faultCode!=null"> AND FAULT_CODE=#{ew.entity.faultCode}</if>
+                    <if test="ew.entity.description!=null"> AND DESCRIPTION=#{ew.entity.description}</if>
                     <if test="ew.entity.faultDate!=null"> AND FAULT_DATE=#{ew.entity.faultDate}</if>
                     <if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
                     <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
diff --git a/equip/src/main/resources/mapper/ResourceStatusReceiveMapper.xml b/equip/src/main/resources/mapper/ResourceStatusReceiveMapper.xml
index f9d400c2..a6377cfb 100644
--- a/equip/src/main/resources/mapper/ResourceStatusReceiveMapper.xml
+++ b/equip/src/main/resources/mapper/ResourceStatusReceiveMapper.xml
@@ -8,10 +8,6 @@
         <result column="SITE" property="site" />
         <result column="RESRCE" property="resrce" />
         <result column="STATUS" property="status" />
-        <result column="DATE_TIME" property="dateTime" />
-        <result column="CHANGE_STATUS" property="changeStatus" />
-        <result column="CHANGE_DATE_TIME" property="changeDateTime" />
-        <result column="INTERVAL_TIME" property="intervalTime" />
         <result column="CREATE_USER" property="createUser" />
         <result column="CREATED_DATE_TIME" property="createdDateTime" />
         <result column="MODIFY_USER" property="modifyUser" />
@@ -20,7 +16,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        HANDLE, SITE, RESRCE, STATUS, DATE_TIME, CHANGE_STATUS, CHANGE_DATE_TIME, INTERVAL_TIME, CREATE_USER, CREATED_DATE_TIME, MODIFY_USER, MODIFIED_DATE_TIME
+        HANDLE, SITE, RESRCE, STATUS, CREATE_USER, CREATED_DATE_TIME, MODIFY_USER, MODIFIED_DATE_TIME
     </sql>
 
     <!-- BaseMapper标准查询/修改/删除 -->
@@ -58,10 +54,6 @@
             <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
             <if test="ew.entity.resrce!=null"> AND RESRCE=#{ew.entity.resrce}</if>
             <if test="ew.entity.status!=null"> AND STATUS=#{ew.entity.status}</if>
-            <if test="ew.entity.dateTime!=null"> AND DATE_TIME=#{ew.entity.dateTime}</if>
-            <if test="ew.entity.changeStatus!=null"> AND CHANGE_STATUS=#{ew.entity.changeStatus}</if>
-            <if test="ew.entity.changeDateTime!=null"> AND CHANGE_DATE_TIME=#{ew.entity.changeDateTime}</if>
-            <if test="ew.entity.intervalTime!=null"> AND INTERVAL_TIME=#{ew.entity.intervalTime}</if>
             <if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
             <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
             <if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
@@ -80,10 +72,6 @@
                 <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
                 <if test="ew.entity.resrce!=null"> AND RESRCE=#{ew.entity.resrce}</if>
                 <if test="ew.entity.status!=null"> AND STATUS=#{ew.entity.status}</if>
-                <if test="ew.entity.dateTime!=null"> AND DATE_TIME=#{ew.entity.dateTime}</if>
-                <if test="ew.entity.changeStatus!=null"> AND CHANGE_STATUS=#{ew.entity.changeStatus}</if>
-                <if test="ew.entity.changeDateTime!=null"> AND CHANGE_DATE_TIME=#{ew.entity.changeDateTime}</if>
-                <if test="ew.entity.intervalTime!=null"> AND INTERVAL_TIME=#{ew.entity.intervalTime}</if>
                 <if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
                 <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
                 <if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
@@ -110,10 +98,6 @@
                     <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
                     <if test="ew.entity.resrce!=null"> AND RESRCE=#{ew.entity.resrce}</if>
                     <if test="ew.entity.status!=null"> AND STATUS=#{ew.entity.status}</if>
-                    <if test="ew.entity.dateTime!=null"> AND DATE_TIME=#{ew.entity.dateTime}</if>
-                    <if test="ew.entity.changeStatus!=null"> AND CHANGE_STATUS=#{ew.entity.changeStatus}</if>
-                    <if test="ew.entity.changeDateTime!=null"> AND CHANGE_DATE_TIME=#{ew.entity.changeDateTime}</if>
-                    <if test="ew.entity.intervalTime!=null"> AND INTERVAL_TIME=#{ew.entity.intervalTime}</if>
                     <if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
                     <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
                     <if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
@@ -140,10 +124,6 @@
                     <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
                     <if test="ew.entity.resrce!=null"> AND RESRCE=#{ew.entity.resrce}</if>
                     <if test="ew.entity.status!=null"> AND STATUS=#{ew.entity.status}</if>
-                    <if test="ew.entity.dateTime!=null"> AND DATE_TIME=#{ew.entity.dateTime}</if>
-                    <if test="ew.entity.changeStatus!=null"> AND CHANGE_STATUS=#{ew.entity.changeStatus}</if>
-                    <if test="ew.entity.changeDateTime!=null"> AND CHANGE_DATE_TIME=#{ew.entity.changeDateTime}</if>
-                    <if test="ew.entity.intervalTime!=null"> AND INTERVAL_TIME=#{ew.entity.intervalTime}</if>
                     <if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
                     <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
                     <if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
@@ -170,10 +150,6 @@
                     <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
                     <if test="ew.entity.resrce!=null"> AND RESRCE=#{ew.entity.resrce}</if>
                     <if test="ew.entity.status!=null"> AND STATUS=#{ew.entity.status}</if>
-                    <if test="ew.entity.dateTime!=null"> AND DATE_TIME=#{ew.entity.dateTime}</if>
-                    <if test="ew.entity.changeStatus!=null"> AND CHANGE_STATUS=#{ew.entity.changeStatus}</if>
-                    <if test="ew.entity.changeDateTime!=null"> AND CHANGE_DATE_TIME=#{ew.entity.changeDateTime}</if>
-                    <if test="ew.entity.intervalTime!=null"> AND INTERVAL_TIME=#{ew.entity.intervalTime}</if>
                     <if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
                     <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
                     <if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
@@ -200,10 +176,6 @@
                     <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
                     <if test="ew.entity.resrce!=null"> AND RESRCE=#{ew.entity.resrce}</if>
                     <if test="ew.entity.status!=null"> AND STATUS=#{ew.entity.status}</if>
-                    <if test="ew.entity.dateTime!=null"> AND DATE_TIME=#{ew.entity.dateTime}</if>
-                    <if test="ew.entity.changeStatus!=null"> AND CHANGE_STATUS=#{ew.entity.changeStatus}</if>
-                    <if test="ew.entity.changeDateTime!=null"> AND CHANGE_DATE_TIME=#{ew.entity.changeDateTime}</if>
-                    <if test="ew.entity.intervalTime!=null"> AND INTERVAL_TIME=#{ew.entity.intervalTime}</if>
                     <if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
                     <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
                     <if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
@@ -230,10 +202,6 @@
                     <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
                     <if test="ew.entity.resrce!=null"> AND RESRCE=#{ew.entity.resrce}</if>
                     <if test="ew.entity.status!=null"> AND STATUS=#{ew.entity.status}</if>
-                    <if test="ew.entity.dateTime!=null"> AND DATE_TIME=#{ew.entity.dateTime}</if>
-                    <if test="ew.entity.changeStatus!=null"> AND CHANGE_STATUS=#{ew.entity.changeStatus}</if>
-                    <if test="ew.entity.changeDateTime!=null"> AND CHANGE_DATE_TIME=#{ew.entity.changeDateTime}</if>
-                    <if test="ew.entity.intervalTime!=null"> AND INTERVAL_TIME=#{ew.entity.intervalTime}</if>
                     <if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
                     <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
                     <if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
@@ -256,10 +224,6 @@
             <if test="site!=null">SITE,</if>
             <if test="resrce!=null">RESRCE,</if>
             <if test="status!=null">STATUS,</if>
-            <if test="dateTime!=null">DATE_TIME,</if>
-            <if test="changeStatus!=null">CHANGE_STATUS,</if>
-            <if test="changeDateTime!=null">CHANGE_DATE_TIME,</if>
-            <if test="intervalTime!=null">INTERVAL_TIME,</if>
             <if test="createUser!=null">CREATE_USER,</if>
             <if test="createdDateTime!=null">CREATED_DATE_TIME,</if>
             <if test="modifyUser!=null">MODIFY_USER,</if>
@@ -270,10 +234,6 @@
             <if test="site!=null">#{site},</if>
             <if test="resrce!=null">#{resrce},</if>
             <if test="status!=null">#{status},</if>
-            <if test="dateTime!=null">#{dateTime},</if>
-            <if test="changeStatus!=null">#{changeStatus},</if>
-            <if test="changeDateTime!=null">#{changeDateTime},</if>
-            <if test="intervalTime!=null">#{intervalTime},</if>
             <if test="createUser!=null">#{createUser},</if>
             <if test="createdDateTime!=null">#{createdDateTime},</if>
             <if test="modifyUser!=null">#{modifyUser},</if>
@@ -291,10 +251,6 @@
             #{site},
             #{resrce},
             #{status},
-            #{dateTime},
-            #{changeStatus},
-            #{changeDateTime},
-            #{intervalTime},
             #{createUser},
             #{createdDateTime},
             #{modifyUser},
@@ -308,10 +264,6 @@
         <if test="et.site!=null">SITE=#{et.site},</if>
         <if test="et.resrce!=null">RESRCE=#{et.resrce},</if>
         <if test="et.status!=null">STATUS=#{et.status},</if>
-        <if test="et.dateTime!=null">DATE_TIME=#{et.dateTime},</if>
-        <if test="et.changeStatus!=null">CHANGE_STATUS=#{et.changeStatus},</if>
-        <if test="et.changeDateTime!=null">CHANGE_DATE_TIME=#{et.changeDateTime},</if>
-        <if test="et.intervalTime!=null">INTERVAL_TIME=#{et.intervalTime},</if>
         <if test="et.createUser!=null">CREATE_USER=#{et.createUser},</if>
         <if test="et.createdDateTime!=null">CREATED_DATE_TIME=#{et.createdDateTime},</if>
         <if test="et.modifyUser!=null">MODIFY_USER=#{et.modifyUser},</if>
@@ -325,10 +277,6 @@
         SITE=#{et.site},
         RESRCE=#{et.resrce},
         STATUS=#{et.status},
-        DATE_TIME=#{et.dateTime},
-        CHANGE_STATUS=#{et.changeStatus},
-        CHANGE_DATE_TIME=#{et.changeDateTime},
-        INTERVAL_TIME=#{et.intervalTime},
         CREATE_USER=#{et.createUser},
         CREATED_DATE_TIME=#{et.createdDateTime},
         MODIFY_USER=#{et.modifyUser},
@@ -342,10 +290,6 @@
         <if test="et.site!=null">SITE=#{et.site},</if>
         <if test="et.resrce!=null">RESRCE=#{et.resrce},</if>
         <if test="et.status!=null">STATUS=#{et.status},</if>
-        <if test="et.dateTime!=null">DATE_TIME=#{et.dateTime},</if>
-        <if test="et.changeStatus!=null">CHANGE_STATUS=#{et.changeStatus},</if>
-        <if test="et.changeDateTime!=null">CHANGE_DATE_TIME=#{et.changeDateTime},</if>
-        <if test="et.intervalTime!=null">INTERVAL_TIME=#{et.intervalTime},</if>
         <if test="et.createUser!=null">CREATE_USER=#{et.createUser},</if>
         <if test="et.createdDateTime!=null">CREATED_DATE_TIME=#{et.createdDateTime},</if>
         <if test="et.modifyUser!=null">MODIFY_USER=#{et.modifyUser},</if>
@@ -358,10 +302,6 @@
                     <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
                     <if test="ew.entity.resrce!=null"> AND RESRCE=#{ew.entity.resrce}</if>
                     <if test="ew.entity.status!=null"> AND STATUS=#{ew.entity.status}</if>
-                    <if test="ew.entity.dateTime!=null"> AND DATE_TIME=#{ew.entity.dateTime}</if>
-                    <if test="ew.entity.changeStatus!=null"> AND CHANGE_STATUS=#{ew.entity.changeStatus}</if>
-                    <if test="ew.entity.changeDateTime!=null"> AND CHANGE_DATE_TIME=#{ew.entity.changeDateTime}</if>
-                    <if test="ew.entity.intervalTime!=null"> AND INTERVAL_TIME=#{ew.entity.intervalTime}</if>
                     <if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
                     <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
                     <if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
@@ -405,10 +345,6 @@
                     <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
                     <if test="ew.entity.resrce!=null"> AND RESRCE=#{ew.entity.resrce}</if>
                     <if test="ew.entity.status!=null"> AND STATUS=#{ew.entity.status}</if>
-                    <if test="ew.entity.dateTime!=null"> AND DATE_TIME=#{ew.entity.dateTime}</if>
-                    <if test="ew.entity.changeStatus!=null"> AND CHANGE_STATUS=#{ew.entity.changeStatus}</if>
-                    <if test="ew.entity.changeDateTime!=null"> AND CHANGE_DATE_TIME=#{ew.entity.changeDateTime}</if>
-                    <if test="ew.entity.intervalTime!=null"> AND INTERVAL_TIME=#{ew.entity.intervalTime}</if>
                     <if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
                     <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
                     <if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
@@ -434,15 +370,14 @@
     <!--自定义sql-->
     <select id="getOneByMaxCreateDateTime" resultType="com.foreverwin.mesnac.equip.model.ResourceStatusReceive">
         SELECT * FROM (
-                 SELECT  ROWNUM SEQ, RSR.*
-                 FROM Z_RESOURCE_STATUS_RECEIVE RSR
-                 WHERE RSR.CHANGE_STATUS IS NULL AND RSR.SITE = #{site} AND RSR.RESRCE = #{resrce}
-                 ORDER BY RSR.CREATED_DATE_TIME DESC
-             ) WHERE SEQ = 1
+                          SELECT  ROWNUM SEQ, RSR.*
+                          FROM Z_RESOURCE_STATUS_RECEIVE RSR
+                          WHERE RSR.MODIFIED_DATE_TIME IS NULL AND RSR.SITE = #{site} AND RSR.RESRCE = #{resrce}
+                          ORDER BY RSR.CREATED_DATE_TIME DESC
+                      ) WHERE SEQ = 1
     </select>
 
     <!--自定义sql-->
 
 
-
 </mapper>

From daad2e4a8ec465bb8afa80c555633ff704b75b50 Mon Sep 17 00:00:00 2001
From: philip <244793088@qq.com>
Date: Thu, 9 Sep 2021 15:34:36 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ReportDataController.java      | 22 +++++
 .../common/mapper/ReportDataMapper.java       |  4 +-
 .../common/service/ReportDataService.java     |  4 +
 .../service/impl/ReportDataServiceImpl.java   | 11 ++-
 .../resources/mapper/ReportDataMapper.xml     | 86 ++++++++++++++++++-
 5 files changed, 121 insertions(+), 6 deletions(-)

diff --git a/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java b/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java
index 489c8013..c07f1dd0 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java
@@ -144,4 +144,26 @@ public class ReportDataController {
         }
     }
 
+    @GetMapping("/inspectionDetailPassRate")
+    public R findInspectionDetailPassRate(@RequestParam(required = false) Map paramMap) {
+        try {
+            paramMap.put("site", CommonMethods.getSite());
+            List<Map<String, Object>> result = reportDataService.findInspectionDetailPassRate(paramMap);
+            return R.ok(result);
+        } catch (Exception e) {
+            return R.failed(e.getMessage());
+        }
+    }
+    @GetMapping("/sectionPassRate")
+    public R findSectionPassRate(@RequestParam(required = false) Map paramMap) {
+        try {
+            paramMap.put("site", CommonMethods.getSite());
+            List<Map<String, Object>> result = reportDataService.findSectionPassRate(paramMap);
+            return R.ok(result);
+        } catch (Exception e) {
+            return R.failed(e.getMessage());
+        }
+    }
+
+
 }
diff --git a/common/src/main/java/com/foreverwin/mesnac/common/mapper/ReportDataMapper.java b/common/src/main/java/com/foreverwin/mesnac/common/mapper/ReportDataMapper.java
index 99997824..9ba95f21 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/mapper/ReportDataMapper.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/mapper/ReportDataMapper.java
@@ -1,6 +1,5 @@
 package com.foreverwin.mesnac.common.mapper;
 
-import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -31,4 +30,7 @@ public interface ReportDataMapper {
 
     List<Map<String, Object>> findUserPassRate(Map paramMap);
 
+    List<Map<String, Object>> findInspectionDetailPassRate(Map paramMap);
+
+    List<Map<String, Object>> findSectionPassRate(Map paramMap);
 }
diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/ReportDataService.java b/common/src/main/java/com/foreverwin/mesnac/common/service/ReportDataService.java
index c12c2e47..47bef354 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/service/ReportDataService.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/service/ReportDataService.java
@@ -50,4 +50,8 @@ public interface ReportDataService {
 
     List<Map<String, Object>> findUserPassRate(Map paramMap);
 
+    List<Map<String, Object>> findInspectionDetailPassRate(Map paramMap);
+
+    List<Map<String, Object>> findSectionPassRate(Map paramMap);
+
 }
diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ReportDataServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ReportDataServiceImpl.java
index 3eb3964e..8b021f78 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ReportDataServiceImpl.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ReportDataServiceImpl.java
@@ -9,7 +9,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDate;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -85,4 +84,14 @@ public class ReportDataServiceImpl implements ReportDataService{
     public List<Map<String, Object>> findUserPassRate(Map paramMap) {
         return reportDataMapper.findUserPassRate(paramMap);
     }
+
+    @Override
+    public List<Map<String, Object>> findInspectionDetailPassRate(Map paramMap) {
+        return reportDataMapper.findInspectionDetailPassRate(paramMap);
+    }
+
+    @Override
+    public List<Map<String, Object>> findSectionPassRate(Map paramMap) {
+        return reportDataMapper.findSectionPassRate(paramMap);
+    }
 }
diff --git a/common/src/main/resources/mapper/ReportDataMapper.xml b/common/src/main/resources/mapper/ReportDataMapper.xml
index a8e1f3f9..d79e2ece 100644
--- a/common/src/main/resources/mapper/ReportDataMapper.xml
+++ b/common/src/main/resources/mapper/ReportDataMapper.xml
@@ -410,7 +410,7 @@
         JOIN WORK_CENTER WC ON WC.SITE = zit.SITE AND WC.WORK_CENTER = zit.WORK_CENTER
         LEFT JOIN WORK_CENTER_T WT ON WT.WORK_CENTER_BO = WC.HANDLE AND WT.LOCALE = 'zh'
         LEFT JOIN Z_ABNORMAL_BILL ZAB ON zit.SFC=ZAB.SFC AND zit.SITE=ZAB.SITE AND zit.STEP_ID=ZAB.STEP_ID AND zab."TYPE"='Z'
-        WHERE  zit.SITE= #{site} AND zit.CATEGORY='P' AND zit.STATUS='COMPLETE'
+        WHERE  zit.SITE= #{site} AND (zit.CATEGORY='P' OR zit.CATEGORY='S') AND zit.STATUS='COMPLETE'
         <if test="workCenter != null and workCenter != ''" >
             AND zit.WORK_CENTER = #{workCenter}
         </if>
@@ -423,7 +423,6 @@
         GROUP BY zit."RESULT",zit.sfc ,zit.OPERATION,zit.STEP_ID, zit.CREATED_DATE_TIME,zit.RESRCE,zab.NC_QTY, WT.DESCRIPTION,ZSD.DISPATCH_QTY
         ) GROUP BY DESCRIPTION, "MONTH"
         ORDER BY DESCRIPTION,"MONTH"
-
     </select>
 
     <select id="findCheckUserPassRate" resultType="java.util.HashMap" parameterType="java.util.HashMap">
@@ -441,7 +440,7 @@
             LEFT JOIN WORK_CENTER_T WT ON WT.WORK_CENTER_BO = WC.HANDLE AND WT.LOCALE = 'zh'
             LEFT JOIN Z_ABNORMAL_BILL ZAB ON zit.SFC=ZAB.SFC AND zit.SITE=ZAB.SITE AND zit.STEP_ID=ZAB.STEP_ID AND zab."TYPE"='Z'
             LEFT JOIN Z_NWA_USER ZNU ON  ZNU.USER_NAME = ZIT.MODIFY_USER
-            WHERE  zit.SITE= #{site} AND zit.CATEGORY='P' AND zit.STATUS='COMPLETE'
+            WHERE  zit.SITE= #{site} AND (zit.CATEGORY='P' OR zit.CATEGORY='S') AND zit.STATUS='COMPLETE'
             <if test="workCenter != null and workCenter != ''" >
                 AND zit.WORK_CENTER = #{workCenter}
             </if>
@@ -483,7 +482,7 @@
         LEFT JOIN WORK_CENTER_T WT ON WT.WORK_CENTER_BO = WC.HANDLE AND WT.LOCALE = 'zh'
         LEFT JOIN Z_ABNORMAL_BILL ZAB ON zit.SFC=ZAB.SFC AND zit.SITE=ZAB.SITE AND zit.STEP_ID=ZAB.STEP_ID AND zab."TYPE"='Z'
         LEFT JOIN Z_ABNORMAL_BILL_DISPOSE ZABD ON ZAB.HANDLE=ZABD.ABNORMAL_BILL_BO
-        WHERE  zit.SITE= #{site} AND zit.CATEGORY='P' AND zit.STATUS='COMPLETE'
+        WHERE  zit.SITE= #{site} AND (zit.CATEGORY='P' OR zit.CATEGORY='S') AND zit.STATUS='COMPLETE'
         <if test="workCenter != null and workCenter != ''" >
             AND zit.WORK_CENTER = #{workCenter}
         </if>
@@ -502,4 +501,83 @@
         GROUP BY DESCRIPTION, "MONTH",ZNU.FULL_NAME,DUTY_USER
         ORDER BY DESCRIPTION,"MONTH"
     </select>
+
+    <select id="findInspectionDetailPassRate" resultType="java.util.HashMap" parameterType="java.util.HashMap">
+        SELECT DATE_TIME,sum(NG_QTY) NC_QTY, sum(OK_QTY) OK_QTY,sum(CHECK_QTY) CHECK_QTY,sum(DISPATCH_QTY) DISPATCH_QTY,FULL_NAME,DUTY_USER,DUTY_DEPART,WORK_ORDER,ITEM_NUMBER,ITEM,ITEM_DESC,OPERATION_DESC,CATEGORY,EMPLOYEE_DESCRIPTION,COMMENTS,DESCRIPTION WORK_CENTER_DESCRIPTION FROM
+        (
+        SELECT  CASE WHEN ROW_NUMBER() OVER(PARTITION BY zit.sfc ,zit.OPERATION,zit.STEP_ID ORDER BY zit.CREATED_DATE_TIME DESC)=1 AND zit."RESULT"='OK' THEN 0
+        WHEN ROW_NUMBER() OVER(PARTITION BY zit.sfc ,zit.OPERATION,zit.STEP_ID ORDER BY zit.CREATED_DATE_TIME DESC)=1 AND zit."RESULT"='NG' THEN TO_NUMBER(zab.NC_QTY)
+        ELSE 0 END NG_QTY, WT.DESCRIPTION,ZNU.FULL_NAME,ZSD.EMPLOYEE,ZSD.EMPLOYEE_DESCRIPTION,CFA.VALUE WORK_ORDER,CFB.VALUE ITEM_NUMBER,O.OPERATION,OT.DESCRIPTION OPERATION_DESC,
+        ROW_NUMBER() OVER(PARTITION BY zit.sfc,zit.STEP_ID ORDER BY zit.CREATED_DATE_TIME DESC) seq,I.ITEM,IT.DESCRIPTION ITEM_DESC,TO_CHAR(zit.CREATED_DATE_TIME,'YYYY-MM-DD') DATE_TIME,
+         CASE WHEN ROW_NUMBER() OVER(PARTITION BY zit.sfc ,zit.OPERATION,zit.STEP_ID ORDER BY zit.CREATED_DATE_TIME DESC)=1 AND zit."RESULT"='OK' THEN zsd.DISPATCH_QTY
+                WHEN ROW_NUMBER() OVER(PARTITION BY zit.sfc ,zit.OPERATION,zit.STEP_ID ORDER BY zit.CREATED_DATE_TIME DESC)=1 AND zit."RESULT"='NG' THEN 0
+                ELSE 0 END OK_QTY,zsd.DISPATCH_QTY,
+        zit."RESULT",COUNT(ZIT.HANDLE) check_qty, zit.sfc ,zit.STEP_ID,zit.CATEGORY,zit.COMMENTS,ZABD.DUTY_USER,ZABD.DUTY_DEPART
+         FROM Z_INSPECTION_TASK zit
+        JOIN OPERATION O ON O.OPERATION = zit.OPERATION AND O.SITE = zit.SITE AND o.CURRENT_REVISION='true'
+        LEFT JOIN OPERATION_T OT ON OT.OPERATION_BO = O.HANDLE AND OT.LOCALE = 'zh'
+        JOIN sfc S ON  S.SFC=zit.SFC AND  s.SITE=zit.SITE
+        LEFT JOIN SHOP_ORDER SO ON SO.HANDLE = S.SHOP_ORDER_BO
+        JOIN ITEM I ON I.HANDLE = SO.ITEM_BO
+        LEFT JOIN ITEM_T IT ON IT.ITEM_BO = S.ITEM_BO
+        LEFT JOIN CUSTOM_FIELDS CFA ON CFA.HANDLE = SO.HANDLE AND CFA."ATTRIBUTE" = 'WORK_ORDER'
+        LEFT JOIN CUSTOM_FIELDS CFB ON CFB.HANDLE = SO.HANDLE AND CFB."ATTRIBUTE" = 'ITEM_NUMBER'
+        JOIN Z_SFC_DISPATCH ZSD ON  ZSD.SFC=zit.SFC AND  ZSD.SITE=zit.SITE AND zit.STEP_ID=ZSD.STEP_ID
+        JOIN WORK_CENTER WC ON WC.SITE = zit.SITE AND WC.WORK_CENTER = zit.WORK_CENTER
+        LEFT JOIN WORK_CENTER_T WT ON WT.WORK_CENTER_BO = WC.HANDLE AND WT.LOCALE = 'zh'
+        LEFT JOIN Z_ABNORMAL_BILL ZAB ON zit.SFC=ZAB.SFC AND zit.SITE=ZAB.SITE AND zit.STEP_ID=ZAB.STEP_ID AND zab."TYPE"='Z'
+        LEFT JOIN Z_ABNORMAL_BILL_DISPOSE ZABD ON ZAB.HANDLE=ZABD.ABNORMAL_BILL_BO
+        LEFT JOIN Z_NWA_USER ZNU ON ZNU.SITE = ZIT.SITE AND ZNU.USER_NAME = ZIT.MODIFY_USER
+        WHERE   zit.SITE= #{site}  AND (zit.CATEGORY='P' OR zit.CATEGORY='S') AND zit.STATUS='COMPLETE'
+        <if test="workCenter != null and workCenter != ''" >
+            AND zit.WORK_CENTER = #{workCenter}
+        </if>
+        <if test="startFromDate != null and startFromDate != ''" >
+            AND zit.CREATED_DATE_TIME >= TO_DATE(#{startFromDate}, 'YYYY-MM-DD') - 8/24
+        </if>
+        <if test="startToDate != null and startToDate != ''" >
+            AND zit.CREATED_DATE_TIME &lt;= TO_DATE(#{startToDate}|| '15:59:59', 'YYYY-MM-DD HH24:MI:SS')
+        </if>
+        <if test="userId != null and userId != ''" >
+            AND zsd.EMPLOYEE like  '%'||#{userId}||'%'
+        </if>
+        <if test="workOrder != null and workOrder != ''" >
+            AND CFA.VALUE LIKE '%'||#{workOrder}||'%'
+        </if>
+        GROUP BY ZABD.DUTY_USER,zsd.DISPATCH_QTY,ZABD.DUTY_DEPART,zit."RESULT",zit.sfc ,zit.OPERATION,zit.STEP_ID,CFA.VALUE,CFB.VALUE, zit.CREATED_DATE_TIME,zit.RESRCE,zab.NC_QTY,zit.CREATED_DATE_TIME, ZNU.FULL_NAME,WT.DESCRIPTION,I.ITEM,IT.DESCRIPTION,O.OPERATION,OT.DESCRIPTION,ZSD.EMPLOYEE,ZSD.EMPLOYEE_DESCRIPTION,zit.COMMENTS,zit.CATEGORY
+        ) GROUP BY DATE_TIME,DESCRIPTION,FULL_NAME,DUTY_USER,DUTY_DEPART,WORK_ORDER,ITEM_NUMBER,ITEM,ITEM_DESC,OPERATION,OPERATION_DESC,CATEGORY,EMPLOYEE,EMPLOYEE_DESCRIPTION,COMMENTS
+    </select>
+    <select id="findSectionPassRate" resultType="java.util.HashMap" parameterType="java.util.HashMap">
+        SELECT  "SECTION","MONTH",sum(NG_QTY) NC_QTY, sum(OK_QTY) OK_QTY,sum(CHECK_QTY) CHECK_QTY,round(sum(OK_QTY)*100/sum(DISPATCH_QTY),2)||'% ' OK_RATE FROM
+        (
+        SELECT  CASE WHEN ROW_NUMBER() OVER(PARTITION BY zit.sfc ,zit.OPERATION,zit.STEP_ID ORDER BY zit.CREATED_DATE_TIME DESC)=1 AND zit."RESULT"='OK' THEN 0
+        WHEN ROW_NUMBER() OVER(PARTITION BY zit.sfc ,zit.OPERATION,zit.STEP_ID ORDER BY zit.CREATED_DATE_TIME DESC)=1 AND zit."RESULT"='NG' THEN TO_NUMBER(zab.NC_QTY)
+        ELSE 0 END NG_QTY , TO_CHAR(zit.CREATED_DATE_TIME,'YYYY-MM') "MONTH",
+        CASE WHEN ROW_NUMBER() OVER(PARTITION BY zit.sfc ,zit.OPERATION,zit.STEP_ID ORDER BY zit.CREATED_DATE_TIME DESC)=1 AND zit."RESULT"='OK' THEN zsd.DISPATCH_QTY
+        WHEN ROW_NUMBER() OVER(PARTITION BY zit.sfc ,zit.OPERATION,zit.STEP_ID ORDER BY zit.CREATED_DATE_TIME DESC)=1 AND zit."RESULT"='NG' THEN 0
+        ELSE 0 END OK_QTY,CS1.VALUE "SECTION"
+        ,ZSD.DISPATCH_QTY,
+        ROW_NUMBER() OVER(PARTITION BY zit.sfc ,zit.OPERATION,zit.STEP_ID ORDER BY zit.CREATED_DATE_TIME DESC) seq,
+        zit."RESULT",COUNT(ZIT.HANDLE) check_qty, zit.sfc ,zit.OPERATION,zit.STEP_ID FROM Z_INSPECTION_TASK zit
+        JOIN RESRCE R ON zit.SITE = R.SITE AND R.RESRCE = zit.RESRCE
+        LEFT JOIN CUSTOM_FIELDS CS1 ON CS1.HANDLE = R.HANDLE AND CS1.ATTRIBUTE = 'SECTION'
+        JOIN sfc S ON  S.SFC=zit.SFC AND  s.SITE=zit.SITE
+        JOIN Z_SFC_DISPATCH ZSD ON  ZSD.SFC=zit.SFC AND  ZSD.SITE=zit.SITE AND zit.STEP_ID=ZSD.STEP_ID
+        JOIN WORK_CENTER WC ON WC.SITE = zit.SITE AND WC.WORK_CENTER = zit.WORK_CENTER
+        LEFT JOIN WORK_CENTER_T WT ON WT.WORK_CENTER_BO = WC.HANDLE AND WT.LOCALE = 'zh'
+        LEFT JOIN Z_ABNORMAL_BILL ZAB ON zit.SFC=ZAB.SFC AND zit.SITE=ZAB.SITE AND zit.STEP_ID=ZAB.STEP_ID AND zab."TYPE"='Z'
+        WHERE  zit.SITE= #{site}  AND (zit.CATEGORY='P' OR zit.CATEGORY='S') AND zit.STATUS='COMPLETE'
+        <if test="section != null and section != ''" >
+            AND CS1.VALUE = #{section}
+        </if>
+        <if test="startFromDate != null and startFromDate != ''" >
+            AND TO_CHAR(zit.CREATED_DATE_TIME,'YYYY-MM') >=#{startFromDate}
+        </if>
+        <if test="startToDate != null and startToDate != ''" >
+            AND TO_CHAR(zit.CREATED_DATE_TIME,'YYYY-MM') &lt;= #{startToDate}
+        </if>
+        GROUP BY zit."RESULT",zit.sfc ,zit.OPERATION,zit.STEP_ID, zit.CREATED_DATE_TIME,zit.RESRCE,zab.NC_QTY,ZSD.DISPATCH_QTY,CS1.VALUE
+        ) GROUP BY  "MONTH","SECTION"
+        ORDER BY "SECTION","MONTH"
+    </select>
 </mapper>
\ No newline at end of file

From 48d2a894b62075149e0c983b77c068649d762c00 Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Thu, 9 Sep 2021 15:36:38 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=AE=BE=E5=A4=87dnc=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E3=80=81=E6=95=85=E9=9A=9C=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equip/controller/ResourceStatusReceiveController.java       | 2 --
 1 file changed, 2 deletions(-)

diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceStatusReceiveController.java b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceStatusReceiveController.java
index c3bcde88..4931b428 100644
--- a/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceStatusReceiveController.java
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceStatusReceiveController.java
@@ -2,7 +2,6 @@ package com.foreverwin.mesnac.equip.controller;
 
 import com.foreverwin.modular.core.util.R;
 import com.foreverwin.modular.core.util.FrontPage;
-import com.foreverwin.modular.core.util.CommonMethods;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -71,7 +70,6 @@ public class ResourceStatusReceiveController {
                 .or().like(ResourceStatusReceive::getSite, frontPage.getGlobalQuery())
                 .or().like(ResourceStatusReceive::getResrce, frontPage.getGlobalQuery())
                 .or().like(ResourceStatusReceive::getStatus, frontPage.getGlobalQuery())
-                .or().like(ResourceStatusReceive::getChangeStatus, frontPage.getGlobalQuery())
                 .or().like(ResourceStatusReceive::getCreateUser, frontPage.getGlobalQuery())
                 .or().like(ResourceStatusReceive::getModifyUser, frontPage.getGlobalQuery())
     );