springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationCorrectExcelListen.java
@@ -286,17 +286,17 @@ if (StringUtils.isNotEmpty(oneData.get(15))) { vo.setCensusRegister(oneData.get(15).trim()); } if (StringUtils.isEmpty(oneData.get(16))) { Integer isOk = PopulCultureLevelEnum.getCodeByName(oneData.get(16)); if (isOk.equals(-1)) { index++; ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO(); setMistake(oneData, mistake); mistake.setMistake("您填写的学历有误"); mistakes.add(mistake); continue; } vo.setCultureLevel(isOk); if (StringUtils.isNotEmpty(oneData.get(16))) { // Integer isOk = PopulCultureLevelEnum.getCodeByName(oneData.get(16)); // if (isOk.equals(-1)) { // index++; // ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO(); // setMistake(oneData, mistake); // mistake.setMistake("您填写的学历有误"); // mistakes.add(mistake); // continue; // } vo.setCultureLevel(oneData.get(16).trim()); } if (StringUtils.isNotEmpty(oneData.get(17))) { vo.setCorrectPersonCode(oneData.get(17).trim()); springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationMajorExcelListen.java
@@ -303,16 +303,16 @@ vo.setCustodyPerson(oneData.get(18).trim()); } if (StringUtils.isNotEmpty(oneData.get(19))) { Integer isOk = PopulRelationEnum.getCodeByName(oneData.get(19)); if (isOk.equals(-1)) { index++; ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO(); setMistake(oneData, mistake); mistake.setMistake("您填写的与监护人关系有误"); mistakes.add(mistake); continue; } vo.setCustodyRelation(isOk); // Integer isOk = PopulRelationEnum.getCodeByName(oneData.get(19)); // if (isOk.equals(-1)) { // index++; // ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO(); // setMistake(oneData, mistake); // mistake.setMistake("您填写的与监护人关系有误"); // mistakes.add(mistake); // continue; // } vo.setCustodyRelation(oneData.get(19).trim()); } if (StringUtils.isNotEmpty(oneData.get(20))) { vo.setCustodyCardNo(oneData.get(20).trim()); springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationRehabilitationExcelListen.java
@@ -308,17 +308,17 @@ vo.setMainRelatives(oneData.get(17).trim()); } if (StringUtils.isNotEmpty(oneData.get(18))) { Integer isOk = PopulRelationEnum.getCodeByName(oneData.get(18)); if (isOk.equals(-1)) { index++; ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO(); setRehabilitationMistake(oneData, mistake); mistake.setMistake("您填写的与人员关系有误"); mistakes.add(mistake); continue; } vo.setPatientRelation(isOk); // Integer isOk = PopulRelationEnum.getCodeByName(oneData.get(18)); // if (isOk.equals(-1)) { // index++; // ComMngPopulationRehabilitationMistakeExcelVO mistake = // new ComMngPopulationRehabilitationMistakeExcelVO(); // setRehabilitationMistake(oneData, mistake); // mistake.setMistake("您填写的与人员关系有误"); // mistakes.add(mistake); // continue; // } vo.setPatientRelation(oneData.get(18).trim()); } if (StringUtils.isNotEmpty(oneData.get(19))) { vo.setRehabReasonAndType(oneData.get(19).trim()); springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationVeteransExcelListen.java
@@ -176,16 +176,16 @@ vo.setPhoto(oneData.get(6)); } if (StringUtils.isNotEmpty(oneData.get(7))) { Integer isOk = PopulRegiterNatureEnum.getCodeByName(oneData.get(7).trim()); if (isOk.equals(-1)) { index++; ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO(); setVeteransMistake(oneData, mistake); mistake.setMistake("您填写的户籍性质有误"); mistakes.add(mistake); continue; } vo.setRegiterNature(isOk); // Integer isOk = PopulRegiterNatureEnum.getCodeByName(oneData.get(7).trim()); // if (isOk.equals(-1)) { // index++; // ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO(); // setVeteransMistake(oneData, mistake); // mistake.setMistake("您填写的户籍性质有误"); // mistakes.add(mistake); // continue; // } vo.setRegiterNature(oneData.get(7).trim()); } if (StringUtils.isNotEmpty(oneData.get(8))) { vo.setCensusRegister(oneData.get(8).trim()); @@ -338,7 +338,7 @@ index++; ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO(); setVeteransMistake(oneData, mistake); mistake.setMistake("您填写的婚姻关系·有误"); mistake.setMistake("您填写的婚姻关系有误"); mistakes.add(mistake); continue; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCorrectPopulationVO.java
@@ -240,7 +240,7 @@ * 学历 */ @ApiModelProperty("学历") private Integer cultureLevel; private String cultureLevel; /** * 社区矫正人员编号 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMajorPopulationVO.java
@@ -91,7 +91,7 @@ * 与监护人关系 */ @ApiModelProperty("与监护人关系") private Integer custodyRelation; private String custodyRelation; /** * 监护人公民身份号码 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCorrectExcelVO.java
@@ -69,7 +69,7 @@ private String censusRegister; @ExcelProperty(value = "学历", index = 16) private Integer cultureLevel; private String cultureLevel; @ExcelProperty(value = "社区矫正人员编号", index = 17) private String correctPersonCode; springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMajorExcelVO.java
@@ -77,7 +77,7 @@ private String custodyPerson; @ExcelProperty(value = "与监护人关系", index = 19) private Integer custodyRelation; private String custodyRelation; @ExcelProperty(value = "监护人公民身份号码", index = 20) private String custodyCardNo; springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationRehabilitationExcelVO.java
@@ -75,7 +75,7 @@ private String mainRelatives; @ExcelProperty(value = "与人员关系", index = 18) private Integer patientRelation; private String patientRelation; @ExcelProperty(value = "列管原因及类型", index = 19) private String rehabReasonAndType; springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVeteransExcelVO.java
@@ -41,8 +41,8 @@ @ExcelProperty(value = "照片", index = 6) private String photo; @ExcelProperty(value = "户籍性质（1.城镇户口 2.农村户口）", index = 7) private Integer regiterNature; @ExcelProperty(value = "户籍性质", index = 7) private String regiterNature; @ExcelProperty(value = "户口所在地", index = 8) private String censusRegister; springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComRehabilitationPopulationVO.java
@@ -74,7 +74,7 @@ * 与人员关系 */ @ApiModelProperty("与人员关系") private Integer patientRelation; private String patientRelation; /** * 列管原因及类型 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComVeteransPopulationVO.java
@@ -89,10 +89,10 @@ private String photo; /** * 户籍性质（1.城镇户口 2.农村户口） * 户籍性质 */ @ApiModelProperty("户籍性质（1.城镇户口 2.农村户口）") private Integer regiterNature; @ApiModelProperty("户籍性质") private String regiterNature; /** * 入伍时间 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
@@ -570,7 +570,7 @@ + " id = #{populationId}") PopulationDetailVO getPopulationDetailApp(@Param("populationId") Long populationId); @Select("<script> " + "SELECT " + " * " + "FROM " + " ( " + " SELECT " + " cmp.id, " + " cmp.`name` AS userName, " @Select("<script> " + " SELECT " + " cmp.id, " + " cmp.`name` AS userName, " + " cmpct.label, " + " cmp.card_no, " + " cmp.card_no_str, " + " cmp.sex, " + " cmp.address, " + " cmp.political_outlook, " + " cmp.census_register, " + " cmp.house_id, " + " cmp.phone, " + " IFNULL(cmp.house_id,0) as isHouse, " @@ -589,9 +589,7 @@ + "AND cmp.house_id is null " + " </if> " + "<if test='populationListDTO.communityId != null'>" + "AND cmpct.community_id = #{populationListDTO.communityId} " + " </if> " + "<if test='populationListDTO.politicalOutlook != null'>" + "AND cmp.political_outlook = #{populationListDTO.politicalOutlook} " + " </if> " + " ) as population where 1=1 " + "<if test='populationListDTO.eventStatus != null'>" + "AND population.eventStatus = #{populationListDTO.eventStatus} " + " </if> " + " </script>") + "AND cmp.political_outlook = #{populationListDTO.politicalOutlook} " + " </if> " + " </script>") IPage<ComMngPopulationListVO> getGridPopulationAdminList(Page page, @Param("populationListDTO") ComMngPopulationListDTO populationListDTO); @@ -617,18 +615,15 @@ @Param("populationDTO") PageComMngPopulationDTO populationDTO); @Select("<script> " + "SELECT " + " count( id ) AS localNum, " + " ( SELECT count( cmpct.id ) FROM com_mng_population_community_tags as cmpct left join com_mng_population as cmp on cmp.id = cmpct.population_id WHERE cmp.out_or_local = 2 " + "<if test='communityId != null and communityId != 0'>" + " AND cmpct.community_id = #{communityId} " + " </if> " + " ) AS flowNum, " + " ( SELECT count( cmpct.id ) FROM com_mng_population_community_tags as cmpct left join com_mng_population as cmp on cmp.id = cmpct.population_id WHERE cmpct.label IS NOT NULL " + "<if test='communityId != null and communityId != 0'>" + " AND cmpct.community_id = #{communityId} " + " </if> " + " ) AS specialNum " + "FROM " + " com_mng_population_community_tags as cmpct left join com_mng_population as cmp on cmp.id = cmpct.population_id " + "WHERE " + " cmp.out_or_local = 1 " + "<if test='communityId != null and communityId != 0'>" + " AND cmpct.community_id = #{communityId} " + " </if> " + " </script>") + " ( SELECT count( cmp.id ) FROM com_mng_population as cmp WHERE cmp.out_or_local = 2 " + " ) AS flowNum, " + " ( SELECT count( cmpct.id ) FROM com_mng_population as cmp left join com_mng_population_community_tags AS cmpct on cmp.id = cmpct.population_id WHERE cmpct.label IS NOT NULL " + " ) AS specialNum " + "FROM " + " com_mng_population as cmp " + "WHERE " + " cmp.out_or_local = 1 " + " </script>") PopulationStatisticsVO getGridPopulationStatistics(@Param("communityId") Long communityId); @Select("<script> " + "SELECT " + " * " + "FROM " + " ( " + " SELECT " + " cmp.id, " + " cmp.`name` AS userName, " @Select("<script> " + " SELECT " + " cmp.id, " + " cmp.`name` AS userName, " + " cmpct.label, " + " cmp.card_no, " + " cmp.card_no_str, " + " cmp.sex, " + " cmp.address, " + " cmp.political_outlook, " + " cmp.census_register, " + " cmp.house_id, " + " cmp.phone, " + " IFNULL(cmp.house_id,0) as isHouse, " @@ -651,9 +646,7 @@ + "AND cmp.house_id is null " + " </if> " + "<if test='populationExportDTO.communityId != null'>" + "AND cmpct.community_id = #{populationExportDTO.communityId} " + " </if> " + "<if test='populationExportDTO.politicalOutlook != null'>" + "AND cmp.political_outlook = #{populationExportDTO.politicalOutlook} " + " </if> " + " ) as population where 1=1 " + "<if test='populationExportDTO.eventStatus != null'>" + "AND population.eventStatus = #{populationExportDTO.eventStatus} " + " </if> " + " </script>") + "AND cmp.political_outlook = #{populationExportDTO.politicalOutlook} " + " </if> " + " </script>") List<ComMngPopulationListVO> getGridPopulationAdminLists(@Param("populationExportDTO") ComMngPopulationExportDTO populationExportDTO);
@@ -197,7 +197,7 @@ /** * 学历 */ private Integer cultureLevel; private String cultureLevel; /** * 社区矫正人员编号 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMajorPopulationDO.java
@@ -77,7 +77,7 @@ /** * 与监护人关系 */ private Integer custodyRelation; private String custodyRelation; /** * 监护人公民身份号码 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComRehabilitationPopulationDO.java
@@ -62,7 +62,7 @@ /** * 与人员关系 */ private Integer patientRelation; private String patientRelation; /** * 列管原因及类型 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComVeteransPopulationDO.java
@@ -75,9 +75,9 @@ private String photo; /** * 户籍性质（1.城镇户口 2.农村户口） * 户籍性质 */ private Integer regiterNature; private String regiterNature; /** * 入伍时间
