From 1fcf1bba002ccdb4035a82855e91dc0337c7a541 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Tue, 20 Aug 2024 08:55:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=B5=8B=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/constant/BusinessConstants.java | 20 +++++- .../common/core/utils/ImportExcelUtils.java | 10 ++- .../bracelet/exportVo/PersonExportVo.java | 11 +-- .../bracelet/importVo/PersonImportVo.java | 8 +++ .../bracelet/mapper/PersonMgeMapper.java | 16 +++++ .../service/impl/PersonMgeServiceImpl.java | 66 ++++++++++++++++-- .../main/resources/download/person_model.xlsx | Bin 49111 -> 49195 bytes .../mapper/bracelet/PersonMgeMapper.xml | 12 +++- 8 files changed, 128 insertions(+), 15 deletions(-) diff --git a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/constant/BusinessConstants.java b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/constant/BusinessConstants.java index d8c0a82..2640c22 100644 --- a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/constant/BusinessConstants.java +++ b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/constant/BusinessConstants.java @@ -9,6 +9,22 @@ package com.bonus.common.core.constant; */ public class BusinessConstants { + /** + * 身份证类型 + */ + public static final int SAME_TYPE = 1; + /** + * 手机号 + */ + public static final int SAME_TYPE2 = 2; + /** + * 安全帽编号 + */ + public static final int SAME_TYPE3 = 3; + /** + * 马甲编号 + */ + public static final int SAME_TYPE4 = 4; public static final int TYPE = 1; public static final int TYPE2 = 2; public static final int TYPE3 = 0; @@ -29,7 +45,9 @@ public class BusinessConstants { public final static String XLS = ".xls"; - /** * 杆塔导入 */ + /** + * 杆塔导入 + */ public final static String Gt_IMPORT_VO = "GtImportVo"; /** * 人员导入 diff --git a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/ImportExcelUtils.java b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/ImportExcelUtils.java index 0626388..8f938b1 100644 --- a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/ImportExcelUtils.java +++ b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/ImportExcelUtils.java @@ -88,7 +88,7 @@ public class ImportExcelUtils { private static boolean checkModal(Sheet sheet, String className) { int colNum = sheet.getRow(1).getLastCellNum(); if (Objects.equals(className, BusinessConstants.PERSON_IMPORT_VO)) { - return colNum == 7; + return colNum == 9; }else if(Objects.equals(className, BusinessConstants.Gt_IMPORT_VO)){ return colNum == 4; } @@ -179,6 +179,14 @@ public class ImportExcelUtils { // 人员岗位 obj.put("post", row.getCell(BusinessConstants.CELL_6).getStringCellValue()); } + if (row.getCell(BusinessConstants.CELL_7) != null) { + // 安全帽编号 + obj.put("aqmCode", row.getCell(BusinessConstants.CELL_7).getStringCellValue()); + } + if (row.getCell(BusinessConstants.CELL_8) != null) { + // 安全帽编号 + obj.put("mjCode", row.getCell(BusinessConstants.CELL_8).getStringCellValue()); + } return obj; } diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/exportVo/PersonExportVo.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/exportVo/PersonExportVo.java index 6487009..ea3085a 100644 --- a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/exportVo/PersonExportVo.java +++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/exportVo/PersonExportVo.java @@ -28,12 +28,13 @@ public class PersonExportVo { @Excel(name = "电话", width = 20.0,height = 15.0,orderNum = "4") private String phone; - @Excel(name = "安全帽编号", width = 20.0,height = 15.0,orderNum = "5") + + @Excel(name = "人员岗位", width = 20.0,height = 15.0,orderNum = "5") + private String post; + + @Excel(name = "安全帽编号", width = 20.0,height = 15.0,orderNum = "6") private String aqmCode; - @Excel(name = "马甲编号", width = 20.0,height = 15.0,orderNum = "6") + @Excel(name = "马甲编号", width = 20.0,height = 15.0,orderNum = "7") private String mjCode; - - @Excel(name = "人员岗位", width = 20.0,height = 15.0,orderNum = "7") - private String post; } diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/importVo/PersonImportVo.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/importVo/PersonImportVo.java index 85ab7a5..642334f 100644 --- a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/importVo/PersonImportVo.java +++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/importVo/PersonImportVo.java @@ -50,4 +50,12 @@ public class PersonImportVo implements Serializable { * 岗位 */ private String post; + /** + * 安全帽编号 + */ + private String aqmCode; + /** + * 马甲编号 + */ + private String mjCode; } diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/PersonMgeMapper.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/PersonMgeMapper.java index 4cfd340..ddd66d6 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/PersonMgeMapper.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/PersonMgeMapper.java @@ -245,4 +245,20 @@ public interface PersonMgeMapper { * @date 2024/8/19 15:08 */ Integer canItBeModified(PersonVo vo); + + /** + * 获取所有已入库的安全帽编号 + * @return List> + * @author cwchen + * @date 2024/8/19 18:01 + */ + List> aqmCodeIsExist(); + + /** + * 获取所有已入库的马甲编号 + * @return List> + * @author cwchen + * @date 2024/8/19 18:31 + */ + List> mjCodeIsExist(); } diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/PersonMgeServiceImpl.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/PersonMgeServiceImpl.java index 1640424..57383a8 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/PersonMgeServiceImpl.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/PersonMgeServiceImpl.java @@ -186,7 +186,7 @@ public class PersonMgeServiceImpl implements IPersonMgeService { } // 人员已分配班组，岗位限制修改 Integer canItBeModified = mapper.canItBeModified(vo); - if(canItBeModified > 0){ + if (canItBeModified > 0) { return AjaxResult.error("人员已分配班组，岗位已限制修改"); } // 验证身份证是否重复、手机号 @@ -311,10 +311,10 @@ public class PersonMgeServiceImpl implements IPersonMgeService { } // 判断人员是否领用设备包括手环箱、手环、安全帽等设备 List isLyDevices = mapper.isLyDevices(vo); - if(isLyDevices.get(0) > 0){ + if (isLyDevices.get(0) > 0) { return AjaxResult.error("该人员已绑定手环"); } - if(isLyDevices.get(1) > 0){ + if (isLyDevices.get(1) > 0) { return AjaxResult.error("该人员已绑定设备"); } // 删除人员、资源文件、人脸照片 @@ -417,19 +417,31 @@ public class PersonMgeServiceImpl implements IPersonMgeService { } list.add(personVo); } - // 校验身份证号、电话是否存在相同数据 + // 校验身份证号、电话、安全帽编号、马甲编号 是否存在相同数据 List sameList = same(list, 1, "身份证号"); List sameList2 = same(list, 2, "电话"); + List sameList3 = same(list, 3, "安全帽编号"); + List sameList4 = same(list, 4, "马甲编号"); String existData = isExistData(sameList); String existData2 = isExistData(sameList2); + String existData3 = isExistData(sameList3); + String existData4 = isExistData(sameList4); if (StringUtils.isNotBlank(existData)) { return AjaxResult.error(existData); } if (StringUtils.isNotBlank(existData2)) { return AjaxResult.error(existData2); } - // 校验库中数据是否重复 + if (StringUtils.isNotBlank(existData3)) { + return AjaxResult.error(existData3); + } + if (StringUtils.isNotBlank(existData4)) { + return AjaxResult.error(existData4); + } + // 校验库中数据的身份证号、手机号、安全帽编号、马甲编号是否重复 List> personIsExist = mapper.personIsExist(new PersonVo()); + List> aqmCodes = mapper.aqmCodeIsExist(); + List> mjCodes = mapper.mjCodeIsExist(); for (PersonVo vo : list) { if (idCardIsExist(personIsExist, vo, 1)) { return AjaxResult.error("第" + vo.getSerialNumber() + "行身份证号码已存在"); @@ -437,6 +449,12 @@ public class PersonMgeServiceImpl implements IPersonMgeService { if (idCardIsExist(personIsExist, vo, 2)) { return AjaxResult.error("第" + vo.getSerialNumber() + "行电话已存在"); } + if (codeIsExist(aqmCodes, vo.getAqmCode())) { + return AjaxResult.error("第" + vo.getSerialNumber() + "行安全帽编号已存在"); + } + if (codeIsExist(mjCodes, vo.getMjCode())) { + return AjaxResult.error("第" + vo.getSerialNumber() + "行马甲编号已存在"); + } } for (PersonVo vo : list) { // 对身份证号、手机号 进行 sm4加密 保存人员数据、保存文件资源 @@ -495,6 +513,29 @@ public class PersonMgeServiceImpl implements IPersonMgeService { } } + /** + * 判断安全帽编号、马甲编号 是否重复 + * @param list + * @param value + * @return boolean + * @author cwchen + * @date 2024/8/19 18:09 + */ + public boolean codeIsExist(List> list, String value) { + if (CollectionUtils.isEmpty(list) || StringUtils.isEmpty(value)) { + return false; + } else { + for (Map map : list) { + String code = map.get("code"); + if (Objects.equals(code, value)) { + return true; + } + } + return false; + } + } + + /** * 文件上传 * @@ -591,6 +632,8 @@ public class PersonMgeServiceImpl implements IPersonMgeService { vo.setPhone(handleData(obj.getString("phone"))); vo.setFile(obj.get("file") != null ? (MultipartFile) obj.get("file") : null); vo.setPost(setPost(postList, handleData(obj.getString("post")))); + vo.setAqmCode(handleData(obj.getString("aqmCode"))); + vo.setMjCode(handleData(obj.getString("mjCode"))); return vo; } @@ -637,11 +680,20 @@ public class PersonMgeServiceImpl implements IPersonMgeService { } public static List same(List list, int type, String name) { - // 1 身份证号 2.手机号 + // 1 身份证号 2.手机号 3.安全安全帽编号 4.马甲编号 List errList = new ArrayList(); Map map = new HashMap(); for (int i = 0; i < list.size(); i++) { - String key = type == BusinessConstants.TYPE ? list.get(i).getIdCard() : list.get(i).getPhone(); + String key = null; + if (type == BusinessConstants.SAME_TYPE) { + key = list.get(i).getIdCard(); + } else if (type == BusinessConstants.SAME_TYPE2) { + key = list.get(i).getPhone(); + } else if (type == BusinessConstants.SAME_TYPE3) { + key = list.get(i).getAqmCode(); + } else if (type == BusinessConstants.SAME_TYPE4) { + key = list.get(i).getMjCode(); + } if (key == null || Objects.equals("", key)) { continue; } diff --git a/bonus-modules/bonus-bracelet/src/main/resources/download/person_model.xlsx b/bonus-modules/bonus-bracelet/src/main/resources/download/person_model.xlsx index dfadd265d61ea0ac0fe1a7579537d40696ab4e26..088653c032cc096dad6bffe13c643917b9bb5172 100644 GIT binary patch delta 6134 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 delta 6040 zcmYkAbyO5ww})p2hi-a z5+Eq1LsXW}k2x@$E8(Gyyc)Vt@Qz8+SaKSL8N*Zk*oT&nhie^~(9r{mD}$5eW=ly2 zT=gJEa*^+nbkKC`FQ6uSO{IXsMScplY6YM7F3x*gfln`qNR|v_q%KRbaU(ar2lJEnUX9 z@7IzNH7^McHmuYL{L1dhHCcwcksbzx-9%kSuj3IAI4x8tAYTE#zt~+)pg`d0YT}UJ zf!tm?J^-onTb@SmvYQXZi^GD@*6fsrD4&JiSf>YxFsn56P}5Zq;C{0&4V zgsWnSx1}XYTtf$zk>hGbp~$swHCU^pCXOdNK3(T(EuL*)3*Rm|RYUkbTiDkZJL(Nr zfGmSu9N?IBElY`4O9Bb2mAyt{j?yhNIndI~?%aKEcRrBkLNz?HWe&mKSLyC%Nux4saR`Osa_Qks4AXx$1 zz*jJV$f1@~Z0qv+mr@Y8@Kle$Oq8S1lMxXvC#lq{_PRUNhGlQ@jQ>_ocTh6splVU62W60bv#R^-1!pbxW@xR4o`5CxreGFIoXzhEi2KoObF~q z2|41>tXyK^4vh%)&y?|tpGO8?e)BvPNIW9uB4T~|;ea!v_r<>3P#^<&J6`lZ*ojrk5hnTLLcR8>)|cv0zXgYBh>51GG^BX9uzHPI{JhAM zJDieej!=11(q)MINz15Nmh+^r4~r=eYGMnEARu1D-{sY@33BZeAn?4N*U^KNvl*8Q z&s0yUzg;-{l2evKvytqq(!*{ZqPY>Lsu#=u4o%fZ3k+H%TYE;>sQfkBFVFW>sirhd zW+`u#!YrI}6lAOjV^{<$!6%1JyZd$q7=3W2^ORz+l9uZPPbeq%^g9%pJkB|-fGv~= z`m(`BxCqIJVsxdSgQSV^qQiM|fX(&WSs=dNI$ z+9KVPr0!Mo0uFm|!NlQ@mQxGW`wcD#9pF?gp-D`6$NQC+%! zr!1Efj_ZR3nfHO-<9OpqCN~P<^F~0|jl8+dQ|1p~)Hu<2{{S*sCe776aP)XN5dv

uk5U|NH7-R`K;OyoU<*KgR!*MM;#iL$$-&Chm>myltV+Vh-M> zwl-26B)_j6!MZbAsrBmS^IK|5J6#2z^#CA5U8;_3e4|e)(4$ z_1Ist#YM02E>GC=J-i2(IE?7#_|=s>Q>(V8U-P+eM#u15ZqdSc>hBC5KL}gXCp4vM z(tC8!S16rzzO&q}-iBwnT5O#yjKKD7)&0z!zuE5@nG-V;SM~D&~u|nPV^vc`mjt|7T1yYkQX+E-83Fo{gY?= zY@vbQ5=irAM8$gH4Cz{gE~)W285*&F=|r-anX`4G%`EF5P&D$hW^gx>{3JWcOmIRo zX!IV04q5ja!9|2>-MD@w!|yx$=jZWG{m$ec))hnD%j`PwGu#TtdM4eIZ=;Wg_vvis z8l-ciy#oH&TN!!5-l6k%y}^YogX2}+cE3M@1pVf@eEZym`M` zUpIY3pn=F`)}S>HcDY)lxsut>fVn^_V>h-u;-1~aA=s`SYX)w8(B}@%7q)znD#U)d zK$|dyLql~%s2La3XJMzGFIB3eq^YeR6p5 z*vx(5SOuZ0P3LULzURbApm7Qh=JzwT(Vx7TDKy}&)M>qEhY_fXGAUX69%{O?QzuS{ zi#3k886LiSF^b#<)w~>nLRwBp4OtoB#!aXg~`7$}Bn{$Im2$)YTz0aclBfewT&j_Ry!= zw#l5JXT>cOl=|YOE;UK{_X@3R&6JkxdtK^$g4C-GaQ+CWjvK{c&Ew0Af+n1H1XXER z3O>u2HqTt3DtDG-@RzQ~`YZb)p%z@)3*80P; zC7pc3vr3}U6pbp7v7YsQ|2(`x+UN%|q|kA12i4Xp&C#hbab_Ll;oahz8L<1!XYn&c zKMX;@$?x3}y{gi_fTZqw-aWy13CJk`_qxV->odUQk6=@;fDNqYLvX7Zo9 z1J$zhm69(-MJ~ta%^LH5jY%E(867D~hnd}d6(fYTBVo<&rBPIRdp|7lw~QMmhQ<`G z1etPEx^wrouXMGYVCr0r#ZOS+pm>~Y-#PiCC~8JBP03~h0ee?gKm1Y1OELoJ+TlY& zU{*XjHt^G2QJZ4(Dljwrx3kL~0dCP=rUB0iRO-=HONrrluSLe2d(&S*Gts^ExYcqI zG957A{a!PxQ)}-zpY0Zf1^RCe1OrDqq*HDqAqlCfR3{1^5#=fk1;VX%Ymr%%Hl)bm zJmBF+pHqTp#Nm^fTH|&(k8uBe;|ZCG1}WJ&s3Go=g}Gr<&5B|PVN1QRiQh}!IoB7g zS)WFB%xM)34NR@Q1nTsI0%kqTa}>_b51MTFo4r`$taH{wontrY3LoT%h?DjyKcSLU2jn97)hP@#VgPN5}&O_uPSxx^cA?1b{~ zzwJHz-Niu-1Y{V(6lsa<%Lq5QWdz`pKN-&aYEQ_OA zyixC5#h<(Aq$ri+edLk+Mfs4fumT1UXs^5-tHS8em`@S50^zcX6}8{LK&IDbU3f$% z8_|@iGHn86<05U^WZm|!XYLhpI*%OX3jM;?Kf+I|l9s7#{Z4^g%Ti%<%~+_%yA{L# zis59awlYQp=lR28QzlhLQH%0a&aWar#y3VNgRTwuj{6maOd5*4)!o!vyrO?SFCkl^ zeDJQ5+=bw4nx^fM$xOQsIi#TJ{YP`Xyr7Aig@`VZ+BBBdX8FdQj82Ae;5NBcfUu1@ ziHH-iGFsFkKLS5e5gtP3OkbVR|FeMaSoqT}ttw&?aY7kF50(c!q=Vwh!^Vl8F&mW? zDP%*5)X1FV624?|X+Q}j(an14G6B9=%riUf05|EXiHst=Ngy@*tLJAcM|dbpEEaRU z5MgH}$YyKI95xdLlI*#8E#h}N`ZhQ?WFT*C(qZN6A9{V>0_8wANd9 zIqn+-ce0AqYF1J)>?%tj?M(o3y4WwdHb)B&RD>!>!nM41KSq^bQmz+88$EHy*T9s7~?ZTrf1|*rZgpw?U z#-mHXO1h#fl=t-$BLrBYU4$76AROw;G~@~+@=1|oz7S6_lOCaaI=jm2C6W8V&cvp* z!I(dei4Y13;bInc$;+eC0#%BrNCIDMfYIlTo|hjG{xW|1&3!G+qhxXkPRg(nG(!G< zZ;#VP88KNkZ~5pbVm^2N!h<_rCy|Ac=L0k$S9L{MtwdikF-3A=Nl=RK@ zXe#nN#4{vJJ4lv+;;CWNQ2@O`Z4kv2IgpLnJ zVd|b~>(s-zIl46E{Y!K`8p*G|k$`Y`WT{#@rXthJHSTBLZmTG{8%ED6RX!JE^LohR z#c2{H;%fMvf3}0G-7Vi(f`Ou@%Jpdnbc8P}E)q6b%x{hQ>*@;-X@){Ls74vHK+9TK z(T)pG-_68Wv>?un92^rgmWI`q%J79*2KI=`B}J z{5O=i?3ySvqt8w=USN#uvFCbBqjCS>{0t=%MP&S0AxtpwW7V-(1|@fZH6&~b0hVZ{ zf$gigO0{TlRpoR)_>xSKS?9zncCC~^5aIaPAwEZGDFkDXU;H>9l{iIRR6@3w6~^>{ zC+#k$4FLw}SOLzqJ0tEA-Qtjx_L2X+p`(zBS=2k!dv_jHfT>Qh74Hl0d@LR~&KsMZ z1^pDBbX3PVd?(wl>yNbk7q&bi#K%kP$#lM9tJmuTZtrE;!`eh;)ys6~Bt&0wro!~@ zP@P0M=kORKjpVPj@vM^{)v%;ObifXRTO6lWyVQg8RY^=a#m<$fPp8&ELi&$Wu@A(h zKf?6$F6}*iQvCzyg%ZthuHAEIRiFImRq@^w&e=43v!2Q?2kWJ$(`lYMN)X!g=(!!~WD!Wq8--t6Voos+p8_u5fPS|uhRXyhL<<)=^qNe(8?_d~^VG%-QQUYA>$8&~D>L(0KXE8E zEo11`(Q`H2>MA!X)gOD=z}u};G*wntj|MT2K?V&TZ*~8o4k3>*;NyH)rJgfLzi`*M zBji0~uB2*f*%#I`=9EwtFTJj@v8tN&-fk9Z5wEa|wWFRUw%aCm z^-{9kecQg!DvoP1s(PuB*YN0V=4oHh6~{eJgF;ABJ1_PZ1#!tzrO2sUuR`+-Ns!}& zZp_f3Z%v6|xtU%id{17(1-`dU=Wi;|Fb{M?EwGwOmpBz)l_ykNpr`f{zX{+_!{L~3 zLZPn|=1C9t?!WlsUJxt`<9tc_IYhREBqCfTS!HCe(CrWN-vZ~qXc4r?KK>Tm;iF0@ z7!mp-w~!7JM2kfxz0|I0oKiPu4tsR{l~3-z=eG^6ARVRUpaggWT1gaVY<0HRmg znd>}$fe}joRANAJl5}TRa&7*xyG{HsxK%9X?iu%I0R318K8frlvXqztLr&Nnz3?s5BE3NoJ z%nm+}$Z&et<-MKb@K-XyW^u0`Jd`;lorIpbp*}vWi03Ie1jEM(JAdJqIF^P`ZB;geNb?!Bh~uZc%@~=6DLJ%`TceE44lXyvv;1-WJ~O{)Juj#=ao_1X@`v5z zC-;BImLsI?zb*C)YVOCL|?<)^Q> zbdjEKF*hx?hIOP1`B%I5_fzn-P@*bc_A!#id!%id3*f`oX9pdUPzjKcpX* zpAWq|;Fs=@3`+8siZLhddPiKG9zVu%IOxff=%y(}OV@JlxgzwIzJ{ye7zFy=fMRNr z1D#i+ESf}sjHtvW6!;(PjN)mQV)%!8-o9gsTL4YhjhT?0J1~t~BoZ93;TlFaO22RwEHgd-Q!;-gjg6==o W|2;^BhZ4Y}M^S$x$IWj1yYoM+Ct>^m diff --git a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/PersonMgeMapper.xml b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/PersonMgeMapper.xml index b48ad86..5bf84a0 100644 --- a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/PersonMgeMapper.xml +++ b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/PersonMgeMapper.xml @@ -238,7 +238,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" tp.phone, tp.aqm_code AS aqmCode, tp.mj_code AS mjCode, - sdd.dict_label AS post + sdd.dict_label AS post, + tp.aqm_code AS aqmCode, + tp.mj_code AS mjCode FROM tb_people tp LEFT JOIN sys_dict_data sdd ON tp.post = sdd.dict_value AND sdd.dict_type = 'post_type' AND sdd.status = '0' WHERE tp.del_flag = 0 @@ -265,6 +267,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + +