Merge remote-tracking branch 'origin/dev_party_mange' into dev_party_mange

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/IcPartyMemberFromDTO.java

@@ -81,4 +81,5 @@ public class IcPartyMemberFromDTO extends PageFormDTO implements Serializable {
      */
     private String payEndDate;
     private String year;
+    private String month;
 }

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java

@@ -124,4 +124,7 @@ public interface ResiPartyMemberOpenFeignClient {
      */
     @PostMapping("/resi/partymember/icPartyMember/icPartyMemberSync")
     Result icPartyMemberSync(@RequestBody IcPartyMemberDTO dto);
+
+    @PostMapping("/resi/partymember/icPartyMember/getPartyMemberByIdCard")
+    Result<IcPartyMemberDTO> getPartyMemberByIdCard(@RequestBody IcPartyMemberDTO dto);
 }

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java

@@ -88,4 +88,9 @@ public class ResiPartyMemberOpenFeignClientFallback implements ResiPartyMemberOp
     public Result icPartyMemberSync(IcPartyMemberDTO dto) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "icPartyMemberSync", dto);
     }
+
+    @Override
+    public Result<IcPartyMemberDTO> getPartyMemberByIdCard(IcPartyMemberDTO dto) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "getPartyMemberByIdCard", dto);
+    }
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java

@@ -23,6 +23,7 @@ import com.epmet.modules.partymember.entity.IcPartyMemberEntity;
 import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO;
 import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO;
 import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeDTO;
+import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeSubDTO;
 import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -220,7 +221,12 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl<IcPartyOrgDao, IcPart
         result.setValue(staffInfo.getAgencyId());
 //        result.setOrgPids(staffInfo.getAgencyPIds());
         result.setLabel(staffInfo.getAgencyName());
-        result.setChildren(baseDao.selectAllBranchByAgencyId(staffInfo.getAgencyId(),tokenDto.getCustomerId()));
+        //该行政组织下的所有类型为支部的党组织
+        List<BranchlistTreeSubDTO> orgList = baseDao.selectAllBranchByAgencyId(staffInfo.getAgencyId(),tokenDto.getCustomerId());
+        if(CollectionUtils.isEmpty(orgList)){
+            return new Result<List<BranchlistTreeDTO>>().ok(resultList);
+        }
+        result.setChildren(orgList);
         resultList.add(result);
         return new Result<List<BranchlistTreeDTO>>().ok(resultList);
     }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java

@@ -112,6 +112,12 @@ public class IcPartyMemberController implements ResultDataResolver {
         return new Result();
     }
 
+    @PostMapping("getPartyMemberByIdCard")
+    public Result<IcPartyMemberDTO> getPartyMemberByIdCard(@RequestBody IcPartyMemberDTO dto){
+        IcPartyMemberDTO result = icPartyMemberService.getPartyMemberByIdCard(dto);
+        return new Result<IcPartyMemberDTO>().ok(result);
+    }
+
     @NoRepeatSubmit
     @PostMapping("export")
     public void export(@LoginUser TokenDto tokenDto, @RequestBody IcPartyMemberFromDTO formDTO, HttpServletResponse response) throws Exception {

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java

@@ -85,6 +85,16 @@ public interface IcPartyMemberService extends BaseService<IcPartyMemberEntity> {
      */
     void delete(String[] ids);
 
+    /**
+     * 根据身份证获取党员信息
+     *
+     * @Param dto
+     * @Return {@link IcPartyMemberDTO}
+     * @Author zhaoqifeng
+     * @Date 2022/6/9 10:07
+     */
+    IcPartyMemberDTO getPartyMemberByIdCard(IcPartyMemberDTO dto);
+
     /**
      * 党员信息同步
      *

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

@@ -121,7 +121,9 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl<IcPartyMemberDao,
             formDTO.setPartyOrgId(org.getId());
         }
         formDTO.setCustomerId(tokenDto.getCustomerId());
-        formDTO.setYear(DateUtils.format(new Date(), DateUtils.DATE_PATTERN_YYYY));
+        String date = DateUtils.format(new Date(), DateUtils.DATE_PATTERN_YYYYMM);
+        formDTO.setYear(date.substring(0, 4));
+        formDTO.setMonth(date.substring(4, 6));
         PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage());
         List<IcPartyMemberResultDTO> list = baseDao.selectList(formDTO);
 
@@ -331,6 +333,24 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl<IcPartyMemberDao,
         icPartyMemberPointDao.delete(pointWrapper);
     }
 
+    /**
+     * 根据身份证获取党员信息
+     *
+     * @param dto
+     * @Param dto
+     * @Return {@link IcPartyMemberDTO}
+     * @Author zhaoqifeng
+     * @Date 2022/6/9 10:07
+     */
+    @Override
+    public IcPartyMemberDTO getPartyMemberByIdCard(IcPartyMemberDTO dto) {
+        LambdaQueryWrapper<IcPartyMemberEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(IcPartyMemberEntity::getCustomerId, dto.getCustomerId());
+        wrapper.eq(IcPartyMemberEntity::getIdCard, dto.getIdCard());
+        IcPartyMemberEntity partyMember = baseDao.selectOne(wrapper);
+        return  ConvertUtils.sourceToTarget(partyMember, IcPartyMemberDTO.class);
+    }
+
     /**
      * 党员信息同步
      *

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

@@ -51,7 +51,7 @@
             a.LDZH,
             a.PARTY_ZW,
             a.ADDRESS,
-            IF( b.PAY_DATE IS NULL, 0, 1 ) AS isPay,
+            IF( e.MONEY IS NULL, 0, 1 ) AS isPay,
             b.PAY_DATE,
             a.CULTURE,
             a.TOTAL_SCORE AS point,
@@ -73,6 +73,8 @@
             AND b.CUSTOMER_ID = #{customerId}
             INNER JOIN ic_party_org d ON a.SSZB = d.ID
             AND d.DEL_FLAG = 0
+            LEFT JOIN ic_party_member_pay_record_detail e ON a.ID = e.PARTY_MEMBER_ID
+            AND e.DEL_FLAG = 0 AND e.`YEAR` = #{year} AND e.`MONTH` = #{month}
         WHERE
             a.DEL_FLAG = 0
             AND a.CUSTOMER_ID = #{customerId}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserRoleResultDTO.java

@@ -1,5 +1,6 @@
 package com.epmet.dto.result;
 
+import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,4 +17,10 @@ public class IcUserRoleResultDTO implements Serializable  {
      * 是否是志愿者0否，1是
      */
     private String isVolunteer;
+    /**
+     * 是否是党员0否，1是
+     */
+    private String isPartyMember;
+
+    private IcPartyMemberDTO partyMemberInfo;
 }

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

@@ -2238,6 +2238,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     public IcUserRoleResultDTO getUserRoleByIdCard(IcResiUserDTO formDTO) {
         IcUserRoleResultDTO result = new IcUserRoleResultDTO();
         result.setIsVolunteer(NumConstant.ZERO_STR);
+        result.setIsPartyMember(NumConstant.ZERO_STR);
         //根据身份证获取小程序端居民信息
         LambdaQueryWrapper<UserBaseInfoEntity> baseInfoWrapper = new LambdaQueryWrapper<>();
         baseInfoWrapper.eq(UserBaseInfoEntity::getCustomerId, formDTO.getCustomerId());
@@ -2257,7 +2258,15 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 }
             }
         }
-
+        //获取党员信息
+        com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO memberFormDTO = new com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO();
+        memberFormDTO.setCustomerId(formDTO.getCustomerId());
+        memberFormDTO.setIdCard(formDTO.getIdCard());
+        Result<com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO> memberInfoResult = resiPartyMemberOpenFeignClient.getPartyMemberByIdCard(memberFormDTO);
+        if (memberInfoResult.success() && null != memberInfoResult.getData()) {
+            result.setIsPartyMember(NumConstant.ONE_STR);
+            result.setPartyMemberInfo(memberInfoResult.getData());
+        }
         return result;
     }