From ef8a8d7febb625d18dcfe0a492b3b91858e08ace Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 20 Sep 2022 11:17:28 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=94=B9+sql?= =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/ImportEpidemicSpecialAttention.java | 3 +++ ...IcEpidemicSpecialAttentionServiceImpl.java | 22 +++++++++++++++++- ..._default_ic_epidemic_special_attention.sql | 5 ++++ .../excel/attention_nat_template.xlsx | Bin 8729 -> 8920 bytes 4 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.70__default_ic_epidemic_special_attention.sql diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ImportEpidemicSpecialAttention.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ImportEpidemicSpecialAttention.java index 2f690d2d7c..52135be6e5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ImportEpidemicSpecialAttention.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ImportEpidemicSpecialAttention.java @@ -45,6 +45,9 @@ public class ImportEpidemicSpecialAttention extends ExcelVerifyInfo { @Excel(name = "备注") private String remark; + @Excel(name = "隔离状态") + private String isolatedState; + @ExcelIgnore private Integer attentionType; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java index 490219bcb9..d41cf26726 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java @@ -380,7 +380,6 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl errorInfo = new ArrayList<>(); - try { List list = ExcelPoiUtils.importExcel(inputStream, 0,1,ImportEpidemicSpecialAttention.class); if (CollectionUtils.isEmpty(list)){ @@ -414,7 +413,17 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl> isolatedState = epmetAdminOpenFeignClient.dictDataList("isolatedState"); + if (!isolatedState.success()){ + throw new EpmetException("查询字典表数据失败..."+"isolatedState"); + } + Map dictMap = isolatedState.getData().stream().collect(Collectors.toMap(SysDictDataDTO::getDictLabel, SysDictDataDTO::getDictValue)); if (list.size() > errorInfo.size()){ Map groupByIdCard = list.stream().collect(Collectors.groupingBy(ImportEpidemicSpecialAttention::getIdCard, Collectors.counting())); groupByIdCard.forEach((idCard,count) -> { @@ -428,6 +437,7 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl idCards = list.stream().map(m -> m.getIdCard()).collect(Collectors.toList()); + List existsEntities = new ArrayList<>(); List existList = baseDao.getExistList(attentionType, idCards); if (CollectionUtils.isNotEmpty(existList)){ for (String s : existList) { @@ -436,10 +446,17 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl> groupByStatus = list.stream().collect(Collectors.groupingBy(ImportEpidemicSpecialAttention::getAddStatus)); @@ -447,6 +464,9 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl entities = ConvertUtils.sourceToTarget(needInsert, IcEpidemicSpecialAttentionEntity.class); entities.forEach(e -> { + if (attentionType.compareTo(NumConstant.TWO) == NumConstant.ZERO){ + e.setIsolatedState(dictMap.get(e.getIsolatedState())); + } e.setIsAttention(NumConstant.ONE); e.setOrgId(agencyInfo.getId()); e.setPid(agencyInfo.getPid()); diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.70__default_ic_epidemic_special_attention.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.70__default_ic_epidemic_special_attention.sql new file mode 100644 index 0000000000..99e215885a --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.70__default_ic_epidemic_special_attention.sql @@ -0,0 +1,5 @@ +UPDATE ic_epidemic_special_attention +SET UPDATED_TIME = NOW(), + ISOLATED_STATE = '1' +WHERE ISOLATED_STATE IS NULL + AND ATTENTION_TYPE = 2; \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/attention_nat_template.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/attention_nat_template.xlsx index e41ebaf0a701ebbf335adc241c29cd48721ec35c..ee99d3be893edb9a6d5a5b93fcade863c1ef55fe 100644 GIT binary patch delta 4652 zcmZ9QWmFX2y2b~jq(Mp;n4wcb5QLFtXpojp$#LkC8oDKBNa+xihM|#0QbLd%8VRMP zLE!p7XRUkgJ$tQp?=R1%_gQ#E@jdxnk7Pdb@69p%Z1qX1!F>NrdErVl561nWD5ej4#?KgNIECIrv;x7Ji?A-CvZ4 zi7GrM0T%)6ZBo#`vzHbP81zcmG;EMx9#`&AoA5nmu9n<=s)V?ozs&DhYdn*VE`QEW z%^uH3XEYjZFO#`pfzRIw&{BJVLj?c;2mn!<>oVe2ie9KwY!-xbm>@aeF!h=&?XbU} zf(;DjNiy|w_)yZqYD1}Z$&8sOEW0-^I(0jAdshB!kLJclJT%jUv!2HaNI}qS-AemQ zr)PGGVjt| zQ;iQ*$R%Hs#HyGUy+Oe#<|*W03qW*KFDH(jSqb?^&B!T`MQ&(gUPd*i(7C;HnBV!8 z!*X^LHTy$o7T3FVuKAKS?E3=jdn!F#^C{=V@{WI2f}+APB;qrY#L_d|op{l}WDCOap$ZP!`_vxA(sMvZO8@DV>cRZC+ z>1-@^e7|Zsy-tge-5MUj(y%)@qkk|5d6MJUtmvtM)?u-Sc0BA8kIoVtJ1s;Y;~rEy zt<}~)5U`%W6Na!k?rli=Jogsr+Ws`kP&@=F6im1d=lrCWi3=$RncZ~CCk^>jBi@90vSJgznU9!-5f@tR|b|K z1CHm))An>m-+F~(6oD1267W6;#@cDcMGGZQ41sG;XX?2D0fUGrsvH4T0^f$a;@xkV z$Q5us6(&xaTbA=nmKPA$rDyGF;kpnXvh(Vs)Mm1KTafrs=e2Q@sq9flidv)hf$wkBFo(6U)jP|KgwhO@eWT-Ky$cYkd>vBn974b%yMAiz={pVJ0oEHBegYVVl~Gpvr9v< zn>1nCV<}_`7G$|-NDz2SbJ-*%Rt4S?Ha08j2B9c$=+Q%XoOlROihG0`AppSk5&$6i z`~7|22zYqDePipv?+br3ZMx)wnW092YVJd{Y9w*c?8)C>If=*FKH{1n!9`*{Xk<=e zALfvWVS?g%M`1foeT7F6(@j1x(Y7=r67V7dp=3nc|OLw zJ!FXwIN#fIHhLIjZ$k%cIUfzgkc!Y*3%;Q_4_jR|u6@3@hq*m>U4qo$A8CxA-0TCS zuKmBPg}5}e$;*BBiSzrU_v9QimS58%M0ZvhB=}uo8R0-KLR8XRTLUxQa_5pVX$(M`#@ zR_(I)UzYWYLure@Ra@jqcZf?$73CT{1qN=sdN6`sP;i`Z^vvU{_!i=&wyr~ zNL#}OCq>l{XnoZq?-)t>PQhqAq{RepSj5#A0)$7_**nTVMl&o{>XwH1k!KMSG2xt( zNsu3*$DUgoM(9CUvM=E)*|K9ghkC%*i2mSk+lY^~>MJSDqh(5Ri-Uw}fV$6fY?=9H zqDJC;STqkkt;hSmBA>>MdW|^Q)_z6ihtoIBvC#}1$u&UOk(AXEwcp&W6B>!+chrHi z)CdypdfL6=t$tYu!5f5S_bfdEvAYA1NW~HvRH$GnQ2*>d?gC2ndJmbTAeNl{Ny&X~ z+$( z)lO4U7TS8_cky~RE;oZG?HFN<>xKw3Dq(hiWkl*Aq^6rl^mfswP5H z=L(__oVOlDv1pj7>FH+F>%;c>=8KsHmO^KdZ{04Pl5Z;5Zo2%GGhEPK771SEtu{}V zs(>)6GG0RJkTcawR*R9D86ZLrgPxX-hr#U2leLXxTB~qidZFl1Uf?bR_3vQ>M-)p1 zdRqVT%pLN44DVSPuN$`>j{&x@>I(1L%XHJUxu4NIsWD;&)=BWETTX>I4U{fbW+GzW z9G|Ec`$%>YF{sn8V7O7X2yeJYZ-YOU;keKF`OtkA1l)KU+O^x8RW-GIf(NHvrjd_5 zk}e3(;hqb3q6rObjp>_tuuz2P+Q8sJ-5-G@kIi`=P%|GJkPD|gJvJ{>B`WQ77p77b&w%_KeJSFydXjfyebG2LqTdW8x5 ztzs%emyRz}SkYK9t2I%Lmumz#^Sm5Nq=P1gUpHNhep-P<#TKg2Vmp`zb0LklT|bj< zcS!^4=Sxnk1cD6RlMo?fL<0|xYK(7IyCkoVKX$@yXe7mDBl2H0IWWGHS|PxV=5Ign z4_SJ+V??TB*BKEns6_s>M<_UeFec>d6XcIRf+kVV9~4Qhfe8(0G=DJNLtG|lrH`pC zV3AI7f{khCTY7TQObLW-Ob!?_q6(O?LWo_~wYcP{o9ed7V@6 zuMYmvsV#_0BYT|8*SHFiSwQo41J-2OqWcYJijD`ShZUiVG7!&;0AYRFZiL7RpArEw z-%i<2DnSHHd??f9Po_>-LF~JxSH#85r1Swk=3^=6{ApRj+ET+$Vh6wb1*KCJ{^t6? z3V3d#OM83(!Ne(Hj{3zGB4$bbiRKcNo`i=}1P~0^TSnw)Tw&mqtU)>^xSDJyHu_ln zy1LNCd4xSxNS(}0?%`)F5>km|a)e^YdtBlWO{GD5*6?|e-|DZ?f-@96mv_N|c+MpK*7I&i$^I~~M7GuH8o3jL_h|wpH&wLb zRwP4Lr%jOdjZ5&>V6ZSrZUTiXrZCP_Px3O}brUh3D-B$cekhL3T^Nk}7FS7F)7f(1 zM`U57qRiv1`!9KJCjqg4{aHPu1@>VUkaC_kv0$@%uT)aZKhx`k!1WuoOTKAH6S%n^^tDJM>@pkEY5MsXE)7DZ$svUB5GIZH}IB;>OA$6xSF1J#uTlWN$0CaD8|ft6OHFBOPw+BiwDeF`g=mK#GP);q?rH^7h}n5(rse( zkzkD*q^tO<;)tavwBC?3`fUV|ufo1g%9B5XCV>+RF0vFlBjwQB%X<0)jo8`m7Hajb zmUIs@Ss$@u_Pb}jPQsasUO8*^7$DjqAC)`3d-i*kRPFxU>S%#Hw=v{?VbJG&gvI`w zX?hGKt;0Y7K0T}6TUGIl#{>hTMmIFH!=I`8eLCY%Ailb4hDF(WY;pd$)*QHqG#4;D z>^hM#uip0Dn+GMss2JA9B?h~}vyuFZn;y0;M`A^=QS9rkzEanaIe_s;1vjpsW#^Oo z|4*iNulO?8{svWUR1j?*mK}*L}MvvzTT{S$THX=}Xf6(nwFJqEF?7_}bA3s&azrO)ANV0)9rv?-1# zr51bs@n1Bs0gBI$C*-Yo%w(aS?Ged;U#1pBD5{pC8TPQ1Q$}57Fn^&m&C= z7~_e{k3ggr`o`-;>6OrQMP#rd8xjOtQsA0R6>SDF3Vjo)?m-@)uEN07vCbj$ZoO`Yzii;gM>($I~dv7^$eO>2GTK&ZO3Jwsvf>(z-C+zk-&|I zje~UW0RLi#t;aGr*sP4GU?4S0l8FZ=jvfF&VS#B-Ax!kx)%2(wCgi`X7hw#lB-enJ@rRFTv!%|26ZkDgTrY{~Rm;`0ve1hw=w=0RJ0L{v(JYLA8U$ qvGwp#m*8jE{`e>XW_I9zoBSWS=wp;Cv)TVe`B~-{cx_DoDE8=PqX delta 4416 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 Date: Tue, 20 Sep 2022 14:00:12 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IcEpidemicSpecialAttentionController.java | 16 +++++++++++++++- .../java/com/epmet/excel/NatExportExcel.java | 7 +++++-- .../IcEpidemicSpecialAttentionServiceImpl.java | 4 +++- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicSpecialAttentionController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicSpecialAttentionController.java index fc84fdc43d..169dc8ea37 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicSpecialAttentionController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicSpecialAttentionController.java @@ -15,6 +15,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.constants.ImportTaskConstants; import com.epmet.dto.IcEpidemicSpecialAttentionDTO; +import com.epmet.dto.SysDictDataDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.dto.result.NatPieResultDTO; @@ -23,6 +24,7 @@ import com.epmet.excel.NatExportExcel; import com.epmet.excel.NatImportExcel; import com.epmet.excel.VaccinationExportExcel; import com.epmet.excel.VaccinationImportExcel; +import com.epmet.feign.EpmetAdminOpenFeignClient; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.service.IcEpidemicSpecialAttentionService; import lombok.extern.slf4j.Slf4j; @@ -35,7 +37,9 @@ import javax.servlet.http.HttpServletResponse; import java.io.InputStream; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** @@ -53,6 +57,8 @@ public class IcEpidemicSpecialAttentionController { private IcEpidemicSpecialAttentionService icEpidemicSpecialAttentionService; @Autowired private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient; + @Autowired + private EpmetAdminOpenFeignClient epmetAdminOpenFeignClient; /** * Desc: 【疫苗接种关注名单，疫苗接种关注名单】列表 @@ -195,11 +201,19 @@ public class IcEpidemicSpecialAttentionController { formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); formDTO.setIsPage(false); - PageData pageData = icEpidemicSpecialAttentionService.vaccinationList(formDTO); + PageData pageData = icEpidemicSpecialAttentionService.vaccinationList(formDTO); // 关注类型，核酸检测：2，疫苗接种：1，行程上报：0 if (formDTO.getAttentionType().equals(NumConstant.ONE)){ ExcelUtils.exportExcelToTarget(response, null, pageData.getList(), VaccinationExportExcel.class); }else { + Result> isolatedState = epmetAdminOpenFeignClient.dictDataList("isolatedState"); + if (!isolatedState.success()){ + throw new EpmetException("查询字典表数据失败..."+"isolatedState"); + } + Map dictMap = isolatedState.getData().stream().collect(Collectors.toMap(SysDictDataDTO::getDictValue, SysDictDataDTO::getDictLabel)); + pageData.getList().forEach(l -> { + l.setIsolatedState(dictMap.get(l.getIsolatedState())); + }); ExcelUtils.exportExcelToTarget(response, null, pageData.getList(), NatExportExcel.class); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/NatExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/NatExportExcel.java index cc3d827af0..fd404ca278 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/NatExportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/NatExportExcel.java @@ -29,7 +29,10 @@ public class NatExportExcel { @Excel(name = "关注原因",width = 40) private String reason; - @Excel(name = "最近一次通知时间",width = 20) - private String lastInformTime; + @Excel(name = "最后一次核酸时间",width = 20) + private String lastNatTime; + + @Excel(name = "隔离状态",width = 20) + private String isolatedState; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java index d41cf26726..27e07f9f4c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java @@ -162,7 +162,9 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.natList(formDTO)); result.setList(pageInfo.getList()); From fb2e7c326e87c3e9591aa2344741fdccdbe032d3 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 20 Sep 2022 14:33:44 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...IcEpidemicSpecialAttentionServiceImpl.java | 2 +- .../excel/attention_nat_template.xlsx | Bin 8920 -> 8888 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java index 27e07f9f4c..f051330c16 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java @@ -406,7 +406,7 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImplOg-aJX:_QsNtG^GMp?R;5zl}J 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 SEg+@GlaL}p2AduL0000Y7*=Wk delta 3882 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 From ac7b6637c96bc122d3f18551f020b2f1ef86c3a5 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 20 Sep 2022 15:24:34 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcEpidemicSpecialAttentionServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java index f051330c16..2a2a6732da 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java @@ -427,7 +427,7 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl dictMap = isolatedState.getData().stream().collect(Collectors.toMap(SysDictDataDTO::getDictLabel, SysDictDataDTO::getDictValue)); if (list.size() > errorInfo.size()){ - Map groupByIdCard = list.stream().collect(Collectors.groupingBy(ImportEpidemicSpecialAttention::getIdCard, Collectors.counting())); + Map groupByIdCard = list.stream().filter(l -> StringUtils.isNotBlank(l.getIdCard())).collect(Collectors.groupingBy(ImportEpidemicSpecialAttention::getIdCard, Collectors.counting())); groupByIdCard.forEach((idCard,count) -> { if (Integer.valueOf(count.toString()).compareTo(1) != 0){ for (ImportEpidemicSpecialAttention i : list) { From 5138b5985b49e697c94c81602152b91522d5035f Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 20 Sep 2022 15:57:27 +0800 Subject: [PATCH 5/5] a --- .../java/com/epmet/commons/tools/constant/NumConstant.java | 1 + .../src/main/java/com/epmet/enums/NatPieColorEnum.java | 3 ++- .../service/impl/IcEpidemicSpecialAttentionServiceImpl.java | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java index 1f0d76e14f..d3e34b119d 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java @@ -85,6 +85,7 @@ public interface NumConstant { String POSITIVE_EIGHT_STR = "+8"; String EMPTY_STR = ""; String ONE_NEG_STR = "-1"; + String ONE_HUNDRED_STR = "100"; String FIFTY_STR="50"; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/enums/NatPieColorEnum.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/enums/NatPieColorEnum.java index 99a44729a6..6f6b58f854 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/enums/NatPieColorEnum.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/enums/NatPieColorEnum.java @@ -13,7 +13,8 @@ public enum NatPieColorEnum { REd("0","#ee6666"), YELLOW("2","#fac858"), ORANGE("1","#fc8452"), - GREEN("3","#91cc75"), + THREE("3","#73c0de"), + GREEN("100","#91cc75"), ; private String key; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java index 2a2a6732da..794ae31b9d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java @@ -601,7 +601,7 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl