支部管理v3

epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/DeletePartyMemberFormDTO.java

@@ -0,0 +1,31 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 删除党员入参DTO
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/18 18:05
+ */
+@Data
+public class DeletePartyMemberFormDTO implements Serializable {
+    private static final long serialVersionUID = 2325963253025239121L;
+
+    public interface AddUserInternalGroup {}
+    /**
+     * 党员id
+     */
+    @NotBlank(message = "党员id不能为空",groups = {PartyMemberIdFormDTO.AddUserInternalGroup.class})
+    private String partyMemberId;
+
+    /**
+     * 党支部id
+     */
+    @NotBlank(message = "党支部id不能为空",groups = {PartyMemberIdFormDTO.AddUserInternalGroup.class})
+    private String partyBranchId;
+
+}

epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyMemberIdFormDTO.java

@@ -0,0 +1,24 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 党员id
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/18 14:48
+ */
+@Data
+public class PartyMemberIdFormDTO implements Serializable {
+    private static final long serialVersionUID = 3088195909670495675L;
+
+    public interface AddUserInternalGroup {}
+    /**
+     * 党员id
+     */
+    @NotBlank(message = "党员id不能为空",groups = {AddUserInternalGroup.class})
+    private String partyMemberId;
+}

epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyMemberInfoDetailResultDTO.java

@@ -0,0 +1,60 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 党员信息详情返参DTO
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/18 15:19
+ */
+@Data
+public class PartyMemberInfoDetailResultDTO implements Serializable {
+    private static final long serialVersionUID = -4887670791276512339L;
+    /**
+     * 党员id
+     */
+    private String partyMemberId;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 1男2女0未知
+     */
+    private String gender;
+
+    /**
+     * true已激活，false未激活
+     */
+    private Boolean status;
+
+    /**
+     * 返回：账号于2019年10月31日在海泊桥社区-第一网格激活
+     */
+    private String activeDesc;
+
+    /**
+     * 党支部名称（机关-网格-支部名）
+     */
+    private String partyBranchName;
+
+    /**
+     * 党支部id
+     */
+    private String partyBranchId;
+}

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/PartyBranchManageController.java

@@ -141,4 +141,31 @@ public class PartyBranchManageController {
         partyMemberIdResultDTO.setPartyMemberId(partyBranchManageService.editPartyMember(formDTO));
         return new Result<PartyMemberIdResultDTO>().ok(partyMemberIdResultDTO);
     }
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.PartyMemberInfoDetailResultDTO>
+     * @param formDTO
+     * @author yinzuomei
+     * @description 10、党员详情
+     * @Date 2020/6/18 15:25
+     **/
+    @PostMapping("/partymember/detail")
+    public Result<PartyMemberInfoDetailResultDTO> queryPartyMemberDetail(@RequestBody PartyMemberIdFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, PartyMemberIdFormDTO.AddUserInternalGroup.class);
+        return new Result<PartyMemberInfoDetailResultDTO>().ok(partyBranchManageService.queryPartyMemberDetail(formDTO.getPartyMemberId()));
+    }
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result
+     * @param deletePartyMemberFormDTO
+     * @author yinzuomei
+     * @description 删除党员
+     * @Date 2020/6/18 17:51
+     **/
+    @PostMapping("partymember/delete")
+    public Result  deletePartyMember(@RequestBody DeletePartyMemberFormDTO deletePartyMemberFormDTO){
+        ValidatorUtils.validateEntity(deletePartyMemberFormDTO, DeletePartyMemberFormDTO.AddUserInternalGroup.class);
+        partyBranchManageService.deletePartyMember(deletePartyMemberFormDTO);
+        return new Result();
+    }
 }

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

@@ -1,13 +1,7 @@
 package com.epmet.service;
 
-import com.epmet.dto.form.PartyBranchAddFormDTO;
-import com.epmet.dto.form.PartyBranchEditFormDTO;
-import com.epmet.dto.form.PartyBranchListFormDTO;
-import com.epmet.dto.form.SaveOrUpdateParyMemberFormDTO;
-import com.epmet.dto.result.PartyBranchAddResultDTO;
-import com.epmet.dto.result.PartyBranchInfoResultDTO;
-import com.epmet.dto.result.PartyBranchListResultDTO;
-import com.epmet.dto.result.PartyMemberInfoResultDTO;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.*;
 
 import java.util.List;
 
@@ -89,4 +83,22 @@ public interface PartyBranchManageService {
      * @Date 2020/6/17 23:29 
      **/
     String editPartyMember(SaveOrUpdateParyMemberFormDTO formDTO);
+
+    /**
+     * @param partyMemberId
+     * @return com.epmet.dto.result.PartyMemberInfoDetailResultDTO
+     * @author yinzuomei
+     * @description 10、党员详情：根据党员id查询党员详情
+     * @Date 2020/6/18 15:25
+     **/
+    PartyMemberInfoDetailResultDTO queryPartyMemberDetail(String partyMemberId);
+
+    /**
+     * @return void
+     * @param deletePartyMemberFormDTO
+     * @author yinzuomei
+     * @description 删除党员
+     * @Date 2020/6/18 17:51 
+     **/
+    void deletePartyMember(DeletePartyMemberFormDTO deletePartyMemberFormDTO);
 }

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

@@ -10,7 +10,9 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO;
+import com.epmet.resi.partymember.dto.partymember.form.DelPartyMemberBaseInfoFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.PartyMemberBaseInfoAddFormDTO;
+import com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDetailResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.PartymemberBaseInfoResultDTO;
 import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient;
 import com.epmet.service.PartyBranchManageService;
@@ -167,6 +169,39 @@ public class PartyBranchManageServiceImpl implements PartyBranchManageService {
         }
     }
 
+    @Override
+    public PartyMemberInfoDetailResultDTO queryPartyMemberDetail(String partyMemberId) {
+        PartyMemberInfoDetailResultDTO partyMemberInfoDetailResultDTO=new PartyMemberInfoDetailResultDTO();
+        Result<PartyMemberBaseInfoDetailResultDTO> partyMemberResult=resiPartyMemberOpenFeignClient.queryPartyMemberBaseInfoById(partyMemberId);
+        if(partyMemberResult.success()&&null!=partyMemberResult.getData()){
+            partyMemberInfoDetailResultDTO=ConvertUtils.sourceToTarget(partyMemberResult.getData(),PartyMemberInfoDetailResultDTO.class);
+            Result<CustomerPartyBranchDTO> partyBranchDTOResult=govOrgOpenFeignClient.getPartyBranchById(partyMemberResult.getData().getPartyBranchId());
+            if(partyBranchDTOResult.success()){
+                String agencyName=partyBranchDTOResult.getData().getAgencyName();
+                String gridName=partyBranchDTOResult.getData().getGridName();
+                String branchName=partyBranchDTOResult.getData().getPartyBranchName();
+                partyMemberInfoDetailResultDTO.setPartyBranchName(String.format("%s-%s-%s",agencyName,gridName,branchName));
+            }else{
+                logger.error("党员详情查询异常");
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public void deletePartyMember(DeletePartyMemberFormDTO deletePartyMemberFormDTO) {
+        DelPartyMemberBaseInfoFormDTO formDTO = ConvertUtils.sourceToTarget(deletePartyMemberFormDTO, DelPartyMemberBaseInfoFormDTO.class);
+        Result result = resiPartyMemberOpenFeignClient.deltePartyMemberBaseInfo(formDTO);
+        if (!result.success()) {
+            throw new RenException(result.getCode());
+        }
+        //党支部总人数-1
+        Result decrResult = govOrgOpenFeignClient.decrPartyBranchMember(deletePartyMemberFormDTO.getPartyBranchId());
+        if (decrResult.success()) {
+            logger.info("删除党员成功,党支部总人数已-1");
+        }
+    }
+
     private PartyMemberBaseInfoAddFormDTO getPartyMemberBaseInfoAddFormDTO(SaveOrUpdateParyMemberFormDTO formDTO,
                                                                            CustomerPartyBranchDTO customerPartyBranchDTO) {
         PartyMemberBaseInfoAddFormDTO partyMemberBaseInfoAddFormDTO=new PartyMemberBaseInfoAddFormDTO();

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerPartyBranchDTO.java

@@ -94,6 +94,11 @@ public class CustomerPartyBranchDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 网格名称
+     */
+	private String gridName;
+
     /**
      * 网格所属机关id
      */

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java

@@ -121,4 +121,14 @@ public interface GovOrgOpenFeignClient {
      **/
     @GetMapping("/gov/org/customergrid/getGridInfo/{gridId}")
     Result<GridInfoResultDTO> queryGridInfo(@PathVariable("gridId") String gridId);
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result
+     * @param partyBranchId
+     * @author yinzuomei
+     * @description 党支部宗人数-1
+     * @Date 2020/6/18 18:28
+     **/
+    @GetMapping(value = "gov/org/customerpartybranch/decrPartyBranchMember/{partyBranchId}")
+    Result decrPartyBranchMember(@PathVariable("partyBranchId") String partyBranchId);
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java

@@ -72,4 +72,9 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
     public Result<GridInfoResultDTO> queryGridInfo(String gridId) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getGridInfo",gridId);
     }
+
+    @Override
+    public Result decrPartyBranchMember(String partyBranchId) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "decrPartyBranchMember",partyBranchId);
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerPartyBranchController.java

@@ -116,4 +116,17 @@ public class CustomerPartyBranchController {
         ValidatorUtils.validateEntity(formDTO);
         return new Result<List<ListPartyBranchResultDTO>>().ok(customerPartyBranchService.listpartybranch(formDTO));
     }
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result
+     * @param partyBranchId
+     * @author yinzuomei
+     * @description 党支部人数-1
+     * @Date 2020/6/18 18:31
+     **/
+    @GetMapping("decrPartyBranchMember/{partyBranchId}")
+    public Result decrPartyBranchMember(@PathVariable("partyBranchId") String partyBranchId){
+        customerPartyBranchService.decrPartyBranchMember(partyBranchId);
+        return new Result();
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerPartyBranchDao.java

@@ -35,4 +35,7 @@ import java.util.List;
 public interface CustomerPartyBranchDao extends BaseDao<CustomerPartyBranchEntity> {
     //根据客户id、网格id查询党支部列表
     List<ListPartyBranchResultDTO> selectListPartyBranchResultDTO(ListPartyBranchFormDTO formDTO);
+
+    //党支部人数-1
+    int decrPartyBranchMember(String partyBranchId);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerPartyBranchService.java

@@ -103,4 +103,13 @@ public interface CustomerPartyBranchService extends BaseService<CustomerPartyBra
      * @Date 2020/6/17 16:33
      **/
     List<ListPartyBranchResultDTO> listpartybranch(ListPartyBranchFormDTO formDTO);
+
+    /**
+     * @return void
+     * @param partyBranchId
+     * @author yinzuomei
+     * @description 党支部人数-1
+     * @Date 2020/6/18 18:31
+     **/
+    void decrPartyBranchMember(String partyBranchId);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerPartyBranchServiceImpl.java

@@ -91,6 +91,7 @@ public class CustomerPartyBranchServiceImpl extends BaseServiceImpl<CustomerPart
         if(null!=customerPartyBranchDTO){
             CustomerGridDTO customerGridDTO=customerGridService.get(entity.getGridId());
             if(null!=customerGridDTO){
+                customerPartyBranchDTO.setGridName(customerGridDTO.getGridName());
                 CustomerAgencyDTO customerAgencyDTO=customerAgencyService.get(customerGridDTO.getPid());
                 if(null!=customerAgencyDTO){
                     customerPartyBranchDTO.setAgencyId(customerAgencyDTO.getId());
@@ -128,4 +129,9 @@ public class CustomerPartyBranchServiceImpl extends BaseServiceImpl<CustomerPart
         return baseDao.selectListPartyBranchResultDTO(formDTO);
     }
 
+    @Override
+    public void decrPartyBranchMember(String partyBranchId) {
+        baseDao.decrPartyBranchMember(partyBranchId);
+    }
+
 }

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerPartyBranchDao.xml

@@ -33,4 +33,12 @@
             ORDER BY
                 CREATED_TIME DESC
     </select>
+    <!-- 党支部人数-1 -->
+    <update id="decrPartyBranchMember" parameterType="java.lang.String">
+        UPDATE customer_party_branch
+        SET TOTAL_PARTY_MEMBER = TOTAL_PARTY_MEMBER - 1
+        WHERE
+            id = #{partyBranchId}
+            AND DEL_FLAG = '0'
+    </update>
 </mapper>

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java

@@ -105,7 +105,6 @@ public class ArticleController {
      * @date 2020/6/2 16:50
      **/
     @PostMapping("oprationlist")
-    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTY_VOICE_OPERATION_LIST)
     public Result<List<ArticleOperationResultDTO>> operationList(@RequestBody ArticleOperationFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, ArticleOperationFormDTO.AddUserInternalGroup.class);
         List<ArticleOperationResultDTO> list =
@@ -121,7 +120,6 @@ public class ArticleController {
      * @date 2020/6/3 9:44
      **/
     @PostMapping("articledetail")
-    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTY_VOICE_DETAIL)
     public Result<GovArticleDetailResultDTO> articleDetail(@RequestBody GovArticleDetailFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, GovArticleDetailFormDTO.AddUserInternalGroup.class);
         GovArticleDetailResultDTO articleDetail = articleService.queryGovArticleDetail(formDTO.getArticleId());

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

@@ -0,0 +1,31 @@
+package com.epmet.resi.partymember.dto.partymember.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 删除党员入参DTO
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/18 18:09
+ */
+@Data
+public class DelPartyMemberBaseInfoFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 2735219691600150687L;
+    public interface AddUserInternalGroup {}
+
+    /**
+     * 党员id
+     */
+    @NotBlank(message = "党员id不能为空",groups = {DelPartyMemberBaseInfoFormDTO.AddUserInternalGroup.class})
+    private String partyMemberId;
+
+    /**
+     * 党支部id
+     */
+    @NotBlank(message = "党支部id不能为空",groups = {DelPartyMemberBaseInfoFormDTO.AddUserInternalGroup.class})
+    private String partyBranchId;
+}

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartyMemberBaseInfoDetailResultDTO.java

@@ -0,0 +1,56 @@
+package com.epmet.resi.partymember.dto.partymember.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 党员详情返参DTO
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/18 15:31
+ */
+@Data
+public class PartyMemberBaseInfoDetailResultDTO implements Serializable {
+    private static final long serialVersionUID = -1416472090639851835L;
+
+    /**
+     * 党员id
+     */
+    private String partyMemberId;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 1男2女0未知
+     */
+    private String gender;
+
+    /**
+     * true已激活，false未激活
+     */
+    private Boolean status;
+
+    /**
+     * 返回：账号于2019年10月31日在海泊桥社区-第一网格激活
+     */
+    private String activeDesc;
+
+    /**
+     * 党支部id
+     */
+    private String partyBranchId;
+}

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

@@ -3,7 +3,9 @@ package com.epmet.resi.partymember.feign;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO;
+import com.epmet.resi.partymember.dto.partymember.form.DelPartyMemberBaseInfoFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.PartyMemberBaseInfoAddFormDTO;
+import com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDetailResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.PartymemberBaseInfoResultDTO;
 import com.epmet.resi.partymember.feign.fallback.ResiPartyMemberOpenFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -48,6 +50,26 @@ public interface ResiPartyMemberOpenFeignClient {
      * @description 根据党支部id,查询党员列表
      * @Date 2020/6/18 10:12
      **/
-    @GetMapping(value = "resi/partymember/partymemberbaseinfo/listPartyMemberBaseInfo/{partyBranchId}")
+    @GetMapping(value = "/resi/partymember/partymemberbaseinfo/listPartyMemberBaseInfo/{partyBranchId}")
     Result<List<PartymemberBaseInfoResultDTO>> listPartyMemberBaseInfo(@PathVariable("partyBranchId") String partyBranchId);
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result
+     * @param partyMemberId 党员库id主键
+     * @author yinzuomei
+     * @description 根据党员id查询党员信息
+     * @Date 2020/6/18 15:30
+     **/
+    @GetMapping(value = "/resi/partymember/partymemberbaseinfo/queryPartyMemberBaseInfoById/{partyMemberId}")
+    Result<PartyMemberBaseInfoDetailResultDTO> queryPartyMemberBaseInfoById(@PathVariable("partyMemberId") String partyMemberId);
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result
+     * @param formDTO
+     * @author yinzuomei
+     * @description 删除党员
+     * @Date 2020/6/18 17:57
+     **/
+    @GetMapping(value = "/resi/partymember/partymemberbaseinfo/delete", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    Result deltePartyMemberBaseInfo(@RequestBody DelPartyMemberBaseInfoFormDTO formDTO);
 }

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

@@ -4,7 +4,9 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO;
+import com.epmet.resi.partymember.dto.partymember.form.DelPartyMemberBaseInfoFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.PartyMemberBaseInfoAddFormDTO;
+import com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDetailResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.PartymemberBaseInfoResultDTO;
 import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient;
 import org.springframework.stereotype.Component;
@@ -34,4 +36,14 @@ public class ResiPartyMemberOpenFeignClientFallback implements ResiPartyMemberOp
     public Result<List<PartymemberBaseInfoResultDTO>> listPartyMemberBaseInfo(String partyBranchId) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "listPartyMemberBaseInfo", partyBranchId);
     }
+
+    @Override
+    public Result<PartyMemberBaseInfoDetailResultDTO> queryPartyMemberBaseInfoById(String partyMemberId) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "queryPartyMemberBaseInfoById", partyMemberId);
+    }
+
+    @Override
+    public Result deltePartyMemberBaseInfo(DelPartyMemberBaseInfoFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "deltePartyMemberBaseInfo", formDTO);
+    }
 }

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

@@ -28,9 +28,11 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.modules.partymember.excel.PartymemberBaseInfoExcel;
 import com.epmet.modules.partymember.service.PartymemberBaseInfoService;
 import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO;
+import com.epmet.resi.partymember.dto.partymember.form.DelPartyMemberBaseInfoFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.PartyMemberBaseInfoAddFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.ReviewedParyMemberFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.UnderReviewParyMemberFormDTO;
+import com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDetailResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.PartymemberBaseInfoResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.ReviewedParyMemberResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.UnderReviewParyMemberResultDTO;
@@ -149,4 +151,28 @@ public class PartymemberBaseInfoController {
         return new Result<List<PartymemberBaseInfoResultDTO>>().ok(partymemberBaseInfoService.listPartyMemberBaseInfo(partyBranchId));
     }
 
+    /**
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDetailResultDTO>
+     * @param partyMemberId
+     * @author yinzuomei
+     * @description 根据党员库id，查询党员信息
+     * @Date 2020/6/18 17:15
+     **/
+    @GetMapping("queryPartyMemberBaseInfoById/{partyMemberId}")
+    public Result<PartyMemberBaseInfoDetailResultDTO> queryPartyMemberBaseInfoById(String partyMemberId){
+        return new Result<PartyMemberBaseInfoDetailResultDTO>().ok(partymemberBaseInfoService.queryPartyMemberBaseInfoById(partyMemberId));
+    }
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result
+     * @param formDTO
+     * @author yinzuomei
+     * @description 删除党员
+     * @Date 2020/6/18 17:45
+     **/
+    @PostMapping("delete")
+    public Result deltePartyMemberBaseInfo(@RequestBody DelPartyMemberBaseInfoFormDTO formDTO){
+        partymemberBaseInfoService.deltePartyMemberBaseInfo(formDTO);
+        return new Result();
+    }
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartyBranchMembersDao.java

@@ -20,6 +20,7 @@ package com.epmet.modules.partymember.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.modules.partymember.entity.PartyBranchMembersEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 党支部党员关系表
@@ -29,5 +30,7 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface PartyBranchMembersDao extends BaseDao<PartyBranchMembersEntity> {
-	
+    int deletePartyBranchMember(@Param("partyBranchId") String partyBranchId,
+                                @Param("partyMemberId") String partyMemberId,
+                                @Param("userId") String userId);
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberBaseInfoDao.java

@@ -22,6 +22,7 @@ import com.epmet.modules.partymember.entity.PartymemberBaseInfoEntity;
 import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
 import com.epmet.resi.partymember.dto.partymember.form.ReviewedParyMemberFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.UnderReviewParyMemberFormDTO;
+import com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDetailResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.ReviewedParyMemberResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.UnderReviewParyMemberResultDTO;
 import org.apache.ibatis.annotations.Mapper;
@@ -97,4 +98,13 @@ public interface PartymemberBaseInfoDao extends BaseDao<PartymemberBaseInfoEntit
      * @Date 2020/6/18 11:05
      **/
     List<PartymemberBaseInfoEntity> selectListPartyMemberBaseInfo(String partyBranchId);
+
+    /**
+     * @return com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDetailResultDTO
+     * @param partyMemberId
+     * @author yinzuomei
+     * @description 根据党员库id，查询党员信息
+     * @Date 2020/6/18 17:24
+     **/
+    PartyMemberBaseInfoDetailResultDTO queryPartyMemberBaseInfoById(String partyMemberId);
 }

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

@@ -24,9 +24,11 @@ import com.epmet.modules.partymember.entity.PartymemberBaseInfoEntity;
 import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO;
 import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmAutoDTO;
 import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
+import com.epmet.resi.partymember.dto.partymember.form.DelPartyMemberBaseInfoFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.PartyMemberBaseInfoAddFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.ReviewedParyMemberFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.UnderReviewParyMemberFormDTO;
+import com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDetailResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.PartymemberBaseInfoResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.ReviewedParyMemberResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.UnderReviewParyMemberResultDTO;
@@ -145,4 +147,22 @@ public interface PartymemberBaseInfoService extends BaseService<PartymemberBaseI
      * @Date 2020/6/18 10:17
      **/
     List<PartymemberBaseInfoResultDTO> listPartyMemberBaseInfo(String partyBranchId);
+
+    /**
+     * @return com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDetailResultDTO
+     * @param partyMemberId
+     * @author yinzuomei
+     * @description 根据党员库id，查询党员信息
+     * @Date 2020/6/18 17:15
+     **/
+    PartyMemberBaseInfoDetailResultDTO queryPartyMemberBaseInfoById(String partyMemberId);
+
+    /**
+     * @param formDTO
+     * @return void
+     * @author yinzuomei
+     * @description 删除党员
+     * @Date 2020/6/18 17:35
+     **/
+    void deltePartyMemberBaseInfo(DelPartyMemberBaseInfoFormDTO formDTO);
 }

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

@@ -25,6 +25,7 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.IdCardNoValidatorUtils;
@@ -35,8 +36,10 @@ import com.epmet.dto.result.GridInfoResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.feign.GovOrgFeignClient;
+import com.epmet.modules.partymember.dao.PartyBranchMembersDao;
 import com.epmet.modules.partymember.dao.PartymemberAuthRecordDao;
 import com.epmet.modules.partymember.dao.PartymemberBaseInfoDao;
+import com.epmet.modules.partymember.entity.PartymemberAuthRecordEntity;
 import com.epmet.modules.partymember.entity.PartymemberBaseInfoEntity;
 import com.epmet.modules.partymember.redis.PartymemberBaseInfoRedis;
 import com.epmet.modules.partymember.service.PartyBranchMembersService;
@@ -45,9 +48,11 @@ import com.epmet.resi.partymember.dto.partymember.PartyBranchMembersDTO;
 import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO;
 import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmAutoDTO;
 import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
+import com.epmet.resi.partymember.dto.partymember.form.DelPartyMemberBaseInfoFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.PartyMemberBaseInfoAddFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.ReviewedParyMemberFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.UnderReviewParyMemberFormDTO;
+import com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDetailResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.PartymemberBaseInfoResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.ReviewedParyMemberResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.UnderReviewParyMemberResultDTO;
@@ -81,6 +86,10 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl<PartymemberB
 	private PartyBranchMembersService partyBranchMembersService;
  	@Autowired
 	private PartymemberAuthRecordDao partymemberAuthRecordDao;
+	@Autowired
+ 	private PartyBranchMembersDao partyBranchMembersDao;
+	@Autowired
+	private LoginUserUtil loginUserUtil;
 
 	private final static String EQUAL = "11";
 	private final static int START = 0;
@@ -393,6 +402,7 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl<PartymemberB
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public String addPartyMemberBaseInfo(PartyMemberBaseInfoAddFormDTO formDTO) {
 		//校验数据
 		this.checkPartymemberBaseInfoDTO(formDTO.getIdCard(),formDTO.getMobile(),null);
@@ -423,6 +433,37 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl<PartymemberB
 		return resultDTOList;
 	}
 
+	@Override
+	public PartyMemberBaseInfoDetailResultDTO queryPartyMemberBaseInfoById(String partyMemberId) {
+		PartyMemberBaseInfoDetailResultDTO partyMemberBaseInfoDetailResultDTO = baseDao.queryPartyMemberBaseInfoById(partyMemberId);
+		if (null != partyMemberBaseInfoDetailResultDTO) {
+			//性别
+			partyMemberBaseInfoDetailResultDTO.setGender(IdCardNoValidatorUtils.getGender(partyMemberBaseInfoDetailResultDTO.getIdCard()));
+			PartymemberAuthRecordEntity entity = partymemberAuthRecordDao.selectByPartyMemberBaseInfoId(partyMemberId);
+			if (null != entity) {
+				partyMemberBaseInfoDetailResultDTO.setStatus(Boolean.TRUE);
+				partyMemberBaseInfoDetailResultDTO.setActiveDesc(entity.getAuthDesc());
+			} else {
+				partyMemberBaseInfoDetailResultDTO.setStatus(Boolean.FALSE);
+				partyMemberBaseInfoDetailResultDTO.setActiveDesc("");
+			}
+		}
+		return partyMemberBaseInfoDetailResultDTO;
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void deltePartyMemberBaseInfo(DelPartyMemberBaseInfoFormDTO formDTO) {
+		PartymemberAuthRecordEntity entity = partymemberAuthRecordDao.selectByPartyMemberBaseInfoId(formDTO.getPartyMemberId());
+		if (null != entity) {
+			throw new RenException(EpmetErrorCode.CANNOT_DELETE_PARTY_MEMBER.getCode());
+		}
+		this.deleteById(formDTO.getPartyMemberId());
+		partyBranchMembersDao.deletePartyBranchMember(formDTO.getPartyBranchId(),
+				formDTO.getPartyMemberId(),
+				loginUserUtil.getLoginUserId());
+	}
+
 	/**
 	 * 生成返回结果
 	 *

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

@@ -14,6 +14,11 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
-
-
+    <!-- 删除党员关系 -->
+    <update id="deletePartyBranchMember" parameterType="map">
+        	update party_branch_members
+            set DEL_FLAG='1',UPDATED_TIME=NOW(),UPDATED_BY=#{userId}
+            WHERE PARTYMEMBER_BASE_INFO_ID=#{partyMemberId}
+            AND BRANCH_ID=#{partyBranchId}
+    </update>
 </mapper>

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

@@ -145,4 +145,21 @@
             AND pbm.BRANCH_ID = #{partyBranchId}
         ORDER BY CONVERT (pbi.`NAME` USING gbk) ASC
     </select>
+
+    <!--    根据党员库id，查询党员信息-->
+    <select id="queryPartyMemberBaseInfoById" resultType="com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDetailResultDTO"
+        parameterType="java.lang.String">
+        SELECT
+            pbi.id AS partyMemberId,
+            pbi.`NAME`,
+            pbi.ID_CARD AS idCard,
+            pbi.MOBILE,
+            pbm.BRANCH_ID AS partyBranchId
+        FROM
+            party_branch_members pbm
+            LEFT JOIN PARTYMEMBER_BASE_INFO pbi ON ( pbm.PARTYMEMBER_BASE_INFO_ID = pbi.ID AND pbi.DEL_FLAG = '0' )
+        WHERE
+            pbm.DEL_FLAG = '0'
+            AND pbm.PARTYMEMBER_BASE_INFO_ID = #{partyMemberId}
+    </select>
 </mapper>