From 7564ef74fc34e12f1bded6576438ed7e4028b9ab Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 27 Aug 2021 16:36:19 +0800
Subject: [PATCH 01/60] =?UTF-8?q?=E6=88=91=E6=94=B6=E5=88=B0=E7=9A=84sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mapper/epmetmessage/InfoProfileDao.xml | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetmessage/InfoProfileDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetmessage/InfoProfileDao.xml
index 8c31bdcbb8..f93f3198d7 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetmessage/InfoProfileDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetmessage/InfoProfileDao.xml
@@ -75,9 +75,9 @@
SELECT
ir.INFO_ID,
ip.content,
- ii.CREATED_TIME,
+ ip.CREATED_TIME,
ir.READ_FLAG,
- ii.publish_staff_id,
+ ip.publish_staff_id,
ip.first_att_id,
ia.ATTACHMENT_NAME AS name,
ia.ATTACHMENT_FORMAT AS format,
@@ -91,18 +91,20 @@
end) as duration
FROM
info_receivers ir
- INNER JOIN info ii ON ( ir.INFO_ID = ii.ID )
- INNER JOIN info_profile ip ON ( ii.ID = ip.INFO_ID AND ip.DEL_FLAG = '0' )
+
+ INNER JOIN info ii ON ( ir.INFO_ID = ii.ID )
+
+ INNER JOIN info_profile ip ON ( ir.INFO_ID = ip.INFO_ID AND ip.DEL_FLAG = '0' )
LEFT JOIN info_att ia on ( ip.first_att_id = ia.id AND ia.DEL_FLAG = '0' )
WHERE
ir.DEL_FLAG = '0'
- AND ii.DEL_FLAG = '0'
AND ir.STAFF_ID = #{userId}
+ AND ii.DEL_FLAG = '0'
and ii.content like concat('%',trim(#{content}),'%')
ORDER BY
- ii.CREATED_TIME DESC
+ ip.CREATED_TIME DESC
+
+
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformCustomerRegisterDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformCustomerRegisterDao.xml
index 9ab368a8bc..66d039fc3c 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformCustomerRegisterDao.xml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ThirdplatformCustomerRegisterDao.xml
@@ -36,6 +36,20 @@
and DEL_FLAG = 0
+
+
+
insert into thirdplatform_customer_register
(
diff --git a/epmet-openapi/epmet-openapi-sdk/pom.xml b/epmet-openapi/epmet-openapi-sdk/pom.xml
new file mode 100644
index 0000000000..c006c05b10
--- /dev/null
+++ b/epmet-openapi/epmet-openapi-sdk/pom.xml
@@ -0,0 +1,15 @@
+
+
+
+ epmet-openapi
+ com.epmet
+ 2.0.0
+
+ 4.0.0
+
+ epmet-openapi-sdk
+
+
+
\ No newline at end of file
diff --git a/epmet-openapi/epmet-openapi-sdk/src/main/java/com/epmet/openapi/sdk/encrypt/Md5Util.java b/epmet-openapi/epmet-openapi-sdk/src/main/java/com/epmet/openapi/sdk/encrypt/Md5Util.java
new file mode 100644
index 0000000000..0838048629
--- /dev/null
+++ b/epmet-openapi/epmet-openapi-sdk/src/main/java/com/epmet/openapi/sdk/encrypt/Md5Util.java
@@ -0,0 +1,133 @@
+package com.epmet.openapi.sdk.encrypt;
+
+import java.io.UnsupportedEncodingException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+public class Md5Util {
+ /**
+ * 加密盐 值
+ */
+ public static final String SALT = "EPMET_UMD_SALT";
+
+ public static String md5(String string) throws Exception {
+ if (string == null || string.trim().length() == 0) {
+ return null;
+ }
+ return getMD5(string.getBytes("GBK"));
+ }
+
+ private static final char hexDigits[] = { // 用来将字节转换成 16 进制表示的字符
+ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
+
+ private static String getMD5(byte[] source) throws Exception {
+ String s = null;
+ MessageDigest md = MessageDigest.getInstance("MD5");
+ md.update(source);
+ byte tmp[] = md.digest(); // MD5 的计算结果是一个 128 位的长整数，
+ // 用字节表示就是 16 个字节
+ char str[] = new char[16 * 2]; // 每个字节用 16 进制表示的话，使用两个字符，
+ // 所以表示成 16 进制需要 32 个字符
+ int k = 0; // 表示转换结果中对应的字符位置
+ for (int i = 0; i < 16; i++) { // 从第一个字节开始，对 MD5 的每一个字节
+ // 转换成 16 进制字符的转换
+ byte byte0 = tmp[i]; // 取第 i 个字节
+ str[k++] = hexDigits[byte0 >>> 4 & 0xf]; // 取字节中高 4 位的数字转换,
+ // >>> 为逻辑右移，将符号位一起右移
+ str[k++] = hexDigits[byte0 & 0xf]; // 取字节中低 4 位的数字转换
+ }
+ s = new String(str); // 换后的结果转换为字符串
+ return s;
+ }
+
+ private static String byteArrayToHexString(byte b[]) {
+ StringBuffer resultSb = new StringBuffer();
+ for (int i = 0; i < b.length; i++)
+ resultSb.append(byteToHexString(b[i]));
+
+ return resultSb.toString();
+ }
+
+ private static String byteToHexString(byte b) {
+ int n = b;
+ if (n < 0)
+ n += 256;
+ int d1 = n / 16;
+ int d2 = n % 16;
+ return hexDigits[d1] + "" + hexDigits[d2];
+ }
+
+ public static String MD5Encode(String origin, String charsetname) throws Exception {
+ String resultString = null;
+ resultString = new String(origin);
+ MessageDigest md = MessageDigest.getInstance("MD5");
+ if (charsetname == null || "".equals(charsetname))
+ resultString = byteArrayToHexString(md.digest(resultString
+ .getBytes()));
+ else
+ resultString = byteArrayToHexString(md.digest(resultString
+ .getBytes(charsetname)));
+ return resultString;
+ }
+
+
+ public static void main(String[] args) {
+ for (int i = 0; i < 5; i++) {
+ String uuid = "03a1dcd8cb1811eabac1c03fd56f7847";
+ System.out.println(get12Char(uuid));
+ }
+ }
+
+ /**
+ * 获取短字符
+ *
+ * @param str
+ * @return 大写
+ */
+ public static String get12Char(String str) {
+ String arr[] = ShortText(str);
+ String rst = (arr[0] + arr[1]).toUpperCase();
+ return rst.substring(0, 4) + rst.substring(4, 8) + rst.substring(8, 12);
+ }
+
+ private static String[] ShortText(String string) {
+ String[] chars = new String[]{ // 要使用生成URL的字符
+ "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n",
+ "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z",
+ "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B",
+ "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N",
+ "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"};
+
+ String hex = "";
+
+ MessageDigest md = null;
+ try {
+ md = MessageDigest.getInstance("MD5");
+ hex = byteArrayToHexString(md.digest(SALT.concat(string)
+ .getBytes("utf-8")));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ int hexLen = hex.length();
+ int subHexLen = hexLen / 8;
+ String[] ShortStr = new String[4];
+
+ for (int i = 0; i < subHexLen; i++) {
+ String outChars = "";
+ int j = i + 1;
+ String subHex = hex.substring(i * 8, j * 8);
+ long idx = Long.valueOf("3FFFFFFF", 16) & Long.valueOf(subHex, 16);
+
+ for (int k = 0; k < 6; k++) {
+ int index = (int) (Long.valueOf("0000003D", 16) & idx);
+ outChars += chars[index];
+ idx = idx >> 5;
+ }
+ ShortStr[i] = outChars;
+ }
+
+ return ShortStr;
+ }
+
+}
diff --git a/epmet-openapi/epmet-openapi-sdk/src/main/java/com/epmet/openapi/sdk/sign/OpenApiSignUtils.java b/epmet-openapi/epmet-openapi-sdk/src/main/java/com/epmet/openapi/sdk/sign/OpenApiSignUtils.java
new file mode 100644
index 0000000000..e44b17aa30
--- /dev/null
+++ b/epmet-openapi/epmet-openapi-sdk/src/main/java/com/epmet/openapi/sdk/sign/OpenApiSignUtils.java
@@ -0,0 +1,109 @@
+package com.epmet.openapi.sdk.sign;
+
+import com.epmet.openapi.sdk.encrypt.Md5Util;
+
+import java.util.*;
+
+/**
+ * OpenApi签名工具
+ */
+public class OpenApiSignUtils {
+
+ /**
+ * @Description 创建签名
+ * @return
+ * @author wxz
+ * @date 2021.03.22 16:47
+ */
+ public static String createSign(Map contentMap, String signKey) throws Exception {
+ String str2beSigned = mapToSignStr(contentMap);
+ str2beSigned = str2beSigned.concat("&sign_key=").concat(signKey);
+ return Md5Util.md5(str2beSigned);
+ }
+
+ /**
+ * @Description 验签
+ * @return
+ * @author wxz
+ * @date 2021.03.22 16:51
+ */
+ public static boolean checkSign(Map contentMap, String signKey) throws Exception {
+ String newSign = createSign(contentMap, signKey);
+ return newSign.equals(contentMap.get("sign"));
+ }
+
+ /**
+ * @Description map转化为签名明文
+ * @return
+ * @author wxz
+ * @date 2021.03.22 16:47
+ */
+ public static String mapToSignStr(Map map) {
+ Set keySet = map.keySet();
+ String[] keyArray = (String[])keySet.toArray(new String[keySet.size()]);
+ Arrays.sort(keyArray);
+ StringBuilder sb = new StringBuilder();
+
+ for(int i = 0; i < keyArray.length; ++i) {
+ String key = keyArray[i];
+ String val = (String)map.get(key);
+ if (val != null && val.trim().length() > 0 && !"sign".equals(key)) {
+ if (!sb.toString().isEmpty()) {
+ sb.append("&");
+ }
+
+ sb.append(key).append("=").append((String)map.get(key));
+ }
+ }
+
+ return sb.toString();
+ }
+
+ public static void main(String[] args) throws Exception {
+ generateGetAccessTokenSign();
+ System.out.println("==============");
+ generateGetOrgDetailSign();
+ }
+
+ private static void generateGetAccessTokenSign() throws Exception {
+ long now = System.currentTimeMillis();
+ System.out.println(now);
+
+ String uuid = UUID.randomUUID().toString().replace("-", "");
+
+ HashMap content = new HashMap<>();
+ content.put("app_id", "7d98b8af2d05752b4225709c4cfd4bd0");
+ content.put("timestamp", String.valueOf(now));
+ content.put("nonce", uuid);
+ content.put("auth_type", "take_token");
+
+ String secret = "3209ee9f41704482be1a1fb5873a25376f2899191ca846119d44168316bc3e44";
+
+ String sign = createSign(content, secret);
+
+ System.out.println("时间戳:" + now);
+ System.out.println("随机数:" + uuid);
+ System.out.println("签名：" + sign);
+ }
+
+ private static void generateGetOrgDetailSign() throws Exception {
+ long now = System.currentTimeMillis();
+ String uuid = UUID.randomUUID().toString().replace("-", "");;
+ System.out.println("时间戳:" + now);
+ System.out.println("随机数:" + uuid);
+
+ HashMap content = new HashMap<>();
+ //content.put("orgId", "aaa");
+ //content.put("test", null);
+ content.put("gridId", "12128e0f614f1c00a058ea9a107033b2");
+ content.put("app_id", "7d98b8af2d05752b4225709c4cfd4bd0");
+ content.put("timestamp", String.valueOf(now));
+ content.put("nonce", uuid);
+ content.put("auth_type", "take_token");
+
+ String secret = "3209ee9f41704482be1a1fb5873a25376f2899191ca846119d44168316bc3e44";
+
+ String sign = createSign(content, secret);
+ System.out.println("签名：" + sign);
+ }
+}
diff --git a/epmet-openapi/pom.xml b/epmet-openapi/pom.xml
index 9db62073f3..a3be582a53 100644
--- a/epmet-openapi/pom.xml
+++ b/epmet-openapi/pom.xml
@@ -13,6 +13,7 @@
epmet-openapi
epmet-openapi-scan
+ epmet-openapi-sdk
\ No newline at end of file
From 2557b58325b51fbdbcc61a4c8e6bcfe53451d044 Mon Sep 17 00:00:00 2001
From: wxz
Date: Tue, 31 Aug 2021 22:21:44 +0800
Subject: [PATCH 20/60] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=8F=90=E4=BA=A4?=
=?UTF-8?q?=EF=BC=9A=E6=BC=8F=E4=BA=86openapi-sdk=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
epmet-module/epmet-third/epmet-third-server/pom.xml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml
index bd811cf03e..a945beb046 100644
--- a/epmet-module/epmet-third/epmet-third-server/pom.xml
+++ b/epmet-module/epmet-third/epmet-third-server/pom.xml
@@ -21,6 +21,11 @@
+
+ com.epmet
+ epmet-openapi-sdk
+ 2.0.0
+
com.epmet
epmet-third-client
From 8df605b3cdf2cfb0e11233506db7d1d8b6f2e529 Mon Sep 17 00:00:00 2001
From: zhaoqifeng
Date: Wed, 1 Sep 2021 09:56:55 +0800
Subject: [PATCH 21/60] =?UTF-8?q?=E5=85=9A=E5=91=98=E8=AE=A4=E8=AF=81bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../partymember/service/impl/PartyMemberConfirmServiceImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
index 80cc4cc91e..1610de67c6 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
@@ -193,7 +193,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
PartymemberInfoEntity.class);
PartymemberInfoDTO info = partymemberInfoService.getPartyMemberInfoByUser(partyMemberInfoDTO.getCustomerId(), partyMemberInfoDTO.getUserId());
if (null != info) {
- partyMemberInfoDTO.setId(info.getId());
+ partyMemberInfoEntity.setId(info.getId());
}
if (confirmAutoDTO == null || !confirmAutoDTO.getComparisonResults()) {
log.info("submit confirmAutoDTO return null or false:{}",JSON.toJSONString(confirmAutoDTO));
From bdc0ab6e20a0e7915cdfade6d75dd716a3e6eeeb Mon Sep 17 00:00:00 2001
From: jianjun
Date: Fri, 3 Sep 2021 10:32:01 +0800
Subject: [PATCH 22/60] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E4=BD=9C?=
=?UTF-8?q?=E5=AE=9E=E5=86=B5=E6=97=A5=E6=9C=9Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../datastats/impl/DataStatsServiceImpl.java | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index 6a8896618d..868a97eda4 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -1,5 +1,6 @@
package com.epmet.dataaggre.service.datastats.impl;
+ import com.alibaba.fastjson.JSON;
import com.epmet.commons.dynamic.datasource.annotation.DataSource;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.constant.StrConstant;
@@ -1487,26 +1488,25 @@ public class DataStatsServiceImpl implements DataStatsService {
}
String startDate = null;
String actulStartDate = null;
- String endDate = null;
+ String endDate = formDTO.getDateId();
Date dateIdDate = DateUtils.parse(formDTO.getDateId(), DateUtils.DATE_PATTERN_YYYYMMDD);
boolean isYesterday = DateUtils.getBeforeNDay(1,DateUtils.DATE_PATTERN_YYYYMMDD).equals(formDTO.getDateId());
switch (formDTO.getType()){
case "yesterday":
startDate = DateUtils.getBeforeNDay(formDTO.getDateId(),1);
- endDate = formDTO.getDateId();
actulStartDate = formDTO.getDateId();
break;
case "thisWeek":
- actulStartDate = DateUtils.getWeekStart(formDTO.getDateId());
- startDate = DateUtils.getBeforeNDay(actulStartDate,1);
- DateUtils.format(DateUtils.addDateDays(yesterday, -1),DateUtils.DATE_PATTERN_YYYYMMDD);
+ startDate = DateUtils.getWeekStart(formDTO.getDateId());
+ //startDate = DateUtils.getBeforeNDay(actulStartDate,1);
+ //DateUtils.format(DateUtils.addDateDays(yesterday, -1),DateUtils.DATE_PATTERN_YYYYMMDD);
if (!isYesterday){
endDate = DateUtils.getWeekEnd(formDTO.getDateId());
}
break;
case "thisMonth":
- actulStartDate = DateUtils.format(DateUtils.getMonthStart(dateIdDate),DateUtils.DATE_PATTERN_YYYYMMDD);
- startDate = DateUtils.getBeforeNDay(actulStartDate,1);
+ startDate = DateUtils.format(DateUtils.getMonthStart(dateIdDate),DateUtils.DATE_PATTERN_YYYYMMDD);
+ //startDate = DateUtils.getBeforeNDay(actulStartDate,1);
if (!isYesterday) {
endDate = DateUtils.format(DateUtils.getMonthEnd(dateIdDate), DateUtils.DATE_PATTERN_YYYYMMDD);
}
@@ -1516,6 +1516,7 @@ public class DataStatsServiceImpl implements DataStatsService {
}
formDTO.setStartDateId(startDate);
formDTO.setEndDateId(endDate);
+ log.info("getSubWorkFact do select param:{}", JSON.toJSONString(formDTO));
List result = new ArrayList<>();
//如果是社区 则下级是网格 查询网格的数据
if (OrgLevelEnum.COMMUNITY.getCode().equals(formDTO.getAgencyLevel())){
From d657ee22cc0d894b02b78309e9ed799fa11127b3 Mon Sep 17 00:00:00 2001
From: jianjun
Date: Wed, 1 Sep 2021 12:33:23 +0800
Subject: [PATCH 23/60] =?UTF-8?q?=E5=86=8D=E6=AC=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/datastats/impl/DataStatsServiceImpl.java | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index 4667a7b99c..411be35b77 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -1489,26 +1489,22 @@ public class DataStatsServiceImpl implements DataStatsService {
formDTO.setDateId(format.format(yesterday));
}
String startDate = null;
- String actulStartDate = null;
String endDate = formDTO.getDateId();
Date dateIdDate = DateUtils.parse(formDTO.getDateId(), DateUtils.DATE_PATTERN_YYYYMMDD);
boolean isYesterday = DateUtils.getBeforeNDay(1,DateUtils.DATE_PATTERN_YYYYMMDD).equals(formDTO.getDateId());
switch (formDTO.getType()){
case "yesterday":
startDate = DateUtils.getBeforeNDay(formDTO.getDateId(),1);
- actulStartDate = formDTO.getDateId();
+ endDate = formDTO.getDateId();
break;
case "thisWeek":
startDate = DateUtils.getWeekStart(formDTO.getDateId());
- //startDate = DateUtils.getBeforeNDay(actulStartDate,1);
- //DateUtils.format(DateUtils.addDateDays(yesterday, -1),DateUtils.DATE_PATTERN_YYYYMMDD);
if (!isYesterday){
endDate = DateUtils.getWeekEnd(formDTO.getDateId());
}
break;
case "thisMonth":
startDate = DateUtils.format(DateUtils.getMonthStart(dateIdDate),DateUtils.DATE_PATTERN_YYYYMMDD);
- //startDate = DateUtils.getBeforeNDay(actulStartDate,1);
if (!isYesterday) {
endDate = DateUtils.format(DateUtils.getMonthEnd(dateIdDate), DateUtils.DATE_PATTERN_YYYYMMDD);
}
@@ -1544,7 +1540,7 @@ public class DataStatsServiceImpl implements DataStatsService {
Map closeProjectStartMap = closeProjectStart.stream().collect(Collectors.toMap(SubGridProjectResultDTO::getGridId, SubGridProjectResultDTO::getClosedProjectTotal, (o1, o2) -> o1));
Map closeProjectEndMap = closeProjectEnd.stream().collect(Collectors.toMap(SubGridProjectResultDTO::getGridId, SubGridProjectResultDTO::getClosedProjectTotal, (o1, o2) -> o1));
//巡查次数和时间
- List patrolList = statsStaffPatrolRecordDailyService.getPatrolSumList(gridIdList,actulStartDate,formDTO.getEndDateId());
+ List patrolList = statsStaffPatrolRecordDailyService.getPatrolSumList(gridIdList,formDTO.getStartDateId(),formDTO.getEndDateId());
Map patrolListMap = patrolList.stream().collect(Collectors.toMap(PatrolDailySumResult::getFullAgencyId, o -> o, (o1, o2) -> o1));
subAgencyList.forEach(agency->{
@@ -1585,7 +1581,7 @@ public class DataStatsServiceImpl implements DataStatsService {
Map closeProjectEndMap = closeProjectEnd.stream().collect(Collectors.toMap(SubAgencyProjectResultDTO::getAgencyId, SubAgencyProjectResultDTO::getClosedProjectTotal, (o1, o2) -> o1));
//巡查次数和时间
List agencyFullIds = subAgencyList.stream().map(o -> o.getPids().concat(StrConstant.COLON).concat(o.getAgencyId())).collect(Collectors.toList());
- List patrolList = statsStaffPatrolRecordDailyService.getPatrolSumList(agencyFullIds,actulStartDate,formDTO.getEndDateId());
+ List patrolList = statsStaffPatrolRecordDailyService.getPatrolSumList(agencyFullIds,formDTO.getStartDateId(),formDTO.getEndDateId());
Map patrolListMap = patrolList.stream().collect(Collectors.toMap(PatrolDailySumResult::getFullAgencyId, o -> o, (o1, o2) -> o1));
subAgencyList.forEach(agency->{
From 65d8cbcd1911a5294c3185047baa5f75f401242f Mon Sep 17 00:00:00 2001
From: jianjun
Date: Wed, 1 Sep 2021 12:57:43 +0800
Subject: [PATCH 24/60] =?UTF-8?q?=E5=80=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/datastats/impl/DataStatsServiceImpl.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index 411be35b77..443b33c2fa 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -1599,7 +1599,9 @@ public class DataStatsServiceImpl implements DataStatsService {
});
}
- List newResult = result.stream().sorted(Comparator.comparing(o -> o.getTopicToIssueTotal() + o.getIssueToProjectTotal() + o.getClosedProjectTotal() + o.getPatrolTotal())).collect(Collectors.toList());
+ List newResult = result.stream().sorted(Comparator.comparing(o -> o.getTopicToIssueTotal() + o.getIssueToProjectTotal() + o.getClosedProjectTotal() + o.getPatrolTotal()))
+ .collect(Collectors.toList());
+ Collections.reverse(newResult);
return newResult;
}
From 59f134ef5455499dabe283e71fd438f0bb62255c Mon Sep 17 00:00:00 2001
From: jianjun
Date: Wed, 1 Sep 2021 13:22:04 +0800
Subject: [PATCH 25/60] =?UTF-8?q?=E3=80=82=E3=80=82=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../dataaggre/service/datastats/impl/DataStatsServiceImpl.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/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index 443b33c2fa..748ba3cf82 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -1494,7 +1494,7 @@ public class DataStatsServiceImpl implements DataStatsService {
boolean isYesterday = DateUtils.getBeforeNDay(1,DateUtils.DATE_PATTERN_YYYYMMDD).equals(formDTO.getDateId());
switch (formDTO.getType()){
case "yesterday":
- startDate = DateUtils.getBeforeNDay(formDTO.getDateId(),1);
+ startDate = formDTO.getDateId();
endDate = formDTO.getDateId();
break;
case "thisWeek":
From b1c45ef5582c8ab927daebf73314e97e5a98ea8e Mon Sep 17 00:00:00 2001
From: sunyuchao
Date: Wed, 1 Sep 2021 13:35:12 +0800
Subject: [PATCH 26/60] =?UTF-8?q?sql=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/resources/mapper/epmetuser/CustomerStaffDao.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml
index 9b5da74efb..cc2f8dab8b 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml
@@ -96,10 +96,10 @@
'grid_manager'
- , sr.created_time DESC
+ , sr.created_time DESC
) t
GROUP BY t.staff_id
- ORDER BY t.is_first ]]> 1
+ ORDER BY t.is_first ]]> 1, t.staff_id desc
LIMIT #{pageNo}, #{pageSize}
From 7e1a228191be6d82720882bd5d035ff09e5f7dcc Mon Sep 17 00:00:00 2001
From: jianjun
Date: Wed, 1 Sep 2021 13:38:39 +0800
Subject: [PATCH 27/60] =?UTF-8?q?=E5=B7=AE=E5=80=BC=20=E5=B7=AE=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../datastats/impl/DataStatsServiceImpl.java | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index 748ba3cf82..eef006470e 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -1490,21 +1490,25 @@ public class DataStatsServiceImpl implements DataStatsService {
}
String startDate = null;
String endDate = formDTO.getDateId();
+ String breforeStartDate = null;
Date dateIdDate = DateUtils.parse(formDTO.getDateId(), DateUtils.DATE_PATTERN_YYYYMMDD);
boolean isYesterday = DateUtils.getBeforeNDay(1,DateUtils.DATE_PATTERN_YYYYMMDD).equals(formDTO.getDateId());
switch (formDTO.getType()){
case "yesterday":
startDate = formDTO.getDateId();
+ breforeStartDate = startDate = DateUtils.getBeforeNDay(startDate,1);
endDate = formDTO.getDateId();
break;
case "thisWeek":
startDate = DateUtils.getWeekStart(formDTO.getDateId());
+ breforeStartDate = startDate = DateUtils.getBeforeNDay(startDate,1);
if (!isYesterday){
endDate = DateUtils.getWeekEnd(formDTO.getDateId());
}
break;
case "thisMonth":
startDate = DateUtils.format(DateUtils.getMonthStart(dateIdDate),DateUtils.DATE_PATTERN_YYYYMMDD);
+ breforeStartDate = startDate = DateUtils.getBeforeNDay(startDate,1);
if (!isYesterday) {
endDate = DateUtils.format(DateUtils.getMonthEnd(dateIdDate), DateUtils.DATE_PATTERN_YYYYMMDD);
}
@@ -1525,17 +1529,17 @@ public class DataStatsServiceImpl implements DataStatsService {
}
List gridIdList = subAgencyList.stream().map(ScreenCustomerGridDTO::getGridId).collect(Collectors.toList());
//查询组织的话题转议题数据
- List toIssueStart = dataStatsDao.getSubGridTopicShiftIssue(gridIdList, formDTO.getStartDateId());
+ List toIssueStart = dataStatsDao.getSubGridTopicShiftIssue(gridIdList, breforeStartDate);
List toIssueEnd = dataStatsDao.getSubGridTopicShiftIssue(gridIdList, formDTO.getEndDateId());
Map toIssueStartMap = toIssueStart.stream().collect(Collectors.toMap(SubGridFormDTO.Topic::getGridId, SubGridFormDTO.Topic::getShiftedIssueTotal, (o1, o2) -> o1));
Map toIssueEndMap = toIssueEnd.stream().collect(Collectors.toMap(SubGridFormDTO.Topic::getGridId, SubGridFormDTO.Topic::getShiftedIssueTotal, (o1, o2) -> o1));
//查询组织的议题转项目数据
- List toProjectStart = dataStatsDao.getSubGridIssue(gridIdList, formDTO.getStartDateId());
+ List toProjectStart = dataStatsDao.getSubGridIssue(gridIdList, breforeStartDate);
List toProjectEnd = dataStatsDao.getSubGridIssue(gridIdList, formDTO.getEndDateId());
Map toProjectStartMap = toProjectStart.stream().collect(Collectors.toMap(SubGridIssueResultDTO::getGridId, SubGridIssueResultDTO::getShiftProjectTotal, (o1, o2) -> o1));
Map toProjectEndMap = toProjectEnd.stream().collect(Collectors.toMap(SubGridIssueResultDTO::getGridId, SubGridIssueResultDTO::getShiftProjectTotal, (o1, o2) -> o1));
//查询组织已关闭的项目数据
- List closeProjectStart = dataStatsDao.getSubGridProject(gridIdList, formDTO.getStartDateId());
+ List closeProjectStart = dataStatsDao.getSubGridProject(gridIdList, breforeStartDate);
List closeProjectEnd = dataStatsDao.getSubGridProject(gridIdList, formDTO.getEndDateId());
Map closeProjectStartMap = closeProjectStart.stream().collect(Collectors.toMap(SubGridProjectResultDTO::getGridId, SubGridProjectResultDTO::getClosedProjectTotal, (o1, o2) -> o1));
Map closeProjectEndMap = closeProjectEnd.stream().collect(Collectors.toMap(SubGridProjectResultDTO::getGridId, SubGridProjectResultDTO::getClosedProjectTotal, (o1, o2) -> o1));
@@ -1565,23 +1569,23 @@ public class DataStatsServiceImpl implements DataStatsService {
List agencyList = subAgencyList.stream().map(ScreenCustomerAgencyDTO::getAgencyId).collect(Collectors.toList());
//查询组织的话题转议题数据
- List toIssueStart = dataStatsDao.getSubAgencyTopicShiftIssue(agencyList, formDTO.getStartDateId());
+ List toIssueStart = dataStatsDao.getSubAgencyTopicShiftIssue(agencyList, breforeStartDate);
List toIssueEnd = dataStatsDao.getSubAgencyTopicShiftIssue(agencyList, formDTO.getEndDateId());
Map toIssueStartMap = toIssueStart.stream().collect(Collectors.toMap(SubAgencyFormDTO.Topic::getAgencyId, SubAgencyFormDTO.Topic::getShiftedIssueTotal, (o1, o2) -> o1));
Map toIssueEndMap = toIssueEnd.stream().collect(Collectors.toMap(SubAgencyFormDTO.Topic::getAgencyId, SubAgencyFormDTO.Topic::getShiftedIssueTotal, (o1, o2) -> o1));
//查询组织的议题转项目数据
- List toProjectStart = dataStatsDao.getSubAgencyIssue(agencyList, formDTO.getStartDateId());
+ List toProjectStart = dataStatsDao.getSubAgencyIssue(agencyList, breforeStartDate);
List toProjectEnd = dataStatsDao.getSubAgencyIssue(agencyList, formDTO.getEndDateId());
Map toProjectStartMap = toProjectStart.stream().collect(Collectors.toMap(SubAgencyIssueResultDTO::getAgencyId, SubAgencyIssueResultDTO::getShiftProjectTotal, (o1, o2) -> o1));
Map toProjectEndMap = toProjectEnd.stream().collect(Collectors.toMap(SubAgencyIssueResultDTO::getAgencyId, SubAgencyIssueResultDTO::getShiftProjectTotal, (o1, o2) -> o1));
//查询组织已关闭的项目数据
- List closeProjectStart = dataStatsDao.getSubAgencyProject(agencyList, formDTO.getStartDateId());
+ List closeProjectStart = dataStatsDao.getSubAgencyProject(agencyList, breforeStartDate);
List closeProjectEnd = dataStatsDao.getSubAgencyProject(agencyList, formDTO.getEndDateId());
Map closeProjectStartMap = closeProjectStart.stream().collect(Collectors.toMap(SubAgencyProjectResultDTO::getAgencyId, SubAgencyProjectResultDTO::getClosedProjectTotal, (o1, o2) -> o1));
Map closeProjectEndMap = closeProjectEnd.stream().collect(Collectors.toMap(SubAgencyProjectResultDTO::getAgencyId, SubAgencyProjectResultDTO::getClosedProjectTotal, (o1, o2) -> o1));
//巡查次数和时间
List agencyFullIds = subAgencyList.stream().map(o -> o.getPids().concat(StrConstant.COLON).concat(o.getAgencyId())).collect(Collectors.toList());
- List patrolList = statsStaffPatrolRecordDailyService.getPatrolSumList(agencyFullIds,formDTO.getStartDateId(),formDTO.getEndDateId());
+ List patrolList = statsStaffPatrolRecordDailyService.getPatrolSumList(agencyFullIds,breforeStartDate,formDTO.getEndDateId());
Map patrolListMap = patrolList.stream().collect(Collectors.toMap(PatrolDailySumResult::getFullAgencyId, o -> o, (o1, o2) -> o1));
subAgencyList.forEach(agency->{
From a574ef5683d1cf0c1cd1746ae7b94a71365d1f0c Mon Sep 17 00:00:00 2001
From: jianjun
Date: Wed, 1 Sep 2021 13:40:25 +0800
Subject: [PATCH 28/60] =?UTF-8?q?=E5=B7=AE=E5=80=BC=20=E5=B7=AE=E5=80=BC?=
=?UTF-8?q?=20=E4=BB=A3=E7=A0=81=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/datastats/impl/DataStatsServiceImpl.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index eef006470e..1002b8c34a 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -1490,25 +1490,21 @@ public class DataStatsServiceImpl implements DataStatsService {
}
String startDate = null;
String endDate = formDTO.getDateId();
- String breforeStartDate = null;
Date dateIdDate = DateUtils.parse(formDTO.getDateId(), DateUtils.DATE_PATTERN_YYYYMMDD);
boolean isYesterday = DateUtils.getBeforeNDay(1,DateUtils.DATE_PATTERN_YYYYMMDD).equals(formDTO.getDateId());
switch (formDTO.getType()){
case "yesterday":
startDate = formDTO.getDateId();
- breforeStartDate = startDate = DateUtils.getBeforeNDay(startDate,1);
endDate = formDTO.getDateId();
break;
case "thisWeek":
startDate = DateUtils.getWeekStart(formDTO.getDateId());
- breforeStartDate = startDate = DateUtils.getBeforeNDay(startDate,1);
if (!isYesterday){
endDate = DateUtils.getWeekEnd(formDTO.getDateId());
}
break;
case "thisMonth":
startDate = DateUtils.format(DateUtils.getMonthStart(dateIdDate),DateUtils.DATE_PATTERN_YYYYMMDD);
- breforeStartDate = startDate = DateUtils.getBeforeNDay(startDate,1);
if (!isYesterday) {
endDate = DateUtils.format(DateUtils.getMonthEnd(dateIdDate), DateUtils.DATE_PATTERN_YYYYMMDD);
}
@@ -1517,6 +1513,7 @@ public class DataStatsServiceImpl implements DataStatsService {
log.warn("===========");
}
formDTO.setStartDateId(startDate);
+ String breforeStartDate = DateUtils.getBeforeNDay(formDTO.getStartDateId(),1);
formDTO.setEndDateId(endDate);
log.info("getSubWorkFact do select param:{}", JSON.toJSONString(formDTO));
List result = new ArrayList<>();
From 23936ab7437da2e0535cd926c4ec5d4b28c374d0 Mon Sep 17 00:00:00 2001
From: sunyuchao
Date: Wed, 1 Sep 2021 14:35:38 +0800
Subject: [PATCH 29/60] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=86=85=E6=9C=89?=
=?UTF-8?q?=E5=8D=95=E4=BD=8D=E9=A2=86=E5=AF=BC=E6=A0=87=E7=AD=BE=E7=9A=84?=
=?UTF-8?q?=E4=BA=BA=E6=8E=92=E5=9C=A8=E5=89=8D=E9=9D=A2=EF=BC=8C=E7=BD=91?=
=?UTF-8?q?=E6=A0=BC=E5=86=85=E6=9C=89=E7=BD=91=E6=A0=BC=E9=95=BF=E6=A0=87?=
=?UTF-8?q?=E7=AD=BE=E7=9A=84=E4=BA=BA=E6=8E=92=E5=9C=A8=E5=89=8D=E9=9D=A2?=
=?UTF-8?q?=EF=BC=8C=E9=83=A8=E9=97=A8=E5=86=85=E6=9C=89=E9=83=A8=E9=97=A8?=
=?UTF-8?q?=E9=A2=86=E5=AF=BC=E6=A0=87=E7=AD=BE=E7=9A=84=E4=BA=BA=E6=8E=92?=
=?UTF-8?q?=E5=9C=A8=E5=89=8D=E9=9D=A2=EF=BC=8C=E7=9B=B8=E5=90=8C=E8=81=8C?=
=?UTF-8?q?=E4=BD=8D=E5=8F=8A=E5=85=B6=E4=BB=96=E8=81=8C=E4=BD=8D=E6=8C=89?=
=?UTF-8?q?=E5=88=9B=E5=BB=BA=E9=A1=BA=E5=BA=8F=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/resources/mapper/epmetuser/CustomerStaffDao.xml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml
index cc2f8dab8b..07039eeed0 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml
@@ -60,6 +60,7 @@
SELECT DISTINCT
sr.staff_id,
+ cs.created_time,
case when gsr.role_key =
@@ -74,6 +75,7 @@
then 1 else 0 end is_first
FROM staff_role sr
+ INNER JOIN customer_staff cs ON sr.staff_id = cs.user_id
INNER JOIN gov_staff_role gsr ON sr.role_id = gsr.id AND gsr.customer_id = #{customerId}
WHERE
sr.del_flag = '0'
@@ -96,10 +98,9 @@
'grid_manager'
- , sr.created_time DESC
) t
GROUP BY t.staff_id
- ORDER BY t.is_first ]]> 1, t.staff_id desc
+ ORDER BY t.is_first ]]> 1, t.created_time desc
LIMIT #{pageNo}, #{pageSize}
From 8d08abc80c2e6d5ff3f123ac4493a806e9d7ca64 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 1 Sep 2021 15:12:11 +0800
Subject: [PATCH 30/60] =?UTF-8?q?screenProjectOrgDaily=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ScreenProjectOrgDailyServiceImpl.java | 26 ++----
.../extract/FactOriginProjectMainDailyDao.xml | 91 +++++++++----------
.../screen/ScreenProjectOrgDailyDao.xml | 2 +-
3 files changed, 48 insertions(+), 71 deletions(-)
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectOrgDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectOrgDailyServiceImpl.java
index 3a37d17a40..9fbca67078 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectOrgDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectOrgDailyServiceImpl.java
@@ -184,44 +184,30 @@ public class ScreenProjectOrgDailyServiceImpl extends BaseServiceImpl projectOrgDaily = baseDao.selectOrgProjectByAgency(agencyInfos, dateId);
if (CollectionUtils.isEmpty(projectOrgDaily)){
log.info(String.format(PingYinConstants.SELECT_GRID_INFO_BY_ORG_IS_NULL,customerId));
return;
}
log.info(projectOrgDaily.toString());
- List createProjects = disposeCreateProject(agencyInfos, dateId);
+ agencyInfos = disposeCreateProject(agencyInfos, dateId);
agencyInfos.forEach(a -> {
a.setDateId(dateId);
projectOrgDaily.forEach(p -> {
if (a.getAreaCode().equals(p.getAreaCode())){
- a.setResolvedRatio(getRatio(p.getResolvedNum(),p.getProjectTotal()));
- a.setBadRatio(getRatio(p.getBadTotal(),p.getEvaluateTotal()));
- a.setGoodRatio(getRatio(p.getGoodTotal(),p.getEvaluateTotal()));
- a.setBadTotal(p.getBadTotal());
- a.setEvaluateTotal(p.getEvaluateTotal());
- a.setGoodTotal(p.getGoodTotal());
- a.setProjectTotal(p.getProjectTotal());
- a.setResolvedNum(p.getResolvedNum());
- }
- });
- });
- agencyInfos.forEach(a -> {
- createProjects.forEach(p -> {
- if (a.getOrgId().equals(p.getOrgId())){
a.setBadTotal(p.getBadTotal() + a.getBadTotal());
a.setEvaluateTotal(p.getEvaluateTotal() + a.getEvaluateTotal());
a.setGoodTotal(p.getGoodTotal() + a.getGoodTotal());
a.setProjectTotal(p.getProjectTotal() + a.getProjectTotal());
a.setResolvedNum(p.getResolvedNum() + a.getResolvedNum());
- a.setResolvedRatio(getRatio(a.getResolvedNum(),a.getProjectTotal()));
- a.setBadRatio(getRatio(a.getBadTotal(),a.getEvaluateTotal()));
- a.setGoodRatio(getRatio(a.getGoodTotal(),a.getEvaluateTotal()));
+ a.setResolvedRatio(getRatio(p.getResolvedNum(),p.getProjectTotal()));
+ a.setBadRatio(getRatio(p.getBadTotal(),p.getEvaluateTotal()));
+ a.setGoodRatio(getRatio(p.getGoodTotal(),p.getEvaluateTotal()));
}
});
});
log.info(agencyInfos.toString());
- del(customerId, dateId);
insert(agencyInfos,customerId,dateId);
}
@@ -239,6 +225,7 @@ public class ScreenProjectOrgDailyServiceImpl extends BaseServiceImpl projectOrgDaily = baseDao.selectOrgProject(agencyInfos, dateId);
if (CollectionUtils.isEmpty(projectOrgDaily)){
log.info(String.format(PingYinConstants.SELECT_GRID_INFO_BY_ORG_IS_NULL,customerId));
@@ -278,7 +265,6 @@ public class ScreenProjectOrgDailyServiceImpl extends BaseServiceImpl
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectOrgDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectOrgDailyDao.xml
index 0700977462..841526476b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectOrgDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectOrgDailyDao.xml
@@ -138,7 +138,7 @@
FROM screen_project_grid_daily g
LEFT JOIN screen_customer_grid cg ON cg.GRID_ID = g.GRID_ID
WHERE g.DEL_FLAG = 0
- AND cg.PARENT_AGENCY_ID = #{a.orgId}
+ AND cg.ALL_PARENT_IDS LIKE CONCAT('%',#{a.orgId},'%')
AND g.DATE_ID #{dateId}
From 7d2ccc1906362aaff3e3b47b16397591d3100300 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 2 Sep 2021 09:51:42 +0800
Subject: [PATCH 31/60] =?UTF-8?q?selectMonthPieChart=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../resources/mapper/screen/ScreenIndexDataMonthlyDao.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
index 43d30e9193..7b641de992 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
@@ -6,9 +6,9 @@