党员管理查看详情

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/PartyPostEnum.java

@@ -0,0 +1,61 @@
+package com.epmet.commons.tools.enums;
+
+import java.util.Objects;
+
+/**
+ * @author Administrator
+ */
+public enum PartyPostEnum {
+    //党员职务
+    PTDY("0", "普通党员"),
+    ZBSJ("1", "支部书记"),
+    ZBWY("2", "支部委员"),
+    DWWY("3", "党委委员"),
+
+    UN_KNOWN("8", "未知");
+
+    private String code;
+    private String name;
+
+
+    PartyPostEnum(String code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public static String getName(String code) {
+        PartyPostEnum[] partyPostEnums = values();
+        for (PartyPostEnum partyPostEnum : partyPostEnums) {
+            if (Objects.equals(partyPostEnum.getCode(), code)) {
+                return partyPostEnum.getName();
+            }
+        }
+        return PartyPostEnum.UN_KNOWN.getName();
+    }
+
+    public static String getCode(String name) {
+        PartyPostEnum[] partyPostEnums = values();
+        for (PartyPostEnum partyPostEnum : partyPostEnums) {
+            if (partyPostEnum.getName().equals(name)) {
+                return partyPostEnum.getCode();
+            }
+        }
+        return null;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -170,4 +171,12 @@ public interface OperCustomizeOpenFeignClient {
     @PostMapping("/oper/customize/icExportTemplate/getExcelHeaderAndSqlColumnForExport")
     Result<IcCustomExportResultDTO> getExcelHeaderAndSqlColumnForExport(@RequestBody IcExportTemplateQueryFormDTO param);
 
+    /**
+     * 使用item相关条件查询关联的options
+     * @param input
+     * @return
+     */
+    @PostMapping("/oper/customize/icformitemoptions/getItemConditions")
+    Result<Map<String, String>> getOptionsMap(@RequestBody IcFormOptionsQueryFormDTO input);
+
 }

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java

@@ -12,6 +12,7 @@ import com.epmet.dto.result.*;
 import com.epmet.feign.OperCustomizeOpenFeignClient;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -130,4 +131,15 @@ public class OperCustomizeOpenFeignClientFallback implements OperCustomizeOpenFe
 		return ModuleUtils.feignConError(ServiceConstant.OPER_CUSTOMIZE_SERVER, "getExcelHeaderAndSqlColumnForExport", param);
     }
 
+	/**
+	 * 使用item相关条件查询关联的options
+	 *
+	 * @param input
+	 * @return
+	 */
+	@Override
+	public Result<Map<String, String>> getOptionsMap(IcFormOptionsQueryFormDTO input) {
+		return ModuleUtils.feignConError(ServiceConstant.OPER_CUSTOMIZE_SERVER, "getOptionsMap", input);
+	}
+
 }

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemOptionsController.java

@@ -35,6 +35,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 
 /**
@@ -120,5 +121,19 @@ public class IcFormItemOptionsController {
         return new Result<List<IcFormItemOptionsDTO>>().ok(r);
     }
 
+    @PostMapping("getItemConditions")
+    public Result<Map<String, String>> getOptionsMap(@RequestBody IcFormOptionsQueryFormDTO input) {
+        ValidatorUtils.validateEntity(input, IcFormOptionsQueryFormDTO.QueryByLabelAndCustomerIdForForm.class);
+        String customerId = input.getCustomerId();
+        String formCode = input.getFormCode();
+        String columnName = input.getColumnName();
+        Integer columnNum = input.getColumnNum();
+        List<IcFormItemOptionsDTO> list = icFormItemOptionsService.getOptionsByItemConditions(customerId, formCode, columnName, columnNum);
+        Map<String, String> map = list.stream()
+                .collect(Collectors.toMap(IcFormItemOptionsDTO::getOptionValue, IcFormItemOptionsDTO::getOptionLabel, (o1, o2) -> o1));
+        return new Result<Map<String, String>>().ok(map);
+    }
+
+
 
 }

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

@@ -7,6 +7,7 @@ import lombok.Data;
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -123,7 +124,7 @@ public class IcPartyMemberDTO implements Serializable {
      * 志愿者类型,逗号隔开
      */
     private String volunteerCategory;
-    private String volunteerCategoryName;
+    private List<String> volunteerCategoryName;
     /**
      * 备注
      */

epmet-module/resi-partymember/resi-partymember-server/pom.xml

@@ -104,6 +104,18 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-admin-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>oper-customize-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -5,12 +5,19 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.enums.DictTypeEnum;
+import com.epmet.commons.tools.enums.IcFormCodeEnum;
+import com.epmet.commons.tools.enums.PartyPostEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.IcFormOptionsQueryFormDTO;
+import com.epmet.feign.EpmetAdminOpenFeignClient;
 import com.epmet.feign.EpmetUserOpenFeignClient;
+import com.epmet.feign.OperCustomizeOpenFeignClient;
 import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity;
 import com.epmet.modules.partyOrg.service.IcPartyOrgService;
 import com.epmet.modules.partymember.dao.IcPartyMemberDao;
@@ -25,6 +32,7 @@ import javax.annotation.Resource;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 数字平台党员信息表
@@ -39,6 +47,10 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl<IcPartyMemberDao,
     private IcPartyOrgService icPartyOrgService;
     @Resource
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+    @Resource
+    private EpmetAdminOpenFeignClient epmetAdminOpenFeignClient;
+    @Resource
+    private OperCustomizeOpenFeignClient operCustomizeOpenFeignClient;
 
     @Override
     public PageData<IcPartyMemberDTO> page(Map<String, Object> params) {
@@ -68,11 +80,38 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl<IcPartyMemberDao,
     @Override
     public IcPartyMemberDTO get(String id) {
         IcPartyMemberEntity entity = baseDao.selectById(id);
+        IcPartyMemberDTO dto = ConvertUtils.sourceToTarget(entity, IcPartyMemberDTO.class);
         //党组织名
+        if (StringUtils.isNotBlank(dto.getSszb())) {
+            IcPartyOrgEntity org = icPartyOrgService.selectById(dto.getSszb());
+            if (null == org) {
+                throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "获取党组织信息失败", "获取党组织信息失败");
+            }
+            dto.setOrgName(org.getPartyOrgName());
+        }
         //职务
+        if (StringUtils.isNotBlank(dto.getPartyZw())) {
+            dto.setPostName(PartyPostEnum.getName(dto.getPartyZw()));
+        }
         //文化程度
+        if (StringUtils.isNotBlank(dto.getCulture())) {
+            Result<Map<String, String>> education = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.EDUCATION.getCode());
+            if (!education.success()) {
+                throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "获取文化程度信息失败", "获取文化程度信息失败");
+            }
+            dto.setCultureName(education.getData().get(dto.getCulture()));
+        }
         //志愿者类别
-        return ConvertUtils.sourceToTarget(entity, IcPartyMemberDTO.class);
+        if (StringUtils.isNotBlank(dto.getVolunteerCategory())) {
+            IcFormOptionsQueryFormDTO optionsForm = new IcFormOptionsQueryFormDTO();
+            optionsForm.setCustomerId(dto.getCustomerId());
+            optionsForm.setFormCode(IcFormCodeEnum.RESI_BASE_INFO.getCode());
+            optionsForm.setColumnName("VOLUNTEER_CATEGORY");
+            Result<Map<String, String>> volunteerMap = operCustomizeOpenFeignClient.getOptionsMap(optionsForm);
+            List<String> category = Arrays.asList(dto.getVolunteerCategory().split(StrConstant.COMMA));
+            dto.setVolunteerCategoryName(category.stream().map(volunteerMap.getData()::get).collect(Collectors.toList()));
+        }
+        return dto;
     }
 
     @Override