diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java index fe487d3631..e624c5038f 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java @@ -38,6 +38,9 @@ public enum DictTypeEnum { YT_POPULATION_TYPE("yt_population_type","人口类型",41), YT_POLITICS_STATUS("yt_politics_status","政治面貌",42), YT_ID_CARD_TYPE("yt_id_card_type","证件类型",43), + + POVERTY_TYPE("poverty_type", "贫困属性", 60), + UNIT_TYPE("unit_type", "企业类型", 61), ; private final String code; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/PovertyCondoleDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/PovertyCondoleDTO.java new file mode 100755 index 0000000000..3828be0957 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/PovertyCondoleDTO.java @@ -0,0 +1,86 @@ +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + + +/** + * 日照：贫困人员慰问记录 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-06-17 + */ +@Data +public class PovertyCondoleDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + private String id; + + /** + * 贫困人员ID + */ + private String povertyId; + + /** + * 居民ID + */ + private Integer resiUserId; + + /** + * 贫困人员姓名 + */ + private String userName; + + /** + * 慰问时间 + */ + private Date condoleTime; + + /** + * 慰问人员，多人以“,”相隔 + */ + private String condoleStaff; + + /** + * 慰问内容 + */ + private String content; + + /** + * 详细描述 + */ + private String remark; + + /** + * 图片 + */ + private List imgs; + + /** + * 电话 + */ + private String mobile; + + /** + * 身份证号码 + */ + private String idCard; + + /** + * 贫困属性 + */ + private String povertyType; + + /** + * 脱贫状态 + */ + private Integer povertyStatus; + +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/PovertyManageDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/PovertyManageDTO.java index 219040f7e2..507ec16c35 100755 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/PovertyManageDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/PovertyManageDTO.java @@ -3,12 +3,9 @@ package com.epmet.dto; import lombok.Data; import java.io.Serializable; -import java.util.Date; /** - * - * * @author generator generator@elink-cn.com * @since v1.0.0 2023-06-16 */ @@ -20,76 +17,46 @@ public class PovertyManageDTO implements Serializable { /** * 主键ID */ - private String id; + private String id; /** * 居民ID */ - private String resiUserId; + private String resiUserId; /** * 组织ID */ - private String agencyId; + private String agencyId; /** * 网格ID */ - private String gridId; + private String gridId; /** * 姓名 */ - private String userName; + private String userName; /** * 电话 */ - private String mobile; + private String mobile; /** * 身份证号码 */ - private String idCard; + private String idCard; /** * 贫困属性 */ - private Integer povertyType; + private String povertyType; /** * 脱贫状态 */ - private Integer povertyStatus; - - /** - * 删除标识：0.未删除 1.已删除 - */ - private Integer delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; + private Integer povertyStatus; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PovertyManageDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PovertyManageDTO.java new file mode 100755 index 0000000000..18b0c347da --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PovertyManageDTO.java @@ -0,0 +1,62 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-06-16 + */ +@Data +public class PovertyManageDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + private String id; + + /** + * 居民ID + */ + private String resiUserId; + + /** + * 组织ID + */ + private String agencyId; + + /** + * 网格ID + */ + private String gridId; + + /** + * 姓名 + */ + private String userName; + + /** + * 电话 + */ + private String mobile; + + /** + * 身份证号码 + */ + private String idCard; + + /** + * 贫困属性 + */ + private String povertyType; + + /** + * 脱贫状态 + */ + private Integer povertyStatus; + +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/povertyManage/PovertyCondoleAttrDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/povertyManage/PovertyCondoleAttrDTO.java new file mode 100644 index 0000000000..417cee916e --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/povertyManage/PovertyCondoleAttrDTO.java @@ -0,0 +1,20 @@ +package com.epmet.dto.form.povertyManage; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author yan Lu + * @description 描述 + * @create 2023/6/18 21:46 + */ +@Data +public class PovertyCondoleAttrDTO implements Serializable { + + private static final long serialVersionUID = -5490762499712805180L; + + private String pcId; + + private String url; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/povertyManage/PovertyCondoleFormDto.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/povertyManage/PovertyCondoleFormDto.java new file mode 100644 index 0000000000..55ac71a2d7 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/povertyManage/PovertyCondoleFormDto.java @@ -0,0 +1,47 @@ +package com.epmet.dto.form.povertyManage; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @author yan Lu + * @description 贫困人员慰问记录 + * @create 2023/6/17 15:44 + */ +@Data +public class PovertyCondoleFormDto extends PageFormDTO implements Serializable { + + + private static final long serialVersionUID = 8556498763914596452L; + + private String id; + + private String povertyId; + + private String resiUserId; + + private String userName; + + private String idCard; + + private String content; + + private String remark; + + private String condoleStaff; + + private String povertyStatus; + + private String povertyType; + + private List imgs; + + private String condoleTime; + + private String startTime; + + private String endTime; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/povertyManage/PovertyManageFormDto.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/povertyManage/PovertyManageFormDto.java index 865a7ce182..2b3d3db855 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/povertyManage/PovertyManageFormDto.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/povertyManage/PovertyManageFormDto.java @@ -20,7 +20,7 @@ public class PovertyManageFormDto extends PageFormDTO implements Serializable { private String resiUserId; - private String name; + private String userName; private String mobile; @@ -30,7 +30,7 @@ public class PovertyManageFormDto extends PageFormDTO implements Serializable { private String gridId; - private String povertyStatus; + private Integer povertyStatus; private String povertyType; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/PovertyCondoleController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/PovertyCondoleController.java new file mode 100755 index 0000000000..9e6d3502b0 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/PovertyCondoleController.java @@ -0,0 +1,144 @@ +package com.epmet.controller; + +import com.baomidou.mybatisplus.core.toolkit.IdWorker; +import com.epmet.commons.tools.annotation.MaskResponse; +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.enums.DictTypeEnum; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.dto.PovertyCondoleDTO; +import com.epmet.dto.form.povertyManage.PovertyCondoleAttrDTO; +import com.epmet.dto.form.povertyManage.PovertyCondoleFormDto; +import com.epmet.entity.PovertyCondoleAttrEntity; +import com.epmet.feign.EpmetAdminOpenFeignClient; +import com.epmet.service.PovertyCondoleAttrService; +import com.epmet.service.PovertyCondoleService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.CollectionUtils; +import org.springframework.web.bind.annotation.*; + +import java.text.ParseException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + + +/** + * 日照：贫困人员慰问记录 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-06-17 + */ +@RestController +@RequestMapping("povertyCondole") +public class PovertyCondoleController { + + @Autowired + private PovertyCondoleService povertyCondoleService; + + @Autowired + private PovertyCondoleAttrService attrService; + + @Autowired + private EpmetAdminOpenFeignClient adminOpenFeignClient; + + @RequestMapping("page") + @MaskResponse(fieldNames = {"mobile", "idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) + public Result> page(@RequestParam Map params) { + PageData page = povertyCondoleService.page(params); + if (null != page && page.getList().size() > 0) { + buildData(page.getList()); + } + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET}) + public Result get(@PathVariable("id") String id) { + PovertyCondoleDTO data = povertyCondoleService.get(id); + List imgs = attrService.selectByPcId(id); + if (!CollectionUtils.isEmpty(imgs)) { + List imageList = new ArrayList<>(); + imgs.forEach(file -> { + imageList.add(file.getUrl()); + }); + data.setImgs(imageList); + } + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody PovertyCondoleFormDto dto) throws ParseException { + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + dto.setId(IdWorker.getIdStr()); + if (!CollectionUtils.isEmpty(dto.getImgs())) { + List imageList = new ArrayList<>(); + buildImgs(imageList, dto.getImgs(), dto.getId()); + attrService.insertBatch(imageList); + } + povertyCondoleService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody PovertyCondoleFormDto dto) throws ParseException { + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + if (!CollectionUtils.isEmpty(dto.getImgs())) { + List imageList = new ArrayList<>(); + buildImgs(imageList, dto.getImgs(), dto.getId()); + attrService.insertBatch(imageList); + } + povertyCondoleService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids) { + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + povertyCondoleService.delete(ids); + return new Result(); + } + + @PostMapping("search") + @MaskResponse(fieldNames = {"mobile", "idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) + public Result> search(@RequestBody PovertyCondoleFormDto formDto) { + PageData page = povertyCondoleService.search(formDto); + if (null != page && page.getList().size() > 0) { + buildData(page.getList()); + } + return new Result().ok(page); + } + + private void buildData(List dtoList) { + Result> dictMapRes = adminOpenFeignClient.dictMap(DictTypeEnum.POVERTY_TYPE.getCode()); + if (null != dictMapRes.getData() && dictMapRes.getData().size() > 0) { + Map dictMap = dictMapRes.getData(); + for (PovertyCondoleDTO dto : dtoList) { + if (null != dto.getPovertyType()) { + dto.setPovertyType(dictMap.get(dto.getPovertyType())); + } + } + } + } + + private void buildImgs(List imgList, List dtoImgs, String dtoId) { + for (String url : dtoImgs) { + PovertyCondoleAttrEntity attr = new PovertyCondoleAttrEntity(); + attr.setPovertyCondoleId(dtoId); + attr.setAttachmentUrl(url); + attr.setAttachmentFormat(url.substring(url.lastIndexOf(".") + NumConstant.ONE).toLowerCase()); + attr.setAttachmentType("image"); + imgList.add(attr); + } + } +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/PovertyManageController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/PovertyManageController.java index 4150443c57..3ed3e2b45f 100755 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/PovertyManageController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/PovertyManageController.java @@ -1,6 +1,8 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.MaskResponse; import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.enums.DictTypeEnum; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; @@ -10,11 +12,14 @@ import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.PovertyManageDTO; import com.epmet.dto.form.povertyManage.PovertyManageFormDto; +import com.epmet.feign.EpmetAdminOpenFeignClient; import com.epmet.service.PovertyManageService; -import com.github.pagehelper.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; +import java.util.Map; + /** * @author generator generator@elink-cn.com @@ -27,10 +32,18 @@ public class PovertyManageController { @Autowired private PovertyManageService povertyManageService; - @PostMapping("page") - public Result> selectList(@RequestBody PovertyManageFormDto formDTO) { - Page page = povertyManageService.selectPage(formDTO); - return new Result().ok(page); + @Autowired + private EpmetAdminOpenFeignClient adminOpenFeignClient; + + + @RequestMapping("page") + @MaskResponse(fieldNames = {"mobile", "idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) + public Result> page(@RequestParam Map params) { + PageData page = povertyManageService.page(params); + if (null != page && page.getList().size() > 0) { + buildData(page.getList()); + } + return new Result>().ok(page); } @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET}) @@ -65,4 +78,26 @@ public class PovertyManageController { return new Result(); } + @PostMapping("search") + @MaskResponse(fieldNames = {"mobile", "idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) + public Result> search(@RequestBody PovertyManageFormDto formDto) { + PageData page = povertyManageService.search(formDto); + if (null != page && page.getList().size() > 0) { + buildData(page.getList()); + } + return new Result>().ok(page); + } + + private void buildData(List dtoList) { + Result> dictMapRes = adminOpenFeignClient.dictMap(DictTypeEnum.POVERTY_TYPE.getCode()); + if (null != dictMapRes.getData() && dictMapRes.getData().size() > 0) { + Map dictMap = dictMapRes.getData(); + for (PovertyManageDTO dto : dtoList) { + if (null != dto.getPovertyType()) { + dto.setPovertyType(dictMap.get(dto.getPovertyType())); + } + } + } + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/PovertyCondoleAttrDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/PovertyCondoleAttrDao.java new file mode 100644 index 0000000000..3fb446dc1b --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/PovertyCondoleAttrDao.java @@ -0,0 +1,21 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.form.povertyManage.PovertyCondoleAttrDTO; +import com.epmet.entity.PovertyCondoleAttrEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author yan Lu + * @description 描述 + * @create 2023/6/18 21:40 + */ +@Mapper +public interface PovertyCondoleAttrDao extends BaseDao { + + List selectByPcId(@Param("pcId") String pcId); + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/PovertyCondoleDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/PovertyCondoleDao.java new file mode 100755 index 0000000000..9b6e5b9c04 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/PovertyCondoleDao.java @@ -0,0 +1,24 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.PovertyCondoleDTO; +import com.epmet.entity.PovertyCondoleEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 日照：贫困人员慰问记录 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-06-17 + */ +@Mapper +public interface PovertyCondoleDao extends BaseDao { + + List search(@Param("userName") String userName, @Param("idCard") String idCard, + @Param("condoleStaff") String condoleStaff, @Param("povertyType") String povertyType, + @Param("povertyStatus") String povertyStatus, @Param("content") String content, + @Param("startTime") String startTime, @Param("endTime") String endTime); +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/PovertyManageDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/PovertyManageDao.java index dc0d92a675..1bc31ea0d4 100755 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/PovertyManageDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/PovertyManageDao.java @@ -2,9 +2,9 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.PovertyManageDTO; -import com.epmet.dto.form.povertyManage.PovertyManageFormDto; import com.epmet.entity.PovertyManageEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -15,6 +15,7 @@ import java.util.List; @Mapper public interface PovertyManageDao extends BaseDao { - List selectPage(PovertyManageFormDto formDTO); - + List search(@Param("userName") String userName, @Param("mobile") String mobile, + @Param("idCard") String idCard, @Param("povertyType") String povertyType, + @Param("povertyStatus") Integer povertyStatus); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PovertyCondoleAttrEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PovertyCondoleAttrEntity.java new file mode 100644 index 0000000000..2c5656d5e6 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PovertyCondoleAttrEntity.java @@ -0,0 +1,36 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * @author yan Lu + * @description 描述 + * @create 2023/6/18 21:10 + */ +@EqualsAndHashCode(callSuper = false) +@TableName("poverty_condole_attr") +@Data +public class PovertyCondoleAttrEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + private String id; + + private String povertyCondoleId; + + private String fileName; + + private String attachmentName; + + private String attachmentSize; + + private String attachmentFormat; + + private String attachmentType; + + private String attachmentUrl; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PovertyCondoleEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PovertyCondoleEntity.java new file mode 100755 index 0000000000..25b177160e --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PovertyCondoleEntity.java @@ -0,0 +1,58 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 日照：贫困人员慰问记录 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-06-17 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("poverty_condole") +public class PovertyCondoleEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 贫困人员ID + */ + private String povertyId; + + /** + * 居民ID + */ + private String resiUserId; + + /** + * 贫困人员姓名 + */ + private String userName; + + /** + * 慰问时间 + */ + private Date condoleTime; + + /** + * 慰问人员，多人以“,”相隔 + */ + private String condoleStaff; + + /** + * 慰问内容 + */ + private String content; + + /** + * 详细描述 + */ + private String remark; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PovertyManageEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PovertyManageEntity.java index f9f7582a19..2d24de8d23 100755 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PovertyManageEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PovertyManageEntity.java @@ -51,7 +51,7 @@ public class PovertyManageEntity extends BaseEpmetEntity { /** * 贫困属性 */ - private Integer povertyType; + private String povertyType; /** * 脱贫状态 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/PovertyCondoleExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/PovertyCondoleExcel.java new file mode 100755 index 0000000000..cbaf98a711 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/PovertyCondoleExcel.java @@ -0,0 +1,60 @@ +package com.epmet.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 日照：贫困人员慰问记录 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-06-17 + */ +@Data +public class PovertyCondoleExcel { + + @Excel(name = "主键ID") + private String id; + + @Excel(name = "贫困人员ID") + private String povertyId; + + @Excel(name = "居民ID") + private Integer resiUserId; + + @Excel(name = "贫困人员姓名") + private String name; + + @Excel(name = "慰问时间") + private Date condoleTiem; + + @Excel(name = "慰问人员，多人以“,”相隔") + private String condoleStaff; + + @Excel(name = "慰问内容") + private String content; + + @Excel(name = "详细描述") + private String remark; + + @Excel(name = "删除标识：0.未删除 1.已删除") + private Integer delFlag; + + @Excel(name = "乐观锁") + private Integer revision; + + @Excel(name = "创建人") + private String createdBy; + + @Excel(name = "创建时间") + private Date createdTime; + + @Excel(name = "更新人") + private String updatedBy; + + @Excel(name = "更新时间") + private Date updatedTime; + + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/PovertyCondoleAttrService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/PovertyCondoleAttrService.java new file mode 100644 index 0000000000..6957c90680 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/PovertyCondoleAttrService.java @@ -0,0 +1,22 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.dto.form.povertyManage.PovertyCondoleAttrDTO; +import com.epmet.entity.PovertyCondoleAttrEntity; + +import java.util.List; + +/** + * @author yan Lu + * @description 描述 + * @create 2023/6/18 21:21 + */ +public interface PovertyCondoleAttrService extends BaseService { + + void update(PovertyCondoleAttrDTO dto); + + void delete(String[] ids); + + List selectByPcId(String id); + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/PovertyCondoleService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/PovertyCondoleService.java new file mode 100755 index 0000000000..1412144b11 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/PovertyCondoleService.java @@ -0,0 +1,82 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.PovertyCondoleDTO; +import com.epmet.dto.form.povertyManage.PovertyCondoleFormDto; +import com.epmet.entity.PovertyCondoleEntity; + +import java.text.ParseException; +import java.util.List; +import java.util.Map; + +/** + * 日照：贫困人员慰问记录 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-06-17 + */ +public interface PovertyCondoleService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2023-06-17 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2023-06-17 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return PovertyCondoleDTO + * @author generator + * @date 2023-06-17 + */ + PovertyCondoleDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2023-06-17 + */ + void save(PovertyCondoleFormDto dto) throws ParseException; + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2023-06-17 + */ + void update(PovertyCondoleFormDto dto) throws ParseException; + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2023-06-17 + */ + void delete(String[] ids); + + PageData search(PovertyCondoleFormDto formDto); +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/PovertyManageService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/PovertyManageService.java index f8eb31d531..bd0adbde64 100755 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/PovertyManageService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/PovertyManageService.java @@ -1,10 +1,13 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; import com.epmet.dto.PovertyManageDTO; import com.epmet.dto.form.povertyManage.PovertyManageFormDto; import com.epmet.entity.PovertyManageEntity; -import com.github.pagehelper.Page; + +import java.util.List; +import java.util.Map; /** * @author generator generator@elink-cn.com @@ -12,6 +15,26 @@ import com.github.pagehelper.Page; */ public interface PovertyManageService extends BaseService { + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2023-06-17 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2023-06-17 + */ + List list(Map params); + /** * 单条查询 * @@ -52,5 +75,6 @@ public interface PovertyManageService extends BaseService { */ void delete(String[] ids); - Page selectPage(PovertyManageFormDto formDTO); + PageData search(PovertyManageFormDto formDto); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PovertyCondoleAttrServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PovertyCondoleAttrServiceImpl.java new file mode 100644 index 0000000000..be566dd818 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PovertyCondoleAttrServiceImpl.java @@ -0,0 +1,37 @@ +package com.epmet.service.impl; + +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.dao.PovertyCondoleAttrDao; +import com.epmet.dto.form.povertyManage.PovertyCondoleAttrDTO; +import com.epmet.entity.PovertyCondoleAttrEntity; +import com.epmet.service.PovertyCondoleAttrService; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.List; + +/** + * @author yan Lu + * @description 描述 + * @create 2023/6/18 21:38 + */ +@Service +public class PovertyCondoleAttrServiceImpl extends BaseServiceImpl implements PovertyCondoleAttrService { + + @Override + public void update(PovertyCondoleAttrDTO dto) { + PovertyCondoleAttrEntity entity = ConvertUtils.sourceToTarget(dto, PovertyCondoleAttrEntity.class); + updateById(entity); + } + + @Override + public void delete(String[] ids) { + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + @Override + public List selectByPcId(String id) { + return baseDao.selectByPcId(id); + } +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PovertyCondoleServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PovertyCondoleServiceImpl.java new file mode 100755 index 0000000000..2d74d0ac26 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PovertyCondoleServiceImpl.java @@ -0,0 +1,101 @@ +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.dao.PovertyCondoleDao; +import com.epmet.dto.PovertyCondoleDTO; +import com.epmet.dto.form.povertyManage.PovertyCondoleFormDto; +import com.epmet.entity.PovertyCondoleEntity; +import com.epmet.service.PovertyCondoleService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 日照：贫困人员慰问记录 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-06-17 + */ +@Service +public class PovertyCondoleServiceImpl extends BaseServiceImpl implements PovertyCondoleService { + + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, PovertyCondoleDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + return ConvertUtils.sourceToTarget(entityList, PovertyCondoleDTO.class); + } + + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + return wrapper; + } + + @Override + public PovertyCondoleDTO get(String id) { + PovertyCondoleEntity entity = baseDao.selectById(id); + + return ConvertUtils.sourceToTarget(entity, PovertyCondoleDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(PovertyCondoleFormDto dto) throws ParseException { + PovertyCondoleEntity entity = ConvertUtils.sourceToTarget(dto, PovertyCondoleEntity.class); + if (StringUtils.isNotEmpty(dto.getCondoleTime())) { + entity.setCondoleTime(new SimpleDateFormat("yyyy-MM-dd").parse(dto.getCondoleTime())); + } + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(PovertyCondoleFormDto dto) throws ParseException { + PovertyCondoleEntity entity = ConvertUtils.sourceToTarget(dto, PovertyCondoleEntity.class); + if (StringUtils.isNotEmpty(dto.getCondoleTime())) { + entity.setCondoleTime(new SimpleDateFormat("yyyy-MM-dd").parse(dto.getCondoleTime())); + } + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + @Override + public PageData search(PovertyCondoleFormDto formDto) { + PageInfo pageInfo = PageHelper.startPage(formDto.getPageNo(), formDto.getPageSize(), formDto.getIsPage()) + .doSelectPageInfo(() -> baseDao.search(formDto.getUserName(), formDto.getIdCard(), formDto.getCondoleStaff(), formDto.getPovertyType(), + formDto.getPovertyStatus(), formDto.getContent(), formDto.getStartTime(), formDto.getEndTime())); + return new PageData<>(pageInfo.getList() == null ? new ArrayList<>() : pageInfo.getList(), pageInfo.getTotal()); + } + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PovertyManageServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PovertyManageServiceImpl.java index d433c0c63f..7638ff5f0c 100755 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PovertyManageServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PovertyManageServiceImpl.java @@ -1,18 +1,26 @@ package com.epmet.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.dao.PovertyManageDao; import com.epmet.dto.PovertyManageDTO; import com.epmet.dto.form.povertyManage.PovertyManageFormDto; import com.epmet.entity.PovertyManageEntity; import com.epmet.service.PovertyManageService; -import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Arrays; +import java.util.List; +import java.util.Map; /** * @author generator generator@elink-cn.com @@ -21,6 +29,28 @@ import java.util.Arrays; @Service public class PovertyManageServiceImpl extends BaseServiceImpl implements PovertyManageService { + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, PovertyManageDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + return ConvertUtils.sourceToTarget(entityList, PovertyManageDTO.class); + } + + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + return wrapper; + } + @Override public PovertyManageDTO get(String id) { PovertyManageEntity entity = baseDao.selectById(id); @@ -49,9 +79,9 @@ public class PovertyManageServiceImpl extends BaseServiceImpl selectPage(PovertyManageFormDto formDTO) { - return PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()) - .doSelectPage(() -> baseDao.selectPage(formDTO)); + public PageData search(PovertyManageFormDto formDto) { + PageInfo pageInfo = PageHelper.startPage(formDto.getPageNo(), formDto.getPageSize(), formDto.getIsPage()) + .doSelectPageInfo(() -> baseDao.search(formDto.getUserName(), formDto.getMobile(), formDto.getIdCard(), formDto.getPovertyType(), formDto.getPovertyStatus())); + return new PageData<>(pageInfo.getList() == null ? new ArrayList<>() : pageInfo.getList(), pageInfo.getTotal()); } - } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/PovertyCondoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/PovertyCondoleDao.xml new file mode 100755 index 0000000000..ca317e853c --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/PovertyCondoleDao.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + pc.id, + pm.USER_NAME, + pm.MOBILE, + pm.ID_CARD, + pm.POVERTY_TYPE, + pm.POVERTY_STATUS, + pc.CONDOLE_TIME, + pc.CONDOLE_STAFF, + pc.CONTENT, + pc.REMARK + + + + + diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/PovertyManageDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/PovertyManageDao.xml index 4e95016d16..5f5fafc40a 100755 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/PovertyManageDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/PovertyManageDao.xml @@ -20,8 +20,7 @@ - - + pm.ID, pm.RESI_USER_ID, pm.AGENCY_ID, @@ -32,21 +31,20 @@ pm.POVERTY_TYPE, pm.POVERTY_STATUS - - + SELECT + + FROM poverty_manage pm pm.DEL_FLAG = 0 - - AND pm.USER_NAME LIKE CONCAT('%', #{name}, '%') + + AND pm.USER_NAME LIKE concat( '%', #{userName}, '%') - AND pm.MOBILE LIKE CONCAT('%', #{mobile}, '%') + AND pm.MOBILE LIKE concat( '%', #{mobile}, '%') - AND pm.ID_CARD LIKE CONCAT('%', #{idCard}, '%') + AND pm.ID_CARD LIKE concat( '%', #{idCard}, '%') AND pm.POVERTY_TYPE = #{povertyType} @@ -54,12 +52,6 @@ AND pm.POVERTY_STATUS = #{povertyStatus} - - AND pm.AGENCY_ID = #{agencyId} - - - AND pm.GRID_ID = #{gridId} -