Browse Source

脱贫户管理

dev
luyan 2 years ago
parent
commit
ace8ef6a80
  1. 3
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java
  2. 86
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/PovertyCondoleDTO.java
  3. 51
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/PovertyManageDTO.java
  4. 62
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PovertyManageDTO.java
  5. 20
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/povertyManage/PovertyCondoleAttrDTO.java
  6. 47
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/povertyManage/PovertyCondoleFormDto.java
  7. 4
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/povertyManage/PovertyManageFormDto.java
  8. 144
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/PovertyCondoleController.java
  9. 45
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/PovertyManageController.java
  10. 21
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/PovertyCondoleAttrDao.java
  11. 24
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/PovertyCondoleDao.java
  12. 7
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/PovertyManageDao.java
  13. 36
      epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PovertyCondoleAttrEntity.java
  14. 58
      epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PovertyCondoleEntity.java
  15. 2
      epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PovertyManageEntity.java
  16. 60
      epmet-user/epmet-user-server/src/main/java/com/epmet/excel/PovertyCondoleExcel.java
  17. 22
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/PovertyCondoleAttrService.java
  18. 82
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/PovertyCondoleService.java
  19. 28
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/PovertyManageService.java
  20. 37
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PovertyCondoleAttrServiceImpl.java
  21. 101
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PovertyCondoleServiceImpl.java
  22. 40
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PovertyManageServiceImpl.java
  23. 75
      epmet-user/epmet-user-server/src/main/resources/mapper/PovertyCondoleDao.xml
  24. 26
      epmet-user/epmet-user-server/src/main/resources/mapper/PovertyManageDao.xml

3
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;

86
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<String> imgs;
/**
* 电话
*/
private String mobile;
/**
* 身份证号码
*/
private String idCard;
/**
* 贫困属性
*/
private String povertyType;
/**
* 脱贫状态
*/
private Integer povertyStatus;
}

51
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;
}

62
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;
}

20
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;
}

47
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<String> imgs;
private String condoleTime;
private String startTime;
private String endTime;
}

4
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;

144
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<PageData<PovertyCondoleDTO>> page(@RequestParam Map<String, Object> params) {
PageData<PovertyCondoleDTO> page = povertyCondoleService.page(params);
if (null != page && page.getList().size() > 0) {
buildData(page.getList());
}
return new Result<PageData<PovertyCondoleDTO>>().ok(page);
}
@RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
public Result<PovertyCondoleDTO> get(@PathVariable("id") String id) {
PovertyCondoleDTO data = povertyCondoleService.get(id);
List<PovertyCondoleAttrDTO> imgs = attrService.selectByPcId(id);
if (!CollectionUtils.isEmpty(imgs)) {
List<String> imageList = new ArrayList<>();
imgs.forEach(file -> {
imageList.add(file.getUrl());
});
data.setImgs(imageList);
}
return new Result<PovertyCondoleDTO>().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<PovertyCondoleAttrEntity> 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<PovertyCondoleAttrEntity> 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<PageData<PovertyCondoleDTO>> search(@RequestBody PovertyCondoleFormDto formDto) {
PageData<PovertyCondoleDTO> page = povertyCondoleService.search(formDto);
if (null != page && page.getList().size() > 0) {
buildData(page.getList());
}
return new Result().ok(page);
}
private void buildData(List<PovertyCondoleDTO> dtoList) {
Result<Map<String, String>> dictMapRes = adminOpenFeignClient.dictMap(DictTypeEnum.POVERTY_TYPE.getCode());
if (null != dictMapRes.getData() && dictMapRes.getData().size() > 0) {
Map<String, String> dictMap = dictMapRes.getData();
for (PovertyCondoleDTO dto : dtoList) {
if (null != dto.getPovertyType()) {
dto.setPovertyType(dictMap.get(dto.getPovertyType()));
}
}
}
}
private void buildImgs(List<PovertyCondoleAttrEntity> imgList, List<String> 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);
}
}
}

45
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<PageData<PovertyManageDTO>> selectList(@RequestBody PovertyManageFormDto formDTO) {
Page<PovertyManageDTO> 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<PageData<PovertyManageDTO>> page(@RequestParam Map<String, Object> params) {
PageData<PovertyManageDTO> page = povertyManageService.page(params);
if (null != page && page.getList().size() > 0) {
buildData(page.getList());
}
return new Result<PageData<PovertyManageDTO>>().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<PageData<PovertyManageDTO>> search(@RequestBody PovertyManageFormDto formDto) {
PageData<PovertyManageDTO> page = povertyManageService.search(formDto);
if (null != page && page.getList().size() > 0) {
buildData(page.getList());
}
return new Result<PageData<PovertyManageDTO>>().ok(page);
}
private void buildData(List<PovertyManageDTO> dtoList) {
Result<Map<String, String>> dictMapRes = adminOpenFeignClient.dictMap(DictTypeEnum.POVERTY_TYPE.getCode());
if (null != dictMapRes.getData() && dictMapRes.getData().size() > 0) {
Map<String, String> dictMap = dictMapRes.getData();
for (PovertyManageDTO dto : dtoList) {
if (null != dto.getPovertyType()) {
dto.setPovertyType(dictMap.get(dto.getPovertyType()));
}
}
}
}
}

21
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<PovertyCondoleAttrEntity> {
List<PovertyCondoleAttrDTO> selectByPcId(@Param("pcId") String pcId);
}

24
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<PovertyCondoleEntity> {
List<PovertyCondoleDTO> 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);
}

7
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<PovertyManageEntity> {
List<PovertyManageDTO> selectPage(PovertyManageFormDto formDTO);
List<PovertyManageDTO> search(@Param("userName") String userName, @Param("mobile") String mobile,
@Param("idCard") String idCard, @Param("povertyType") String povertyType,
@Param("povertyStatus") Integer povertyStatus);
}

36
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;
}

58
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;
}

2
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;
/**
* 脱贫状态

60
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;
}

22
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<PovertyCondoleAttrEntity> {
void update(PovertyCondoleAttrDTO dto);
void delete(String[] ids);
List<PovertyCondoleAttrDTO> selectByPcId(String id);
}

82
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<PovertyCondoleEntity> {
/**
* 默认分页
*
* @param params
* @return PageData<PovertyCondoleDTO>
* @author generator
* @date 2023-06-17
*/
PageData<PovertyCondoleDTO> page(Map<String, Object> params);
/**
* 默认查询
*
* @param params
* @return java.util.List<PovertyCondoleDTO>
* @author generator
* @date 2023-06-17
*/
List<PovertyCondoleDTO> list(Map<String, Object> 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<PovertyCondoleDTO> search(PovertyCondoleFormDto formDto);
}

28
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<PovertyManageEntity> {
/**
* 默认分页
*
* @param params
* @return PageData<PovertyManageDTO>
* @author generator
* @date 2023-06-17
*/
PageData<PovertyManageDTO> page(Map<String, Object> params);
/**
* 默认查询
*
* @param params
* @return java.util.List<PovertyManageDTO>
* @author generator
* @date 2023-06-17
*/
List<PovertyManageDTO> list(Map<String, Object> params);
/**
* 单条查询
*
@ -52,5 +75,6 @@ public interface PovertyManageService extends BaseService<PovertyManageEntity> {
*/
void delete(String[] ids);
Page<PovertyManageDTO> selectPage(PovertyManageFormDto formDTO);
PageData<PovertyManageDTO> search(PovertyManageFormDto formDto);
}

37
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<PovertyCondoleAttrDao, PovertyCondoleAttrEntity> 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<PovertyCondoleAttrDTO> selectByPcId(String id) {
return baseDao.selectByPcId(id);
}
}

101
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<PovertyCondoleDao, PovertyCondoleEntity> implements PovertyCondoleService {
@Override
public PageData<PovertyCondoleDTO> page(Map<String, Object> params) {
IPage<PovertyCondoleEntity> page = baseDao.selectPage(
getPage(params, FieldConstant.CREATED_TIME, false),
getWrapper(params)
);
return getPageData(page, PovertyCondoleDTO.class);
}
@Override
public List<PovertyCondoleDTO> list(Map<String, Object> params) {
List<PovertyCondoleEntity> entityList = baseDao.selectList(getWrapper(params));
return ConvertUtils.sourceToTarget(entityList, PovertyCondoleDTO.class);
}
private QueryWrapper<PovertyCondoleEntity> getWrapper(Map<String, Object> params) {
String id = (String) params.get(FieldConstant.ID_HUMP);
QueryWrapper<PovertyCondoleEntity> 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<PovertyCondoleDTO> search(PovertyCondoleFormDto formDto) {
PageInfo<PovertyCondoleDTO> 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());
}
}

40
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<PovertyManageDao, PovertyManageEntity> implements PovertyManageService {
@Override
public PageData<PovertyManageDTO> page(Map<String, Object> params) {
IPage<PovertyManageEntity> page = baseDao.selectPage(
getPage(params, FieldConstant.CREATED_TIME, false),
getWrapper(params)
);
return getPageData(page, PovertyManageDTO.class);
}
@Override
public List<PovertyManageDTO> list(Map<String, Object> params) {
List<PovertyManageEntity> entityList = baseDao.selectList(getWrapper(params));
return ConvertUtils.sourceToTarget(entityList, PovertyManageDTO.class);
}
private QueryWrapper<PovertyManageEntity> getWrapper(Map<String, Object> params) {
String id = (String) params.get(FieldConstant.ID_HUMP);
QueryWrapper<PovertyManageEntity> 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<PovertyManageDao,
}
@Override
public Page<PovertyManageDTO> selectPage(PovertyManageFormDto formDTO) {
return PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage())
.doSelectPage(() -> baseDao.selectPage(formDTO));
public PageData<PovertyManageDTO> search(PovertyManageFormDto formDto) {
PageInfo<PovertyManageDTO> 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());
}
}

75
epmet-user/epmet-user-server/src/main/resources/mapper/PovertyCondoleDao.xml

@ -0,0 +1,75 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.epmet.dao.PovertyCondoleDao">
<resultMap type="com.epmet.entity.PovertyCondoleEntity" id="povertyCondoleMap">
<result property="id" column="ID"/>
<result property="povertyId" column="POVERTY_ID"/>
<result property="resiUserId" column="RESI_USER_ID"/>
<result property="userName" column="USER_NAME"/>
<result property="condoleTime" column="CONDOLE_TIME"/>
<result property="condoleStaff" column="CONDOLE_STAFF"/>
<result property="content" column="CONTENT"/>
<result property="remark" column="REMARK"/>
<result property="delFlag" column="DEL_FLAG"/>
<result property="revision" column="REVISION"/>
<result property="createdBy" column="CREATED_BY"/>
<result property="createdTime" column="CREATED_TIME"/>
<result property="updatedBy" column="UPDATED_BY"/>
<result property="updatedTime" column="UPDATED_TIME"/>
</resultMap>
<sql id="retrunMap">
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
</sql>
<select id="search" resultType="com.epmet.dto.PovertyCondoleDTO">
SELECT
<include refid="retrunMap"/>
FROM poverty_condole pc
LEFT JOIN poverty_manage pm ON pc.POVERTY_ID = pm.ID
<where>
pc.DEL_FLAG = 0
<if test="null != content and content != ''">
AND pc.CONTENT LIKE concat( '%', #{content}, '%')
</if>
<if test="null != userName and userName != ''">
AND pm.USER_NAME LIKE concat( '%', #{userName}, '%')
</if>
<if test="null != idCard and idCard != ''">
AND pm.ID_CARD LIKE concat( '%', #{idCard}, '%')
</if>
<if test="null != povertyType and povertyType != ''">
AND pm.POVERTY_TYPE = #{povertyType}
</if>
<if test="null != povertyStatus and povertyStatus != ''">
AND pm.POVERTY_STATUS = #{povertyStatus}
</if>
<if test="null != condoleStaff and condoleStaff != ''">
AND pc.CONDOLE_STAFF LIKE concat( '%', #{condoleStaff}, '%')
</if>
<if test="null != startTime and startTime != '' and null != endTime and endTime !=''">
AND DATE_FORMAT(pc.CONDOLE_TIME,"%Y-%m-%d") BETWEEN DATE_FORMAT(#{startTime},"%Y-%m-%d") AND
DATE_FORMAT(#{endTime},"%Y-%m-%d")
</if>
<if test="null != startTime and startTime != ''">
AND DATE_FORMAT(pc.CONDOLE_TIME,"%Y-%m-%d") &gt;= DATE_FORMAT(#{startTime},"%Y-%m-%d")
</if>
<if test="null != endTime and endTime != ''">
AND DATE_FORMAT(pc.CONDOLE_TIME,"%Y-%m-%d") &lt;= DATE_FORMAT(#{endTime},"%Y-%m-%d")
</if>
</where>
</select>
</mapper>

26
epmet-user/epmet-user-server/src/main/resources/mapper/PovertyManageDao.xml

@ -20,8 +20,7 @@
<result property="updatedBy" column="UPDATED_BY"/>
<result property="updatedTime" column="UPDATED_TIME"/>
</resultMap>
<sql id="resultMap">
<sql id="returnMap">
pm.ID,
pm.RESI_USER_ID,
pm.AGENCY_ID,
@ -32,21 +31,20 @@
pm.POVERTY_TYPE,
pm.POVERTY_STATUS
</sql>
<select id="selectPage" resultType="com.epmet.dto.PovertyManageDTO">
select
<include refid="resultMap"/>
from poverty_manage pm
<select id="search" resultType="com.epmet.dto.PovertyManageDTO">
SELECT
<include refid="returnMap"/>
FROM poverty_manage pm
<where>
pm.DEL_FLAG = 0
<if test="null != name and name != ''">
AND pm.USER_NAME LIKE CONCAT('%', #{name}, '%')
<if test="null != userName and userName != ''">
AND pm.USER_NAME LIKE concat( '%', #{userName}, '%')
</if>
<if test="null != mobile and mobile != ''">
AND pm.MOBILE LIKE CONCAT('%', #{mobile}, '%')
AND pm.MOBILE LIKE concat( '%', #{mobile}, '%')
</if>
<if test="null != idCard and idCard != ''">
AND pm.ID_CARD LIKE CONCAT('%', #{idCard}, '%')
AND pm.ID_CARD LIKE concat( '%', #{idCard}, '%')
</if>
<if test="null != povertyType and povertyType != ''">
AND pm.POVERTY_TYPE = #{povertyType}
@ -54,12 +52,6 @@
<if test="null != povertyStatus and povertyStatus != ''">
AND pm.POVERTY_STATUS = #{povertyStatus}
</if>
<if test="null != agencyId and agencyId != ''">
AND pm.AGENCY_ID = #{agencyId}
</if>
<if test="null != gridId and gridId != ''">
AND pm.GRID_ID = #{gridId}
</if>
</where>
</select>

Loading…
Cancel
Save