From 0f97b84f5eb97175175c6612cd6e47d67a9f9015 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Sat, 25 Jun 2022 08:33:31 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E3=80=90=E7=96=AB=E8=8B=97=E6=8E=A5?= =?UTF-8?q?=E7=A7=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E7=96=AB=E8=8B=97=E6=8E=A5?= =?UTF-8?q?=E7=A7=8D&&=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B=E5=85=B3?= =?UTF-8?q?=E6=B3=A8=E5=88=97=E8=A1=A8=E4=B8=AD=E6=95=B0=E6=8D=AE=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E9=97=AE=E9=A2=98=EF=BC=88=E5=9B=A0=E4=B8=BA=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=B2=A1=E5=8A=A0customerId=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=90=8C=E5=AE=A2=E6=88=B7=E4=B8=8B=E8=BA=AB?= =?UTF-8?q?=E4=BB=BD=E8=AF=81=E5=85=81=E8=AE=B8=E9=87=8D=E5=A4=8D=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/IcEpidemicSpecialAttentionDao.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml index 3c992a4132..c6249ea224 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml @@ -33,8 +33,8 @@ IFNULL((SELECT DATE_FORMAT(CREATED_TIME,'%Y-%m-%d %H:%i:%s') FROM ic_notice WHERE DEL_FLAG = '0' AND ORIGIN = #{attentionType} AND ID_CARD = a.ID_CARD ORDER BY CREATED_TIME DESC LIMIT 1),'') AS lastInformTime, IFNULL(v.vaccinationCount,0) AS vaccinationCount FROM ic_epidemic_special_attention a - LEFT JOIN ic_resi_user b ON a.id_card = b.id_card AND b.del_flag = '0' - LEFT JOIN (SELECT id_card ,count(1) AS vaccinationCount FROM ic_vaccine WHERE DEL_FLAG = 0 GROUP BY ID_CARD) v ON (v.ID_CARD = a.ID_CARD) + LEFT JOIN ic_resi_user b ON a.id_card = b.id_card AND b.del_flag = '0' and b.CUSTOMER_ID=a.CUSTOMER_ID + LEFT JOIN (SELECT id_card , CUSTOMER_ID, count(1) AS vaccinationCount FROM ic_vaccine WHERE DEL_FLAG = 0 GROUP BY ID_CARD, CUSTOMER_ID) v ON (v.ID_CARD = a.ID_CARD and v.CUSTOMER_ID=a.CUSTOMER_ID) WHERE a.DEL_FLAG = 0 AND a.ORG_ID = #{orgId} AND a.ATTENTION_TYPE = #{attentionType} @@ -79,7 +79,7 @@ b.HOME_ID, IFNULL((SELECT DATE_FORMAT(CREATED_TIME,'%Y-%m-%d %H:%i:%s') FROM ic_notice WHERE DEL_FLAG = '0' AND ORIGIN = #{attentionType} AND ID_CARD = a.ID_CARD ORDER BY CREATED_TIME DESC LIMIT 1),'') AS lastInformTime FROM ic_epidemic_special_attention a - LEFT JOIN ic_resi_user b ON a.id_card = b.id_card AND b.del_flag = '0' + LEFT JOIN ic_resi_user b ON a.id_card = b.id_card AND b.del_flag = '0' and a.CUSTOMER_ID = b.CUSTOMER_ID WHERE a.DEL_FLAG = 0 AND a.ORG_ID = #{orgId} AND a.ATTENTION_TYPE = #{attentionType} From eaf642a7ab30a555a007572a79a162f23ed42069 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 27 Jun 2022 10:06:36 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=90=84=E7=B1=BB=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=85=B3=E8=81=94=E6=97=B6=E5=8A=A0=E4=B8=8A=E5=AE=A2=E6=88=B7?= =?UTF-8?q?ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ChangeDeathDao.xml | 1 + .../src/main/resources/mapper/ChangeRelocationDao.xml | 1 + .../src/main/resources/mapper/ChangeWelfareDao.xml | 1 + 3 files changed, 3 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeDeathDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeDeathDao.xml index 8e14dc15c9..af48cfae7f 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeDeathDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeDeathDao.xml @@ -50,6 +50,7 @@ d.DEL_FLAG = '0' AND d.CUSTOMER_ID = #{customerId} + AND u.CUSTOMER_ID = #{customerId} AND d.GRID_ID = #{gridId} diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeRelocationDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeRelocationDao.xml index 1d5b39e76e..8bdf2847fe 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeRelocationDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeRelocationDao.xml @@ -74,6 +74,7 @@ r.DEL_FLAG = '0' AND r.CUSTOMER_ID = #{customerId} + AND u.CUSTOMER_ID = #{customerId} AND r.AGENCY_ID = #{gridId} diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeWelfareDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeWelfareDao.xml index e10a64a0ce..51524b85c6 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeWelfareDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeWelfareDao.xml @@ -48,6 +48,7 @@ w.DEL_FLAG = '0' AND w.CUSTOMER_ID = #{customerId} + AND u.CUSTOMER_ID = #{customerId} AND w.GRID_ID = #{gridId} From a0788727c87a032257b98df1af5ed598e2da9e99 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 27 Jun 2022 10:24:10 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=8F=AA=E6=9C=89=E7=BB=8F=E7=BA=AC?= =?UTF-8?q?=E5=BA=A6=E5=8F=96=E6=A0=B9=E7=BB=84=E7=BB=87=E7=9A=84=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E4=BF=A1=E6=81=AF=E4=B8=8D=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/CustomerGridDao.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml index e428bc42c6..7e2da08f95 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml @@ -421,7 +421,7 @@ SELECT cg.id gridId, CONCAT( - ca.organization_name, + cu.organization_name, "-", cg.grid_name ) agencyGridName, @@ -431,6 +431,7 @@ IFNULL(cg.latitude, ca.latitude) latitude FROM customer_grid cg + INNER JOIN customer_agency cu ON cu.id = cg.pid AND cu.customer_id = cg.customer_id INNER JOIN customer_agency ca ON ca.pid = '0' AND ca.customer_id = cg.customer_id WHERE cg.del_flag = '0' From cf6c6e47a35802e8e7719d55f96f2c2a47b45481 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 27 Jun 2022 17:49:11 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9scan=E6=9C=8D=E5=8A=A1loc?= =?UTF-8?q?al,dev,test=E7=9A=84=E6=97=A5=E5=BF=97=E7=BA=A7=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-openapi-scan/src/main/resources/logback-spring.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-openapi/epmet-openapi-scan/src/main/resources/logback-spring.xml b/epmet-openapi/epmet-openapi-scan/src/main/resources/logback-spring.xml index 49b85a6b0c..d30eb155a1 100644 --- a/epmet-openapi/epmet-openapi-scan/src/main/resources/logback-spring.xml +++ b/epmet-openapi/epmet-openapi-scan/src/main/resources/logback-spring.xml @@ -143,7 +143,7 @@ - + From 3306411c399a153312506c945c93c33528f48131 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 28 Jun 2022 16:25:09 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=B8=80=E4=B8=AA=E4=BA=BA=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E8=A7=92=E8=89=B2=20bug=20=E5=AF=BC=E8=87=B4=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index 55b7789e5d..3bddf8f1ed 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -641,7 +641,7 @@ public class EpmetUserServiceImpl implements EpmetUserService { } List roleList = govStaffRoleDao.getStaffRoleList(staffId); - Map roleMap = roleList.stream().collect(Collectors.toMap(StaffRoleResultDTO::getRoleKey, StaffRoleResultDTO::getRoleName)); + Map roleMap = roleList.stream().collect(Collectors.toMap(StaffRoleResultDTO::getRoleKey, StaffRoleResultDTO::getRoleName,(o1,o2)->o1)); result.setRoleMap(roleMap); //1.查询工作人员所在的网格列表