bugfixed

CeDo

2021-06-11 34f6f5ec893922d6befc71181dd4943cce0bb863

bugfixed

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthRecordForCommunityVO.java

@@ -66,7 +66,7 @@
    private String status;

    @ApiModelProperty(value = "出生日期")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date birthDay;

    @ApiModelProperty(value = "申请人姓名")

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthElderlyApi.java

@@ -45,7 +45,9 @@
     */
    @PostMapping("/batchSave")
    R batchSave(@RequestBody List<EldersAuthElderlyExcelVO> eldersAuthElderlyExcelVOS,@RequestParam("communityId") Long communityId,@RequestParam("createBy") Long createBy){

        if(eldersAuthElderlyExcelVOS==null||eldersAuthElderlyExcelVOS.size()==0){
            return R.fail("模板为空");
        }
        return comEldersAuthElderlyService.batchSave(eldersAuthElderlyExcelVOS,communityId,createBy);
    }


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

@@ -210,7 +210,7 @@
            " AND e.type = #{pageEldersAuthRecordDTO.type}\n" +
            "</if>" +
            " <if test='pageEldersAuthRecordDTO.month!=null'>\n" +
            " AND month(e.CREATE_BY) = #{pageEldersAuthRecordDTO.month}\n" +
            " AND month(e.CREATE_AT) = #{pageEldersAuthRecordDTO.month}\n" +
            "</if>\n" +
            "</where>\n" +
            "<if test='pageEldersAuthRecordDTO.sortColumns!=null'>\n" +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEldersAuthElderlyServiceImpl.java

@@ -62,6 +62,10 @@
            comEldersAuthElderlyDO.setDomicile(eldersAuthService.queryDomicile(e.getIdCard()));
            comEldersAuthElderlyDO.setIsExist(Objects.equals("是",e.getIsExist())?1:2);
            comEldersAuthElderlyDO.setIsBigAge(Objects.equals("是",e.getIsExist())?1:2);
            /**
             * 去重
             */

            listDO.add(comEldersAuthElderlyDO);
        });
        this.saveBatch(listDO);