Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-16 a9714988000ecf12c0e069f2f21aa449e3512108

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopStoreDO.java

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java

@@ -93,22 +93,17 @@
                }
                vo.setCardNo(oneData.get(1));
                //根据身份证号码解析年龄以及性别
                if(IdCardUtil.strongVerifyIdNumber(vo.getCardNo())){
                    //获取用户生日
                    String birthday = vo.getCardNo().substring(6, 14);
                    //设置用户年龄
                    vo.setAge(AgeUtils.getAgeFromBirthTime(birthday));
                    //获取用户性别
                    int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
                    if(sex%2 == 1){
                        vo.setSex(PopulSexEnum.nan.getCode());
                    }else{
                        vo.setSex(PopulSexEnum.nv.getCode());
                    }
                //获取用户生日
                String birthday = vo.getCardNo().substring(6, 14);
                //设置用户年龄
                vo.setAge(AgeUtils.getAgeFromBirthTime(birthday));
                //获取用户性别
                int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
                if(sex%2 == 1){
                    vo.setSex(PopulSexEnum.nan.getCode());
                }else{
                    throw new ServiceException("500", "身份证号码有误:第" + index + "行,第3列");
                    vo.setSex(PopulSexEnum.nv.getCode());
                }

                if(oneData.get(2) != null){
                    vo.setNation(oneData.get(2));
                }

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComHouseMemberVo.java

@@ -1,11 +1,16 @@
package com.panzhihua.common.model.vos.user;

import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import com.panzhihua.common.model.helper.sensitive.Sensitive;
import com.panzhihua.common.model.helper.sensitive.SensitiveStrategy;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel("房屋成员信息")
@EncryptDecryptClass
public class ComHouseMemberVo {

    @ApiModelProperty("房屋成员用户id")
@@ -15,6 +20,8 @@
    private String name;

    @ApiModelProperty("手机号")
    @EncryptDecryptField
    @Sensitive(strategy = SensitiveStrategy.PHONE)
    private String phone;

    @ApiModelProperty("与户主关系")

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommonDataApi.java

@@ -806,7 +806,7 @@
        List<String> head5 = new ArrayList<String>();
        head5.add("与户主关系");
        List<String> head6 = new ArrayList<String>();
        head6.add("街道");
        head6.add("街/路/巷");
        List<String> head7 = new ArrayList<String>();
        head7.add("小区号（政府对于每个小区都有特定编号）");
        List<String> head8 = new ArrayList<String>();

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityQuestnaireApi.java

@@ -211,7 +211,11 @@
                                try {
                                    ComActQuestnaireAnswerContentVO firstvo = answers.get(keySet.toArray()[0]).get(0);
                                    if (firstvo != null) {
                                        dateStr =  firstvo.getCreateAt().toString();
                                        Date time = firstvo.getCreateAt();
                                        if(time!=null) {
                                            String sd = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(time);
                                            dateStr = sd;
                                        }
                                    }
                                }catch (Exception e){
                                    dateStr = "";

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VillageApi.java

@@ -34,7 +34,9 @@
@RestController
@RequestMapping("/villagemanager/")
public class VillageApi extends BaseController {
    private String excelConvenientUrl = "http://panzhihua.nhys.cdnhxx.com/web/实有房屋导入模板.xlsx";
//    private String excelConvenientUrl = "http://panzhihua.nhys.cdnhxx.com/web/实有房屋导入模板.xlsx";
    @Value("${excel.excelConvenientUrl}")
    private String excelConvenientUrl;
    @Resource
    private CommunityService communityService;

@@ -73,8 +75,8 @@

    @ApiOperation(value = "下载模板-实有房屋")
    @GetMapping(value = "/serve/download/template")
    public R downloadTemplate(HttpServletResponse response) throws IOException, SftpException {
        return R.ok(excelConvenientUrl);
    public R downloadTemplate(HttpServletResponse response){
        return R.ok(excelConvenientUrl + "实有房屋导入模板.xlsx");
    }

    @ApiOperation(value = "excel导入实有房屋")

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java

@@ -94,7 +94,7 @@
    List<ComMngFamilyInfoVO> listFamilyByUserId(Long userId);

    @Select("select id,`name`,phone,relation from com_mng_population where road = #{comMngPopulationDO.road} and door_no = #{comMngPopulationDO.doorNo} and floor = #{comMngPopulationDO.floor} and unit_no = #{comMngPopulationDO.unitNo} and house_no = #{comMngPopulationDO.houseNo} and id != #{comMngPopulationDO.id}")
    List<ComHouseMemberVo> listHouseMermberByUserId(ComMngPopulationDO comMngPopulationDO);
    List<ComHouseMemberVo> listHouseMermberByUserId(@Param("comMngPopulationDO") ComMngPopulationDO comMngPopulationDO);

    @Select("<script> " +
            "SELECT\n" +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopStoreDO.java

@@ -117,7 +117,10 @@
     * 负责人
     */
    private String contacts;

    /**
     * 管理后台用户id
     */
    private Long sysUserId;
    @Override
    public String toString() {
        return "ComShopStoreDO{" +