From fb16ae9c961579caa47479a560ef7efd187fe3c6 Mon Sep 17 00:00:00 2001 From: fumeiai Date: Fri, 22 May 2020 11:14:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A6=BB=E8=81=8C=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E4=B8=8E=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84=E7=9A=84?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=85=B3=E7=B3=BB=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 34 +++++++++++++++--- .../app/service/impl/StaffServiceImpl.java | 22 ++++++++++++ .../app/service/impl/StaffServiceImpl.class | Bin 13388 -> 14635 bytes 3 files changed, 52 insertions(+), 4 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 7b169cb8..41f536f9 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,8 +3,8 @@ - - + + @@ -156,7 +157,7 @@ - + @@ -251,9 +252,34 @@ file://$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java - 93 + 97 + + file://$PROJECT_DIR$/src/main/java/com/lz/modules/app/controller/StaffController.java + 225 + + + file://$PROJECT_DIR$/src/main/java/com/lz/common/utils/ExcelUtil.java + 1057 + + + file://$PROJECT_DIR$/src/main/java/com/lz/modules/app/controller/StaffController.java + 229 + + + file://$PROJECT_DIR$/src/main/java/com/lz/modules/app/controller/StaffController.java + 231 + + + file://$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java + 180 + diff --git a/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java b/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java index a6a123f2..7bc7ab95 100644 --- a/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java +++ b/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java @@ -41,6 +41,10 @@ public class StaffServiceImpl extends ServiceImpl impleme StaffProjectExperienceService staffProjectExperienceService; @Resource StaffWorkTransferRecordService staffWorkTransferRecordService; + @Resource + DepartmentsService departmentsService; + @Resource + DepartmentsStaffRelateService departmentsStaffRelateService; @Override public PageUtils queryPage(Map params) { @@ -184,6 +188,11 @@ public class StaffServiceImpl extends ServiceImpl impleme staffEntity.setId(Staff.getId()); this.updateById(staffEntity); } + + createDepartmentInfo(staffEntity, map.get("primarySector")); + createDepartmentInfo(staffEntity, map.get("secondarySector")); + createDepartmentInfo(staffEntity, map.get("tertiarySector")); + StaffOccupationEntity occupation = staffOccupationService.getOne(new QueryWrapper().eq("staff_id", staffEntity.getId())); if (occupation == null) { occupationEntity.setStaffId(staffEntity.getId()); @@ -240,6 +249,19 @@ public class StaffServiceImpl extends ServiceImpl impleme } } + private void createDepartmentInfo(StaffEntity staffEntity, String departmentName) { + DepartmentsEntity departmentsEntity = departmentsService.getOne(new QueryWrapper().eq("department_name", departmentName)); + if (departmentsEntity != null) { + DepartmentsStaffRelateEntity departmentsStaffRelateEntity = departmentsStaffRelateService.getOne(new QueryWrapper().eq("department_id", departmentsEntity.getDepartmentId()).eq("staff_id", staffEntity.getId())); + if (departmentsStaffRelateEntity == null) { + departmentsStaffRelateEntity = new DepartmentsStaffRelateEntity(); + departmentsStaffRelateEntity.setStaffId(staffEntity.getId()); + departmentsStaffRelateEntity.setDepartmentId(departmentsEntity.getDepartmentId()); + departmentsStaffRelateService.save(departmentsStaffRelateEntity); + } + } + } + private StaffEntity convertStaffEntity(DepartmentStaffBo staffBo) { StaffEntity staffEntity = new StaffEntity(); staffEntity.setName(staffBo.getName());//员工姓名 diff --git a/target/classes/com/lz/modules/app/service/impl/StaffServiceImpl.class b/target/classes/com/lz/modules/app/service/impl/StaffServiceImpl.class index 50949e79b95eb0b156694556c139ce8ea31e311f..760b967a1c7a43fde5a3e14b9f6e23f1fc80d015 100644 GIT binary patch literal 14635 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 N5#sU-e{Syng=WA3~I}Fn~M%# z6FyY_>}~+<-7IJPAE;n7A|YS?m)A3jO)OHD}*NG+)ykQ7PPqK++T z3DgPtQA6qmq@L7QlLjiK`;jIYs-LMvLmg;jOJiG_s7bh~EzSI>Cw`xtt95fNT4<3K zkd~6IK3e(ZJjv0bwKm&m(N>G|wP>fsUlNcl?QOZhmJWWjl#YJ3Lt0#@MJJzh*6uE< z+f|EhT6DL=(!(!3rI!}HZMn#nixqGmh1p7rzS``kQh&uez$XJWCWCCbBp{bct{)v` zuu4?yC>dJx)27kBEFeQvC8R1tR3)S;AypY7{cX8C?8CkQ+RIQ|hN=H6Y#HvyPz}eG zT943TP(Vh?RX!QzN3P^)gFbWB=ScOLt3GoTWUgGTeRQ0!&PE4hjM|O$qd*F@LAwIA z8>4mwv>VNmh6QRkM*1sRrn`m)AWg=pG+w1^R4Pki(;2?uZE9Y-F<`+`<(eqt;4i_~Dh)vCNi*693?IP$2h6-ZM@ z)~VZ%X@I|L@d@4$Bu>bmo}Y7lapA12#ammOCrTZ`ID!OD=5kxv`^1LJa$yi>H7achudmK5a zhA(N~%PJjG=@l&wYx9UoM^!o|%iU28)7|-=6rU}xI`W#lUb3j}F;B_DOk3Q%%=1dz zh7H8++W2fZj5!d@g%|a~jB>XG_+7B?PD)lb~D%P;yEhhOxOV}^#6Y}&K?eUw;%tvL9NWNnbU_PhY=BMQ-Kn<;9$GtCA7-bA6R*W) zJWiZGti}_R;;7UBPvR*<@IX}<4qyvM#gNw!MJ=~hSw77^K($J!wT&_=t{jwU2fg*SlR*h8Djgy^X*y2Tg=9hz5nF#I3V0&k zVwe?pB2JpntJ6w=Z&5sHob!}1d9Hb0id(}TAftLY=U;lWtNaZPr0j(2m4 zd7ODZIW8c_h2(e-Su7&Q#pJl;Ps5StekI4v)pEF${2m~`2gz?4`7I~EhsbXQ`K{#0 zsy_`sUTLawxH+eK4j(1QwdA;t9M_ZM26B9i95<5VCUV^TM{o@P5#Q-4e5xF|^cV1x zcX+6tYFUbaAQT^rFNGsmCaEeV@`BPPFT4%icEU4!JG{x=gWd>gN6=$0dX}P>#RH&Y z$RG3{ME#&$Io3Oi20^vuc1&N7*MaiU`}+( z0csKSm11C}TVF5`!Jr5(i49z;1LddOxow+-b9bP_UgUz9{I~Kp*a@fb89wKc)SpMr7x?NpE<^rDj)1( zk*Z#%R*5Hm*Lr#cGqk=Tf|*(;MR23mH$^Z@>)8?9 zoUQln=#wgX>tQyT$s}eejSw;kp*e%zngQq##{bX_W#(&(zMXo+(#n^MzBu@3=3_wL zBUSICjr8x6IDOC=Nbm~|O_)2Zhu=XlX8wi~s-t