From 6bd490d4f67f9983089317db5af3aaa2940f0ecb Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Thu, 8 Jul 2021 10:52:32 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E7=BD=91?=
 =?UTF-8?q?=E6=A0=BC=E5=91=98=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=8E=92=E5=BA=8F=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/datastats/FactGridMemberStatisticsDailyDao.xml       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/FactGridMemberStatisticsDailyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/FactGridMemberStatisticsDailyDao.xml
index 6795b4cd23..835e266dd8 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/FactGridMemberStatisticsDailyDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/FactGridMemberStatisticsDailyDao.xml
@@ -98,7 +98,7 @@
             and del_flag = 0
         </where>
         group by member.staff_id, member.grid_id
-        order by ${sort} desc
+        order by ${sort} desc, convert(member.staff_name using gbk) asc, member.GRID_ID
     </select>
 
     <select id="getGridMemberIssueProjectStats"

From 83f1d5bd268481db03abb51d46383c9f3ab528ac Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Thu, 8 Jul 2021 10:53:00 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E7=BD=91?=
 =?UTF-8?q?=E6=A0=BC=E5=91=98=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=8E=92=E5=BA=8F=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/datastats/FactGridMemberStatisticsDailyDao.xml       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/FactGridMemberStatisticsDailyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/FactGridMemberStatisticsDailyDao.xml
index 835e266dd8..fdbb6fdc04 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/FactGridMemberStatisticsDailyDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/FactGridMemberStatisticsDailyDao.xml
@@ -98,7 +98,7 @@
             and del_flag = 0
         </where>
         group by member.staff_id, member.grid_id
-        order by ${sort} desc, convert(member.staff_name using gbk) asc, member.GRID_ID
+        order by ${sort} desc, convert(member.staff_name using gbk) asc, member.GRID_ID asc
     </select>
 
     <select id="getGridMemberIssueProjectStats"

From b65b3e2aaa0c00ba81ad1451fd0d9a369d6a1b87 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 9 Jul 2021 14:34:09 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=91=98=E5=B7=A1?=
 =?UTF-8?q?=E6=9F=A5=20=E9=80=82=E5=BA=94=20=E6=95=B0=E6=8D=AE=E8=9E=8D?=
 =?UTF-8?q?=E5=90=88=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../result/StatsStaffPatrolRecordDailyDTO.java | 10 ++++++++++
 .../user/StatsStaffPatrolRecordDailyDao.java   | 18 +++++++++++++++++-
 .../biz/impl/BizDataStatsServiceImpl.java      |  3 +++
 .../user/impl/StatsStaffPatrolServiceImpl.java |  2 +-
 .../user/StatsStaffPatrolRecordDailyDao.xml    | 11 ++++++++++-
 5 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/result/StatsStaffPatrolRecordDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/result/StatsStaffPatrolRecordDailyDTO.java
index ad8c156e77..64d3eb84e4 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/result/StatsStaffPatrolRecordDailyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/result/StatsStaffPatrolRecordDailyDTO.java
@@ -39,11 +39,21 @@ public class StatsStaffPatrolRecordDailyDTO implements Serializable {
      */
 	private String id;
 
+    /**
+     * 来源类型 external:外部，internal:内部
+     */
+	private String sourceType;
+
     /**
      * 客户Id
      */
 	private String customerId;
 
+	/**
+     * 来源客户Id
+     */
+	private String sourceCustomerId;
+
     /**
      * 统计日期 关联日期dim表
      */
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/user/StatsStaffPatrolRecordDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/user/StatsStaffPatrolRecordDailyDao.java
index 1a25f9cfdf..42233f31d6 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/user/StatsStaffPatrolRecordDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/user/StatsStaffPatrolRecordDailyDao.java
@@ -35,7 +35,23 @@ import java.util.List;
 @Mapper
 public interface StatsStaffPatrolRecordDailyDao extends BaseDao<StatsStaffPatrolRecordDailyEntity> {
 
+    /**
+     * desc: 请描述类的业务用途
+     *
+     * @param insertList
+     * @return java.lang.Integer
+     * @author LiuJanJun
+     * @date 2021/7/9 1:57 下午
+     */
     Integer insertBatch(@Param("list") List<StatsStaffPatrolRecordDailyDTO> insertList);
 
-    int delete(StaffPatrolStatsFormDTO formDTO);
+    /**
+     * desc: 删除内部数据
+     *
+     * @param formDTO
+     * @return int
+     * @author LiuJanJun
+     * @date 2021/7/9 2:03 下午
+     */
+    int deleteInternal(StaffPatrolStatsFormDTO formDTO);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/biz/impl/BizDataStatsServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/biz/impl/BizDataStatsServiceImpl.java
index 29cca916f7..fbeb7a391f 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/biz/impl/BizDataStatsServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/biz/impl/BizDataStatsServiceImpl.java
@@ -227,6 +227,9 @@ public class BizDataStatsServiceImpl implements BizDataStatsService {
             record.setPatrolTotal(NumConstant.ZERO);
             record.setLatestPatrolStatus("end");
             record.setReportProjectCount(NumConstant.ZERO);
+
+            record.setSourceType("internal");
+            record.setSourceCustomerId(record.getCustomerId());
             //最后巡查时间
             record.setLatestPatrolTime(null);
             if (recordDailyDTO != null) {
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/StatsStaffPatrolServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/StatsStaffPatrolServiceImpl.java
index 0da9e3eea6..b07253b001 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/StatsStaffPatrolServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/StatsStaffPatrolServiceImpl.java
@@ -32,7 +32,7 @@ public class StatsStaffPatrolServiceImpl implements StatsStaffPatrolService {
 
     @Override
     public Integer delAndInsertBatch(StaffPatrolStatsFormDTO formDTO, List<StatsStaffPatrolRecordDailyDTO> insertList) {
-        int delete = statsStaffPatrolRecordDailyDao.delete(formDTO);
+        int delete = statsStaffPatrolRecordDailyDao.deleteInternal(formDTO);
         log.debug("delAndInsertBatch delete:{},param:{}", delete, JSON.toJSONString(formDTO));
         return statsStaffPatrolRecordDailyDao.insertBatch(insertList);
     }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/StatsStaffPatrolRecordDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/StatsStaffPatrolRecordDailyDao.xml
index d3ea3d3f9a..3f6cda5d85 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/StatsStaffPatrolRecordDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/StatsStaffPatrolRecordDailyDao.xml
@@ -6,7 +6,9 @@
          insert into stats_staff_patrol_record_daily
         (
             ID,
+            SOURCE_TYPE,
             CUSTOMER_ID,
+            SOURCE_CUSTOMER_ID,
             DATE_ID,
             WEEK_ID,
             MONTH_ID,
@@ -31,7 +33,9 @@
         <foreach collection="list" item="item" separator=",">
             (
             (SELECT REPLACE(UUID(), '-', '') AS id),
+            #{item.sourceType},
             #{item.customerId},
+            #{item.sourceCustomerId},
             #{item.dateId},
             #{item.weekId},
             #{item.monthId},
@@ -54,11 +58,16 @@
             now()
             )
         </foreach>
+        ON DUPLICATE KEY UPDATE
+            PATROL_TOTAL = values(PATROL_TOTAL),
+            TOTAL_TIME = values(TOTAL_TIME),
+            UPDATED_BY = VALUES(UPDATED_BY)
     </insert>
-    <delete id="delete">
+    <delete id="deleteInternal">
         DELETE FROM stats_staff_patrol_record_daily
         WHERE CUSTOMER_ID = #{customerId}
         AND DATE_ID = #{dateId}
+        AND SOURCE_TYPE = 'internal'
         <if test="gridId != null and gridId != ''">
             AND GRID_ID = #{gridId}
         </if>