【功能优化】党员学历统计增加其他分类

code/smart-community/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java

@@ -30,6 +30,7 @@ import com.epmet.dto.form.IcPartyMemberListFormDTO;
 import com.epmet.dto.result.PartyMemberAgeResultDTO;
 import com.epmet.dto.result.PartyMemberEducationResultDTO;
 import com.epmet.dto.result.UploadImgResultDTO;
+import com.epmet.dto.result.resi.ResiPortrayalResultDTO;
 import com.epmet.feign.*;
 import com.epmet.modules.partyOrg.dao.IcPartyOrgDao;
 import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity;
@@ -407,9 +408,18 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl<IcPartyMemberDao,
             map = list.stream().collect(Collectors.toMap(OptionDataResultDTO::getCode, OptionDataResultDTO::getValue));
             total = list.stream().mapToInt(item -> Integer.parseInt(item.getValue())).sum();
         }
+
+        /**
+         * 构造”其他“编码
+         */
+        DictListResultDTO otherDic = new DictListResultDTO();
+        otherDic.setLabel("其他");
+        otherDic.setValue(null);
+        dictResult.getData().add(otherDic);
+
         Map<String, String> finalMap = map;
         int finalTotal = total;
-        return dictResult.getData().stream().map(item -> {
+        List<OptionDataResultDTO> optionDataResultDTOS = dictResult.getData().stream().map(item -> {
             OptionDataResultDTO dto = new OptionDataResultDTO();
             dto.setCode(item.getValue());
             dto.setLabel(item.getLabel());
@@ -424,6 +434,8 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl<IcPartyMemberDao,
             dto.setRadio(radio.stripTrailingZeros().toPlainString().concat("%"));
             return dto;
         }).collect(Collectors.toList());
+
+        return optionDataResultDTOS;
     }
 
     @Override

code/smart-community/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml

@@ -147,8 +147,8 @@
             ic_party_member
         WHERE
             DEL_FLAG = '0'
-        AND CULTURE IS NOT NULL
-        AND CULTURE != ''
+--         AND CULTURE IS NOT NULL
+--         AND CULTURE != ''
         <choose>
             <when test='orgId != "" and orgId != null'>
                 AND (SSZB = #{orgId} OR ORG_PIDS LIKE CONCAT('%',#{orgId},'%'))