Merge remote-tracking branch 'origin/develop' into release_temp

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/SubAgencyIndexRankResultDTO.java

@@ -27,16 +27,19 @@ public class SubAgencyIndexRankResultDTO implements Serializable {
      * 党建能力
      */
     private Double governAbility = 0.0;
+    private Double originGovernAbility = 0.0;
 
     /**
      * 治理能力
      */
     private Double partyDevAbility = 0.0;
+    private Double originPartyDevAbility = 0.0;
 
     /**
      * 服务能力
      */
     private Double serviceAbility = 0.0;
+    private Double originServiceAbility = 0.0;
 
     private String orgId;
     private String orgType;

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml

@@ -363,6 +363,9 @@
             ROUND((ROUND(sy.govern_ablity,1) * sy.GOVERN_ABLITY_WEIGHT),1) AS governAbility,
             ROUND((ROUND(sy.party_dev_ablity,1) * sy.PARTY_DEV_WEIGHT),1) AS partyDevAbility,
             ROUND((ROUND(sy.service_ablity,1) * sy.SERVICE_ABLITY_WEIGHT),1) AS serviceAbility,
+            ROUND(sy.govern_ablity,1) AS originGovernAbility,
+            ROUND(sy.party_dev_ablity,1) AS originPartyDevAbility,
+            ROUND(sy.service_ablity,1) AS originServiceAbility,
             sy.ORG_ID as orgId,
             sca.area_code as areaCode
         FROM screen_customer_agency sca

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/PartyBranchManageServiceImpl.java

@@ -137,17 +137,14 @@ public class PartyBranchManageServiceImpl implements PartyBranchManageService {
         CustomerPartyBranchDTO customerPartyBranch = customerPartyBranchResult.getData();
         PartyMemberBaseInfoAddFormDTO partyMemberBaseInfoAddFormDTO = this.getPartyMemberBaseInfoAddFormDTO(formDTO, customerPartyBranch);
         Result<String> result = resiPartyMemberOpenFeignClient.addPartyMemberBaseInfo(partyMemberBaseInfoAddFormDTO);
+        if (!result.success() || StringUtils.isBlank(result.getData())) {
+            throw new RenException(result.getCode(), result.getMsg());
+        }
         //3、党支部总人数+1
-        if (result.success() && StringUtils.isNotBlank(result.getData())) {
-            //党支部总人数+1
-            customerPartyBranch.setTotalPartyMember(customerPartyBranch.getTotalPartyMember() + 1);
-            Result<String> updatePartyBranchResult = govOrgOpenFeignClient.updatePartyBranch(customerPartyBranch);
-            if (updatePartyBranchResult.success()) {
-                logger.info(String.format("党支部(%s)总人数+1", formDTO.getPartyBranchId()));
-            }
-        } else {
-            logger.error("添加党员异常");
-            throw new RenException(result.getCode());
+        customerPartyBranch.setTotalPartyMember(customerPartyBranch.getTotalPartyMember() + 1);
+        Result<String> updatePartyBranchResult = govOrgOpenFeignClient.updatePartyBranch(customerPartyBranch);
+        if (updatePartyBranchResult.success()) {
+            logger.info(String.format("党支部(%s)总人数+1", formDTO.getPartyBranchId()));
         }
         return result.getData();
     }