From 3ab9d2a39c0f0ba3275ddf18e924f21867a7ceba Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Wed, 28 Feb 2024 15:10:58 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=91=E5=AE=A4=E5=AF=BC=E5=85=A5=E5=8F=8A?= =?UTF-8?q?=E6=A0=87=E5=87=86=E7=A7=91=E5=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/template/科室信息导入表.xlsx | Bin 0 -> 11120 bytes .../com/xinelu/common/constant/Constants.java | 5 + .../department/DepartmentController.java | 29 ++++ .../DepartmentDiseaseTypeController.java | 4 +- .../ImportDownloadController.java | 3 + .../NormDepartmentCompareController.java | 91 +++++++++++ .../manage/domain/department/Department.java | 4 +- .../NormDepartmentCompare.java | 92 +++++++++++ .../mapper/department/DepartmentMapper.java | 17 ++ .../NormDepartmentCompareMapper.java | 62 +++++++ .../agency/impl/AgencyServiceImpl.java | 4 +- .../department/IDepartmentService.java | 9 ++ .../impl/DepartmentServiceImpl.java | 63 +++++++- .../INormDepartmentCompareService.java | 62 +++++++ .../NormDepartmentCompareServiceImpl.java | 91 +++++++++++ .../xinelu/manage/vo/sysarea/SysAreaVO.java | 11 ++ .../manage/department/DepartmentMapper.xml | 86 ++++++++++ .../NormDepartmentCompareMapper.xml | 151 ++++++++++++++++++ .../mapper/manage/sysarea/SysAreaMapper.xml | 39 ++--- 19 files changed, 791 insertions(+), 32 deletions(-) create mode 100644 postdischarge-admin/src/main/resources/template/科室信息导入表.xlsx create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/controller/normdepartmentcompare/NormDepartmentCompareController.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/domain/normdepartmentcompare/NormDepartmentCompare.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/mapper/normdepartmentcompare/NormDepartmentCompareMapper.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/service/normdepartmentcompare/INormDepartmentCompareService.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/service/normdepartmentcompare/impl/NormDepartmentCompareServiceImpl.java create mode 100644 postdischarge-manage/src/main/resources/mapper/manage/normdepartmentcompare/NormDepartmentCompareMapper.xml diff --git a/postdischarge-admin/src/main/resources/template/科室信息导入表.xlsx b/postdischarge-admin/src/main/resources/template/科室信息导入表.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..96e2fb969277ac16f72d63cc76923b3254d3bc20 GIT binary patch literal 11120 zcmeHtRa70#)-CSt65QPh1oz+&Jh;2NJ8UcjcXx;2?(P-{65Ktw|B#&XNzQlA`0wK# z-?|3|8CGPe+;bk>1=<#L!-DK>ZZE zg>`-A0tN!I1_1&>`m30(jSanvrA1ows01hzTHv+c3DTE}y+}Z85}H77glc6|WD=L9 z4mot=T-K%9QUj6)s7hOeU!<-Ph$D5At#hSd-oGK??`( zO;hyzw~s<`A#F*TK4$&nanO|2LHY0|cD`Azfb;&;WvYNW_MHeAQMJ%ZOIo~lny$Ho zd|DYREBJgFTFl6g4s(NEH5H>-sSduBPX3kx>wrG`wJteu7o{?|-WQ;e{|dCewVmNB(wSagc+f<6kMRG*WF8^4I%@Ltq-0qdCd78SbrK- zJ~%d8ESW;R9*Bx@CX?Si*i`VWe$HR%c-&W+)2?{PTDqYq%zY$YkKyV#qQq^(tySi$ zKfCCF?AhbPem)Od`9(PmaN+!=g8j};){qGJ4-a*ZwieHpHshQ6Xz@uS{VtGe!ko&8 zqiVd^=FVP2P9YJADFG=_CTU3tY&<4Gd}a?D$8!-x#pS!_knY4>+jmrhiSP=dW1j$! z{FB>Hw;R2`0ZzYlv_<^_IPweNsDA_8(cZz@@)h#DC~0$lex#t2z$eIW_e}&w5fE%W zv;2EmzWI$9lWfRKnznN_Sr_fjLdo&?Zl;mlT-@g)QeQmcTAk5y_G%=6&zMdFiXEqm zJYmx7%&~yS=Ox&bD&pREiepudSXoDp7D6&D$Y6~V#fo=!F6jDxER&YG7&@`~Gcbps=#%MAJc zj-;Tm>idkjv*yRyjR_~Pr;bzNt}p*KBS2B1aR)TyEhU$#Kk?|B?S@Q5k2C_Pb0=sIG1 z4fddzz?~YeWk?r*9UfTHW^UmfS1UBkXH(#r8og2YO6iG2BR-Bbt`Wid@3maxc_BtpQxx~K{2iGgc?L` zjnUR&lkKHkykNGioRYxxH?47y08tDbrINX^a&;vELCK1-sq?QRqH3bq3gko=4DUKR zo^Rx6`lZYi)hYaau5U~MLnH^nAH9Xk4xO>3(dNYh)-P0Kh|E79eyW^*kb`6u3`Euu z%GSjwk$vf<(zJXv8s0U7G*&u#f!nPetix<}&2OO(1Xg>$JW(~5 zgz^aJ7Z$|)-sMEMG%g^sz5luG8$R{9E2!FIxF_QAdPi=90|AID_!rh^iM0%53-2~e zd!^1c*%(NIU~A?bXV$7NlW}9xPiHh80WiC)*g3RwRP`<;Q&p?5ht9pGHYfTs&yPFl zKlp;Srz+EuIGrU{;N2;?n(vTjXV0^rRH7o|#x~fZ!YGVQIWPbk6;k)#a1zPvjTZFn zd2gzmET%sLb0;1Q>ebe~(KmZEM40xGV6iuW58qp0f{eMQ;b+{4ZLw<4JPwmpdAN|kt`R-7t}&CLwM@L_z&qk{H=(u_jP`%v zA?8;eiinZ6o?(31G~Pcz4qx}FQO1@ z4aEag^}aG|lP9VfgLsAq3!B+NN54SCnzVPunV19di#Q)P-S@3qG2PrR9^@MLbBvXi zO7QBXkf8BK07yEjeZ*Ef-7FsVigh-vPqtr0#zT6JmNp|9(8Rnkq_5x-1E?R@@z2$_!&}d-&9Wqme!3^%V5+rq41{=AtjfQ z4weuvca&i&O%^uv?(HW9*KKB~aAPRk7x*!y_Eh_W$d_X8Hev{r~h}|8q3*`YH4ht~i(& zS{nZLDHL#b4|f9&1l0Dj`dyBKgakHXiAk&+4vXnbz4<>${+UjOiv97s(0;Tb&rXs}1-O*TeA zrkM;&`ii?3LHqSX6pac2DJw^>22wnG*HkYhoXtA}l4u#6wIi?VE-NgkkSXMB+TIA8 zPa-ak&yUyTnLOAVV333vp*%BC`c&1eX?RQlx}@}9;0jJHM_l|!TYe0V0diO-QYO;u z&}N-bgr^wa%Y&Gmq+fJB296AZK9HSMA4n5@a=4Qn)!$4@0*fD*U{q+OnY zVnd)oLlfZW=6bJ~{fDO+#m2F_RqIB(G z)~I=Xoo!&X#Qa85p2kf1%_EM%X)T*a!ADaiE(9%qJ&CD3oOhu^wK8mCn4g()g0);) z754FK>~B!OEhr1~^0BHF-9q9s@57zfN(ALe#c>8)gZfRNYAlH)AX34^3{WK5AQ!p^ z?yQ1>^eo>?V*-dMk}LuUjG$n2i!Nu+PqcWvaa!D-HXqii&x85W`P>|yP9bxKk-3HU zdN4e0M+>|?F6B?}rz^C1pOzvq*`E?l_?~VH#vk}8v-3n4+FX7dR8ugtJ#5xn6S%KJ zzJa%J$skn)dwZ&86Gpb0f)H-biGMm5v)d2gK%s=?|YI-}nxsp<=Iwd^|oC;%&!UZCj7@?s9Zluqb9>jMl$g z+=E)3$!UZ;i!#o{Pk|QnGD4c^%EdVniK4vUU?53HAA5;J02SH#{hh%ok|~wLdz69U zC1b+eg^EP1lYDL_|!36JvDPR71kBFUkK5v>BfC=}T(X?`S^hoeg6l+}-0f0&l z4V*&iZnb};4CxZVm4C0#VTEX3{Q64N2KQZo>R(E}ykah8vcN+tP zI+KHGEjH_-W$UfXgZl|nRt?1t8Ub|cBSz(2coSn`z=Z%RCS(_p&zdOHjEZ^|Em%yrLY-e0|{HH(@ z3=$#DL_HxxO!7Te)vtafS}HXa=IOTF`AAR=oB=dlpj&`sq+>*}Q#&eeZh1>(_uA9? z(o~I0l@Z*vz!t}CC2k-4`QnrO_3!iRU1x^$#g`vy-;3r@%-EUzK zBgYc)R~1K(6ugB9B7y^^gKc`nm=2Je8l&Kj;+8*&uQW5nb4zj_Ay zd+^|^iIJ`Mvb_+=0|CMR+9>QDTrCXkUn7QD4Rh-yRqUrvJ>HcXosh!o2TM~@O{1jo z${!~r=ul8H&6qdDX*~wrxRtuh@&xO_FwmjVDNB|0z9~@>nD~HCntgM6mNHKESZ6p* zx3|c!H~M6pdg#&@6UAKDfAZ)$?rwFp9YHc4cf6px0{xI*T2}JK;65$$;O1WX*1f*0 zwu$yKr*6fv+1L8*mVPtC%KY8k9Q*xbmHEoM%A@xn7+&pE1j3VRLD?5vkacs%6_CMo zi0v1C6Xs$zIL9=P-4j;M_kaO=bWNp_&^afMB%Arucdm&pN2mS%-L*2Scy%PkFJeZ0+Fu2gh9H}}-oN0`^kgXLS8u;ZE=q18f;sFGH@V51Oo|Gjf?)%vi%*azs$fHU`aS|aI;TVkK z&*4aAYzqhf_|}{Yd^?RlGw^A9Z;I+nJ=HORI+9btBUE<+e0CeRj;afX&Lnv!8C)Sy ziKbT_BiOtgT+Cp`L)X`x!*e%}vpmIV8-B^!pGG}}u@Z1NQNJo28fi^HAXqUP%!DMt z2`-OvN9BAHe55bk&qhWdz-N<2zt3}AZ*xLts!lkmPDkp@@YH$Md=&-nA3=RgKpo!Y z8aEs}YsQ8H8=a?qsuo_Ff`0LGRd$>+JE9lGAk3-bP-|X{$hO5Ye%I&dYa`qHKFUAn z$G%(Hq{&RJS*wSjppFVVj?^uK)+FK6(MM@R~oxn)dRrN1Y zEt&K{v{STfKg}dXJ)?JrLnbknF2i=wm+p$6QKNrsAWo=b*KEe@R{I&f(NFFEj}s+%O&(oqo>tEQN{DEnm3S3eXpD@%o zV~nQ8l1M=$ji)wi9YrNVw^T7oo7YV3O@_*&6S}0?C1uCf4qVZf917S{g@sC`fd)@a z$XH9&g%Mo^oWK(h{;UCt;F#D)N+~DB% zY2dHtMP3ItyPbYjkmS9cwF6eUyt|i$!GXYZ7er! zFpE9k9rO-DhVUzXrve@sfnIlfx?t#D@nF1r9Nf)mCvzxVWp>z9+hmd!BgoM3_z@fc zGJeNIDtMj2cZ(K_yX@X2>7QU&xlS$UfnQl7xH$VZqz1T1|`vV$a;z z%lFpA2$3<^C`9=|1q@U7x5`48f_gWHw5=Ip{`6AoVeWkHmk*{AUHSr;db&5gJ3G$} zh*$)?o*rj|Vms{*;awQ`2u4-quraDC?L=kb3g1puecK8MQMN7ExxL_syo#&8ohJHy zPvOV)7S*k*g-KM7|I|%Dj zjH);;z71$UKVbazF1Hapkr7L);J4EOwt#`r3mC(0k~uVD6`!~oLpGO@uHkxmfApcC zep(B9w93Jsk1^|}Vdf3o$P7WPbc8Hn)Wv*N2+4E5XF7jo(qRcq9PN3rq5l<4kA0dZ z7Cur#0kHJyXqDhAC6OJt7BHY!3s{*J^j}^R%b=K2_Fg=QS&94-667gsFV zwf6eF2tH5XI}sGuH#Ym6lP>j#uK9V@TlI^N3Pv)3yZ7$kGvv=z$P#>>^=n_Bf&U(i zF4dLzeRxT65x=BRUemfSrxx}mx^{*J3J!LrR>nVLQqLGo>nR9xHrv`A8ljTuxcia3T~M(x} zyt3XO(xxf#@{2rgHJ64IPTjWNmtj9fI)Fe&m~x$_FFc-c#stWL1OMXaUWII7PUoHP zmI7CAsM>uPXQ93bC3TQ#R5x!G6cWBYTnAd5j0KDz|0!^~T3853=5t+2y7f3OzTO!O z;8rM#kzxw?m`W!tW)+LQuTZNiPoTpN4i6CGb9SD^KTsb;rE3P-pw^d&p3R%eC>HD@ z@utF#dsKT&51&=;;H}K0#pjJi0OhK!P>WJ2yxb_UE*~A3X`fvU++`X~x2iB4bj|nz zlyaLOJVP7qr*be3@@+^5{tK?iAuJW$GBbiHzx%sjdM|1dZ%`}63jFESk;02@&24iG zckCF%$}7tLIBN3GD{T$GDGKF;L2Wey_#nuD+DK0Rw|^Ph*P3YyjnjA))2HP1S?c&T7r zgv3Sfi9Y6iP>P*AGW~%PtSWst!0vCh;JxAqVoH%uC3}5vbF<`rbURu^Jt>>dnn2uh zJkbdVQ8dyx6nZdBfy>7-6%rAZq*4WFC-uFZ>_Jfu8*~aK;$YL{5MX zR=0>}EcO^*PxQ_%YH)*PTnbrlJcEO=oBcZJ%u`pVG@ZqfmcX@t5)PyRCrmi!#~?y~ zV2HXqq+o{%Fr?VBVYy+0p!>sj2XYMt_PL z7*~?JB~BPZXz-27p{%|!>p8?mk2Hk7^ETYN3p4)Bu)(IcT|zw#->s+G*&y?_ihH?B zac+DgcK#RQqtFViFfOuDQ_)d@PLl9#I(41uLC!_8b9P(&18q#OlswBVk2~)UiW@Mp z185m19^ZPzgQF&jE3ewer_>8@hOcLKlLYPa78omaB^3!Y1ALGYIyYk}n)iR`-3Rz@bH^^wlSXNJe3)Pk=Aw!*o!nED2 z((f9qCd80)lhg&XITc#91P^w9JSOUPL1>Q6Y3`OQYSEHmP4jh9HzIbM%&fdU~g; zGip-3X88TP0J7|ZXHw?=p3QhyUN-Ibc0cG!oL>q4pRxSc>GeOsNqBRNeg6XE%uD(T z=jHchANVEq*OmAa-PV|4vzI~>k?X)G|3pu^MN=W@sA{S}i^U7j03I(Sb>`%~Zts=O zu!f*jD=BurB!TPnNs;?**|}l{xEU8?!Vo>VT{~^oa^_Q8H%}J`5erRS^^=JXAF$xV zC#&b6GQ&n;$LSapbTJ6CZLb2hEjFik;+32j@jW49wIR8^@7u=eSuz_gCEeQa14haF zs#s9{da(Pf7wZr0bqvGg{g@fvPP;duf%yv%wBI=g+(^6F6$c=Uj@|dUb>J=!lkfbw|R0XL=2$z=ZQqeOR-Bb?nUTMktJ^SF(xEl z95NXFmIShP1t+$Dp)I_ZDf)WguP$V53Y`6*#?m={g3v55>;U_}^pPG;+?N4_<*5HH4$t#ZrccCpCRAo5& z0v29V%sL(JDW&!9nzoZL93_tJa}_!vE__7=L`)p0RN;b7UntTN=nf_91c<^x$Apws zD~4~7*HGGL7AElTCr&2~HRL|fX>#V3Ypc+9OcjDZT5?y+De$Qc1~=SvM~4z^%Bl09 zHe(sW7jhif17fK+aA+lh-x~Oz`3JadJ9p$CM`WMn`5Dl9xS%In*cfijs|TmT<@GBe z%-6VTNf1Uf=0klbR9DV?_ldMK7{!a5z)ZbnNOTX3w{c5i-t??2OyfD#!Q}{bdgCu{UuHQTQJIB5H`GwNy zU)BDD@qV}Sd(8Z&on5?tj-Y?H@cR+)pBB_#nB+AE|KmXTfB){VFNeu5s{hVS{(Xl0 zo}K*DBlBO?{>)YW-sRtev_B145dQT0SJ?hrr(X-Yezl)#=+_9pD*sX5_4l6tUf}hr z`)kyS{zLcAa list = departmentService.selectDepartmentListWechatTemplateNum(departmentDto); return AjaxResult.success(list); } + + /** + * 导入科室信息 + * + * @param file 模板文件 + * @return 导入结果 + * @throws Exception 异常信息 + */ + @PreAuthorize("@ss.hasPermi('system:agency:importStationInfo')") + @Log(title = "导入科室信息", businessType = BusinessType.IMPORT) + @PostMapping("/insertDepartmentList") + public AjaxResult insertDepartmentList(MultipartFile file) throws Exception { + //判断excel里面是否有数据/文件格式 + if (Objects.isNull(file) || StringUtils.isBlank(file.getOriginalFilename())) { + return AjaxResult.error("请选择需要导入的文件！"); + } + // 获取文件名 + String orgName = file.getOriginalFilename(); + if (!orgName.endsWith(Constants.XLSX) && !orgName.endsWith(Constants.XLS)) { + return AjaxResult.error("导入文件格式不正确，请导入xlsx或xls格式的文件！"); + } + ExcelUtil util = new ExcelUtil<>(Department.class); + List list = util.importExcel(file.getInputStream()); + return departmentService.insertDepartmentList(list); + } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/departmentdiseasetype/DepartmentDiseaseTypeController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/departmentdiseasetype/DepartmentDiseaseTypeController.java index f1e504f4..513d1c6a 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/departmentdiseasetype/DepartmentDiseaseTypeController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/departmentdiseasetype/DepartmentDiseaseTypeController.java @@ -64,7 +64,7 @@ public class DepartmentDiseaseTypeController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:departmentDisease:add')") @Log(title = "科室病种信息", businessType = BusinessType.INSERT) - @PostMapping("/add") + @PostMapping public AjaxResult add(@RequestBody DepartmentDiseaseType departmentDiseaseType) { return toAjax(departmentDiseaseTypeService.insertDepartmentDiseaseType(departmentDiseaseType)); } @@ -74,7 +74,7 @@ public class DepartmentDiseaseTypeController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:departmentDisease:edit')") @Log(title = "科室病种信息", businessType = BusinessType.UPDATE) - @PutMapping("/edit") + @PutMapping public AjaxResult edit(@RequestBody DepartmentDiseaseType departmentDiseaseType) { return toAjax(departmentDiseaseTypeService.updateDepartmentDiseaseType(departmentDiseaseType)); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/importdownload/ImportDownloadController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/importdownload/ImportDownloadController.java index f5790d87..49471a17 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/importdownload/ImportDownloadController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/importdownload/ImportDownloadController.java @@ -41,6 +41,9 @@ public class ImportDownloadController { if (fileType.equals(Constants.AGENCY)) { file = ResourceUtils.getFile("classpath:template/机构信息导入表.xlsx"); } + if (fileType.equals(Constants.DEPARTMENT)) { + file = ResourceUtils.getFile("classpath:template/科室信息导入表.xlsx"); + } if (Objects.isNull(file)) { throw new ServiceException("下载导入模板文件失败，请联系管理员！"); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/normdepartmentcompare/NormDepartmentCompareController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/normdepartmentcompare/NormDepartmentCompareController.java new file mode 100644 index 00000000..bbf2c96d --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/normdepartmentcompare/NormDepartmentCompareController.java @@ -0,0 +1,91 @@ +package com.xinelu.manage.controller.normdepartmentcompare; + +import com.xinelu.common.annotation.Log; +import com.xinelu.common.core.controller.BaseController; +import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.common.core.page.TableDataInfo; +import com.xinelu.common.enums.BusinessType; +import com.xinelu.common.utils.poi.ExcelUtil; +import com.xinelu.manage.domain.normdepartmentcompare.NormDepartmentCompare; +import com.xinelu.manage.service.normdepartmentcompare.INormDepartmentCompareService; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 标准科室对照信息Controller + * + * @author xinelu + * @date 2024-02-28 + */ +@RestController +@RequestMapping("/system/compare") +public class NormDepartmentCompareController extends BaseController { + @Resource + private INormDepartmentCompareService normDepartmentCompareService; + + /** + * 查询标准科室对照信息列表 + */ + @PreAuthorize("@ss.hasPermi('system:compare:list')") + @GetMapping("/list") + public TableDataInfo list(NormDepartmentCompare normDepartmentCompare) { + startPage(); + List list = normDepartmentCompareService.selectNormDepartmentCompareList(normDepartmentCompare); + return getDataTable(list); + } + + /** + * 导出标准科室对照信息列表 + */ + @PreAuthorize("@ss.hasPermi('system:compare:export')") + @Log(title = "标准科室对照信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, NormDepartmentCompare normDepartmentCompare) { + List list = normDepartmentCompareService.selectNormDepartmentCompareList(normDepartmentCompare); + ExcelUtil util = new ExcelUtil(NormDepartmentCompare.class); + util.exportExcel(response, list, "标准科室对照信息数据"); + } + + /** + * 获取标准科室对照信息详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:compare:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return AjaxResult.success(normDepartmentCompareService.selectNormDepartmentCompareById(id)); + } + + /** + * 新增标准科室对照信息 + */ + @PreAuthorize("@ss.hasPermi('system:compare:add')") + @Log(title = "标准科室对照信息", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody NormDepartmentCompare normDepartmentCompare) { + return toAjax(normDepartmentCompareService.insertNormDepartmentCompare(normDepartmentCompare)); + } + + /** + * 修改标准科室对照信息 + */ + @PreAuthorize("@ss.hasPermi('system:compare:edit')") + @Log(title = "标准科室对照信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody NormDepartmentCompare normDepartmentCompare) { + return toAjax(normDepartmentCompareService.updateNormDepartmentCompare(normDepartmentCompare)); + } + + /** + * 删除标准科室对照信息 + */ + @PreAuthorize("@ss.hasPermi('system:compare:remove')") + @Log(title = "标准科室对照信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(normDepartmentCompareService.deleteNormDepartmentCompareByIds(ids)); + } +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/department/Department.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/department/Department.java index 93349be5..cf21cff6 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/department/Department.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/department/Department.java @@ -99,8 +99,8 @@ public class Department extends BaseEntity { /** * 节点类型，科室：DEPARTMENT，病区：WARD， */ - @ApiModelProperty(value = "节点类型，科室：DEPARTMENT，病区：WARD，") - @Excel(name = "节点类型，科室：DEPARTMENT，病区：WARD，") + @ApiModelProperty(value = "节点类型，科室：DEPARTMENT，病区：WARD") + @Excel(name = "节点类型，科室：DEPARTMENT，病区：WARD") private String nodeType; /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/normdepartmentcompare/NormDepartmentCompare.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/normdepartmentcompare/NormDepartmentCompare.java new file mode 100644 index 00000000..81e1f22e --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/normdepartmentcompare/NormDepartmentCompare.java @@ -0,0 +1,92 @@ +package com.xinelu.manage.domain.normdepartmentcompare; + +import com.xinelu.common.annotation.Excel; +import com.xinelu.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 标准科室对照信息对象 norm_department_compare + * + * @author xinelu + * @date 2024-02-28 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "标准科室对照信息对象", description = "norm_department_compare") +public class NormDepartmentCompare extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + private Long id; + + /** + * 所属科室id + */ + @ApiModelProperty(value = "所属科室id") + @Excel(name = "所属科室id") + private Long departmentId; + + /** + * 所属科室名称 + */ + @ApiModelProperty(value = "所属科室名称") + @Excel(name = "所属科室名称") + private String departmentName; + + /** + * 标准对照名称 + */ + @ApiModelProperty(value = "标准对照名称") + @Excel(name = "标准对照名称") + private String normCompareName; + + /** + * 标准对照编码 + */ + @ApiModelProperty(value = "标准对照编码") + @Excel(name = "标准对照编码") + private String normCompareCode; + + /** + * 标准对照排序 + */ + @ApiModelProperty(value = "标准对照排序") + @Excel(name = "标准对照排序") + private Integer normCompareSort; + + /** + * 标准对照概述 + */ + @ApiModelProperty(value = "标准对照概述") + @Excel(name = "标准对照概述") + private String normCompareRemark; + + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("departmentId", getDepartmentId()) + .append("departmentName", getDepartmentName()) + .append("normCompareName", getNormCompareName()) + .append("normCompareCode", getNormCompareCode()) + .append("normCompareSort", getNormCompareSort()) + .append("normCompareRemark", getNormCompareRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/department/DepartmentMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/department/DepartmentMapper.java index c1789eb3..21492c9f 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/department/DepartmentMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/department/DepartmentMapper.java @@ -2,6 +2,7 @@ package com.xinelu.manage.mapper.department; import com.xinelu.manage.domain.department.Department; import com.xinelu.manage.dto.DepartmentDto; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -85,4 +86,20 @@ public interface DepartmentMapper { */ List selectDepartmentListWechatTemplateNum(DepartmentDto departmentDto); + + /** + * 查询所有的机构信息 + * + * @param departmentNames 机构信息集合 + * @return 列表集合信息 + */ + List getAllDepartmentInfo(@Param("departmentNames") List departmentNames); + + /** + * 科室信息导入 + * + * @param departmentList 机构信息 + * @return int + **/ + int insertDepartmentList(List departmentList); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/normdepartmentcompare/NormDepartmentCompareMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/normdepartmentcompare/NormDepartmentCompareMapper.java new file mode 100644 index 00000000..0f6060b2 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/normdepartmentcompare/NormDepartmentCompareMapper.java @@ -0,0 +1,62 @@ +package com.xinelu.manage.mapper.normdepartmentcompare; + +import com.xinelu.manage.domain.normdepartmentcompare.NormDepartmentCompare; + +import java.util.List; + + +/** + * 标准科室对照信息Mapper接口 + * + * @author xinelu + * @date 2024-02-28 + */ +public interface NormDepartmentCompareMapper { + /** + * 查询标准科室对照信息 + * + * @param id 标准科室对照信息主键 + * @return 标准科室对照信息 + */ + NormDepartmentCompare selectNormDepartmentCompareById(Long id); + + /** + * 查询标准科室对照信息列表 + * + * @param normDepartmentCompare 标准科室对照信息 + * @return 标准科室对照信息集合 + */ + List selectNormDepartmentCompareList(NormDepartmentCompare normDepartmentCompare); + + /** + * 新增标准科室对照信息 + * + * @param normDepartmentCompare 标准科室对照信息 + * @return 结果 + */ + int insertNormDepartmentCompare(NormDepartmentCompare normDepartmentCompare); + + /** + * 修改标准科室对照信息 + * + * @param normDepartmentCompare 标准科室对照信息 + * @return 结果 + */ + int updateNormDepartmentCompare(NormDepartmentCompare normDepartmentCompare); + + /** + * 删除标准科室对照信息 + * + * @param id 标准科室对照信息主键 + * @return 结果 + */ + int deleteNormDepartmentCompareById(Long id); + + /** + * 批量删除标准科室对照信息 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + int deleteNormDepartmentCompareByIds(Long[] ids); +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/impl/AgencyServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/impl/AgencyServiceImpl.java index 180cb455..e1f9e9f2 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/impl/AgencyServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/impl/AgencyServiceImpl.java @@ -165,9 +165,9 @@ public class AgencyServiceImpl implements IAgencyService { } List agencyNames = importDataList.stream().filter(item -> StringUtils.isNotBlank(item.getAgencyName())).map(Agency::getAgencyName).distinct().collect(Collectors.toList()); //根据名称查询护理站基本信息 - List allNurseStationInfo = agencyMapper.getAllAgencyInfo(agencyNames); + List allAgencyInfo = agencyMapper.getAllAgencyInfo(agencyNames); //做差集，去除数据库中已经存在的护理站信息 - List subtractList = new ArrayList<>(CollectionUtils.subtract(importDataList, allNurseStationInfo)); + List subtractList = new ArrayList<>(CollectionUtils.subtract(importDataList, allAgencyInfo)); if (CollectionUtils.isEmpty(subtractList)) { return AjaxResult.success(); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/IDepartmentService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/IDepartmentService.java index dd12bf81..44199e76 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/IDepartmentService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/IDepartmentService.java @@ -1,5 +1,6 @@ package com.xinelu.manage.service.department; +import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.manage.domain.department.Department; import com.xinelu.manage.dto.DepartmentDto; @@ -84,4 +85,12 @@ public interface IDepartmentService { * @return */ List selectDepartmentListWechatTemplateNum(DepartmentDto departmentDto); + + /** + * 科室信息导入 + * + * @param departmentList 科室信息 + * @return int + **/ + AjaxResult insertDepartmentList(List departmentList); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/impl/DepartmentServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/impl/DepartmentServiceImpl.java index d9dee418..a16f110d 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/impl/DepartmentServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/impl/DepartmentServiceImpl.java @@ -1,14 +1,27 @@ package com.xinelu.manage.service.department.impl; +import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.common.exception.ServiceException; import com.xinelu.common.utils.DateUtils; +import com.xinelu.common.utils.SecurityUtils; +import com.xinelu.common.utils.StringUtils; +import com.xinelu.common.utils.bean.BeanUtils; +import com.xinelu.common.utils.regex.RegexUtil; import com.xinelu.manage.domain.department.Department; import com.xinelu.manage.dto.DepartmentDto; import com.xinelu.manage.mapper.department.DepartmentMapper; import com.xinelu.manage.service.department.IDepartmentService; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.BooleanUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; /** @@ -21,6 +34,8 @@ import java.util.List; public class DepartmentServiceImpl implements IDepartmentService { @Resource private DepartmentMapper departmentMapper; + @Resource + private RegexUtil regexUtil; /** * 查询科室信息 @@ -93,7 +108,7 @@ public class DepartmentServiceImpl implements IDepartmentService { /** * 查询科室信息列表及包含话术数量 * - * @param department + * @param departmentDto * @return */ @Override @@ -122,4 +137,50 @@ public class DepartmentServiceImpl implements IDepartmentService { public List selectDepartmentListWechatTemplateNum(DepartmentDto departmentDto) { return departmentMapper.selectDepartmentListWechatTemplateNum(departmentDto); } + + /** + * 科室信息导入 + * + * @param departmentList 科室信息 + * @return 导入结果 + **/ + @Transactional(rollbackFor = Exception.class) + @Override + public AjaxResult insertDepartmentList(List departmentList) { + //判断添加的数据是否为空 + if (CollectionUtils.isEmpty(departmentList)) { + return AjaxResult.error("请添加科室导入信息！"); + } + //根据护理站名称做去除处理 + List importDataList = departmentList.stream().filter(item -> StringUtils.isNotBlank(item.getDepartmentName())).distinct().collect(Collectors.toList()); + //校验联系电话格式是否正确 + Department department = importDataList.stream().filter(item -> StringUtils.isNotBlank(item.getDepartmentPhone())).filter(item -> BooleanUtils.isFalse(regexUtil.regexPhone(item.getDepartmentPhone()))).findFirst().orElse(new Department()); + if (StringUtils.isNotBlank(department.getDepartmentPhone())) { + return AjaxResult.error("当前科室电话：" + department.getDepartmentPhone() + " 格式不正确，请重新录入！"); + } + List departmentName = importDataList.stream().filter(item -> StringUtils.isNotBlank(item.getDepartmentName())).map(Department::getDepartmentName).distinct().collect(Collectors.toList()); + //根据名称查询护理站基本信息 + List allDepartment = departmentMapper.getAllDepartmentInfo(departmentName); + //做差集，去除数据库中已经存在的护理站信息 + List subtractList = new ArrayList<>(CollectionUtils.subtract(importDataList, allDepartment)); + if (CollectionUtils.isEmpty(subtractList)) { + return AjaxResult.success(); + } + List saveDepartmentList = new ArrayList<>(); + for (Department item : subtractList) { + if (Objects.isNull(item.getParentDepartmentId())) { + item.setParentDepartmentId(0L); + } + item.setCreateBy(SecurityUtils.getUsername()); + item.setCreateTime(new Date()); + Department newDepartment = new Department(); + BeanUtils.copyProperties(item, newDepartment); + saveDepartmentList.add(newDepartment); + } + int insertCount = departmentMapper.insertDepartmentList(saveDepartmentList); + if (insertCount <= 0) { + throw new ServiceException("导入科室信息失败，请联系管理员！"); + } + return AjaxResult.success(); + } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/normdepartmentcompare/INormDepartmentCompareService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/normdepartmentcompare/INormDepartmentCompareService.java new file mode 100644 index 00000000..007c1fd8 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/normdepartmentcompare/INormDepartmentCompareService.java @@ -0,0 +1,62 @@ +package com.xinelu.manage.service.normdepartmentcompare; + +import com.xinelu.manage.domain.normdepartmentcompare.NormDepartmentCompare; + +import java.util.List; + + +/** + * 标准科室对照信息Service接口 + * + * @author xinelu + * @date 2024-02-28 + */ +public interface INormDepartmentCompareService { + /** + * 查询标准科室对照信息 + * + * @param id 标准科室对照信息主键 + * @return 标准科室对照信息 + */ + NormDepartmentCompare selectNormDepartmentCompareById(Long id); + + /** + * 查询标准科室对照信息列表 + * + * @param normDepartmentCompare 标准科室对照信息 + * @return 标准科室对照信息集合 + */ + List selectNormDepartmentCompareList(NormDepartmentCompare normDepartmentCompare); + + /** + * 新增标准科室对照信息 + * + * @param normDepartmentCompare 标准科室对照信息 + * @return 结果 + */ + int insertNormDepartmentCompare(NormDepartmentCompare normDepartmentCompare); + + /** + * 修改标准科室对照信息 + * + * @param normDepartmentCompare 标准科室对照信息 + * @return 结果 + */ + int updateNormDepartmentCompare(NormDepartmentCompare normDepartmentCompare); + + /** + * 批量删除标准科室对照信息 + * + * @param ids 需要删除的标准科室对照信息主键集合 + * @return 结果 + */ + int deleteNormDepartmentCompareByIds(Long[] ids); + + /** + * 删除标准科室对照信息信息 + * + * @param id 标准科室对照信息主键 + * @return 结果 + */ + int deleteNormDepartmentCompareById(Long id); +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/normdepartmentcompare/impl/NormDepartmentCompareServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/normdepartmentcompare/impl/NormDepartmentCompareServiceImpl.java new file mode 100644 index 00000000..98d2d7a8 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/normdepartmentcompare/impl/NormDepartmentCompareServiceImpl.java @@ -0,0 +1,91 @@ +package com.xinelu.manage.service.normdepartmentcompare.impl; + +import com.xinelu.common.utils.DateUtils; +import com.xinelu.manage.domain.normdepartmentcompare.NormDepartmentCompare; +import com.xinelu.manage.mapper.normdepartmentcompare.NormDepartmentCompareMapper; +import com.xinelu.manage.service.normdepartmentcompare.INormDepartmentCompareService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + + +/** + * 标准科室对照信息Service业务层处理 + * + * @author xinelu + * @date 2024-02-28 + */ +@Service +public class NormDepartmentCompareServiceImpl implements INormDepartmentCompareService { + @Resource + private NormDepartmentCompareMapper normDepartmentCompareMapper; + + /** + * 查询标准科室对照信息 + * + * @param id 标准科室对照信息主键 + * @return 标准科室对照信息 + */ + @Override + public NormDepartmentCompare selectNormDepartmentCompareById(Long id) { + return normDepartmentCompareMapper.selectNormDepartmentCompareById(id); + } + + /** + * 查询标准科室对照信息列表 + * + * @param normDepartmentCompare 标准科室对照信息 + * @return 标准科室对照信息 + */ + @Override + public List selectNormDepartmentCompareList(NormDepartmentCompare normDepartmentCompare) { + return normDepartmentCompareMapper.selectNormDepartmentCompareList(normDepartmentCompare); + } + + /** + * 新增标准科室对照信息 + * + * @param normDepartmentCompare 标准科室对照信息 + * @return 结果 + */ + @Override + public int insertNormDepartmentCompare(NormDepartmentCompare normDepartmentCompare) { + normDepartmentCompare.setCreateTime(DateUtils.getNowDate()); + return normDepartmentCompareMapper.insertNormDepartmentCompare(normDepartmentCompare); + } + + /** + * 修改标准科室对照信息 + * + * @param normDepartmentCompare 标准科室对照信息 + * @return 结果 + */ + @Override + public int updateNormDepartmentCompare(NormDepartmentCompare normDepartmentCompare) { + normDepartmentCompare.setUpdateTime(DateUtils.getNowDate()); + return normDepartmentCompareMapper.updateNormDepartmentCompare(normDepartmentCompare); + } + + /** + * 批量删除标准科室对照信息 + * + * @param ids 需要删除的标准科室对照信息主键 + * @return 结果 + */ + @Override + public int deleteNormDepartmentCompareByIds(Long[] ids) { + return normDepartmentCompareMapper.deleteNormDepartmentCompareByIds(ids); + } + + /** + * 删除标准科室对照信息信息 + * + * @param id 标准科室对照信息主键 + * @return 结果 + */ + @Override + public int deleteNormDepartmentCompareById(Long id) { + return normDepartmentCompareMapper.deleteNormDepartmentCompareById(id); + } +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/sysarea/SysAreaVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/sysarea/SysAreaVO.java index 84c659ae..6c40c4b3 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/sysarea/SysAreaVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/sysarea/SysAreaVO.java @@ -53,6 +53,17 @@ public class SysAreaVO implements Serializable { */ private String streetCode; + + /** + * 社区名称 + */ + private String communityName; + + /** + * 社区区域编码 + */ + private String communityCode; + /** * 街道区域编码 */ diff --git a/postdischarge-manage/src/main/resources/mapper/manage/department/DepartmentMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/department/DepartmentMapper.xml index ea65defe..7c55aab9 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/department/DepartmentMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/department/DepartmentMapper.xml @@ -220,6 +220,39 @@ d.department_code + + insert into department @@ -325,6 +358,59 @@ + + insert into department( + parent_department_id, + agency_id, + agency_name, + department_name, + department_code, + department_type, + department_abbreviation, + department_person_id, + department_person_name, + node_type, + provide_service_category, + subdivision_category_id, + subdivision_category_name, + norm_department_compare_id, + norm_department_compare_name, + prepare_beds_count, + department_phone, + department_mail, + establish_date, + revoke_date, + create_by, + create_time + ) values + + ( + #{Department.parentDepartmentId}, + #{Department.agencyId}, + #{Department.agencyName}, + #{Department.departmentName}, + #{Department.departmentCode}, + #{Department.departmentType}, + #{Department.departmentAbbreviation}, + #{Department.departmentPersonId}, + #{Department.departmentPersonName}, + #{Department.nodeType}, + #{Department.provideServiceCategory}, + #{Department.subdivisionCategoryId}, + #{Department.subdivisionCategoryName}, + #{Department.normDepartmentCompareId}, + #{Department.normDepartmentCompareName}, + #{Department.prepareBedsCount}, + #{Department.departmentPhone}, + #{Department.departmentMail}, + #{Department.establishDate}, + #{Department.revokeDate}, + #{Department.createBy}, + #{Department.createTime} + ) + + + update department diff --git a/postdischarge-manage/src/main/resources/mapper/manage/normdepartmentcompare/NormDepartmentCompareMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/normdepartmentcompare/NormDepartmentCompareMapper.xml new file mode 100644 index 00000000..353aa678 --- /dev/null +++ b/postdischarge-manage/src/main/resources/mapper/manage/normdepartmentcompare/NormDepartmentCompareMapper.xml @@ -0,0 +1,151 @@ + + + + + + + + + + + + + + + + + + + + select id, department_id, department_name, norm_compare_name, norm_compare_code, norm_compare_sort, norm_compare_remark, create_by, create_time, update_by, update_time from norm_department_compare + + + + + + + + insert into norm_department_compare + + department_id, + + department_name, + + norm_compare_name, + + norm_compare_code, + + norm_compare_sort, + + norm_compare_remark, + + create_by, + + create_time, + + update_by, + + update_time, + + + + #{departmentId}, + + #{departmentName}, + + #{normCompareName}, + + #{normCompareCode}, + + #{normCompareSort}, + + #{normCompareRemark}, + + #{createBy}, + + #{createTime}, + + #{updateBy}, + + #{updateTime}, + + + + + + update norm_department_compare + + department_id = + #{departmentId}, + + department_name = + #{departmentName}, + + norm_compare_name = + #{normCompareName}, + + norm_compare_code = + #{normCompareCode}, + + norm_compare_sort = + #{normCompareSort}, + + norm_compare_remark = + #{normCompareRemark}, + + create_by = + #{createBy}, + + create_time = + #{createTime}, + + update_by = + #{updateBy}, + + update_time = + #{updateTime}, + + + where id = #{id} + + + + delete from norm_department_compare where id = #{id} + + + + delete from norm_department_compare where id in + + #{id} + + + \ No newline at end of file diff --git a/postdischarge-manage/src/main/resources/mapper/manage/sysarea/SysAreaMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/sysarea/SysAreaMapper.xml index 2511fb4a..08ad85e8 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/sysarea/SysAreaMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/sysarea/SysAreaMapper.xml @@ -60,36 +60,25 @@