From 0f72b763761d206f496aff01fb55079e16f1c1fb Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 23 Apr 2023 16:39:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=9A=84=E6=89=80=E5=B1=9E?= =?UTF-8?q?=E7=BB=84=E7=BB=87=EF=BC=8C=E5=8F=AF=E4=BB=A5=E6=98=AF=E7=BD=91?= =?UTF-8?q?=E6=A0=BC=EF=BC=8C=E5=8F=AF=E4=BB=A5=E6=98=AF=E7=A4=BE=E5=8C=BA?= =?UTF-8?q?=EF=BC=8C=E5=8F=AF=E4=BB=A5=E6=98=AF=E8=A1=97=E9=81=93....?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/IcDangerousChemicalsDTO.java | 18 +++--- .../IcDangerousChemicalsAddEditFormDTO.java | 12 +++- .../IcDangerousChemicalsListResultDTO.java | 21 +++++-- .../entity/IcDangerousChemicalsEntity.java | 20 +++--- .../excel/IcDangerousChemicalsExcel.java | 2 +- .../impl/IcDangerousChemicalsServiceImpl.java | 58 +++++++++--------- ...lingshan_dangerous_chemicals_template.xlsx | Bin 9288 -> 9340 bytes .../mapper/IcDangerousChemicalsDao.xml | 17 ++--- 8 files changed, 89 insertions(+), 59 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcDangerousChemicalsDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcDangerousChemicalsDTO.java index 92e3ecf439..238e0da9a1 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcDangerousChemicalsDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcDangerousChemicalsDTO.java @@ -23,9 +23,18 @@ public class IcDangerousChemicalsDTO implements Serializable { private String id; /** - * 灵山：所属网格 + * 灵山：企业所属组织/网格 */ - private String gridId; + private String orgId; + /** + * 灵山：组织：agency；网格：grid + */ + private String orgType; + + /** + * 灵山：ORG_ID的全路径；包含ORG_ID + */ + private String orgIdPath; /** * 客户Id @@ -42,11 +51,6 @@ public class IcDangerousChemicalsDTO implements Serializable { */ private String agencyIdPath; - /** - * 灵山：GRID_ID的全路径；包含grid_id - */ - private String orgIdPath; - /** * 来源【新增:add 导入:import 】 */ diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcDangerousChemicalsAddEditFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcDangerousChemicalsAddEditFormDTO.java index 8a0747d5f1..46c901a770 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcDangerousChemicalsAddEditFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcDangerousChemicalsAddEditFormDTO.java @@ -27,10 +27,16 @@ public class IcDangerousChemicalsAddEditFormDTO implements Serializable { } /** - * 灵山：所属网格 + * 灵山：企业所属组织/网格 */ - @NotBlank(message = "所属网格不能为空", groups = {LingShanAddGroup.class, LingShanEditGroup.class}) - private String gridId; + @NotBlank(message = "所属组织不能为空", groups = {LingShanAddGroup.class, LingShanEditGroup.class}) + private String orgId; + + /** + * 灵山：组织：agency；网格：grid + */ + @NotBlank(message = "所属组织类型不能为空", groups = {LingShanAddGroup.class, LingShanEditGroup.class}) + private String orgType; /** * 场所Id diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcDangerousChemicalsListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcDangerousChemicalsListResultDTO.java index 5d11141ab9..111c981357 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcDangerousChemicalsListResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcDangerousChemicalsListResultDTO.java @@ -17,15 +17,26 @@ public class IcDangerousChemicalsListResultDTO implements Serializable { */ private String icDangerousChemicalsId; /** - * 灵山：所属网格 + * 灵山：企业所属组织/网格 */ - private String gridId; + private String orgId; /** - * xxx社区-网格名称 + * 灵山：组织：agency；网格：grid */ - private String gridName; + private String orgType; + + /** + * 灵山：ORG_ID的全路径；包含ORG_ID + */ + private String orgIdPath; + + /** + * 所属组织，可能是网格名，也可能是组织名 + */ + private String orgName; + /** - * 组织Id + * 所属组织机构Id；灵山：工作人员所属组织id */ private String agencyId; /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcDangerousChemicalsEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcDangerousChemicalsEntity.java index edf0054d58..6b1d55ae1e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcDangerousChemicalsEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcDangerousChemicalsEntity.java @@ -25,12 +25,21 @@ public class IcDangerousChemicalsEntity extends BaseEpmetEntity { private String customerId; /** - * 灵山：所属网格 + * 灵山：企业所属组织/网格 */ - private String gridId; + private String orgId; + /** + * 灵山：组织：agency；网格：grid + */ + private String orgType; + + /** + * 灵山：ORG_ID的全路径；包含ORG_ID + */ + private String orgIdPath; /** - * 所属组织机构Id + * 所属组织机构Id；灵山：工作人员所属组织id */ private String agencyId; @@ -39,11 +48,6 @@ public class IcDangerousChemicalsEntity extends BaseEpmetEntity { */ private String agencyIdPath; - /** - * 灵山：GRID_ID的全路径；包含grid_id - */ - private String orgIdPath; - /** * 来源【新增:add 导入:import 】 */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcDangerousChemicalsExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcDangerousChemicalsExcel.java index a6db250b8f..fd11614c6c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcDangerousChemicalsExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcDangerousChemicalsExcel.java @@ -15,7 +15,7 @@ public class IcDangerousChemicalsExcel { @ExcelProperty(value = "所属组织") @ColumnWidth(25) - private String gridName; + private String orgName; @ExcelProperty(value = "企业名称") @ColumnWidth(25) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java index 9ec9cf922f..c8475b9735 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java @@ -2,9 +2,7 @@ package com.epmet.service.impl; import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; @@ -129,14 +127,6 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl(list, pageInfo.getTotal()); } - private QueryWrapper getWrapper(Map params) { - String id = (String) params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } @Override public IcDangerousChemicalsDTO get(String id) { @@ -147,32 +137,38 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl tWrapper = new LambdaQueryWrapper<>(); - tWrapper.eq(IcDangerousChemicalsEntity::getGridId, gridId); + tWrapper.eq(IcDangerousChemicalsEntity::getOrgId, orgId); tWrapper.eq(IcDangerousChemicalsEntity::getName, name) .ne(StringUtils.isNotBlank(icDangerousChemicalsId),IcDangerousChemicalsEntity::getId,icDangerousChemicalsId); if (baseDao.selectCount(tWrapper) > NumConstant.ZERO) { - String msg = String.format("%下已存在%s", gridName, name); + String msg = String.format("所属组织下已存在%s", name); throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), msg, msg); } } @@ -180,16 +176,22 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl6S)dDOqV&nx#9Wn+vvl9Hdl z^F91y9`2bl_sl%p`!si0?Ov@Ofrd#!v1*A(N8^X-R9RmJf@Q@!SeP)?q8M%SI_ePe?H7WFZ_(10upS%a5Bqej)Q1|W@unx^&PY&2L znui=7uWS@?-8w;Hoer#a%^AB_A1+n(i${Jx-Rju?5g*0QueD`auIY`(l~B(pp8Zv{B93k?F4s%Zd$E9U2o&@zBc$frU#e(jNE;;kNF%8 z4?UgG?1}xkk`!}F;$7)k-yMgAAy>=s6K5npZJR0fOmEX}-^+ki{b-4k@#0vov5V$x=+M za0#(qwjaOa+z15e)ITrMu9W4xoT4IyF=JjrVy!z0GuSWwU4e!tDW-T64lji_H`2-zLZ`!ttyC;)UR*tf4eD?cJKK3ejRY^sSwH-v4Zm0^ z=*Z@%MY@4oweB=^4OY)M&Q^K{A3Z2$4vV&^o;x@%zwL11QaO=_pl_852ljTUeK4!? zP!YD4;${jH;xfeO!SO>zFp%oj2Z~=Rof6i9^;u7z!Eo1&**qv3)=<-~toE+Tb@2L^ zZ6n2N$_y<&M`C0o_?VcD_H?3TB+JnX6rOV+!t7{O*MV}l-%rpwufhi}qHVB#p}ww%6q_Nf$b1ANatMXhYr`0ioL8Lv`NFWg<$o=Nq9cVTsD zta4x^EcI0>I0>tlkl=?*qVDjJ{j{6Il-q`B%d(T>&eg zA-sH!CDeF$+P~CuXd&^k5?YyyRJw(x*wj>bK85ura67}2paP5+xRrLx4~YoCJmTUJtyI3L601@gJL6e4UG;M$?oXOI|7QN9V(;vE zM9{fCkiU{Dq6u|*XF1CEi+(iK-Mn45qogw=9#-F%|KUN^MlJ|u6Be{C-R%RZ&}TCU z>R1ZuP~L-Cykf=a%!;V1Be>Vo2@mK#!~x@qhH`E3=7}|pFd~o^ zU4B=9H6KSTHcJ?gtom?|ZilJs{hnX&NB%ePcw5cBzTh(JuRV14O62|(V^u2zfXIg+ zzP1DV6&Ep)zRTOuSpIMhs9lQJqD10!g-}sR_-cxGv{$KrCRZt!OW4<|l7P1Sbruz5 z-iT!L58@mlzffn_?dYj_{zWlPG&OK)8vIeX(4Xv@&L7sn`4L_?MxmiV|FT+JQ0J<0 z7iXtP@jSr!<<_28(w;hH5!tb>?Azp_PvUR{QJC1zk_~jk5>DB)C_=VO4*9-zt&vwIKIm7Qfz6AgD zex%DD-=g;W`6m0=cX{gY-RkX@SL?DEzGC`$Gg>#@Wy|zj?=LzIt#~653)7V@>x_Xv zCNB^+7MjRqzM%!|Esuuo8J&V=o(D2i79LE}M$-po=3dZ~JIDAKv19eyymtcmZ` z+U~HEN6lK95hx8(SRqFp74>;P-xv$TEPk=^E|RL9w*T!>IrVk2(G&Q7xA8ByQzHmX zRVs{KMcW&^pHB~r@k*wJHqCmpd#bn%S(&Sk=xYy78j$jaWX?Wi32r&@X?(tZC?J^} zp@iK=gKPTO)7~zxdL1j^&d&8pN+{os`^JYy=K|p(&n_a;ZG=Fm=tUGLw)&M9`C`yErts~sI?VQxj3Kc>a&u(rM0$(m0-%U$V`igN?R;G} zie)gcucunY5df)czKBGzXE^u>{8rlYN+EM`l5obAguAf(JrbFS@G}73J^HORZyDMB z7B;Y-p42CUmsJQGf6&}Wew*O*wO_E)gV^a0YffsT+8)9FD}q)5kuYLLLGnu%*g{uG zWb7%?=7!o!=H71@Zl)MV+wuvW(-U~!xH0V)iG;G-wt-__xft$_f&VbC5G$5NG4)@s z&v8snB;dUNe&E-tY|`<`$9p?3qX6j4>0pU2z1-K&E#1Sk*vH?+cvHASa5h0Hy3}1+ z!GP`v#Zm#-$H|}%%$&wX-T7K>!n%0IKU%vgON*Ar2_mh<(bs9@+T$eGOW7d06?&gY z5wZ%-;~*nG`y}kI{BZ9E7fgJROL(Rg+-2@etHOssazHYa!oJ{nC<2m9x;qSN%bEuv z_nL_HI>bh_7+Od#e0tN6G>kJFxTFp)A5U7@)!|CP#9gr^uj)jM^57OZ?rR)gP%eVz`;d=K1cpr{T-%o`6H}o&HPO=j4N7aVUXP=U+-Z!YC**f% zYmYCk=^rKv+=F~#pB$MXmh4O_Vf6IVO7k7qNP2M`-Opky@E2k9?Zj+aT}^Dn3EQKp zIXqAIxiWFPzyXUr$xbhswml600+{}^mt89D30o)12cDYdw+Iu>sq4nD1q_WDjV}axcx4c z{ZoL9|LyGQLNLw9N2MIX)t9mY#q-^zE?fwKSNRVQCl}B%1SiR)+#koQu}MlmtOun^ z9(OIGwYHd1U~X>l90w7Yz={_xhWJRUR#cOO$%C7T84NSCTAdns=n%+T$-m#+-312s zwntZra=@VllaPZ7enqJ*x{58n_VXHz$M@96F$c7zdWg-@Z2FNx^01Mlm$kbeT}qce zfdQy!ew^#I>j|Jt{-abpZZN~Q&!2^Y{zUD5Jh^ZOD(`IiyyXaALo-qSg+VW!XAI!UpyFxqAOl(Q|u*T8p zGU@DYDo3TwNG$d0rYf^geX<&G#vue5Nhaey2f^4-ac}Y^R=-htAzF>`hJ_J6d@(CMEB7kv=hN}_ z>dO8%i-AVgz+OwZi**{dRaS`#NbIw$YVwY8y^6_viEmzr6Nl{{^sYR{AOK z2sVhsB(`%R$&d-4UK2=GLy+IxPfVK2d?1gBrkwdq309_71Sev#``sSsekZrJdF+Qg z24Q50l5i~bWs#|41HkfH42MP{tZN6l0h}fjvnBk$|$Nl6l=>2nGi zov())lk2lj!$mM-3xY7}Lv&{3S(&P7VM+P*yoNIx|Mp49`c|!(*n!-P8poGR=`KFp z1#sVbd*z7(T_cKF0cX&5HUDuaIdroLyGzqUbqPwoV)Z@R#Z@gVXOGw!Wb2H9lc_0J z*hIqjV=3V}^jov+KUMA|)eZEku{}rnKh9dus_03f0Sn6$u5tsK-aJP)d>1et3fdN{ z-&ZKyRk_gDb_^1^qaA_Ld^XU@Iq{|D+^b0QR(g7njRUl}5DN8$Y8IEye~}9biVS}C z&p|__z`gkT)IQeZFfcq@)=y~^NSKq?b#wR;G#?!dB&BPY^4h5VC8thO`H3e4 zOlrrsM?5u9%Yz;?`Y*^ zXRGJ!<>cn@p5M>a#dUfb+%HIpy&l*Hg&SXr^r)1=OnR-<=}T+9iT06i=6P;@4k9`NV~p}DNr@0f53!U?$3g#ESwq{# z6_R^gQ{ux+T4|{%N!zWCv(*D_ zw$k@K<+35^1Yy`DSukuwLTV2{`~N78MA8*up?_mS)G<*ZT$p(<1sDJTgdi(5qMn%! zO%E}~jQDSwV$JdmEfB%ODvnl!uwvz-|NmC~bqjz7VE&6vhzeFt`u}+|005$Y$-nhq oz8`VODutGa;9wI+Yekr`$)hbI^4QG(cea4dE`x2s{O`(t03*hyw*UYD delta 4478 zcmV-^5rOXfNXSUAlK}+hGlbQXmjNz+7FkIu0qR60B!WO}mVIp_5+||^X*XVgk&%tL z6R(8eF>sPLqyiy%@%_KQ`|spvx-N3(5tPnK86)2#$N|Yqk;!F@uG5)&f*fs_6f7?# z#ApK=O_SrJh*y-C3NBSyfif9r$C9L`yo%Avn2KVo`3efAJ?oHGT$HL{#$MHb5?74h zvnAkwkTEX6Fu@GN4bZK6BHAGZ?~&Dm%3FZo7;-2;8jXF=$3I>Js?dKvXqADp$jqj) zGwtFI*@Aas?_TSyH`aCS)nOaM=J)aK{Nkz|)y-tHD-I}$1gBg9Go?zt-rqj9ul7WE zP;EAtGi~N}*^3Os=_dKyK7Bk&zeM=AVsUNyjtRoCd1#k@uiS)Z=jjY30SN+^j9q_{ zk}(|-O2}Q)_~3n$uPYS0_Wu(@myFyXOv!}$0Ud<{;vSH+xexzD@(r^M1GWJQFRM=d zi30!tvj~&T1Rj5tR!eW=HW0oS=zkD+=qZsz+mRo&9VGGQ(cJ*SwoT8BMB79tQ6cFl zIqt1kY=B+#0W8o%FFh3n(q4+T=)bAkztJJ}uvG<4>VtlP zBZOTaIW!4H#FE(veg4_ub`Lp9lO!TsBy@yssY1Ks4?lkxW^}LMfD(YBvxh46O+=@TILr}{ri$rK9dXn|1a-u56Va_B zPMU~b9q~yM(XS((Hxc+hNrl;G(!L%HUS-vTT9%_KFKz@SJ|~=kG;bd#6pO@6A1GM; z$kDecygNBl8aae>k?nJmT-pk&xyVkEbfHhFQe*}&!vZ#+NhxG)GoPQ6)?kADPH%sw z8-OG8eqC^a#~)oSg#LK>`uo3s`R$({-*1`K{nvJN_w(}2x67|yE$_bh>(9F_0Km!e z?U&0xez)f!etNh3^@rtm_qmm!SD77p^-v%K^$i%XDbPM8a>gJBoK7JHz8#S=pT_xv z7O4&GLTGps+2tI*1}L<P&Wt6;9vr94>qe5`R+|?qg7Fck?r?vFYujzcICtwR<3P-^($M$=)`kw96C;< zKokD3T{(=RqpQ{GuzTnX?BQl`w}WS1+DDz;_+m;Skt=M+9{PUBld?cMe=X2+_qV(UGnxJlJnn zEcjQ0e@J4v>R!n)Y|m@CrCYkyY~*t5^_7_&fN<%`D1!N7mD8yaqK|}zlpKf}mUWpZ zW+-fd!q%mFxS!%7MN`k^oLX#0%NabuwH9(j$RU^PnwtV7rApI6f4R`Sh}+gnF=6gi=9!Pg2szIk#4g^>^SI7$UoB$;{lL1>?- z8qOX01crg<_K+0^9ljicGBR>eiC)`()J@ZD*6XdhYHEgRB3t(9&92{bjvc7k8@Md1 za!%wmI9oq%difd~%;P3_+)^8@R?9SWb=mrpvb57N3qqIkwGO_TddqBR;BpNUXNg!d zUz?r1VwlAFS}cYS>1iRRinX_67St_aZ7m*5R}#Kuk6@G~T+Of|HxrnP9o3RvlIUNF z|6KN8iT{mal3}wbHLHy#Hns|9-iKQUzG+b_6k()`FS5h(+RPl2a#7bc1^uH#| zcv=e+>HQ$=!SgJIK1xz+Fo`99*S5Djrys#IHFOUS(PtDKp-F2HMZo|LdaivC__ha! z)mS3_M3V3z44!$lE72i-W<^%T>`@fZrxaCm6Ky^7UTgz4A@f!+Gqy7GUgFFJeW4`~ zTfofpXkH@2uX%wi@8%^g!^a&B{h<*fuaBHWJ|8)OoIY|Ad3^*2WNeOqc`|T%?q~o# zfRHsQ$Oy#|@3X0LK@~~*G|;Mv(KKpJqpmdw=6T(V{SdkwWdvIq&Kp8bB3}qOft(@a zBwp3WUNGACoFrDcyv&rD_cK#O;%TN#USBh~B-dkE@GuN7oI_f^2xp}%68b{6&%*7C z%%DRDj6_|>^KPIa<9q#oWH>TR2=H;A+kOB$F3_WCw8H@%!eTBxBts85+1|1}_rM=G zK0NSt!pQBS$K_o(b;vXB)vjV69eF1f=*Qa08JNJ%cJOe@&acOIuuE@; zLF9BJyn_Udwy$a`hX68~A^@{S9sy$McSeJKC$#XM5@tZLHlm$>8q`LZSuq>Ic8s6g z#wFlp;5{8{5n{4;XDv*Xvk_K{S)}2X1(7b6jfex3jW9DTk&Oo4(X?(MhaMfn2{X_V z!O77QxER|ASM%Cv6`j^$YL`8*m2CimKC}+la%@0{GywqOj1AEJ79=Tg$X~+X#97Go zDVU9OCc?=A6L$)KtvsN&$1uKvjfHnA4p!8^XyDhxVif&#GZ}3dMh7)PdF~8k!o524E521@D`a< z)U;9!3Zk-@$kk?QX_pQ(=p9M7Dc9lwvWzZ@@_oCsQ*yp<3$w5?B_Iw-6#8-|Al}H* zRt&t6a9n;Qg^{{Uoa8!=whkjVY@uI+aF=(;VIz)K+7XB6WNAknJ_VI_#Nm+COFQE5 zMy|t%qnCDn#Nm-#`G`~HAHS1_@!WHG{X&o7mE-odM20NV z!(}|JA#<$wY=^Fn$LHK)1bVODjvv!2he7DR1GO}_VPJj>f%4!x(?O;Mi;xI#Cx$PEz;%1A41`2wuzg-zWeL8*o9tZXQ z$n{_wJ_#%|J1a2#*W>ZipMJmg!&n9!;$-l)<5?N4_BCZg8GrHl^zU~kzdId2d3gTG zN7G+^rT}0h#whYku})rEjyH@@Q>V`#jPE^)B@ot30xI}aTVn}SP%#O-+ke*3@%_6m zp4}gR|KjK8AAZ2O2tApT#2dJ0C5=oMQ5C|}>v%`&Y%AmcoW<6ndVt*y<$=UM-rQIY z4be=Fys$h2WFym7G=#E73^};}zIXoM`Q+D0MDWurCMAvG%Rf8^bSHoNAT}4TgEArf z3e7w!pH0ucJb!rh^27J0b6Q2}NMW7)^DpOrr|%~!Me2ar5@=H~0(FG4cxjDUu1je# z`S|qwliw>qJt`zpiM%H|>+kf*pU1y>A3Dn9qrWDCB7NvjgUke$XiG#y3aL_Tr;k4c zXeM_a&!`h=RG0FII+r9m@P?-iEcHl$r9ugec<#+$gcUc5P--+1-SG1%yl$upB+XEN z-7M>f+<~PuiBPKUB&eE5DAd){@Y6e! zKRz1Y|LyqR-O0yaB(frVz+j2G)GQ6cG)s$&s!My0B+av6i?q_Ec95(x?}NxLKv3et zI4RB9$YX>f{G+MNrr$Cly3m`|4AB1#e+2?@)I_-N}5T^7Ph8;Nt%(k zldu(SX5;GvDWIu#ux3Qg8d6wO(=TgAf)aO`?(HDLO|&cQ z_$~A%5E-^%^7GaZUf+RFWfZ!9?aI4*J56(U&(bzpwVl?6p*!^rv%a&tQ8zj}yStWI z(`uccKt4l1e|Pm*HRgT-Z{T*rU>NkH%`UuP6!iOU*O~tjJhN)XKZ6I2TpfCFS4f?u z#@}Gq+7<4En2*R@1+&Tj*oo>e`FXzW{{v7<0|XQR000O8hfd-^P4ayQ0X6{u0Q&)x zff*Zrkxxp)Kp4gMf_DhBw-dV%ktAIRo8 zR|>W%l;~hJrve3&A}v{@tb?8Ht(A44FpfwG zRVcwaIK&JTjO8VbF|Nc}!gOGA?rcEFiYB&y5zA2rlbGyM*G4=p-7;j3i&2T07<0P< z^QyWAZDbLk6sbpe+&2#tk63#i-ux2`jai1qjj&M_qZ|2k8Q#q_$PEqt=m`sEwcztw zv|I9Nm}cSCK(rs{r!9Fj5ibo|000yK0000000031AOHXWJ(JxcCmXABhx=;^ z0087q000dD0000000031AOHXWr;{HeIstT(S|c_Ao0E|vKmnzb(j#69FRM=di30!t Qvj~$qBs>NyAOHXW0N4j&^8f$< diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcDangerousChemicalsDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcDangerousChemicalsDao.xml index 4a37272196..f3bc3890e2 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcDangerousChemicalsDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcDangerousChemicalsDao.xml @@ -70,8 +70,15 @@