Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java

@@ -498,13 +498,15 @@ public class GovOrgController {
                 sum.setMemberCount(sum.getMemberCount() + list.stream().mapToInt(OrgProjectDetailExcel::getMemberCount).sum());
                 sum.setProjectCount(sum.getProjectCount() + list.stream().mapToInt(OrgProjectDetailExcel::getProjectCount).sum());
                 sum.setClosedCount(sum.getClosedCount() + list.stream().mapToInt(OrgProjectDetailExcel::getClosedCount).sum());
-                sum.setProjectAve(sum.getProjectAve() + list.stream().mapToInt(OrgProjectDetailExcel::getProjectAve).sum());
-                sum.setClosedAve(sum.getClosedAve() + list.stream().mapToInt(OrgProjectDetailExcel::getClosedAve).sum());
                 excelWriter.write(list, writeSheet);
                 formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE);
             } while (org.apache.commons.collections4.CollectionUtils.isNotEmpty(page.getList()) && page.getList().size() == formDTO.getPageSize());
             sum.setIndex(i.getAndIncrement());
             sum.setOrgName("合计");
+            if (NumConstant.ZERO != sum.getMemberCount()) {
+                sum.setProjectAve(sum.getProjectCount()/sum.getMemberCount());
+                sum.setClosedAve(sum.getClosedCount()/sum.getMemberCount());
+            }
             List<OrgProjectDetailExcel> list = new ArrayList<>();
             list.add(sum);
             excelWriter.write(list, writeSheet);

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java

@@ -149,7 +149,7 @@ public class WxMaCodeServiceImpl implements WxMaCodeService {
 		}
 		JSONObject jsonObject = JSONObject.parseObject(submitResult.getData());
 		result.setErrorCode(jsonObject.getInteger(ERR_CODE));
-		result.setErrorMsg(WxMaErrorMsgEnum.findMsgByCode(jsonObject.getInteger(ERR_CODE)));
+		result.setErrorMsg(jsonObject.getString(ERR_MSG));
 		result.setData(jsonObject.getString("auditid"));
 		return result;
 	}

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java

@@ -548,6 +548,9 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                     if ((transferData = this.getResiImportTrasferData(existingResiMap, columnAndValues)) != null) {
                         newlyOrChangedResi.get().getTransferedResis().put(existingResiMap.get("ID"), transferData);
                     }
+
+                    // 因为主表会产生变更记录的，只有组织变更；其他能产生变更记录的，都在子表里面，所以此处只判断组织变更，其他类别的变更交给子表
+                    // 老年人产生变更记录，只会在新增居民的时候产生，修改居民信息不会产生，因为身份证不可变
                 } else {
                     // 新增居民
                     String resiId = IdWorker.getIdStr();
@@ -566,6 +569,11 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                             columnAndValues.get("HOME_ID"),
                             new HashMap<>());
 
+                    // 因为老年人会通过年龄计算，子sheet中不一定有这个人的信息，所以此处需要加入到变更记录中去
+                    if ("1".equals(columnAndValues.get("IS_OLD_PEOPLE"))) {
+                        categoryData.getCategories().put("IS_OLD_PEOPLE", "1");
+                    }
+
                     redisUtils.hMSet(RedisKeys.icResiImportResiCategoryKey(newlyOrChangedResi.get().getImportTag(), "add", resiId), BeanUtil.beanToMap(categoryData));
                     categoryData = null;
                 }