springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java
@@ -178,9 +178,15 @@ vo.setWorkCompany(oneData.get(16)); } if(oneData.get(17) != null){ vo.setRemark(oneData.get(17)); vo.setOutOrLocal(oneData.get(17)); } for (int i = 18; i < headSize; i++) { if(oneData.get(18) != null){ vo.setCensusRegister(oneData.get(18)); } if(oneData.get(19) != null){ vo.setRemark(oneData.get(19)); } for (int i = 20; i < headSize; i++) { if (oneData.get(i) != null && oneData.get(i).equals("是")) { vo.getUserTagStr().add(headData.get(i).substring(0,headData.get(i).indexOf("("))); } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationDTO.java
@@ -90,6 +90,7 @@ */ @ApiModelProperty(value="年龄") private Integer age; /** * 身份证号码 */ springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java
@@ -65,7 +65,13 @@ @ExcelProperty(value = "工作单位", index = 16) private String workCompany; @ExcelProperty(value = "备注", index = 17) @ExcelProperty(value = "外地or本地", index = 17) private String outOrLocal; @ExcelProperty(value = "户口所在地", index = 18) private String censusRegister; @ExcelProperty(value = "备注", index = 19) private String remark; private Integer age; springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java
@@ -62,9 +62,11 @@ @ApiModelProperty("身份证号码") @NotBlank(groups = {AddGroup.class},message = "身份证号码不可为空") @EncryptDecryptField @Sensitive(strategy = SensitiveStrategy.ID_CARD) private String cardNo; @ApiModelProperty("出生年月") private String birthday; @ApiModelProperty("街路巷") @NotBlank(groups = {AddGroup.class},message = "街路巷不可为空") private String road; springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EditComMngPopulationVO.java
@@ -19,7 +19,7 @@ * 实有人口Vo */ @Data @ApiModel("实有人口表") @ApiModel("实有人口编辑表") @EncryptDecryptClass public class EditComMngPopulationVO implements Serializable {
@@ -11,7 +11,7 @@ /** * 用户id */ @ApiModelProperty(value = "用户id",hidden = true) @ApiModelProperty(value = "用户id") private Long userId; /** springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -29,6 +29,7 @@ import com.panzhihua.common.model.vos.shop.ShopOperLogVO; import com.panzhihua.common.model.vos.shop.AddShopGoodsVO; import com.panzhihua.common.model.vos.shop.ShopStoreVO; import com.panzhihua.common.model.vos.user.UserElectronicFileVO; import com.panzhihua.common.model.vos.user.UserPhoneVO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.transaction.annotation.Transactional; @@ -2452,4 +2453,12 @@ */ @PostMapping("/shop/conf/get") R pageShopSysConf(@RequestBody PageComShopSysConfDTO pageComShopSysConfDTO); /** * 编辑实有人口_电子档案 * @param userElectronicFileVO * @return */ @PostMapping("/common/data/population/edit/electronicArchives") R editUserElectronicFile(@RequestBody UserElectronicFileVO userElectronicFileVO); } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommonDataApi.java
@@ -785,7 +785,8 @@ return R.ok(); } @ApiOperation(value = "实有人口编辑") @ApiOperation(value = "编辑实有人口") @PostMapping(value = "/population/edit") public R editPopulationInfo(@RequestBody EditComMngPopulationVO editComMngPopulationVO){ LoginUserInfoVO loginUserInfo = getLoginUserInfo(); @@ -936,7 +937,11 @@ List<String> head17 = new ArrayList<String>(); head17.add("工作单位"); List<String> head18 = new ArrayList<String>(); head18.add("备注"); head18.add("本地/外地"); List<String> head19 = new ArrayList<String>(); head19.add("户口所在地"); List<String> head20 = new ArrayList<String>(); head20.add("备注"); list.add(head0); list.add(head1); list.add(head2); @@ -955,6 +960,8 @@ list.add(head16); list.add(head17); list.add(head18); list.add(head19); list.add(head20); return list; } @@ -977,6 +984,8 @@ data.add(""); data.add(""); data.add("阿里巴巴"); data.add("本地"); data.add("四川成都"); data.add(""); return data; } @@ -1053,4 +1062,11 @@ return R.fail(); } } @ApiOperation(value = "编辑实有人口_电子档案") @PostMapping("/population/edit/electronicArchives") R editPopulation(@RequestBody UserElectronicFileVO userElectronicFileVO){ return communityService.editUserElectronicFile(userElectronicFileVO); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java
@@ -4,6 +4,7 @@ import com.panzhihua.common.model.dtos.user.PageInputUserDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.*; import com.panzhihua.common.model.vos.user.UserElectronicFileVO; import com.panzhihua.service_community.service.*; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -324,7 +325,6 @@ * @param Ids 删除id集合 * @return 删除结果 */ @ApiOperation(value = "批量删除实有人口") @PostMapping("/population/delete") public R deletePopulations(@RequestBody List<Long> Ids) { return comMngPopulationService.deletePopulations(Ids); @@ -335,7 +335,6 @@ * @param communityId 社区id * @return 查询结果 */ @ApiOperation(value = "根据社区id查询所有实有人口") @PostMapping("/population/getAll") public R getPopulationListByCommunityId(@RequestParam(value = "communityId") Long communityId) { return comMngPopulationService.getPopulationListByCommunityId(communityId); @@ -346,7 +345,6 @@ * @param Ids 实有人口id集合 * @return 查询结果 */ @ApiOperation(value = "批量删除实有人口") @PostMapping("/population/getList") public R getPopulationLists(@RequestBody List<Long> Ids) { return comMngPopulationService.getPopulationLists(Ids); @@ -381,4 +379,15 @@ public R deleteSpecialInputUser(@RequestParam(value = "id") Long id){ return comMngPopulationService.deleteSpecialInputUser(id); } /** * 编辑实有人口_电子档案 * @param userElectronicFileVO * @return */ @PostMapping("/population/edit/electronicArchives") R editPopulation(@RequestBody UserElectronicFileVO userElectronicFileVO){ return comMngPopulationService.editUserElectronicFile(userElectronicFileVO); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngCarDAO.java
@@ -39,7 +39,7 @@ " LEFT JOIN com_act t1 ON t.community_id = t1.community_id " + " LEFT JOIN com_mng_struct_area t2 ON t2.id = t.area_id " + " LEFT JOIN sys_user t3 ON t.create_by = t3.user_id " + " WHERE t.source =2 " + " WHERE 1=1" + "<if test='pageComMngCarDTO.name != null and pageComMngCarDTO.name.trim() != ""'>" + " and t.user_name LIKE concat( '%',#{pageComMngCarDTO.name}, '%' ) " + " </if> " + springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
@@ -190,5 +190,9 @@ @Select("select user_id,card_photo_front,card_photo_back,family_book from sys_user where id_card=#{idCard}") UserElectronicFileVO getSysUserElectronicFile(@Param("idCard") String idCard); @Select("select user_id,card_photo_front,card_photo_back,family_book from sys_user where user_id=#{userId}") UserElectronicFileVO getSysUserById(@Param("userId") Long userId); @Select("update sys_user set card_photo_front=#{vo.cardPhotoFront},card_photo_back=#{vo.cardPhotoBack},family_book=#{vo.familyBook} where user_id=#{vo.userId}") void updateSysUserElectronicFile(@Param("vo") UserElectronicFileVO vo); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationDO.java
@@ -86,6 +86,14 @@ @EncryptDecryptField private String phone; /** * 外地or本地 */ private String outOrLocal; /** * 户口所在地 */ private String censusRegister; /** * 备注 */ private String remark; springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java
@@ -7,6 +7,7 @@ import com.panzhihua.common.model.vos.community.ComMngPopulationServeExcelVO; import com.panzhihua.common.model.vos.community.ComMngPopulationVO; import com.panzhihua.common.model.vos.community.EditComMngPopulationVO; import com.panzhihua.common.model.vos.user.UserElectronicFileVO; import java.util.List; @@ -128,4 +129,11 @@ * @return 实有人口电子档信息 */ R electronicArchivesPopulation(Long populationId); /** * 编辑电子档案 * @param userElectronicFileVO * @return */ R editUserElectronicFile(UserElectronicFileVO userElectronicFileVO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -20,6 +20,7 @@ import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO; import com.panzhihua.common.model.vos.user.InputUserInfoVO; import com.panzhihua.common.model.vos.user.UserElectronicFileVO; import com.panzhihua.common.utlis.AgeUtils; import com.panzhihua.service_community.dao.ComActDAO; import com.panzhihua.service_community.dao.ComActVillageDAO; import com.panzhihua.service_community.dao.ComMngPopulationDAO; @@ -173,6 +174,12 @@ page.setSize(pageSize); page.setCurrent(pageNum); IPage<ComMngPopulationVO> iPage = populationDAO.pagePopulation(page, comMngPopulationVO); iPage.getRecords().forEach(vo->{ //获取用户生日 String birthday = vo.getCardNo().substring(6, 14); //设置用户年龄 vo.setBirthday(birthday); }); return R.ok(iPage); } @@ -503,4 +510,14 @@ } return R.ok(); } @Override public R editUserElectronicFile(UserElectronicFileVO userElectronicFileVO) { UserElectronicFileVO electronicFileVO = populationDAO.getSysUserById(userElectronicFileVO.getUserId()); if(electronicFileVO==null){ return R.fail("id有误！"); } populationDAO.updateSysUserElectronicFile(userElectronicFileVO); return R.ok(); } }
