From 9844445fbaaf5a799f4ce2d0243c899275411ad4 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 15 Nov 2022 14:48:18 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E9=81=BF=E5=85=8D=E7=A9=BA=E6=8C=87=E9=92=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/tools/redis/common/CustomerOrgRedis.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerOrgRedis.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerOrgRedis.java index 23a7f1dd3c..bf8425222a 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerOrgRedis.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerOrgRedis.java @@ -1,7 +1,6 @@ package com.epmet.commons.tools.redis.common; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.dto.form.CustomerGridFormDTO; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.feign.CommonAggFeignClient; @@ -13,6 +12,7 @@ import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; @@ -55,6 +55,10 @@ public class CustomerOrgRedis { * @date 2021/11/5 3:12 下午 */ public static GridInfoCache getGridInfo(String gridId){ + if (StringUtils.isBlank(gridId)) { + log.warn("查询网格缓存,gridId is null"); + return null; + } String key = RedisKeys.getGridInfoKey(gridId); Map grid = customerOrgRedis.redisUtils.hGetAll(key); if (!CollectionUtils.isEmpty(grid)) { From 246fa405274d92c70c5d25c59f21c9f78864707b Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 16 Nov 2022 10:23:36 +0800 Subject: [PATCH 02/12] rhzk --- .../dto/result/RHZKStatisticsResultDTO.java | 37 ++++++++++++ .../java/com/epmet/constant/UserConstant.java | 9 +++ .../controller/IcResiUserController.java | 11 ++++ .../java/com/epmet/dao/IcResiUserDao.java | 2 + .../com/epmet/service/IcResiUserService.java | 9 +++ .../service/impl/IcResiUserServiceImpl.java | 57 +++++++++++++++++++ .../main/resources/mapper/IcResiUserDao.xml | 16 ++++++ 7 files changed, 141 insertions(+) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/RHZKStatisticsResultDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/RHZKStatisticsResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/RHZKStatisticsResultDTO.java new file mode 100644 index 0000000000..5cdd7fc1dd --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/RHZKStatisticsResultDTO.java @@ -0,0 +1,37 @@ +package com.epmet.dto.result; + +import com.epmet.commons.tools.constant.NumConstant; +import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @Author zxc + * @DateTime 2022/11/16 09:15 + */ +@Data +public class RHZKStatisticsResultDTO implements Serializable { + private static final long serialVersionUID = 6493812449146476415L; + + private Integer userTotal = NumConstant.ZERO; + + /** + * 人户一致，人在户不在，户在人不在， + * 为空的 暂不清楚 + */ + private Integer rhyzUserTotal = NumConstant.ZERO; + private BigDecimal rhyzUserRatio = NumConstant.ZERO_DECIMAL; + private Integer rzhbzUserTotal = NumConstant.ZERO; + private BigDecimal rzhbzUserRatio = NumConstant.ZERO_DECIMAL; + private Integer hzrzUserTotal = NumConstant.ZERO; + private BigDecimal hzrzUserRatio = NumConstant.ZERO_DECIMAL; + private Integer zbqcUserTotal = NumConstant.ZERO; + private BigDecimal zbqcUserRatio = NumConstant.ZERO_DECIMAL; + + @JsonIgnore + private Integer total; + @JsonIgnore + private String rhzk; +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserConstant.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserConstant.java index a51390f16f..b146f047cd 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserConstant.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserConstant.java @@ -108,4 +108,13 @@ public interface UserConstant { * 居民信息 子表中的主表id */ String IC_RESI_USER = "IC_RESI_USER"; + + /** + * 人户一致，人在户不在，户在人不在， + * 为空的 暂不清楚 + */ + String R_H_Y_Z = "rhyz"; + String R_Z_H_B_Z = "rzhbz"; + String H_Z_R_B_Z = "hzrbz"; + String Z_B_Q_C = ""; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index 429585d104..a7eb0af5e8 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -1465,4 +1465,15 @@ public class IcResiUserController implements ResultDataResolver { return new Result().ok(icResiUserService.getIcResiUserInfo(userId)); } + /** + * @Description 人户状况统计查询 + * @param tokenDto + * @Author zxc + * @Date 2022/11/16 09:22 + */ + @PostMapping("rhzk") + public Result renHuCondition(@LoginUser TokenDto tokenDto){ + return new Result().ok(icResiUserService.renHuCondition(tokenDto)); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java index 8caa220af2..b96b595ac1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java @@ -439,4 +439,6 @@ public interface IcResiUserDao extends BaseDao { * @Date 2022/10/24 15:47 */ ResiAndLocalResiResultDTO getResiCount(@Param("agencyId")String agencyId,@Param("idCard")String idCard,@Param("customerId")String customerId); + + List getUserByRenHu(@Param("agencyId")String agencyId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index 246f87a15d..7bf36c3ecb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -525,4 +525,13 @@ public interface IcResiUserService extends BaseService { IcResiUserInfoCache getIcResiUserInfo(String userId); void epidemicPreventionExport(EpidemicPreventionFormDTO formDTO, HttpServletResponse response) throws IOException; + + /** + * @Description 人户状况统计查询 + * @param tokenDto + * @Author zxc + * @Date 2022/11/16 09:22 + */ + RHZKStatisticsResultDTO renHuCondition(TokenDto tokenDto); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 414ddcaa80..2618c0cea7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -3630,4 +3630,61 @@ public class IcResiUserServiceImpl extends BaseServiceImpl userByRenHu = baseDao.getUserByRenHu(staffInfo.getAgencyId()); + RHZKStatisticsResultDTO r = new RHZKStatisticsResultDTO(); + if (CollectionUtils.isEmpty(userByRenHu)){ + return r; + } + r.setUserTotal(userByRenHu.stream().collect(Collectors.summingInt(RHZKStatisticsResultDTO::getTotal))); + userByRenHu.forEach(u -> { + switch (u.getRhzk()){ + case UserConstant.R_H_Y_Z: + r.setRhyzUserTotal(u.getTotal()); + r.setRhyzUserRatio(getRatio(r.getUserTotal(),u.getTotal())); + break; + case UserConstant.R_Z_H_B_Z: + r.setRzhbzUserTotal(u.getTotal()); + r.setRzhbzUserRatio(getRatio(r.getUserTotal(),u.getTotal())); + break; + case UserConstant.H_Z_R_B_Z: + r.setHzrzUserTotal(u.getTotal()); + r.setHzrzUserRatio(getRatio(r.getUserTotal(),u.getTotal())); + break; + case UserConstant.Z_B_Q_C: + r.setZbqcUserTotal(u.getTotal()); + r.setZbqcUserRatio(getRatio(r.getUserTotal(),u.getTotal())); + break; + default: + break; + } + }); + return r; + } + + /** + * @Description + * @param total 总人数 + * @param fz 分子人数 + * @Author zxc + * @Date 2022/11/16 10:12 + */ + public BigDecimal getRatio(Integer total,Integer fz){ + BigDecimal totalBig = new BigDecimal(total); + BigDecimal fzBig = new BigDecimal(fz); + return fzBig.multiply(NumConstant.ONE_HUNDRED_DECIMAL).divide(totalBig, NumConstant.TWO, BigDecimal.ROUND_HALF_UP); + } + } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 9c48f39c2f..22704d92d8 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -1402,4 +1402,20 @@ AND ID_CARD = #{idCard} + + + From c11e4ee226b331f9839a25d1589c13ad0770cc01 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 16 Nov 2022 11:12:05 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E4=BA=BA=E6=88=B7=E7=8A=B6=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/OwnerRelationResultDTO.java | 5 ++ .../com/epmet/enums/RenHuConditionEnum.java | 52 +++++++++++++++++++ .../service/impl/IcResiUserServiceImpl.java | 6 +++ 3 files changed, 63 insertions(+) create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/enums/RenHuConditionEnum.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OwnerRelationResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OwnerRelationResultDTO.java index 9a3e0c23d7..d42953a90e 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OwnerRelationResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OwnerRelationResultDTO.java @@ -25,5 +25,10 @@ public class OwnerRelationResultDTO implements Serializable { private String userName; private String isSelf; private String relation; + + /** + * 人户状况 + */ + private String renHuCondition; } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/RenHuConditionEnum.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/RenHuConditionEnum.java new file mode 100644 index 0000000000..efdf23bbce --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/RenHuConditionEnum.java @@ -0,0 +1,52 @@ +package com.epmet.enums; + +import org.apache.commons.lang3.StringUtils; + +public enum RenHuConditionEnum { + + /** + * 人户一致，人在户不在，户在人不在， + * 为空的 暂不清楚 + */ + RHYZ("rhyz","人户一致"), + RZHBZ("rzhbz","人在户不在"), + HZRBZ("hzrbz","户在人不在"), + ZBQC("","暂不清楚"), + ; + + private String code; + private String name; + + public static String getNameByCode(String code){ + if (StringUtils.isBlank(code)){ + return ZBQC.name; + } + for (RenHuConditionEnum e : values()) { + if (e.getCode().equals(code)){ + return e.getName(); + } + } + return ZBQC.name; + } + + RenHuConditionEnum(String code, String name) { + this.code = code; + this.name = name; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 2618c0cea7..fe04e0453b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -63,6 +63,7 @@ import com.epmet.dto.result.demand.IcResiDemandDictDTO; import com.epmet.dto.result.demand.OptionDTO; import com.epmet.dto.result.resi.IcResiNonDynamicResultDTO; import com.epmet.entity.*; +import com.epmet.enums.RenHuConditionEnum; import com.epmet.excel.EpidemicPreventionExportExcel; import com.epmet.excel.support.ExportResiUserItemDTO; import com.epmet.feign.*; @@ -1478,6 +1479,11 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Wed, 16 Nov 2022 13:47:05 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E9=9D=9E=E5=BF=85=E5=A1=AB=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E2=80=9C=E8=AF=95=E7=AE=A1=E7=BC=96=E5=8F=B7=E2=80=9D?= =?UTF-8?q?=20=E5=AF=B9=E5=BA=94=E4=BA=A7=E8=9B=8B4679?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcNatDTO.java | 5 +++++ .../com/epmet/dto/form/AddIcNatFormDTO.java | 4 ++++ .../epmet/dto/result/MyNatListResultDTO.java | 5 +++++ .../epmet/dto/result/NatListResultDTO.java | 13 ++++++++++--- .../java/com/epmet/entity/IcNatEntity.java | 5 +++++ .../excel/data/IcNatImportExcelData.java | 3 +++ .../db/migration/V0.0.89_alter_ic_nat.sql | 4 ++++ .../src/main/resources/excel/ic_nat.xlsx | Bin 9198 -> 9824 bytes .../src/main/resources/mapper/IcNatDao.xml | 12 ++++++++---- 9 files changed, 44 insertions(+), 7 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.89_alter_ic_nat.sql diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java index 1e8da051b1..de5e70080b 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java @@ -107,6 +107,11 @@ public class IcNatDTO implements Serializable { */ private String attachmentUrl; + /** + * 试管编号 + */ + private String testTubeCode; + /** * 删除标识 */ 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 1d7ba24673..b87f03d8d7 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 @@ -89,6 +89,10 @@ public class AddIcNatFormDTO implements Serializable { * 附件地址 */ private String attachmentUrl; + /** + * 试管编号 + */ + private String testTubeCode; /** * 是否客户下居民(0:否 1:是) */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyNatListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyNatListResultDTO.java index 355d52d213..59b0515e73 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyNatListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyNatListResultDTO.java @@ -73,4 +73,9 @@ public class MyNatListResultDTO implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") private Date reportTime; + /** + * 试管编号 + */ + private String testTubeCode; + } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatListResultDTO.java index a93294b14f..bba32c13af 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatListResultDTO.java @@ -73,14 +73,14 @@ public class NatListResultDTO implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") @ColumnWidth(25) - @ExcelProperty(value = "采样时间",order = 4) + @ExcelProperty(value = "采样时间",order = 5) private Date sampleTime; /** * 检测结果 */ @ColumnWidth(20) - @ExcelProperty(value = "检测结果",order = 5) + @ExcelProperty(value = "检测结果",order = 7) private String natResult; /** @@ -99,8 +99,15 @@ public class NatListResultDTO implements Serializable { * 检测地点 */ @ColumnWidth(30) - @ExcelProperty(value = "检测地点",order = 7) + @ExcelProperty(value = "检测地点",order = 6) private String natAddress; + /** + * 试管编号 + */ + @ColumnWidth(30) + @ExcelProperty(value = "试管编号",order = 8) + private String testTubeCode; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatEntity.java index 7cbe8cdd66..3246d9be0a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatEntity.java @@ -94,6 +94,11 @@ public class IcNatEntity extends BaseEpmetEntity { */ private String attachmentUrl; + /** + * 试管编号 + */ + private String testTubeCode; + @TableField(exist = false) private String agencyId; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcNatImportExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcNatImportExcelData.java index b54c571f8f..b5b52f8ea4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcNatImportExcelData.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcNatImportExcelData.java @@ -43,6 +43,9 @@ public class IcNatImportExcelData { @ExcelProperty("检测结果") private String natResultZh; + @ExcelProperty("试管编号") + private String testTubeCode; + @Data public static class RowRemarkMessage { diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.89_alter_ic_nat.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.89_alter_ic_nat.sql new file mode 100644 index 0000000000..7925891a55 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.89_alter_ic_nat.sql @@ -0,0 +1,4 @@ +-- 核酸记录表增加非必填字段“试管编号” 对应产蛋4679 +ALTER TABLE `ic_nat` +ADD COLUMN `TEST_TUBE_CODE` varchar(255) NULL COMMENT '试管编号' AFTER `ATTACHMENT_URL`; + diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_nat.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ic_nat.xlsx index 524d327bd7032cf01b51e60fcf15ec903428035d..de671285c675f9d081984301a95e52efe00ced57 100644 GIT binary patch literal 9824 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 delta 7306 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 Hu6+IvcU3~$ diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml index f6daee080d..243fbebcd7 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml @@ -16,7 +16,8 @@ nat_address natAddress, file_name fileName, attachment_url attachmentUrl, - created_time reportTime + created_time reportTime, + test_tube_code testTubeCode FROM ic_nat WHERE @@ -45,7 +46,8 @@ b.nat_time natTime, b.sample_time sampleTime, b.nat_result natResult, - b.nat_address natAddress + b.nat_address natAddress, + b.test_tube_code testTubeCode FROM ic_nat_relation a INNER JOIN ic_nat b ON a.IC_NAT_ID = b.ID @@ -93,7 +95,8 @@ nat_time natTime, sample_time sampleTime, nat_result natResult, - nat_address natAddress + nat_address natAddress, + test_tube_code testTubeCode FROM ic_nat WHERE @@ -134,7 +137,8 @@ nat_time, sample_time, nat_result, - nat_address + nat_address, + test_tube_code FROM ic_nat WHERE From 08a3d213c7b0f842f63fd485c9769e4bd89bf4ca Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 16 Nov 2022 13:49:34 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E4=BC=81=E4=BA=8B=E4=B8=9A=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E5=AF=BC=E5=85=A5=EF=BC=8C=E9=94=99=E8=AF=AFexcel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java index 91dfa20ed9..becc763ba3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java @@ -90,7 +90,7 @@ public class EnterpriseImportExcelDTO { * 默认0 */ @ColumnWidth(20) - @ExcelProperty(value = "场所类别(九小场所/企事业单位)") + @ExcelProperty(value = "场所类别") private String placeCategoryName; @ColumnWidth(20) From 88821961cd984b2ce4083cb1919aa3ee151d8a76 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 16 Nov 2022 14:11:18 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E4=BA=BA=E6=88=B7=E7=8A=B6=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/SubUserHouseListResultDTO.java | 15 ++++++++++ .../epmet/service/impl/HouseServiceImpl.java | 20 +++++++++++++ .../epmet/dto/form/RHZKStatisticsFormDTO.java | 28 ++++++++++++++++++ .../dto/result/RHZKStatisticsResultDTO.java | 1 + .../epmet/feign/EpmetUserOpenFeignClient.java | 4 +++ .../EpmetUserOpenFeignClientFallback.java | 5 ++++ .../controller/IcResiUserController.java | 11 +++++-- .../java/com/epmet/dao/IcResiUserDao.java | 2 +- .../com/epmet/service/IcResiUserService.java | 6 ++-- .../service/impl/IcResiUserServiceImpl.java | 29 +++++++++++++++---- .../main/resources/mapper/IcResiUserDao.xml | 17 ++++++++--- 11 files changed, 123 insertions(+), 15 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RHZKStatisticsFormDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SubUserHouseListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SubUserHouseListResultDTO.java index 45ded6601b..a791a22fd0 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SubUserHouseListResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SubUserHouseListResultDTO.java @@ -1,8 +1,10 @@ package com.epmet.dto.result; +import com.epmet.commons.tools.constant.NumConstant; import lombok.Data; import java.io.Serializable; +import java.math.BigDecimal; /** * @author sun @@ -79,4 +81,17 @@ public class SubUserHouseListResultDTO implements Serializable { */ private Double ldUserRatio = 0.0; + /** + * 人户一致，人在户不在，户在人不在， + * 为空的 暂不清楚 + */ + private Integer rhyzUserTotal = NumConstant.ZERO; + private BigDecimal rhyzUserRatio = NumConstant.ZERO_DECIMAL; + private Integer rzhbzUserTotal = NumConstant.ZERO; + private BigDecimal rzhbzUserRatio = NumConstant.ZERO_DECIMAL; + private Integer hzrzUserTotal = NumConstant.ZERO; + private BigDecimal hzrzUserRatio = NumConstant.ZERO_DECIMAL; + private Integer zbqcUserTotal = NumConstant.ZERO; + private BigDecimal zbqcUserRatio = NumConstant.ZERO_DECIMAL; + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index 31aa88b033..cc07bd0323 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -935,6 +935,13 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { if (!userResult.success()) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民人房统计数据失败" + userResult.getInternalMsg(), userResult.getMsg()); } + RHZKStatisticsFormDTO rhzkStatisticsFormDTO = new RHZKStatisticsFormDTO(); + rhzkStatisticsFormDTO.setOrgIds(idList); + rhzkStatisticsFormDTO.setOrgType(orgType); + Result> rhzkResult = epmetUserOpenFeignClient.renHuCondition(rhzkStatisticsFormDTO); + if (!rhzkResult.success()){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民人户状况统计数据失败" + rhzkResult.getInternalMsg(), rhzkResult.getMsg()); + } //3.汇总封装数据 SubUserHouseListResultDTO dto = null; for (String id : idList) { @@ -964,6 +971,19 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { dto.setLdUserRatio(u.getLdUserRatio()); } } + for (RHZKStatisticsResultDTO r : rhzkResult.getData()) { + if (r.getOrgId().equals(id)){ + dto.setRhyzUserTotal(r.getRhyzUserTotal()); + dto.setRhyzUserRatio(r.getRhyzUserRatio()); + dto.setRzhbzUserTotal(r.getRzhbzUserTotal()); + dto.setRzhbzUserRatio(r.getRzhbzUserRatio()); + dto.setHzrzUserTotal(r.getHzrzUserTotal()); + dto.setHzrzUserRatio(r.getHzrzUserRatio()); + dto.setZbqcUserTotal(r.getZbqcUserTotal()); + dto.setZbqcUserRatio(r.getZbqcUserRatio()); + dto.setUserTotal(r.getUserTotal()); + } + } list.add(dto); } return list; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RHZKStatisticsFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RHZKStatisticsFormDTO.java new file mode 100644 index 0000000000..1d74462fad --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RHZKStatisticsFormDTO.java @@ -0,0 +1,28 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Author zxc + * @DateTime 2022/11/16 13:26 + */ +@Data +public class RHZKStatisticsFormDTO implements Serializable { + private static final long serialVersionUID = -4474168123286467820L; + + private String orgId; + + private List orgIds; + + /** + * grid：网格；village：小区； + */ + private String orgType; + + private String staffId; + private String customerId; + +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/RHZKStatisticsResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/RHZKStatisticsResultDTO.java index 5cdd7fc1dd..fc9e8d88ba 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/RHZKStatisticsResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/RHZKStatisticsResultDTO.java @@ -30,6 +30,7 @@ public class RHZKStatisticsResultDTO implements Serializable { private Integer zbqcUserTotal = NumConstant.ZERO; private BigDecimal zbqcUserRatio = NumConstant.ZERO_DECIMAL; + private String orgId; @JsonIgnore private Integer total; @JsonIgnore diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index b24a4a9651..752ad14639 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -952,4 +952,8 @@ public interface EpmetUserOpenFeignClient { @PostMapping("/epmetuser/dataSyncConfig/disabilityInfoScanTask") Result disabilityInfoScanTask(@RequestBody DataSyncTaskParam formDTO); + + @PostMapping("/epmetuser/icresiuser/rhzkList") + Result> renHuCondition(@RequestBody RHZKStatisticsFormDTO formDTO); + } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index b675a7626b..0b50b901a6 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -741,4 +741,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien public Result disabilityInfoScanTask(DataSyncTaskParam formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "disabilityInfoScanTask", formDTO); } + + @Override + public Result> renHuCondition(RHZKStatisticsFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "renHuCondition", formDTO); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index a7eb0af5e8..e38645b163 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -1472,8 +1472,15 @@ public class IcResiUserController implements ResultDataResolver { * @Date 2022/11/16 09:22 */ @PostMapping("rhzk") - public Result renHuCondition(@LoginUser TokenDto tokenDto){ - return new Result().ok(icResiUserService.renHuCondition(tokenDto)); + public Result renHuCondition(@LoginUser TokenDto tokenDto,@RequestBody RHZKStatisticsFormDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + return new Result().ok(icResiUserService.renHuCondition(formDTO)); + } + + @PostMapping("rhzkList") + public Result> renHuConditionList(@RequestBody RHZKStatisticsFormDTO formDTO){ + return new Result>().ok(icResiUserService.renHuConditionList(formDTO)); } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java index b96b595ac1..2cab64a60b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java @@ -440,5 +440,5 @@ public interface IcResiUserDao extends BaseDao { */ ResiAndLocalResiResultDTO getResiCount(@Param("agencyId")String agencyId,@Param("idCard")String idCard,@Param("customerId")String customerId); - List getUserByRenHu(@Param("agencyId")String agencyId); + List getUserByRenHu(RHZKStatisticsFormDTO formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index 7bf36c3ecb..f346f2c3b1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -528,10 +528,12 @@ public interface IcResiUserService extends BaseService { /** * @Description 人户状况统计查询 - * @param tokenDto + * @param formDTO * @Author zxc * @Date 2022/11/16 09:22 */ - RHZKStatisticsResultDTO renHuCondition(TokenDto tokenDto); + RHZKStatisticsResultDTO renHuCondition(RHZKStatisticsFormDTO formDTO); + + List renHuConditionList(RHZKStatisticsFormDTO formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index fe04e0453b..cda0e3ecc8 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -3639,17 +3639,21 @@ public class IcResiUserServiceImpl extends BaseServiceImpl userByRenHu = baseDao.getUserByRenHu(staffInfo.getAgencyId()); + List userByRenHu = baseDao.getUserByRenHu(formDTO); RHZKStatisticsResultDTO r = new RHZKStatisticsResultDTO(); if (CollectionUtils.isEmpty(userByRenHu)){ return r; @@ -3680,6 +3684,19 @@ public class IcResiUserServiceImpl extends BaseServiceImpl renHuConditionList(RHZKStatisticsFormDTO formDTO) { + if (CollectionUtils.isEmpty(formDTO.getOrgIds())){ + return new ArrayList<>(); + } + List result = new ArrayList<>(); + formDTO.getOrgIds().forEach(o -> { + formDTO.setOrgId(o); + result.add(renHuCondition(formDTO)); + }); + return result; + } + /** * @Description * @param total 总人数 diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 22704d92d8..37abe1f808 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -1411,10 +1411,19 @@ (SELECT ID, IFNULL(RHZK,'') AS rhzk - FROM ic_resi_user - WHERE DEL_FLAG = '0' - AND `STATUS` = '0' - AND PIDS LIKE CONCAT('%',#{agencyId},'%')) t + FROM ic_resi_user + WHERE DEL_FLAG = '0' + AND `STATUS` = '0' + + AND PIDS LIKE CONCAT('%',#{orgId},'%') + + + AND GRID_ID = #{orgId} + + + AND VILLAGE_ID = #{orgId} + + ) t GROUP BY rhzk From e8e4112f36653bdc9ab22c6cc60265a2118118db Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 16 Nov 2022 14:54:39 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E4=BA=BA=E6=88=B7=E7=8A=B6=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/HouseServiceImpl.java | 22 +++++++++------- .../com/epmet/dto/form/UserChartFormDTO.java | 5 ++++ .../service/impl/IcResiUserServiceImpl.java | 1 + .../main/resources/mapper/IcResiUserDao.xml | 26 +++++++++++++++++-- 4 files changed, 42 insertions(+), 12 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index cc07bd0323..36c85a879a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -972,16 +972,18 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { } } for (RHZKStatisticsResultDTO r : rhzkResult.getData()) { - if (r.getOrgId().equals(id)){ - dto.setRhyzUserTotal(r.getRhyzUserTotal()); - dto.setRhyzUserRatio(r.getRhyzUserRatio()); - dto.setRzhbzUserTotal(r.getRzhbzUserTotal()); - dto.setRzhbzUserRatio(r.getRzhbzUserRatio()); - dto.setHzrzUserTotal(r.getHzrzUserTotal()); - dto.setHzrzUserRatio(r.getHzrzUserRatio()); - dto.setZbqcUserTotal(r.getZbqcUserTotal()); - dto.setZbqcUserRatio(r.getZbqcUserRatio()); - dto.setUserTotal(r.getUserTotal()); + if (StringUtils.isNotBlank(r.getOrgId())){ + if (r.getOrgId().equals(id)){ + dto.setRhyzUserTotal(r.getRhyzUserTotal()); + dto.setRhyzUserRatio(r.getRhyzUserRatio()); + dto.setRzhbzUserTotal(r.getRzhbzUserTotal()); + dto.setRzhbzUserRatio(r.getRzhbzUserRatio()); + dto.setHzrzUserTotal(r.getHzrzUserTotal()); + dto.setHzrzUserRatio(r.getHzrzUserRatio()); + dto.setZbqcUserTotal(r.getZbqcUserTotal()); + dto.setZbqcUserRatio(r.getZbqcUserRatio()); + dto.setUserTotal(r.getUserTotal()); + } } } list.add(dto); diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserChartFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserChartFormDTO.java index 7d357089f6..b0b0db77d2 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserChartFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserChartFormDTO.java @@ -27,6 +27,11 @@ public class UserChartFormDTO implements Serializable { */ private String type; + /** + * 人户一致:rhyz；人在户不在：rzhbz；户在人不在：hzrbz；暂不清楚：no；全部：all + */ + private String rhType; + private Integer pageNo = 1; private Integer pageSize = 20; private Boolean isPage = true; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index cda0e3ecc8..c87e96b12c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -3660,6 +3660,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl { + r.setOrgId(u.getOrgId()); switch (u.getRhzk()){ case UserConstant.R_H_Y_Z: r.setRhyzUserTotal(u.getTotal()); diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 37abe1f808..e2ea4571d3 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -1359,6 +1359,18 @@ AND (is_floating != '0' or is_floating is null) + + AND RHZK = 'rhyz' + + + AND RHZK = 'rzhbz' + + + AND RHZK = 'hzrbz' + + + AND(RHZK = '' or RHZK = null) + AND (agency_id = #{orgId} OR pids LIKE CONCAT('%', #{orgId}, '%')) @@ -1406,11 +1418,21 @@