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

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

@@ -507,4 +507,13 @@ public interface GovOrgOpenFeignClient {
      */
     @PostMapping("/gov/org/icneighborhood/neighborhoodoption")
     Result<List<OptionResultDTO>> getNeighborHoodOptions(IcNeighborHoodDTO dto);
+
+    /**
+     * @Description  查询房屋信息
+     * @param idCard
+     * @author zxc
+     * @date 2021/11/3 3:30 下午
+     */
+    @PostMapping("/gov/org/ichouse/selecthouseinfobyidcard")
+    Result<List<String>> selectHouseInfoByIdCard(@RequestParam("idCard")String idCard);
 }

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

@@ -305,6 +305,11 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getNeighborHoodOptions", dto);
     }
 
+    @Override
+    public Result<List<String>> selectHouseInfoByIdCard(String idCard) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectHouseInfoByIdCard", idCard);
+    }
+
     @Override
     public Result<String> selectPidsByGridId(String gridId) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectPidsByGridId", gridId);

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

@@ -88,4 +88,15 @@ public class IcHouseController {
         return new Result<List<OptionResultDTO>>().ok(icHouseService.getHouseOption(formDTO));
     }
 
+    /**
+     * @Description  查询房屋信息
+     * @param idCard
+     * @author zxc
+     * @date 2021/11/3 3:30 下午
+     */
+    @PostMapping("selecthouseinfobyidcard")
+    public Result<List<String>> selectHouseInfoByIdCard(@RequestParam("idCard")String idCard){
+        return new Result<List<String>>().ok(icHouseService.selectHouseInfoByIdCard(idCard));
+    }
+
 }

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

@@ -52,4 +52,13 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
     List<IcHouseExcel> searchAllHouse(@Param("house") IcHouseEntity house);
 
     List<HouseInfoDTO> queryHouseInfo(@Param("houseIdList") Set<String> houseIdList);
+
+    /**
+     * @Description  查询房屋信息
+     * @param idCard
+     * @author zxc
+     * @date 2021/11/3 3:30 下午
+     */
+    List<String> selectHouseInfoByIdCard(@Param("idCard") String idCard);
+
 }

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

@@ -103,4 +103,13 @@ public interface IcHouseService extends BaseService<IcHouseEntity> {
      * @Date 2021/10/25 17:04
      */
     List<OptionResultDTO> getHouseOption(HouseFormDTO formDTO);
+
+    /**
+     * @Description  查询房屋信息
+     * @param idCard
+     * @author zxc
+     * @date 2021/11/3 3:30 下午
+     */
+    List<String> selectHouseInfoByIdCard(String idCard);
+
 }

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

@@ -36,10 +36,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -135,4 +132,19 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
         }).collect(Collectors.toList());
     }
 
+    /**
+     * @Description  查询房屋信息
+     * @param idCard
+     * @author zxc
+     * @date 2021/11/3 3:30 下午
+     */
+    @Override
+    public List<String> selectHouseInfoByIdCard(String idCard) {
+        List<String> result = baseDao.selectHouseInfoByIdCard(idCard);
+        if (CollectionUtils.isEmpty(result)){
+            return new ArrayList<>();
+        }
+        return result;
+    }
+
 }

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

@@ -252,4 +252,16 @@
             ih.ID = #{houseId}
         </foreach>
     </select>
+
+    <!-- 查询房屋信息 -->
+    <select id="selectHouseInfoByIdCard" resultType="java.lang.String">
+        SELECT
+            CONCAT(inh.NEIGHBOR_HOOD_NAME,ib.BUILDING_NAME,ibu.UNIT_NAME,ih.HOUSE_NAME)
+        FROM ic_house ih
+        LEFT JOIN ic_neighbor_hood inh ON (inh.ID = ih.NEIGHBOR_HOOD_ID AND inh.DEL_FLAG = '0')
+        LEFT JOIN ic_building ib ON (ib.ID = ih.BUILDING_ID AND ib.DEL_FLAG = '0')
+        LEFT JOIN ic_building_unit ibu ON (ibu.ID = ih.BUILDING_UNIT_ID AND ibu.DEL_FLAG = '0')
+        WHERE ih.DEL_FLAG = '0'
+          AND ih.OWNER_ID_CARD = #{idCard}
+    </select>
 </mapper>

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ColumnTableNameResultDTO.java

@@ -0,0 +1,20 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description  查询必填字段-接口返参
+ * @Author sun
+ */
+@Data
+public class ColumnTableNameResultDTO implements Serializable {
+    private static final long serialVersionUID = -8441112171986914418L;
+    //表名
+    private String tableName;
+    //字段中文名
+    private String label;
+    //字段名
+    private String columnName;
+}

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

@@ -11,6 +11,7 @@ import com.epmet.dto.result.*;
 import com.epmet.feign.fallback.OperCustomizeOpenFeignClientFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -23,8 +24,8 @@ import java.util.Set;
  * @author yinzuomei@elink-cn.com
  * @date 2020/6/4 13:16
  */
-//@FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallbackFactory = OperCustomizeOpenFeignClientFallbackFactory.class,url = "http://localhost:8089")
-@FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallbackFactory = OperCustomizeOpenFeignClientFallbackFactory.class)
+@FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallbackFactory = OperCustomizeOpenFeignClientFallbackFactory.class,url = "http://localhost:8089")
+//@FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallbackFactory = OperCustomizeOpenFeignClientFallbackFactory.class)
 public interface OperCustomizeOpenFeignClient {
 
     @PostMapping(value = "/oper/customize/customerfootbar/customerfootbars", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@@ -88,4 +89,12 @@ public interface OperCustomizeOpenFeignClient {
      */
     @PostMapping("/oper/customize/icform/items")
     Result<List<FormItem>> listItems(@RequestBody CustomerFormQueryDTO formDto);
+
+    /**
+     * @Author sun
+     * @Description 居民信息新增查询各表必填字段
+     **/
+    @PostMapping("/oper/customize/icformitem/getmustcolumn/{customerId}")
+    Result<List<ColumnTableNameResultDTO>> getMustColumn(@PathVariable("customerId") String customerId);
+
 }

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

@@ -74,4 +74,9 @@ public class OperCustomizeOpenFeignClientFallback implements OperCustomizeOpenFe
 	public Result<List<FormItem>> listItems(CustomerFormQueryDTO formDto) {
 		return ModuleUtils.feignConError(ServiceConstant.OPER_CUSTOMIZE_SERVER, "listItems", formDto);
 	}
+
+	@Override
+	public Result<List<ColumnTableNameResultDTO>> getMustColumn(String customerId) {
+		return ModuleUtils.feignConError(ServiceConstant.OPER_CUSTOMIZE_SERVER, "getMustColumn", customerId);
+	}
 }

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

@@ -26,6 +26,8 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.IcFormItemDTO;
+import com.epmet.dto.result.ColumnTableNameResultDTO;
+import com.epmet.dto.result.CustomerStaffRoleResultDTO;
 import com.epmet.excel.IcFormItemExcel;
 import com.epmet.service.IcFormItemService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -91,4 +93,13 @@ public class IcFormItemController {
         ExcelUtils.exportExcelToTarget(response, null, list, IcFormItemExcel.class);
     }
 
+    /**
+     * @Author sun
+     * @Description 居民信息新增查询各表必填字段
+     **/
+    @PostMapping("getmustcolumn/{customerId}")
+    public Result<List<ColumnTableNameResultDTO>> getMustColumn(@PathVariable String customerId) {
+        return new Result<List<ColumnTableNameResultDTO>>().ok(icFormItemService.getMustColumn(customerId));
+    }
+
 }

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java

@@ -18,6 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.ColumnTableNameResultDTO;
 import com.epmet.dto.result.ConditionResultDTO;
 import com.epmet.dto.result.IcFormResColumnDTO;
 import com.epmet.dto.result.TableHeaderResultDTO;
@@ -64,4 +65,10 @@ public interface IcFormItemDao extends BaseDao<IcFormItemEntity> {
     List<String> querySubTables(@Param("customerId") String customerId, @Param("formCode")String formCode);
 
     Set<String> queryIcResiSubTables(@Param("customerId") String customerId, @Param("formCode")String formCode);
+
+    /**
+     * @Author sun
+     * @Description 居民信息新增查询各表必填字段
+     **/
+    List<ColumnTableNameResultDTO> getMustColumn(@Param("customerId")String customerId);
 }

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemService.java

@@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IcFormItemDTO;
 import com.epmet.dto.form.CustomerFormQueryDTO;
+import com.epmet.dto.result.ColumnTableNameResultDTO;
 import com.epmet.dto.result.ConditionResultDTO;
 import com.epmet.dto.result.IcFormResColumnDTO;
 import com.epmet.dto.result.TableHeaderResultDTO;
@@ -115,4 +116,10 @@ public interface IcFormItemService extends BaseService<IcFormItemEntity> {
     List<String> querySubTables(String customerId, String formCode);
 
     Set<String> queryIcResiSubTables(String customerId, String formCode);
+
+    /**
+     * @Author sun
+     * @Description 居民信息新增查询各表必填字段
+     **/
+    List<ColumnTableNameResultDTO> getMustColumn(String customerId);
 }

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java

@@ -27,6 +27,7 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.IcFormItemDao;
 import com.epmet.dto.IcFormItemDTO;
 import com.epmet.dto.form.CustomerFormQueryDTO;
+import com.epmet.dto.result.ColumnTableNameResultDTO;
 import com.epmet.dto.result.ConditionResultDTO;
 import com.epmet.dto.result.IcFormResColumnDTO;
 import com.epmet.dto.result.TableHeaderResultDTO;
@@ -153,4 +154,13 @@ public class IcFormItemServiceImpl extends BaseServiceImpl<IcFormItemDao, IcForm
         return baseDao.queryIcResiSubTables(customerId,formCode);
     }
 
+    /**
+     * @Author sun
+     * @Description 居民信息新增查询各表必填字段
+     **/
+    @Override
+    public List<ColumnTableNameResultDTO> getMustColumn(String customerId) {
+        return baseDao.getMustColumn(customerId);
+    }
+
 }

epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml

@@ -141,4 +141,21 @@
             AND m.CUSTOMER_ID = #{customerId}
           AND m.FORM_CODE = #{formCode}
     </select>
+
+    <select id="getMustColumn" resultType="com.epmet.dto.result.ColumnTableNameResultDTO">
+        SELECT
+            a.label "label",
+            a.column_name "columnName",
+        IF (
+            ('' = b.table_name OR b.table_name IS NULL ), 'ic_resi_user', b.table_name
+        ) "tableName"
+        FROM
+            ic_form_item a
+        LEFT JOIN ic_form_item_group b ON a.item_group_id = b.id
+        WHERE
+            a.del_flag = '0'
+        AND a.required = '1'
+        AND a.customer_id = #{customerId}
+    </select>
+
 </mapper>

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

@@ -52,7 +52,10 @@ public class PersonDataResultDTO implements Serializable {
     /**
      * 志愿者类别
      */
-    private String volunteerCategory;
+    private List<String> volunteerCategory;
+
+    @JsonIgnore
+    private List<String> volunteerCategoryEn;
 
     public PersonDataResultDTO() {
         this.workUnit = "";
@@ -61,7 +64,7 @@ public class PersonDataResultDTO implements Serializable {
         this.name = "";
         this.financialSituation = new FinancialSituationDTO();
         this.houseInfo = new ArrayList<>();
-        this.volunteerCategory = "";
+        this.volunteerCategory = new ArrayList<>();
     }
 
     /**

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

@@ -162,6 +162,28 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     @Transactional(rollbackFor = Exception.class)
     public void add(TokenDto tokenDto, List<IcResiUserFormDTO> formDTO) {
         //循环自动拼接sql语句，往多个表新增数据
+        //0.校验必填字段是否为空
+        Result<List<ColumnTableNameResultDTO>> resultList = operCustomizeOpenFeignClient.getMustColumn(tokenDto.getCustomerId());
+        if (resultList.success() && null != resultList.getData()) {
+            StringBuffer str = new StringBuffer("");
+            formDTO.forEach(f -> {
+                resultList.getData().forEach(l -> {
+                    if (f.getTableName().equals(l.getTableName())) {
+                        f.getList().forEach(map -> {
+                            if (!map.containsKey(l.getColumnName())) {
+                                str.append(str.length() < NumConstant.ONE ? l.getLabel() : "、" + l.getLabel());
+                            }
+                        });
+                    }
+                });
+            });
+            if (!"".equals(str)) {
+                throw new RenException(String.format("新增居民信息,必要字段值为空,%s值为空", str));
+            }
+        } else {
+            throw new RenException(String.format("新增居民信息-根据客户Id查询必填信息失败，customerId->%s", tokenDto.getCustomerId()));
+        }
+
         //1.先往主表新增数据
         //主表Id
         String resiUserId = UUID.randomUUID().toString().replaceAll("-", "");
@@ -942,9 +964,18 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
      */
     @Override
     public PersonDataResultDTO personData(PersonDataFormDTO formDTO) {
-        baseDao.personData(formDTO.getUserId());
+        PersonDataResultDTO personData = baseDao.personData(formDTO.getUserId());
+        if (null == personData){
+            return new PersonDataResultDTO();
+        }
+        // 房屋信息查询
+        Result<List<String>> listResult = govOrgOpenFeignClient.selectHouseInfoByIdCard(personData.getIdCard());
+        if (!listResult.success()){
+            throw new RenException("查询房屋信息失败");
+        }
+        personData.setHouseInfo(listResult.getData());
         // TODO
-        return null;
+        return personData;
     }
 
     /**