From 5fe95c558d92e36f9a42f8523440319ae2015798 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 17 Feb 2023 12:55:12 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E7=A6=8F=E5=88=A9=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=91=E6=94=BE=E6=A0=87=E8=AF=86=E3=80=81?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E7=B1=BB=E5=88=AB=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/ChangeWelfareDTO.java | 14 ++++++- .../com/epmet/entity/ChangeWelfareEntity.java | 8 ++++ .../com/epmet/excel/ChangeWelfareExcel.java | 18 +++++++-- .../epmet/excel/ChangeWelfareImportExcel.java | 10 +++++ .../epmet/service/ChangeWelfareService.java | 2 +- .../impl/ChangeWelfareServiceImpl.java | 35 +++++++++++++----- .../migration/V0.0.94__pli_change_welfare.sql | 4 ++ .../resources/excel/pli_change_welfare.xlsx | Bin 11358 -> 11461 bytes .../resources/mapper/ChangeWelfareDao.xml | 16 ++++++-- 9 files changed, 89 insertions(+), 18 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.94__pli_change_welfare.sql diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeWelfareDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeWelfareDTO.java index 02ce0b34c8..7ee639d7dc 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeWelfareDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeWelfareDTO.java @@ -1,6 +1,8 @@ package com.epmet.dto; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import lombok.Data; +import org.hibernate.validator.constraints.Length; import java.io.Serializable; import java.util.Date; @@ -16,7 +18,7 @@ import java.util.Date; public class ChangeWelfareDTO implements Serializable { private static final long serialVersionUID = 1L; - + public interface AddUserShowGroup extends CustomerClientShowGroup {} /** * 主键 */ @@ -116,4 +118,14 @@ public class ChangeWelfareDTO implements Serializable { * 是否享受福利，1是 0否 空是 */ private String isWelfare; + + /** + * 福利发放标识：1：已发放；0：未发放 + */ + private Integer grantFlag; + /** + * 福利类别 + */ + @Length(max = 100,message = "福利类别最多输入100字",groups = AddUserShowGroup.class) + private String categoryName; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/ChangeWelfareEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/ChangeWelfareEntity.java index 2ddb43582a..7f0ec9189d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/ChangeWelfareEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/ChangeWelfareEntity.java @@ -72,6 +72,14 @@ public class ChangeWelfareEntity extends BaseEpmetEntity { * 移除原因 */ private String removeReason; + /** + * 福利发放标识：1：已发放；0：未发放 + */ + private Integer grantFlag; + /** + * 福利类别 + */ + private String categoryName; /** * 客户ID diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeWelfareExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeWelfareExcel.java index acb7705b2f..5a58288ba0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeWelfareExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeWelfareExcel.java @@ -21,13 +21,13 @@ public class ChangeWelfareExcel { // @Excel(name = "epmet网格ID") // private String gridId; - @Excel(name = "姓名") + @Excel(name = "姓名",width = 20) private String name; - @Excel(name = "证件号") + @Excel(name = "证件号",width = 20) private String idCard; - @Excel(name = "手机号") + @Excel(name = "手机号",width = 20) private String mobile; @Excel(name = "性别",replace = { "男_1", "女_0", "女_2", " _null"} ) @@ -36,8 +36,18 @@ public class ChangeWelfareExcel { // @Excel(name = "类型") // private String type; // - @Excel(name = "加入时间") + @Excel(name = "加入时间",width = 25) private String joinDate; + /** + * 福利发放标识：1：已发放；0：未发放 + */ + @Excel(name = "福利发放",replace = { "已发放_1", "未发放_0", "_null"},width = 20) + private Integer grantFlag; + /** + * 福利类别 + */ + @Excel(name = "福利类别",width = 120) + private String categoryName; // // @Excel(name = "加入原因") // private String joinReason; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeWelfareImportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeWelfareImportExcel.java index 992be96b4a..07869bfb2f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeWelfareImportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeWelfareImportExcel.java @@ -33,6 +33,16 @@ public class ChangeWelfareImportExcel { // @Excel(name = "客户ID") // private String customerId; + /** + * 福利发放标识：1：已发放；0：未发放 + */ + @Excel(name = "福利发放",replace = { "已发放_1", "未发放_0", "_null"}) + private Integer grantFlag; + /** + * 福利类别 + */ + @Excel(name = "福利类别") + private String categoryName; @ExcelIgnore private Boolean addStatus = false; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeWelfareService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeWelfareService.java index 184cfd9c9a..099c7ae432 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeWelfareService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeWelfareService.java @@ -21,7 +21,7 @@ import java.util.Map; public interface ChangeWelfareService extends BaseService { /** - * 默认分页 + * 福利人员管理-分页查询 * * @param params * @return PageData diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeWelfareServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeWelfareServiceImpl.java index f5808bdf3b..9fd94f7a7f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeWelfareServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeWelfareServiceImpl.java @@ -16,10 +16,7 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.security.user.LoginUserUtil; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.utils.DateUtils; -import com.epmet.commons.tools.utils.ExcelPoiUtils; -import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.*; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; @@ -38,7 +35,6 @@ import com.epmet.entity.ChangeWelfareEntity; import com.epmet.excel.ChangeWelfareImportExcel; import com.epmet.excel.error.ChangeWelfareErrorExcel; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; -import com.epmet.feign.GovOrgFeignClient; import com.epmet.feign.OssFeignClient; import com.epmet.redis.ChangeWelfareRedis; import com.epmet.service.ChangeWelfareService; @@ -88,12 +84,15 @@ public class ChangeWelfareServiceImpl extends BaseServiceImpl page(Map params) { params.put("customerId", loginUserUtil.getLoginUserCustomerId()); @@ -137,6 +136,12 @@ public class ChangeWelfareServiceImpl extends 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 RyJbLX2vXpY-~D^;{{V&@GeiIY delta 5344 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 AND w.JOIN_DATE <= #{endTime} + + AND w.CATEGORY_NAME like concat('%',#{categoryName},'%') + + + AND w.GRANT_FLAG = #{grantFlag} + order by w.CREATED_TIME desc @@ -76,12 +84,14 @@ where ID_CARD=#{idCard} and del_flag='0' - + update pli_change_welfare set REMOVE_DATE=#{removeDate}, REMOVE_REASON=#{removeReason}, - del_flag='1' + del_flag='1', + UPDATED_BY = #{updatedBy}, + UPDATED_TIME = #{removeDate} where del_flag='0' AND ID = #{id} From 64a9eae8cdecf9290616db982d9bc53e5ed94e70 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 17 Feb 2023 14:26:06 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E8=81=94=E5=BB=BA=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E3=80=81=E8=81=94=E5=BB=BA=E5=8D=95=E4=BD=8D=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcPartyActivityController.java | 31 ++++++++++++++++++ .../controller/IcPartyUnitController.java | 28 ++++++++++++++++ .../templates/icpartyactivity_import_tem.xlsx | Bin 0 -> 9091 bytes .../templates/icpartyunit_impoort_tem.xlsx | Bin 0 -> 9316 bytes 4 files changed, 59 insertions(+) create mode 100644 epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/icpartyactivity_import_tem.xlsx create mode 100644 epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/icpartyunit_impoort_tem.xlsx diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java index 38b63b836d..5fb1845333 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java @@ -41,13 +41,18 @@ import com.epmet.service.IcPartyActivityService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.FilenameUtils; +import org.apache.commons.io.IOUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpHeaders; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.io.InputStream; +import java.net.URLEncoder; import java.util.ArrayList; import java.util.List; import java.util.concurrent.CompletableFuture; @@ -214,4 +219,30 @@ public class IcPartyActivityController { PageData page = icPartyActivityService.getActivityList(tokenDto, formDTO); return new Result>().ok(page); } + + /** + * 下载联建活动导入模板 + * @param response + * @throws IOException + */ + @RequestMapping(value = "import-template-download", method = {RequestMethod.GET, RequestMethod.POST}) + public void downloadTemplate(HttpServletResponse response) throws IOException { + response.setCharacterEncoding("UTF-8"); + response.addHeader(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, "Content-Disposition"); + //response.setHeader(HttpHeaders.CONTENT_TYPE, "application/vnd.ms-excel"); + response.setHeader(HttpHeaders.CONTENT_TYPE, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + URLEncoder.encode("联建活动导入模板", "UTF-8") + ".xlsx"); + + InputStream is = this.getClass().getClassLoader().getResourceAsStream("templates/icpartyactivity_import_tem.xlsx"); + try { + ServletOutputStream os = response.getOutputStream(); + IOUtils.copy(is, os); + } finally { + if (is != null) { + is.close(); + } + } + } + + } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java index 4545cb226b..dfa0808fce 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java @@ -27,14 +27,19 @@ import com.epmet.service.IcPartyUnitService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.FilenameUtils; +import org.apache.commons.io.IOUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpHeaders; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.io.InputStream; +import java.net.URLEncoder; import java.nio.file.Path; import java.util.ArrayList; import java.util.List; @@ -330,4 +335,27 @@ public class IcPartyUnitController { return new Result(); } + /** + * 下载联建单位导入模板 + * @param response + * @throws IOException + */ + @RequestMapping(value = "import-template-download", method = {RequestMethod.GET, RequestMethod.POST}) + public void downloadTemplate(HttpServletResponse response) throws IOException { + response.setCharacterEncoding("UTF-8"); + response.addHeader(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, "Content-Disposition"); + //response.setHeader(HttpHeaders.CONTENT_TYPE, "application/vnd.ms-excel"); + response.setHeader(HttpHeaders.CONTENT_TYPE, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + URLEncoder.encode("联建单位导入模板", "UTF-8") + ".xlsx"); + + InputStream is = this.getClass().getClassLoader().getResourceAsStream("templates/icpartyunit_impoort_tem.xlsx"); + try { + ServletOutputStream os = response.getOutputStream(); + IOUtils.copy(is, os); + } finally { + if (is != null) { + is.close(); + } + } + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/icpartyactivity_import_tem.xlsx b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/icpartyactivity_import_tem.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..1d04c7c15d9349ff3e64e60391b15e6d6dcc760a GIT binary patch literal 9091 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 literal 0 HcmV?d00001 From c1d3bdee289e338dbb1fc4d3d27d425136923144 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 17 Feb 2023 17:05:41 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=81=94=E5=BB=BA=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/IcPartyUnitDTO.java | 5 ++ .../com/epmet/dto/form/PartyUnitFormDTO.java | 7 +- .../controller/IcPartyUnitController.java | 67 ++++++++++++------- .../com/epmet/excel/IcPartyUnitExcel.java | 41 ++++++++---- .../service/impl/IcPartyUnitServiceImpl.java | 6 ++ 5 files changed, 83 insertions(+), 43 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyUnitDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyUnitDTO.java index 1aed3be19f..b269fa0d5b 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyUnitDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyUnitDTO.java @@ -86,6 +86,11 @@ public class IcPartyUnitDTO implements Serializable { */ private List serviceMatterNameList; + /** + * 服务事项名称多个按照中文顿号隔开 + */ + private String serviceMatterName; + /** * 联系人 */ diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyUnitFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyUnitFormDTO.java index ec4a1751dd..f238e5dbe1 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyUnitFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyUnitFormDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.form; +import com.epmet.commons.tools.dto.form.PageFormDTO; import lombok.Data; import lombok.NoArgsConstructor; @@ -12,7 +13,7 @@ import java.io.Serializable; */ @NoArgsConstructor @Data -public class PartyUnitFormDTO implements Serializable { +public class PartyUnitFormDTO extends PageFormDTO implements Serializable { private static final long serialVersionUID = 1256798619648265622L; private String customerId; @@ -22,8 +23,8 @@ public class PartyUnitFormDTO implements Serializable { private String type; private String contact; private String contactMobile; - private Integer pageNo; - private Integer pageSize; + // private Integer pageNo; + // private Integer pageSize; /** * 工作端当前登录人员 diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java index dfa0808fce..2832d0009d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java @@ -1,16 +1,24 @@ package com.epmet.controller; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.write.metadata.WriteSheet; import com.epmet.commons.rocketmq.messages.ServerSatisfactionCalFormDTO; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.constant.AppClientConstant; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.OptionDataResultDTO; import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; @@ -28,6 +36,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; import org.springframework.web.bind.annotation.*; @@ -40,11 +49,9 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.net.URLEncoder; -import java.nio.file.Path; -import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.concurrent.CompletableFuture; -import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; @@ -64,11 +71,6 @@ public class IcPartyUnitController { @Resource private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient; - /** - * 联建单位上传临时目录 - */ - private Path IC_PARTY_UNIT_UPLOAD_DIR; - /** * 联建单位-列表查询 @@ -122,25 +124,38 @@ public class IcPartyUnitController { @PostMapping("export") public void export(@LoginUser TokenDto tokenDto, @RequestBody PartyUnitFormDTO formDTO, HttpServletResponse response) throws Exception { formDTO.setCustomerId(tokenDto.getCustomerId()); - List list = icPartyUnitService.list(formDTO); - List excelList = new ArrayList<>(); - AtomicInteger i = new AtomicInteger(1); - if (CollectionUtils.isNotEmpty(list)) { - excelList = list.stream().map(item -> { - IcPartyUnitExcel excel = new IcPartyUnitExcel(); - excel.setIndex(i.getAndIncrement()); - excel.setUnitName(item.getUnitName()); - excel.setContact(item.getContact()); - excel.setContactMobile(item.getContactMobile()); - excel.setType(item.getType()); - excel.setMemberCount(item.getMemberCount()); - excel.setRemark(item.getRemark()); - excel.setSatisfaction(item.getSatisfaction()); - excel.setServiceMatter(String.join(String.valueOf((char) 10), item.getServiceMatterList())); - return excel; - }).collect(Collectors.toList()); + formDTO.setIsPage(false); + formDTO.setCurrentStaffId(tokenDto.getUserId()); + ExcelWriter excelWriter = null; + formDTO.setPageSize(NumConstant.TEN_THOUSAND); + int pageNo = formDTO.getPageNo(); + try { + // 这里 需要指定写用哪个class去写 + String today= DateUtils.format(new Date(),DateUtils.DATE_PATTERN_MMDD); + String fileName = "行程上报信息".concat(today); + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcPartyUnitExcel.class).build(); + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + PageData data = null; + List list = null; + do { + data = icPartyUnitService.search(formDTO); + data.getList().stream().map(item -> { + item.setServiceMatterName(StringUtils.join(item.getServiceMatterList(), StrConstant.COMMA_ZH)); + return item; + }).collect(Collectors.toList()); + list = ConvertUtils.sourceToTarget(data.getList(), IcPartyUnitExcel.class); + formDTO.setPageNo(++pageNo); + excelWriter.write(list, writeSheet); + } while (CollectionUtils.isNotEmpty(data.getList()) && data.getList().size() == formDTO.getPageSize()); + + } catch (Exception e) { + log.error("export exception", e); + } finally { + // 千万别忘记finish 会帮忙关闭流 + if (excelWriter != null) { + excelWriter.finish(); + } } - ExcelUtils.exportExcelToTarget(response, null, excelList, IcPartyUnitExcel.class); } /** diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyUnitExcel.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyUnitExcel.java index 652542ef62..36e9484acc 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyUnitExcel.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyUnitExcel.java @@ -17,7 +17,8 @@ package com.epmet.excel; -import cn.afterturn.easypoi.excel.annotation.Excel; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import lombok.Data; /** @@ -29,30 +30,42 @@ import lombok.Data; @Data public class IcPartyUnitExcel { - @Excel(name = "序号") - private Integer index; - - @Excel(name = "单位名称") + @ColumnWidth(30) + @ExcelProperty(value = "单位名称") private String unitName; - @Excel(name = "分类") - private String type; + @ColumnWidth(25) + @ExcelProperty(value = "所属组织") + private String agencyName; + + @ColumnWidth(25) + @ExcelProperty(value = "分类") + private String typeName; - @Excel(name = "服务事项") - private String serviceMatter; + /** + * 服务事项名称多个按照中文顿号隔开 + */ + @ColumnWidth(100) + @ExcelProperty(value = "服务事项") + private String serviceMatterName; - @Excel(name = "联系人") + @ColumnWidth(16) + @ExcelProperty(value = "联系人") private String contact; - @Excel(name = "联系电话") + @ColumnWidth(16) + @ExcelProperty(value = "联系电话") private String contactMobile; - @Excel(name = "在职党员") + @ColumnWidth(18) + @ExcelProperty(value = "在职党员数") private Integer memberCount; - @Excel(name = "群众满意度") + @ColumnWidth(18) + @ExcelProperty(value = "群众满意度") private String satisfaction; - @Excel(name = "备注") + @ColumnWidth(100) + @ExcelProperty(value = "备注") private String remark; } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java index 0f31a1287d..f430f2b711 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java @@ -145,6 +145,8 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl pointMap = icUserDemandRecService.getServicePoint(formDTO.getCustomerId(), UserDemandConstant.PARTY_UNIT); dtoList.forEach(item -> { + item.setTypeName(unitTypeMap.getData().get(item.getType())); + //这是错误的，应该是赋值type,遗留bug, 先不改了.... item.setType(unitTypeMap.getData().get(item.getType())); if (StringUtils.isNotBlank(item.getServiceMatter())) { List matters = Arrays.asList(item.getServiceMatter().split(StrConstant.COMMA)); @@ -183,6 +185,8 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl pointMap = icUserDemandRecService.getServicePoint(formDTO.getCustomerId(), UserDemandConstant.PARTY_UNIT); dtoList.forEach(item -> { + item.setTypeName(unitTypeMap.getData().get(item.getType())); + //这是错误的，应该是赋值type,遗留bug, 先不改了.... item.setType(unitTypeMap.getData().get(item.getType())); if (StringUtils.isNotBlank(item.getServiceMatter())) { List matters = Arrays.asList(item.getServiceMatter().split(StrConstant.COMMA)); @@ -217,6 +221,8 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl> typeDictMapRes=epmetAdminOpenFeignClient.dictMap(DictTypeEnum.PARTY_UNIT_TYPE.getCode()); Map typeDictMap = typeDictMapRes.success() && MapUtils.isNotEmpty(typeDictMapRes.getData()) ? typeDictMapRes.getData() : new HashMap<>(); + dto.setTypeName(MapUtils.isNotEmpty(typeDictMap) && typeDictMap.containsKey(dto.getType()) ? typeDictMap.get(dto.getType()) : StrConstant.EPMETY_STR); + //这是错误的，应该是赋值type,遗留bug, 先不改了.... dto.setType(MapUtils.isNotEmpty(typeDictMap) && typeDictMap.containsKey(dto.getType()) ? typeDictMap.get(dto.getType()) : StrConstant.EPMETY_STR); // 服务事项 if(CollectionUtils.isNotEmpty(dto.getServiceMatterList())){ From cc9a49883e11094bfcb204251d9561fa09ff42e6 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 17 Feb 2023 17:30:50 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E8=81=94=E5=BB=BA=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IcPartyActivityDTO.java | 6 +- .../epmet/dto/form/PartyActivityFormDTO.java | 7 ++- .../controller/IcPartyActivityController.java | 55 ++++++++++++------- .../controller/IcPartyUnitController.java | 2 +- .../com/epmet/excel/IcPartyActivityExcel.java | 30 ++++++---- .../impl/IcPartyActivityServiceImpl.java | 5 ++ 6 files changed, 70 insertions(+), 35 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java index 0115706902..1217ea6875 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java @@ -179,5 +179,9 @@ public class IcPartyActivityDTO implements Serializable { */ @JsonIgnore private Date updatedTime; - + /** + * actId不为空小程序 + * 为空管理平台 + */ + private String originName; } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java index fb67921cd8..76f6d485db 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.form; +import com.epmet.commons.tools.dto.form.PageFormDTO; import lombok.Data; import lombok.NoArgsConstructor; import org.springframework.format.annotation.DateTimeFormat; @@ -15,7 +16,7 @@ import java.util.Date; */ @NoArgsConstructor @Data -public class PartyActivityFormDTO implements Serializable { +public class PartyActivityFormDTO extends PageFormDTO implements Serializable { private static final long serialVersionUID = -2510068555703677L; @NotBlank(message = "组织Id不能为空" ) private String agencyId; @@ -27,7 +28,7 @@ public class PartyActivityFormDTO implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date endTime; private String serviceMatter; - private Integer pageNo; - private Integer pageSize; + // private Integer pageNo; + // private Integer pageSize; private String customerId; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java index 5fb1845333..2dce5600b5 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java @@ -17,15 +17,21 @@ package com.epmet.controller; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.write.metadata.WriteSheet; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; @@ -53,11 +59,9 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.net.URLEncoder; -import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.concurrent.CompletableFuture; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.Collectors; /** @@ -116,23 +120,36 @@ public class IcPartyActivityController { } @PostMapping("export") - public void export(@RequestBody PartyActivityFormDTO formDTO, HttpServletResponse response) throws Exception { - List list = icPartyActivityService.list(formDTO); - List excelList = new ArrayList<>(); - AtomicInteger i = new AtomicInteger(1); - if (CollectionUtils.isNotEmpty(list)) { - excelList = list.stream().map(item -> { - IcPartyActivityExcel excel = new IcPartyActivityExcel(); - excel.setIndex(i.getAndIncrement()); - excel.setUnitName(item.getUnitName()); - excel.setTitle(item.getTitle()); - excel.setAddress(item.getAddress()); - excel.setPeopleCount(item.getPeopleCount()); - excel.setActivityTime(DateUtils.format(item.getActivityTime(), DateUtils.DATE_TIME_PATTERN)); - return excel; - }).collect(Collectors.toList()); + public void export(@LoginUser TokenDto tokenDto, @RequestBody PartyActivityFormDTO formDTO, HttpServletResponse response) throws Exception { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setIsPage(false); + ExcelWriter excelWriter = null; + formDTO.setPageSize(NumConstant.TEN_THOUSAND); + int pageNo = formDTO.getPageNo(); + try { + // 这里 需要指定写用哪个class去写 + String today= DateUtils.format(new Date(),DateUtils.DATE_PATTERN_MMDD); + String fileName = "联建活动".concat(today); + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcPartyActivityExcel.class).build(); + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + PageData data = null; + List list = null; + do { + data = icPartyActivityService.search(formDTO); + list = ConvertUtils.sourceToTarget(data.getList(), IcPartyActivityExcel.class); + formDTO.setPageNo(++pageNo); + excelWriter.write(list, writeSheet); + } while (CollectionUtils.isNotEmpty(data.getList()) && data.getList().size() == formDTO.getPageSize()); + + } catch (Exception e) { + log.error("export exception", e); + } finally { + // 千万别忘记finish 会帮忙关闭流 + if (excelWriter != null) { + excelWriter.finish(); + } } - ExcelUtils.exportExcelToTarget(response, null, excelList, IcPartyActivityExcel.class); + } /** diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java index 2832d0009d..e1578a2d78 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java @@ -132,7 +132,7 @@ public class IcPartyUnitController { try { // 这里 需要指定写用哪个class去写 String today= DateUtils.format(new Date(),DateUtils.DATE_PATTERN_MMDD); - String fileName = "行程上报信息".concat(today); + String fileName = "联建单位".concat(today); excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcPartyUnitExcel.class).build(); WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); PageData data = null; diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyActivityExcel.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyActivityExcel.java index 9ea9544285..9f54fc3b8f 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyActivityExcel.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyActivityExcel.java @@ -17,7 +17,8 @@ package com.epmet.excel; -import cn.afterturn.easypoi.excel.annotation.Excel; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import lombok.Data; /** @@ -28,23 +29,30 @@ import lombok.Data; */ @Data public class IcPartyActivityExcel { - - @Excel(name = "序号") - private Integer index; - - @Excel(name = "单位名称") + @ColumnWidth(20) + @ExcelProperty(value = "单位名称") private String unitName; - @Excel(name = "活动标题") + @ColumnWidth(25) + @ExcelProperty(value = "活动标题") private String title; - @Excel(name = "活动地址") + @ColumnWidth(35) + @ExcelProperty(value = "活动地址") private String address; - @Excel(name = "服务人数") + @ColumnWidth(15) + @ExcelProperty(value = "服务人数") private Integer peopleCount; - @Excel(name = "活动时间") + @ColumnWidth(20) + @ExcelProperty(value = "活动时间") private String activityTime; - + /** + * actId不为空小程序 + * 为空管理平台 + */ + @ColumnWidth(20) + @ExcelProperty(value = "来源") + private String originName; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java index 4d89c1bef8..1e72ac9ae5 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java @@ -151,6 +151,11 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl Date: Fri, 17 Feb 2023 17:39:35 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/excel/IcPartyActivityExcel.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyActivityExcel.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyActivityExcel.java index 9f54fc3b8f..4b52917350 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyActivityExcel.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyActivityExcel.java @@ -19,8 +19,11 @@ package com.epmet.excel; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import java.util.Date; + /** * 联建活动 * @@ -47,7 +50,8 @@ public class IcPartyActivityExcel { @ColumnWidth(20) @ExcelProperty(value = "活动时间") - private String activityTime; + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date activityTime; /** * actId不为空小程序 * 为空管理平台 From 7d31349b590538b2caac97f5532dddee7382ffca Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 20 Feb 2023 14:02:09 +0800 Subject: [PATCH 6/7] =?UTF-8?q?/icNat/add=E8=8E=B7=E5=8F=96=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E7=83=9F=E5=8F=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../redis/common/CustomerStaffRedis.java | 3 ++- .../epmetuser/impl/EpmetUserServiceImpl.java | 4 ++-- .../com/epmet/dto/form/AddIcNatFormDTO.java | 6 ++++-- .../com/epmet/controller/IcNatController.java | 3 ++- .../epmet/service/impl/IcNatServiceImpl.java | 21 ++++++++++++------- 5 files changed, 24 insertions(+), 13 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerStaffRedis.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerStaffRedis.java index 66abe790f3..61b5b6f250 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerStaffRedis.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerStaffRedis.java @@ -88,11 +88,12 @@ public class CustomerStaffRedis { private static CustomerStaffInfoCache reloadStaffCache(String staffId, String key) { Result staffResult = customerStaffRedis.commonAggFeignClient.getStaffInfo(staffId); if (staffResult == null || !staffResult.success()) { + log.error("/data/aggregator/epmetuser/getStaffInfo/{staffId} 异常 staffId: ",staffId); throw new RenException("获取工作人员信息失败"); } CustomerStaffInfoCache resultData = staffResult.getData(); if (resultData == null) { - log.warn("getStaffInfo staff is null,staffId:{}", staffId); + log.error("getStaffInfo staff is null,staffId:{}", staffId); return null; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index f6de7bd634..d81bb9b1e7 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -9,7 +9,6 @@ import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.form.IdAndNameDTO; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.OrgTypeEnum; -import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; @@ -56,9 +55,9 @@ import com.epmet.dataaggre.service.opercustomize.CustomerFootBarService; import com.epmet.dto.IcResiUserDTO; import com.epmet.dto.UserBaseInfoDTO; import com.epmet.dto.form.DetailByTypeFormDTO; +import com.epmet.dto.form.GetStaffExistRoleFormDTO; import com.epmet.dto.form.SystemMsgFormDTO; import com.epmet.dto.result.DetailByTypeResultDTO; -import com.epmet.dto.form.GetStaffExistRoleFormDTO; import com.epmet.dto.result.NewUserRoleResultDTO; import com.epmet.dto.result.StaffRoleResultDTO; import com.epmet.feign.EpmetMessageOpenFeignClient; @@ -638,6 +637,7 @@ public class EpmetUserServiceImpl implements EpmetUserService { .eq(CustomerStaffEntity::getDelFlag,NumConstant.ZERO_STR); CustomerStaffEntity staffEntity = customerStaffDao.selectOne(queryWrapper); if (null == staffEntity) { + log.error(String.format("customer_staff is null staffId:%s",staffId)); return null; } CustomerStaffResultDTO result = ConvertUtils.sourceToTarget(staffEntity, CustomerStaffResultDTO.class); diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcNatFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcNatFormDTO.java index b87f03d8d7..5fe8f73f31 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcNatFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcNatFormDTO.java @@ -5,7 +5,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.ArrayList; import java.util.Date; @@ -110,6 +109,9 @@ public class AddIcNatFormDTO implements Serializable { private String customerId; private String staffId; private String client; - + /** + * 政府端:gov、居民端:resi、运营端:oper + */ + private String app; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java index 512a43f7e9..b85f409d2b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java @@ -92,7 +92,8 @@ public class IcNatController implements ResultDataResolver { ValidatorUtils.validateEntity(formDTO, AddIcNatFormDTO.Nat.class); formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setStaffId(tokenDto.getUserId()); - formDTO.setClient(tokenDto.getClient()); + // formDTO.setClient(tokenDto.getClient()); + formDTO.setApp(tokenDto.getApp()); icNucleinService.add(formDTO); return new Result(); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java index b9cb1331f1..08fde1f5f9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java @@ -119,7 +119,7 @@ public class IcNatServiceImpl extends BaseServiceImpl imp if (null != icNatDTO && icNatDTO.getNatResult().equals(formDTO.getNatResult())) { throw new RenException(EpmetErrorCode.IC_NAT_IDCARD_NATTIME.getCode(), EpmetErrorCode.IC_NAT_IDCARD_NATTIME.getMsg()); } else if (null != icNatDTO && !icNatDTO.getNatResult().equals(formDTO.getNatResult())) { - if ("wxmp".equals(formDTO.getClient())) { + if (AppClientConstant.APP_RESI.equals(formDTO.getApp())) { throw new RenException(EpmetErrorCode.RESI_IC_NAT.getCode(), EpmetErrorCode.RESI_IC_NAT.getMsg()); } throw new RenException(EpmetErrorCode.IC_NAT.getCode(), EpmetErrorCode.IC_NAT.getMsg()); @@ -129,10 +129,6 @@ public class IcNatServiceImpl extends BaseServiceImpl imp if (null == agencyInfo) { throw new RenException(String.format("获取组织缓存信息失败%s", formDTO.getAgencyId())); } - CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); - if (null == staffInfo){ - throw new EpmetException(String.format("获取工作人员信息失败%s", formDTO.getStaffId())); - } ResiAndLocalResiResultDTO resiCount = icResiUserDao.getResiCount(formDTO.getAgencyId(), formDTO.getIdCard(), formDTO.getCustomerId()); //2.新增核酸基础信息数据 IcNatEntity entity = ConvertUtils.sourceToTarget(formDTO, IcNatEntity.class); @@ -146,8 +142,19 @@ public class IcNatServiceImpl extends BaseServiceImpl imp IcNatRelationEntity relationEntity = ConvertUtils.sourceToTarget(formDTO, IcNatRelationEntity.class); relationEntity.setIcNatId(entity.getId()); relationEntity.setIsLocalResiUser(resiCount.getIsLocal() == NumConstant.ZERO ? NumConstant.ZERO_STR : NumConstant.ONE_STR); - relationEntity.setAgencyId(staffInfo.getAgencyId()); - relationEntity.setPids(StringUtils.isNotBlank(staffInfo.getAgencyPIds()) ? staffInfo.getAgencyPIds() + ":" + staffInfo.getAgencyId() : staffInfo.getAgencyId()); + if(AppClientConstant.APP_GOV.equals(formDTO.getApp())){ + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + if (null == staffInfo){ + log.error(String.format("获取工作人员信息失败%s", formDTO.getStaffId())); + throw new EpmetException(String.format("获取工作人员信息失败%s", formDTO.getStaffId())); + } + relationEntity.setAgencyId(staffInfo.getAgencyId()); + relationEntity.setPids(StringUtils.isNotBlank(staffInfo.getAgencyPIds()) ? staffInfo.getAgencyPIds() + ":" + staffInfo.getAgencyId() : staffInfo.getAgencyId()); + }else{ + relationEntity.setAgencyId(formDTO.getAgencyId()); + AgencyInfoCache agencyInfoCache=CustomerOrgRedis.getAgencyInfo(formDTO.getAgencyId()); + relationEntity.setPids(StringUtils.isNotBlank(agencyInfoCache.getPids()) ? agencyInfoCache.getPids() + ":" + formDTO.getAgencyId() : formDTO.getAgencyId()); + } icNatRelationDao.insert(relationEntity); //3.新增通知表信息 From ebe86eb2ca68077900707fcf98998786d369a93d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 20 Feb 2023 14:07:39 +0800 Subject: [PATCH 7/7] =?UTF-8?q?epmetuser/tripreport/resi-save=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java index 65f289cd46..4ae7ae8b61 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java @@ -183,7 +183,7 @@ public class IcTripReportFormDTO implements Serializable { /** * 交通方式，来源字典表(traffic_type) */ - @NotBlank(message = "返回方式不能为空", groups = {PcAddRequired.class, ResiUserRequired.class}) + // @NotBlank(message = "返回方式不能为空", groups = {PcAddRequired.class, ResiUserRequired.class}) private String trafficType; /** * 其他返回方式，交通方式为其他时此列需要有值 @@ -192,7 +192,7 @@ public class IcTripReportFormDTO implements Serializable { /** * 来源地详细信息 source_address字段的说明 */ - @NotBlank(message = "来自地区不能为空", groups = {PcAddRequired.class, ResiUserRequired.class}) + // @NotBlank(message = "来自地区不能为空", groups = {PcAddRequired.class, ResiUserRequired.class}) private String sourceDetailAddress; /** * 疫苗接种针次 (0针 1针 2针 3针)【小寨子】