From ee09c5a9140bee3d900669415b9a48f1a3452b00 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 9 Jul 2021 11:07:50 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=99=9A=E4=B8=8A?= =?UTF-8?q?=E7=BA=BF=EF=BC=8C=E5=88=A0=E9=99=A4=E8=84=9A=E6=9C=AC=E6=89=8B?= =?UTF-8?q?=E5=8A=A8=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.13__alter_gov_staff_role.sql | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.13__alter_gov_staff_role.sql diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.13__alter_gov_staff_role.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.13__alter_gov_staff_role.sql deleted file mode 100644 index 40aed783d8..0000000000 --- a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.13__alter_gov_staff_role.sql +++ /dev/null @@ -1,9 +0,0 @@ -ALTER TABLE `gov_staff_role_template` -ADD COLUMN `DESCRIPTION` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '角色对应的职责说明' AFTER `FULL_TIME_ONLY`, -ADD COLUMN `SORT` int(11) NULL DEFAULT NULL COMMENT '排序' AFTER `DESCRIPTION`; - - -ALTER TABLE `gov_staff_role` -MODIFY COLUMN `FULL_TIME_ONLY` tinyint(1) NULL DEFAULT 1 COMMENT '是否只有全职 1对应true 0对应false' AFTER `ORG_TYPE`, -MODIFY COLUMN `SORT` int(11) NULL DEFAULT NULL COMMENT '排序' AFTER `FULL_TIME_ONLY`, -ADD COLUMN `DESCRIPTION` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '角色对应的职责说明' AFTER `FULL_TIME_ONLY`; From c5b5e9c735b369c7c2a64a90b2c21ca17e770e08 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 9 Jul 2021 14:25:54 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=BF=90=E8=90=A5=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E6=9D=83=E9=99=90=E5=92=8C=E5=AE=A2=E6=88=B7=E6=9D=83=E9=99=90?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=90=8D=E7=A7=B0=E4=BF=9D=E6=8C=81=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E6=8E=92=E5=BA=8F=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/RoleOperationDefaultDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/RoleOperationDefaultDao.xml b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/RoleOperationDefaultDao.xml index 98cd9f675b..6d45ab19f7 100755 --- a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/RoleOperationDefaultDao.xml +++ b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/RoleOperationDefaultDao.xml @@ -48,6 +48,6 @@ LEFT JOIN role_operation_default d ON (o.OPERATION_KEY = d.OPERATION_KEY AND d.DEL_FLAG = '0' AND d.ROLE_KEY = #{roleKey}) WHERE o.DEL_FLAG = '0' - ORDER BY o.OPERATION_KEY ASC + ORDER BY o.OPERATION_NAME ASC \ No newline at end of file From b65b3e2aaa0c00ba81ad1451fd0d9a369d6a1b87 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 9 Jul 2021 14:34:09 +0800 Subject: [PATCH 3/4] =?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 { + /** + * desc: 请描述类的业务用途 + * + * @param insertList + * @return java.lang.Integer + * @author LiuJanJun + * @date 2021/7/9 1:57 下午 + */ Integer insertBatch(@Param("list") List 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 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 @@ ( (SELECT REPLACE(UUID(), '-', '') AS id), + #{item.sourceType}, #{item.customerId}, + #{item.sourceCustomerId}, #{item.dateId}, #{item.weekId}, #{item.monthId}, @@ -54,11 +58,16 @@ now() ) + ON DUPLICATE KEY UPDATE + PATROL_TOTAL = values(PATROL_TOTAL), + TOTAL_TIME = values(TOTAL_TIME), + UPDATED_BY = VALUES(UPDATED_BY) - + DELETE FROM stats_staff_patrol_record_daily WHERE CUSTOMER_ID = #{customerId} AND DATE_ID = #{dateId} + AND SOURCE_TYPE = 'internal' AND GRID_ID = #{gridId} From 7024d6dd204bdbc904980d13d383d3ed568cb7aa Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 9 Jul 2021 14:50:13 +0800 Subject: [PATCH 4/4] =?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 --- .../dto/user/result/StatsStaffPatrolRecordDailyDTO.java | 5 ----- 1 file changed, 5 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 2d3001d3a6..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 @@ -54,11 +54,6 @@ public class StatsStaffPatrolRecordDailyDTO implements Serializable { */ private String sourceCustomerId; - /** - * 数据来源客户Id - */ - private String sourceCustomerId; - /** * 统计日期 关联日期dim表 */