Merge remote-tracking branch 'remotes/origin/dev_ic_platform' into develop

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/IcFormResColumnDTO.java

@@ -0,0 +1,17 @@
+package com.epmet.dataaggre.dto.epmetuser;
+
+import lombok.Data;
+
+/**
+ * @Description TODO
+ * @Author yinzuomei
+ * @Date 2021/10/27 4:26 下午
+ */
+@Data
+public class IcFormResColumnDTO {
+    private String tableName;
+    private String columnName;
+    private String label;
+    private String link;
+}
+

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/IcResiDetailFormDTO.java

@@ -0,0 +1,20 @@
+package com.epmet.dataaggre.dto.epmetuser.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 查看详情，回显表单
+ * @Author yinzuomei
+ * @Date 2021/10/27 10:22 下午
+ */
+@Data
+public class IcResiDetailFormDTO implements Serializable {
+    public interface AddUserInternalGroup {
+    }
+    @NotBlank(message = "icResiUserId不能为空",groups = AddUserInternalGroup.class)
+    private String icResiUserId;
+}
+

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/IcResiUserPageFormDTO.java

@@ -0,0 +1,37 @@
+package com.epmet.dataaggre.dto.epmetuser.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 居民信息，分页查询入参
+ * @Author yinzuomei
+ * @Date 2021/10/27 2:06 下午
+ */
+@Data
+public class IcResiUserPageFormDTO implements Serializable {
+    public interface AddUserInternalGroup {
+    }
+
+    @NotNull(message = "pageNo不能为空", groups = AddUserInternalGroup.class)
+    private Integer pageNo;
+
+    @NotNull(message = "pageSize不能为空", groups = AddUserInternalGroup.class)
+    private Integer pageSize;
+
+    @NotBlank(message = "formCode不能为空", groups = AddUserInternalGroup.class)
+    private String formCode;
+
+    @NotBlank(message = "customerId不能为空", groups = AddUserInternalGroup.class)
+    private String customerId;
+
+    /**
+     * 表对应的字段及值
+     */
+    private List<ResiUserQueryValueDTO> conditions;
+}
+

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/ResiUserQueryValueDTO.java

@@ -0,0 +1,20 @@
+package com.epmet.dataaggre.dto.epmetuser.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description TODO
+ * @Author yinzuomei
+ * @Date 2021/10/27 6:02 下午
+ */
+@Data
+public class ResiUserQueryValueDTO implements Serializable {
+    private String queryType;
+    private List<String> columnValue;
+    private String columnName;
+    private String tableName;
+}
+

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiUserPageResultDTO.java

@@ -0,0 +1,172 @@
+package com.epmet.dataaggre.dto.epmetuser.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 居民信息分页查询表单返参
+ * @Author yinzuomei
+ * @Date 2021/10/27 2:07 下午
+ */
+@Data
+public class IcResiUserPageResultDTO implements Serializable {
+    private String icResiUserId;
+    private String gridId;
+    private String gridName;
+    /**
+     * 所属小区ID
+     */
+    private String villageId;
+    private String vallageName;
+
+
+    /**
+     * 所属楼宇Id
+     */
+    private String buildId;
+    private String buildName;
+
+    /**
+     * 单元id
+     */
+    private String unitId;
+    private String unitName;
+
+    /**
+     * 所属家庭Id
+     */
+    private String homeId;
+    private String homeName;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 性别
+     */
+    private String gender;
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
+
+    /**
+     * 出生日期
+     */
+    private String birthday;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
+    /**
+     * 是否党员
+     */
+    private Boolean isParty;
+
+    /**
+     * 是否低保户
+     */
+    private Boolean isDbh;
+
+    /**
+     * 是否保障房
+     */
+    private Boolean isEnsureHouse;
+
+    /**
+     * 是否失业
+     */
+    private Boolean isUnemployed;
+
+    /**
+     * 是否育龄妇女
+     */
+    private Boolean isYlfn;
+
+    /**
+     * 是否退役军人
+     */
+    private Boolean isVeterans;
+
+    /**
+     * 是否统战人员
+     */
+    private Boolean isUnitedFront;
+
+    /**
+     * 是否信访人员
+     */
+    private Boolean isXfry;
+
+    /**
+     * 是否志愿者
+     */
+    private Boolean isVolunteer;
+
+    /**
+     * 是否老年人
+     */
+    private Boolean isOldPeople;
+
+    /**
+     * 是否空巢
+     */
+    private Boolean isKc;
+
+    /**
+     * 是否失独
+     */
+    private Boolean isSd;
+
+    /**
+     * 是否失能
+     */
+    private Boolean isSn;
+
+    /**
+     * 是否失智
+     */
+    private Boolean isSz;
+
+    /**
+     * 是否残疾
+     */
+    private Boolean isCj;
+
+    /**
+     * 是否大病
+     */
+    private Boolean isDb;
+
+    /**
+     * 是否慢病
+     */
+    private Boolean isMb;
+
+    /**
+     * 是否特殊人群
+     */
+    private Boolean isSpecial;
+
+    private List<String> demandCategoryIds;
+
+    private String demandName;
+
+    /**
+     * 房屋类型，1楼房，2平房，3别墅
+     */
+    private String houseType;
+}
+

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcResiUserController.java

@@ -0,0 +1,45 @@
+package com.epmet.dataaggre.controller;
+
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dataaggre.dto.epmetuser.form.IcResiDetailFormDTO;
+import com.epmet.dataaggre.dto.epmetuser.form.IcResiUserPageFormDTO;
+import com.epmet.dataaggre.dto.epmetuser.result.IcResiUserPageResultDTO;
+import com.epmet.dataaggre.service.epmetuser.IcResiUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description TODO
+ * @Author yinzuomei
+ * @Date 2021/10/27 2:03 下午
+ */
+@RestController
+@RequestMapping("icresiuser")
+public class IcResiUserController {
+
+    @Autowired
+    private IcResiUserService icResiUserService;
+
+
+    @PostMapping("listresi")
+    public Result<PageData<IcResiUserPageResultDTO>> queryListResi(@LoginUser TokenDto tokenDto, @RequestBody IcResiUserPageFormDTO pageFormDTO){
+        //pageFormDTO.setCustomerId("45687aa479955f9d06204d415238f7cc");
+        ValidatorUtils.validateEntity(pageFormDTO,IcResiUserPageFormDTO.AddUserInternalGroup.class);
+        return new Result<PageData<IcResiUserPageResultDTO>>().ok(icResiUserService.pageResi(pageFormDTO));
+    }
+
+
+    @PostMapping("detail")
+    public Result queryIcResiDetail(@RequestBody IcResiDetailFormDTO pageFormDTO){
+        ValidatorUtils.validateEntity(pageFormDTO,IcResiDetailFormDTO.AddUserInternalGroup.class);
+        return new Result().ok(icResiUserService.queryIcResiDetail(pageFormDTO));
+    }
+}
+

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java

@@ -0,0 +1,18 @@
+package com.epmet.dataaggre.dao.epmetuser;
+
+import com.epmet.dataaggre.dto.epmetuser.IcFormResColumnDTO;
+import com.epmet.dataaggre.dto.epmetuser.form.ResiUserQueryValueDTO;
+import com.epmet.dataaggre.dto.epmetuser.result.IcResiUserPageResultDTO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface IcResiUserDao {
+    List<IcResiUserPageResultDTO> selectListResi(@Param("customerId") String customerId,
+                                                 @Param("formCode") String formCode,
+                                                 @Param("conditions") List<ResiUserQueryValueDTO> conditions,
+                                                 @Param("resultColumns") List<IcFormResColumnDTO> resultColumns,
+                                                 @Param("subTables") List<String> subTables);
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/opercustomize/CustomerFootBarDao.java

@@ -19,6 +19,7 @@ package com.epmet.dataaggre.dao.opercustomize;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dataaggre.dto.app.result.CustomerFootBarDTO;
+import com.epmet.dataaggre.dto.epmetuser.IcFormResColumnDTO;
 import com.epmet.dataaggre.entity.opercustomize.CustomerFootBarEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -56,4 +57,8 @@ public interface CustomerFootBarDao extends BaseDao<CustomerFootBarEntity> {
      * @date 2021/7/28 10:56
      */
     CustomerFootBarEntity selectDefaultIcon(@Param("customerId") String customerId, @Param("appType")String appType, @Param("barKey")String barKey);
+
+    List<IcFormResColumnDTO> queryConditions(@Param("customerId") String customerId, @Param("formCode")String formCode);
+
+    List<String> querySubTables(@Param("customerId") String customerId, @Param("formCode")String formCode);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/IcResiUserService.java

@@ -0,0 +1,14 @@
+package com.epmet.dataaggre.service.epmetuser;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dataaggre.dto.epmetuser.form.IcResiDetailFormDTO;
+import com.epmet.dataaggre.dto.epmetuser.form.IcResiUserPageFormDTO;
+import com.epmet.dataaggre.dto.epmetuser.result.IcResiUserPageResultDTO;
+
+import java.util.Map;
+
+public interface IcResiUserService {
+    PageData<IcResiUserPageResultDTO> pageResi(IcResiUserPageFormDTO pageFormDTO);
+
+     Map queryIcResiDetail(IcResiDetailFormDTO pageFormDTO);
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiUserServiceImpl.java

@@ -0,0 +1,85 @@
+package com.epmet.dataaggre.service.epmetuser.impl;
+
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dataaggre.constant.DataSourceConstant;
+import com.epmet.dataaggre.dao.epmetuser.IcResiUserDao;
+import com.epmet.dataaggre.dto.epmetuser.IcFormResColumnDTO;
+import com.epmet.dataaggre.dto.epmetuser.form.IcResiDetailFormDTO;
+import com.epmet.dataaggre.dto.epmetuser.form.IcResiUserPageFormDTO;
+import com.epmet.dataaggre.dto.epmetuser.result.IcResiUserPageResultDTO;
+import com.epmet.dataaggre.service.epmetuser.IcResiUserService;
+import com.epmet.dataaggre.service.opercustomize.CustomerFootBarService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description TODO
+ * @Author yinzuomei
+ * @Date 2021/10/27 2:04 下午
+ */
+@Service
+@DataSource(DataSourceConstant.EPMET_USER)
+@Slf4j
+public class IcResiUserServiceImpl implements IcResiUserService {
+    @Autowired
+    private IcResiUserDao icResiUserDao;
+    @Autowired
+    private CustomerFootBarService customerFootBarService;
+
+
+
+    @Override
+    public PageData<IcResiUserPageResultDTO> pageResi(IcResiUserPageFormDTO formDTO) {
+        // 查询列表展示项，如果没有，直接返回
+        List<IcFormResColumnDTO> resultColumns=customerFootBarService.queryConditions(formDTO.getCustomerId(),formDTO.getFormCode());
+        if(CollectionUtils.isEmpty(resultColumns)){
+            log.warn("没有配置列表展示列");
+            return new PageData(new ArrayList(), NumConstant.ZERO);
+        }
+
+        // 查询列表展示项需要用到哪些子表
+        List<String> subTables=customerFootBarService.querySubTables(formDTO.getCustomerId(),formDTO.getFormCode());
+
+       /* Set<String> subTableList=resultColumns.stream().filter(item->!item.getTableName().equals("ic_resi_user")
+                                            && StringUtils.isNotBlank(item.getLink()))
+                                        .map(IcFormResColumnDTO :: getTableName).collect(Collectors.toSet());
+        List<String> subTables=new ArrayList<>();
+        subTableList.forEach(tableName->{
+            //'left join ',temp.TABLE_NAME, ' on ( ic_resi_user.ID=',temp.TABLE_NAME,'.IC_RESI_USER  and ',temp.TABLE_NAME,'.del_flag="0" )'
+            String joinSql=String.format("% join %s on ( ic_resi_user.ID=%s.IC_RESI_USER  and %s.del_flag=\"0\" ");
+            subTables.add(joinSql);
+        });*/
+        PageInfo<IcResiUserPageResultDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(),
+                                    formDTO.getPageSize()).doSelectPageInfo(() -> icResiUserDao.selectListResi(formDTO.getCustomerId(),
+                                                                formDTO.getFormCode(),
+                                                                formDTO.getConditions(),
+                                                                resultColumns,
+                                                                subTables));
+        List<IcResiUserPageResultDTO> list = pageInfo.getList();
+        //todo 还早着呢
+
+
+
+        pageInfo.setList(list);
+        return new PageData<>(pageInfo.getList(),pageInfo.getTotal());
+    }
+
+    @Override
+    public Map queryIcResiDetail(IcResiDetailFormDTO pageFormDTO) {
+
+        return null;
+    }
+
+
+}
+

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercustomize/CustomerFootBarService.java

@@ -20,8 +20,11 @@ package com.epmet.dataaggre.service.opercustomize;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.dataaggre.dto.app.form.AppFootBarFormDTO;
 import com.epmet.dataaggre.dto.app.result.AppFootBarResultDTO;
+import com.epmet.dataaggre.dto.epmetuser.IcFormResColumnDTO;
 import com.epmet.dataaggre.entity.opercustomize.CustomerFootBarEntity;
 
+import java.util.List;
+
 /**
  * APP底部菜单栏信息
  *
@@ -39,4 +42,8 @@ public interface CustomerFootBarService extends BaseService<CustomerFootBarEntit
      * @date 2021/7/27 18:59
      */
     AppFootBarResultDTO queryAppFootBars(AppFootBarFormDTO footBarFormDTO);
+
+    List<IcFormResColumnDTO> queryConditions(String customerId, String formCode);
+
+    List<String> querySubTables(String customerId, String formCode);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercustomize/impl/CustomerFootBarServiceImpl.java

@@ -27,6 +27,7 @@ import com.epmet.dataaggre.dao.opercustomize.CustomerFootBarDao;
 import com.epmet.dataaggre.dto.app.form.AppFootBarFormDTO;
 import com.epmet.dataaggre.dto.app.result.AppFootBarResultDTO;
 import com.epmet.dataaggre.dto.app.result.CustomerFootBarDTO;
+import com.epmet.dataaggre.dto.epmetuser.IcFormResColumnDTO;
 import com.epmet.dataaggre.entity.opercrm.CustomerParameterEntity;
 import com.epmet.dataaggre.entity.opercustomize.CustomerFootBarEntity;
 import com.epmet.dataaggre.service.opercrm.CustomerParameterService;
@@ -112,4 +113,14 @@ public class CustomerFootBarServiceImpl extends BaseServiceImpl<CustomerFootBarD
         return resultDTO;
     }
 
+    @Override
+    public List<IcFormResColumnDTO> queryConditions(String customerId, String formCode) {
+        return baseDao.queryConditions(customerId,formCode);
+    }
+
+    @Override
+    public List<String> querySubTables(String customerId, String formCode) {
+        return baseDao.querySubTables(customerId,formCode);
+    }
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dataaggre.dao.epmetuser.IcResiUserDao">
+
+<!--    <insert id="add">-->
+<!--        insert into ${tableName}-->
+<!--        (-->
+<!--            <foreach collection="map.entrySet()" index="key" item="value" separator=",">-->
+<!--                ${key}-->
+<!--            </foreach>-->
+<!--            ,DEL_FLAG-->
+<!--            ,REVISION-->
+<!--            ,CREATED_TIME-->
+<!--            ,UPDATED_TIME-->
+<!--        ) values-->
+<!--        (-->
+<!--        <foreach collection="map.entrySet()" index="key" item="value" separator=",">-->
+<!--            #{value}-->
+<!--        </foreach>-->
+<!--        ,'0'-->
+<!--        ,'0'-->
+<!--        ,NOW()-->
+<!--        ,NOW()-->
+<!--        )-->
+<!--    </insert>-->
+
+    <select id="selectListResi" parameterType="map" resultType="com.epmet.dataaggre.dto.epmetuser.result.IcResiUserPageResultDTO">
+        select
+            ic_resi_user.id as icResiUserId,
+        <foreach item="column" collection="resultColumns" open="" separator="," close="">
+            ${column.columnName}
+        </foreach>
+        FROM
+            ic_resi_user
+        <if test="null != subTables and subTables.size() > 0">
+            <foreach item="subTableName" collection="subTables" open="" separator="" close="">
+                ${subTableName}
+            </foreach>
+        </if>
+
+        WHERE
+            ic_resi_user.DEL_FLAG = '0'
+            and ic_resi_user.customer_id=#{customerId}
+        <if test="null != conditions and conditions.size() > 0">
+            <foreach item="subCondition" collection="conditions" open="" separator="" close="">
+                <if test="null != subCondition.columnValue and subCondition.columnValue.size() > 0">
+
+                    <if test="subCondition.queryType!= null and subCondition.queryType == 'equal' ">
+                        and ${subCondition.columnName} = #{subCondition.columnValue[0]}
+                    </if>
+
+                    <if test="subCondition.queryType!= null and subCondition.queryType == 'like' ">
+                        and ${subCondition.columnName} like concat('%',#{subCondition.columnValue[0]},'%')
+                    </if>
+
+                    <if test="subCondition.queryType!= null and subCondition.queryType == 'daterange' ">
+                        and ${subCondition.columnName} between #{subCondition.columnValue[0]} and #{subCondition.columnValue[1]}
+                    </if>
+                </if>
+            </foreach>
+        </if>
+         order by ic_resi_user.CREATED_TIME desc
+    </select>
+</mapper>

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/opercustomize/CustomerFootBarDao.xml

@@ -38,4 +38,44 @@
             and c.BAR_KEY=#{barKey}
             AND C.DISPLAY='1'
     </select>
+
+    <select id="queryConditions" parameterType="map" resultType="com.epmet.dataaggre.dto.epmetuser.IcFormResColumnDTO">
+        select
+            temp.table_name,
+            concat(temp.table_name,'.',temp.columnName) as columnName,
+            temp.LABEL,
+            temp.link
+        from (
+                 SELECT
+                     ( CASE WHEN M.ITEM_GROUP_ID = '0' THEN 'ic_resi_user' ELSE g.TABLE_NAME END ) AS table_name,
+                     m.COLUMN_NAME AS columnName,
+                     m.LABEL,
+                     g.link
+                 FROM
+                     ic_form_item m
+                         LEFT JOIN ic_form_item_group g ON ( m.ITEM_GROUP_ID = g.id )
+                 WHERE
+                     m.DEL_FLAG = '0'
+                   AND m.CUSTOMER_ID = #{customerId}
+                   and m.FORM_CODE=#{formCode}
+                   AND m.LIST_DISPLAY = '1'
+             )temp
+    </select>
+
+    <select id="querySubTables" parameterType="map" resultType="java.lang.String">
+        select
+            CONCAT('left join ',temp.TABLE_NAME, ' on ( ic_resi_user.ID=',temp.TABLE_NAME,'.IC_RESI_USER  and ',temp.TABLE_NAME,'.del_flag="0" )') as subTables
+        from (
+                 SELECT DISTINCT
+                     m.TABLE_NAME
+                 FROM
+                     ic_form_item_group m
+                 WHERE
+                     m.DEL_FLAG = '0'
+                     AND m.TABLE_NAME IS NOT NULL
+                     AND m.TABLE_NAME != ''
+                    AND m.CUSTOMER_ID = #{customerId}
+                    AND m.FORM_CODE = #{formCode}
+             )temp
+    </select>
 </mapper>

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

@@ -46,7 +46,7 @@ public interface OperCustomizeOpenFeignClient {
     Result<CheckFloatFootBarResultDTO> checkFloatFootBar(@RequestBody CheckFloatFootBarFormDTO checkFloatFootBarFormDTO);
 
     /**
-     * desc: 获取表单填写项
+     * desc: 获取表单填写项 【dynamic=null】查询全部；否则查询对应的item
      * @param formDto
      * @return
      */

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

@@ -102,7 +102,7 @@ public class IcFormController {
 
 
     /**
-     * 获取居民信息表单
+     * 获取居民信息表单 【dynamic=null】查询全部；否则查询对应的item
      *
      * @param formDto
      * @return  com.epmet.commons.tools.utils.Result<CustomerFormResultDTO>
@@ -114,16 +114,13 @@ public class IcFormController {
         if (StringUtils.isBlank(formDto.getCustomerId())){
             formDto.setCustomerId(customerId);
         }
-        if (formDto.getDynamic() == null){
-            formDto.setDynamic(true);
-        }
         ValidatorUtils.validateEntity(formDto,CustomerFormQueryDTO.AddUserInternalGroup.class);
         return new Result<CustomerFormResultDTO>().ok(icFormService.getCustomerForm(formDto));
     }
 
 
     /**
-     * 获取居民信息的查询条件，组件列表
+     * 获取居民信息的查询条件，组件列表 【dynamic=null】查询全部；否则查询对应的item
      *
      * @param tokenDto
      * @param formDto
@@ -134,9 +131,6 @@ public class IcFormController {
     @PostMapping("conditionlist")
     public Result<List<ConditionResultDTO>> queryConditionList(@LoginUser TokenDto tokenDto, @RequestBody CustomerFormQueryDTO formDto){
         formDto.setCustomerId(tokenDto.getCustomerId());
-        if (formDto.getDynamic() == null){
-            formDto.setDynamic(true);
-        }
         ValidatorUtils.validateEntity(formDto,CustomerFormQueryDTO.AddUserInternalGroup.class);
         return new Result<List<ConditionResultDTO>>().ok(icFormItemService.queryConditionList(formDto));
     }

epmet-module/oper-customize/oper-customize-server/src/main/resources/logback-spring.xml

@@ -139,7 +139,7 @@
     </appender>
 
     <!-- 开发、测试环境 -->
-    <springProfile name="dev,test">
+    <springProfile name="local,dev,test">
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
         <logger name="com.epmet.dao" level="INFO"/>

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiDemandDTO.java

@@ -44,29 +44,9 @@ public class IcResiDemandDTO implements Serializable {
 	private String customerId;
 
     /**
-     * 主表Id
+     * 需求code【对应ic_resi_demand_dict】
      */
-	private String icResiUser;
+    private String categoryCode;
-
-    /**
-     * 大类Id
-     */
-	private Date bigClass;
-
-    /**
-     * 大类名称
-     */
-	private Date bigClassName;
-
-    /**
-     * 小类Id
-     */
-	private String smallClass;
-
-    /**
-     * 小类名称
-     */
-	private String smallClassName;
 
     /**
      * 描述

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiDemandDictController.java

@@ -17,7 +17,10 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -29,6 +32,7 @@ import com.epmet.service.IcResiDemandDictService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Map;
 
 
@@ -81,4 +85,9 @@ public class IcResiDemandDictController {
         return new Result();
     }
 
+    @PostMapping("demandoption")
+    public Result<List<OptionResultDTO>> getDemandOptions(@LoginUser TokenDto tokenDto) {
+        return new Result<List<OptionResultDTO>>().ok(icResiDemandDictService.getDemandOptions(tokenDto.getCustomerId()));
+    }
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiDemandDictDao.java

@@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.entity.IcResiDemandDictEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -32,6 +33,6 @@ import java.util.List;
  */
 @Mapper
 public interface IcResiDemandDictDao extends BaseDao<IcResiDemandDictEntity> {
-    List<OptionResultDTO> selectDemandOptions(String customerId);
+    List<OptionResultDTO> selectDemandOptions(@Param("customerId") String customerId);
-    List<OptionResultDTO> selectChildDemands(String parentCode);
+    List<OptionResultDTO> selectChildDemands(@Param("customerId")String customerId, @Param("parentCode") String parentCode);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiDemandEntity.java

@@ -49,24 +49,9 @@ public class IcResiDemandEntity extends BaseEpmetEntity {
 	private String icResiUser;
 
     /**
-     * 大类Id
+     * 需求code【对应ic_resi_demand_dict】
      */
-	private Date bigClass;
+	private String categoryCode;
-
-    /**
-     * 大类名称
-     */
-	private Date bigClassName;
-
-    /**
-     * 小类Id
-     */
-	private String smallClass;
-
-    /**
-     * 小类名称
-     */
-	private String smallClassName;
 
     /**
      * 描述

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiDemandExcel.java

@@ -40,17 +40,8 @@ public class IcResiDemandExcel {
     @Excel(name = "主表Id")
     private String icResiUser;
 
-    @Excel(name = "大类Id")
+    @Excel(name = "需求code")
-    private Date bigClass;
+    private String categoryCode;
-
-    @Excel(name = "大类名称")
-    private Date bigClassName;
-
-    @Excel(name = "小类Id")
-    private String smallClass;
-
-    @Excel(name = "小类名称")
-    private String smallClassName;
 
     @Excel(name = "描述")
     private String remakes;

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiDemandDictService.java

@@ -18,6 +18,7 @@
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IcResiDemandDictDTO;
 import com.epmet.entity.IcResiDemandDictEntity;
@@ -93,4 +94,13 @@ public interface IcResiDemandDictService extends BaseService<IcResiDemandDictEnt
      */
     void delete(String[] ids);
 
+    /**
+     * @Description 获取居民需求
+     * @Param customerId
+     * @Return {@link List< OptionResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/10/27 17:57
+     */
+    List<OptionResultDTO> getDemandOptions(String customerId);
+
 }

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

@@ -21,6 +21,7 @@ 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.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.IcResiDemandDictDao;
@@ -96,4 +97,17 @@ public class IcResiDemandDictServiceImpl extends BaseServiceImpl<IcResiDemandDic
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @param customerId
+     * @Description 获取居民需求
+     * @Param customerId
+     * @Return {@link List<  OptionResultDTO >}
+     * @Author zhaoqifeng
+     * @Date 2021/10/27 17:57
+     */
+    @Override
+    public List<OptionResultDTO> getDemandOptions(String customerId) {
+        return baseDao.selectDemandOptions(customerId);
+    }
+
 }

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiDemandDictDao.xml

@@ -19,8 +19,43 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
-    <select id="selectDemandOptions" resultType="com.epmet.commons.tools.dto.result.OptionResultDTO"> </select>
+    <resultMap id="DemandResult" type="com.epmet.commons.tools.dto.result.OptionResultDTO">
-    <select id="selectChildDemands" resultType="com.epmet.commons.tools.dto.result.OptionResultDTO"> </select>
+        <result column="customerId"/>
+        <result column="value"  property="value"/>
+        <result column="label" property="label"/>
+        <collection property="children" ofType="com.epmet.commons.tools.dto.result.OptionResultDTO"
+                    select="selectChildDemands" column="customerId=customerId,parentCode=value">
+        </collection>
+    </resultMap>
+    <select id="selectDemandOptions" resultMap="DemandResult">
+        SELECT
+            CUSTOMER_ID AS customerId,
+            CATEGORY_CODE AS "value",
+            CATEGORY_NAME AS "label"
+        FROM
+            ic_resi_demand_dict
+        WHERE
+            DEL_FLAG = 0
+            AND LEVEL = 1
+            AND CUSTOMER_ID = #{customerId}
+        ORDER BY
+            SORT ASC
+    </select>
+    <select id="selectChildDemands" resultMap="DemandResult">
+        SELECT
+            CUSTOMER_ID AS customerId,
+            CATEGORY_CODE AS "value",
+            CATEGORY_NAME AS "label"
+        FROM
+            ic_resi_demand_dict
+        WHERE
+            DEL_FLAG = 0
+            AND LEVEL = 2
+            AND CUSTOMER_ID = #{customerId}
+            AND PARENT_CODE = #{parentCode}
+        ORDER BY
+            SORT ASC
+    </select>
 
 
 </mapper>