From 884575e63ef9c6ff8bc274d9faf7ba2295b023b8 Mon Sep 17 00:00:00 2001 From: CMM <2198256324@qq.com> Date: Fri, 28 Apr 2023 15:11:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=BA=93=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectlib/manage/AnnualPlanLibManage.java | 27 ++++++++++++++++++++++ .../pmapi/user/manage/UserAuthLoginManage.java | 1 + .../user/security/auth/model/UserFullInfoDTO.java | 5 ++++ 3 files changed, 33 insertions(+) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java index 6dbe71e..3ef3a57 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java @@ -19,6 +19,7 @@ import com.ningdatech.basic.util.CollUtils; import com.ningdatech.basic.util.StrPool; import com.ningdatech.pmapi.common.constant.CommonConst; import com.ningdatech.pmapi.common.enumeration.CommonEnum; +import com.ningdatech.pmapi.common.helper.RegionCacheHelper; import com.ningdatech.pmapi.common.helper.UserInfoHelper; import com.ningdatech.pmapi.common.model.entity.ExcelExportWriter; import com.ningdatech.pmapi.common.statemachine.util.StateMachineUtils; @@ -89,6 +90,7 @@ public class AnnualPlanLibManage { private final INdProjectStatusChangeService statusChangeService; private final UserInfoHelper userInfoHelper; private final IProjectRenewalFundDeclarationService projectRenewalFundDeclarationService; + private final RegionCacheHelper regionCacheHelper; /** * 年度计划查询状态 @@ -306,6 +308,31 @@ public class AnnualPlanLibManage { } private void assemblyProjectInfo(AnnualLibImportDTO data, Project project) { + Long projectId = data.getProjectId(); + // 从项目库中先查询出对应的项目ID的项目 + Project projectInfo = projectService.getById(projectId); + if (Objects.nonNull(projectInfo)){ + BeanUtils.copyProperties(projectInfo,project); + }else { + // 新增的年度计划库项目 + log.info("项目库中不存在项目ID为：" + projectId + "的项目"); + Long userId = LoginUserUtil.getUserId(); + UserFullInfoDTO userFullInfo = userInfoHelper.getUserFullInfo(userId); + + String regionCode = userFullInfo.getRegionCode(); + Integer regionLevel = userFullInfo.getRegionLevel(); + String regionName = regionCacheHelper.getRegionName(regionCode, regionLevel); + project.setAreaCode(regionCode); + project.setArea(regionName); + project.setStage(ProjectStatusEnum.NOT_APPROVED.getCode()); + project.setStatus(ProjectStatusEnum.IN_THE_ANNUAL_PLAN.getCode()); + project.setSponsor(userFullInfo.getEmployeeCode()); + project.setBuildOrgName(userFullInfo.getEmpPosUnitName()); + project.setResponsibleMan(userFullInfo.getRealName()); + project.setResponsibleManMobile(userFullInfo.getMobile()); + project.setContactName(userFullInfo.getRealName()); + project.setContactPhone(userFullInfo.getMobile()); + } project.setId(data.getProjectId()); project.setProjectName(data.getProjectName()); project.setProjectIntroduction(data.getProjectIntroduction()); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserAuthLoginManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserAuthLoginManage.java index 1dd3e35..50a4ce3 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserAuthLoginManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserAuthLoginManage.java @@ -173,6 +173,7 @@ public class UserAuthLoginManage { userFullInfoDTO.setRealName(userInfo.getRealName()); userFullInfoDTO.setEmployeeCode(employeeCode); userFullInfoDTO.setUsername(userInfo.getRealName()); + userFullInfoDTO.setMobile(userInfo.getMobile()); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/security/auth/model/UserFullInfoDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/security/auth/model/UserFullInfoDTO.java index d26d63e..5482f45 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/user/security/auth/model/UserFullInfoDTO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/security/auth/model/UserFullInfoDTO.java @@ -47,6 +47,11 @@ public class UserFullInfoDTO { private String organizationCode; /** + * 手机号码 + */ + private String mobile; + + /** * 浙政钉组织名称 */ private String organizationName; From 753a99029313717a8ea4f2280479f82015926e0a Mon Sep 17 00:00:00 2001 From: CMM <2198256324@qq.com> Date: Fri, 28 Apr 2023 17:59:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=BA=93=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...年数字化项目年度计划编辑表(空).xls | Bin 30208 -> 31744 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/pmapi/src/main/resources/template/丽水市2023年数字化项目年度计划编辑表(空).xls b/pmapi/src/main/resources/template/丽水市2023年数字化项目年度计划编辑表(空).xls index 7317bace7a0f7c1d913ad7c9c7d5d9241642e1e4..c43cd89b239fcbac80f1cbe602ba41fae700fcfb 100644 GIT binary patch delta 3052 zcmcgue^8s{9sfQrNk~Eh3BM8&uwX4v6q1Ugt%V&^|FGK(4MBlM0)hz$Yu6tVNvTb! zsa;Kxut$5eUQgT8o_EeW+)-hID$^S-6& z+@E{jdz0t${r&5C-zWBW7Q4!l&8+E-mIcPPaINr8RU-i0h0nL}`L`rV^lZZQW_<3( zr&;_+u(2O&eqgACCyU>V{E2Pkqnf9Ldk4j9nq4MtwAuNvwSmuC`*>}kn{PurYc1r% zg(*H?Wak#UT}&3ab66Rlu)4(M(%&#P&ClCy>hC4Ht!$b(0LIWAUBZ0j$50HpxSZw{ zW&fRPNOK=ZbDaQPq=;8W*NDq${-mnQSSz$B5rt_8W3N>q6$H_dlADEC8-Ud*}-v$k5%yDC$VmRWJQP^R8#D@#&ku9645 zGTBjtN#5hMu_T{Veo+#wWl2(%lKi~WmXl;o{+6=@H7==EZ>~y`SClJ0GgZ04=PKQs zs*?7Ti8oV~RozJP*Hz14!LZbfsb)$3QMt`2=Xzs3@`;PX^M$h{W1CsAms#2^6-v|= zD`ZtO$#+z&%{h0vk1yU*B%Z0*q}SFk3pT>ru*Cmdv&pOhYb;md!U`0^exxq*52{VP zu=ZF^F4*`>>#LcaFRX9Y{sYP&Oj;tVJ1=Ojz&eQVPns`lxlj+){Ovm$#EbR6G?toS zD`d3YmZu^!OW`e^i6fsL5xw)C`#np~&&-&lYk|2$JWW63 zJ?Ga;2fLwn(H9TD*uE008t&}eI&P3m(&1pIKQ_*G~JvUF?U37hr_`uKD~6@3xk)#uMEV)H5~q(s}nZilq;&{_ZAlE3TzwU0d^1oAv{Q~&gwYG>}N;k{nc z$PeutBkQT)<>&R%7`_U|qUb*5q0k-Obsln2J8F`2?av((-2d_iy{X_zZ*cUpM5q5} zBZAu?*?`RkuLUS7SE#z<*zu|n!o)U7u22gQGD+1PEpX|;wSYmg0J{^@zY`ka@jxT! z2fv!QjyFJb1Cn&Wj`}VA=YsbSl}4M|oie0aMf%O%%&qS*bsQK!oiIs%?RN$L=%I?P zLvv>W_f0NNcj0R(*K@B|aF<_Kq%@h^=y~hF?-TD$eg8*_>Rnl?K1H`w);)TnDX7Rk z*52LrO|G=Sgg{OAuHepr)`u~ExwUI1*G~T2gTwVJ%Wua(T9O5_34OLhHUO)P~UX#cW@YQH#ra>gK402}E#?j<|aB6(U`->8s1H_F&xg;p1WHd8!|JKF4%(0>b*w*i=d#{vz)(+~66z&qleuD`G< z{MvwCpcgcN1D?&H{}_v;X^d!m_x7R|2fR!G=Gne9hr}E(bOTM3rgaIc<+MZ--`+kh zL{~5hf(gLSH_W9GLv$3&CG&D{U5-2%X%JPYNQ;uUs7QyrHHgkb9oo!A9?b7)RezC_ zwFZb{@=Va7xEYmY7x}oVRE-uOs#1{!(XA@7B3i4WLNtFHBH3OMBH3OsuGS%a4nKHW zC_%J8bC*HIACUMt*6mTa2k-Y`C;SAyEfm68Q~*BJ(~zHshafZxd3YBW^9wzn3a*ei z8}KvXqFprionWk*zxv28YHCo7JPPO~gtI6|B7hE&OwWbKU_F1P-^uFunf_0<-k#CW zq-E|vG>7%jVCinCP>}{6$DO0_w20_DDpya3h)$+5%0)zHR2k_JH7O{H;f7$N0@FcnQV|7Bhgn(C z1iOKF2LzfvGa|a=kn>?QBUOMaI{eBy7DQWAWJR>P^-n+z^F?{5vByae4SdjSfaqMQ=vL_kY-+`w#qRIBfs` delta 1484 zcmZuxU2GIp6h7z9?6xes?9SHh?Cx}65&IjuRG>nmH5=dfk=UTIq|u^*WoZhTMH>oe z++ffLe?oeU5+4jCJP?J%auXk5l#ksk6=AQ3- z=bZ1{nJLX-=}$cT46YjQ{Q+?;1;jb~ez{y$vl{@O;<<)r4^P)V-e=*MKD^-Qk=s+P zdw;^!G@`#NdS8=wbtg;*jV$Hj9W-NXqJoj6SiFnAHsUlC|C>e|l8hzg;f5}awl;Lh zn~moYi!_-u{q!?j zvg#D8HVn@0`$S!z`Sc3*>9ow0qdGIEGVoPVrz&*l70X12KB}(l$?7r`2hEkuDE$B^;Wv_z-c&i%8v{&F3VS}dgjnCO{V2( zeYhWs6pAUjVI?ZD(crVJVfWhAs$&M!bkm_-_A*`n>yMoL#9m(?(IHlx5>S=*(*W zKns1hd`@2NoCpQ(z&hBk!qUl}PGk`9NRJzC_{*2e?QPI_Pi|b4IC5QjqFh`RO0{|;bTqROSsRqp=(>N zZU7i{Z9>`T!mADKjZkorY25E3xzesxlG)-l8UQ|9BFE(6Sh{N1^#2TL8t`8O;tj%0)X0z}h($