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] =?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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