From 0f0aca9e44a4b0aa4099ea8a3a3cf3eeaf658179 Mon Sep 17 00:00:00 2001 From: sunjianxi <839419401@qq.com> Date: Fri, 24 Jan 2025 09:11:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contraller/InvoiceApplyController.java | 14 +++++++++++++- .../contraller/WorkOrderController.java | 14 +++++++------- .../contraller/supplies/ApplyController.java | 9 ++++++++- .../maintenance/MaintenanceOutputData.java | 4 ++-- .../MaintenanceTaskDetailServiceImpl.java | 4 ++-- .../service/impl/WorkOrderServiceImpl.java | 4 +++- .../excel/MaintenanceTaskReport.xlsx | Bin 14698 -> 14701 bytes 7 files changed, 35 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/springblade/modules/business/contraller/InvoiceApplyController.java b/src/main/java/org/springblade/modules/business/contraller/InvoiceApplyController.java index 67a02af..2f08c53 100644 --- a/src/main/java/org/springblade/modules/business/contraller/InvoiceApplyController.java +++ b/src/main/java/org/springblade/modules/business/contraller/InvoiceApplyController.java @@ -76,8 +76,20 @@ public class InvoiceApplyController extends BladeController { public R> page(InvoiceApply apply, Query query) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(apply).orderByDesc(InvoiceApply::getCreateTime); BladeUser user = AuthUtil.getUser(); + List deptIds = null; if(!user.getRoleName().contains("administrator") && !user.getRoleName().contains("admin")){ - wrapper.eq(BaseEntity::getCreateDept,user.getDeptId()); + if(user.getRoleName().equals("客服") || user.getRoleName().equals("维修负责人")){ + String deptId = user.getDeptId(); + List deptList = deptService.list(Wrappers.lambdaQuery(Dept.class).eq(Dept::getParentId,deptId).eq(Dept::getIsDeleted,0)); + if(CollectionUtil.isNotEmpty(deptList)){ + deptIds = deptList.stream().map(Dept::getId).map(x->x+"").collect(Collectors.toList()); + } + }else{ + deptIds = new ArrayList<>(); + String deptId = user.getDeptId(); + deptIds.add(deptId); + } + wrapper.in(BaseEntity::getCreateDept,deptIds); } IPage pages = this.applyService.page(Condition.getPage(query), wrapper); return R.data(pages); diff --git a/src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java b/src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java index 07ec1d5..0ff8c3f 100644 --- a/src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java +++ b/src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java @@ -88,11 +88,13 @@ public class WorkOrderController extends BladeController { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(WorkOrder.class); //客服、维修负责人查询所属运维中心下所有实验室的需求提报 BladeUser user = AuthUtil.getUser(); - List deptIds = null; + List deptIds; String deptId = user.getDeptId(); List deptList = deptService.list(Wrappers.lambdaQuery(Dept.class).eq(Dept::getParentId,deptId).eq(Dept::getIsDeleted,0)); if(CollectionUtil.isNotEmpty(deptList)){ deptIds = deptList.stream().map(Dept::getId).map(x->x+"").collect(Collectors.toList()); + } else { + deptIds = null; } // 数据权限 @@ -106,14 +108,12 @@ public class WorkOrderController extends BladeController { // 客服 // eq.in(WorkOrder::getCreateDept, Func.toLongList(AuthUtil.getDeptId())); wrapper.ne(WorkOrder::getStatus, WorkOrderStatusEnum.KH_ORDER_DRAFT.getValue()); - wrapper.in(WorkOrder::getReportUnit,deptIds); - wrapper.or().eq(WorkOrder::getReportUnit,user.getDeptId()); + wrapper.and(wrp -> wrp.in(WorkOrder::getReportUnit,deptIds).or().eq(WorkOrder::getReportUnit,user.getDeptId())); break; case "3": // 维修负责人 wrapper.ne(WorkOrder::getStatus, WorkOrderStatusEnum.KH_ORDER_DRAFT.getValue()); - wrapper.in(WorkOrder::getReportUnit,deptIds); - wrapper.or().eq(WorkOrder::getReportUnit,user.getDeptId()); + wrapper.and(wrp -> wrp.in(WorkOrder::getReportUnit,deptIds).or().eq(WorkOrder::getReportUnit,user.getDeptId())); break; case "4": // 维修人员 @@ -148,7 +148,7 @@ public class WorkOrderController extends BladeController { if (StringUtils.isNotBlank(workOrderDTO.getRepairPersonName())) { // 根据维修人员的名字模糊查询用户列表 List userList = userService.list(Wrappers.lambdaQuery(User.class) - .like(User::getName, workOrderDTO.getRepairPersonName())); + .like(User::getRealName, workOrderDTO.getRepairPersonName())); if (!userList.isEmpty()) { List userIds = userList.stream().map(User::getId).collect(Collectors.toList()); @@ -177,7 +177,7 @@ public class WorkOrderController extends BladeController { } User user1 = userService.getById(order.getRepairPerson()); if (Func.isNotEmpty(user1)) { - order.setRepairPersonName(user1.getName()); + order.setRepairPersonName(user1.getRealName()); } }); diff --git a/src/main/java/org/springblade/modules/business/contraller/supplies/ApplyController.java b/src/main/java/org/springblade/modules/business/contraller/supplies/ApplyController.java index 64ed2ea..440a620 100644 --- a/src/main/java/org/springblade/modules/business/contraller/supplies/ApplyController.java +++ b/src/main/java/org/springblade/modules/business/contraller/supplies/ApplyController.java @@ -78,7 +78,14 @@ public class ApplyController extends BladeController { } } if(StringUtils.isNotEmpty(apply.getApplyUser())){ - wrapper.eq(Apply::getApplyUser,apply.getApplyUser()); + wrapper.like(Apply::getApplyUser,apply.getApplyUser()); + } + if(apply.getStartTime() != null){ + wrapper.ge(Apply::getApplyTime,apply.getStartTime()); + } + + if(apply.getEndTime() != null){ + wrapper.le(Apply::getApplyTime,apply.getEndTime()); } IPage pages = applyService.page(Condition.getPage(query), wrapper); List records = pages.getRecords(); diff --git a/src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenanceOutputData.java b/src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenanceOutputData.java index d669928..34f14af 100644 --- a/src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenanceOutputData.java +++ b/src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenanceOutputData.java @@ -17,8 +17,8 @@ public class MaintenanceOutputData { //房间 private String deptName; - //专业名称 - private String majorName; + //设备名称 + private String deviceName; //巡检内容 private String checkContent; diff --git a/src/main/java/org/springblade/modules/business/service/impl/MaintenanceTaskDetailServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/MaintenanceTaskDetailServiceImpl.java index ee87638..d28a4d7 100644 --- a/src/main/java/org/springblade/modules/business/service/impl/MaintenanceTaskDetailServiceImpl.java +++ b/src/main/java/org/springblade/modules/business/service/impl/MaintenanceTaskDetailServiceImpl.java @@ -108,7 +108,7 @@ public class MaintenanceTaskDetailServiceImpl extends BaseServiceImpl status = Optional.ofNullable(maintenanceTaskDetail.getStatus()); if (status.isPresent()) { @@ -239,7 +239,7 @@ public class MaintenanceTaskDetailServiceImpl extends BaseServiceImpl status = Optional.ofNullable(maintenanceTaskDetail.getStatus()); if (status.isPresent()) { diff --git a/src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java index 665d94b..3d701ce 100644 --- a/src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java +++ b/src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java @@ -110,7 +110,9 @@ public class WorkOrderServiceImpl extends BaseServiceImplg!bs!e&JHo{t$_^mHO3M7OroF$V zEKhD=EO-&!Op(omiHAJK3um~U0A36l=#ZQ3GI_w7w}9c!?wU`J>C0}%5j(i6FnIdI z{#WL=iHeS8eA`NPyG8K!AY?+%R$!Lbftp@l-a^ai;$K8h$)f@Z`f|0yQMuLCg8oPf zzm_+4ZKu>tHHz(B#BsA-HJ)YG3@WBbo^{!|+t|S!o=op9J!&*vBsjhWR;?9mxr13!5$hz5eYnBV{b01kv7 z6i~u78dm)E{y?iGpiXGgj4l=QZpUc8wf9h0Yx`=T0mJ8pG_6`QaSe_*@d->;9QTsBVj%(pgy(O=)6ly#@;I3j5=`IZLP z?VgpoVO{Sx?Hg$sm-kjtEUOPqiZBlGwylaLtZ|sM&{B`umPy{J{6s5Zb%%&T zMo(@V?6VZI^^^Sc;y?fL8g`DY*TM=fQ4yvzKLVeJ4b+CB42o{N>yjOwurfto?HkNP zNVRu42Y-o|hNXXX_SxJ6<~X+t?x~OD=C0s{*9SCA{OlSPjHo=02j51cw5pzB#zgYm-1qii) z-#U*BkP@3nS=b|Uj!%Que@SYJqQFDzN0O?eHZxmaPpdrI>*{+AELU-$1KY7F{YbMc)23i(%u z{E{B;$K<$GOYLp>B?oQpOoM@Y%_|Pp*zEPUGY~_sBlGP9#I|@`g;L~Le9xAigzjr- zwGe-^J?sg2e8Yd9@*j%e6JLcTr1rMLQbBCvCS}m2$lJ&iI=lS(kS~GT?a^}H=4q;_ zl`vQQxV9gq_fUJ{=wwj18q&>i_RtSOH_@Cp`l{!x8nTSdm!eGRD- z_w%tke|6nMw|Y8r^pcItW8&;sPMvM*Gc&ZOQjP~^rgxpC%M3GbUFg}fZqa4#Pp|tP+js~SVR-DOc3Avy2lBLrfU(0#y~1Ch z({$Rar=Cle8WB*ocFzlXK{=NgQMe&>kfH$;(;RRNcE&bs0i%^?kIZ{EyO&8y3QVjFz1B(Klp`hjL9jIQ2#Tw37y6~OckIR#+|4sFn& z?}2#ic3_&1GLz|)STXE-BM0|gqs>PCsXl{4G7$dTccG9VG7s|)U_ zjIi4+4bnKyp$qtN$Ap(!$MUOyqPscuBoXrvElJxh$=lBxOfD}aexK-6W$No*cdg1- zJJm$*dz?>28-J{rIMWhqnJ*}Rg8A|8kh3g7T0YS;>t*Bnbmq$a82n-rLOH-@L^N3s zyYfkxP(sl6&`hOz6P(Bph$xW-TjK^jKD;EvJ!I0qJQ9*ZZ*56o(}~4#Q1|iEL$hmR z=|gk=YW>nCi*e(dU0WH;35MQPn5`-*#KGgGwGU3qsH0#hb&?;ApR`BXK95-qGG_m6 zUa7}sY1LM%d&8O(e%OE6w3GNXds(wfpnj&0>%>-R$~eUd(*4yAqI$Z7-QY^6Xm!Ee z@i70DD^<5F{h}j|;r{hJqi52YBi53gkRO3XA(^gflhURNb0sD!q=HfGraF43Kr-dc z%a_CE{(~pEu2;o0#1j`|`C}2Z+UOzfN4eQV6h3g-#&&oPzaIbaWR00Tf;rDXL3V(V z#!A9OH%qK+7k?yo+I5VT~fDob2Irc@U~3^nuJ(YfE?@aLGFd zC!6C~+(%3qZ_M%F@UNqh^)5X3{W}}@`Z|PeKFVs?^=8nwl812 zsh}%y&1gRVsYCYB@NIZ$D}ishT&z&)tPmx9r7yo0|4ysm?uuNeu5 zhDB4Qo+e%Qj0+6e1d@-G2Z;qo{n^XQmo8Po;}Z`OCQRkvo|_ zsA{=uJ6)JxJp)SCJ*GjJb%tKlqLn-|`rAhM*TRQ9eHsmhG1E84wV!`d7UblEx4Woq zyidljS32tt_GDYSVO7R0Kh=Q3-^i{b4nxWM?ZG(30~vZ#6eahN%HaXqTpPD7`UQ_Y zL$yp#-YU1@Ca`li&@7SZ7k1szqxbiNk=%KtTUgPX7ej}M<%lv}Z`VVLb>@)Bj+!xS zg#%n-nQ4~<4}~l(f{19ANI9m}zF66s`(Q@vCv-wFR%Pcr)0cDvKUuzp4Hi{OnwBGG z-xD$b07sDFP{wNqJlG})Yy+8xXarX~H^s~C5scSde4_NTN%+s7IYr|!UJ zjL$C0d^@l5ULE#vD8Dh%)RKB3=P90S0g1WhWhbkq*e7kD6Avf<&m?!g}_-5uR&UaFy1L@#*P*n|U~7)#Po)f9v9 zx?B@rZQI>&TEs~C4*<0s>5yQ0kagd6z1-$V85#|#st^9e(COCML)O5P4J}*er+i30 z2kP(tEjiHLiysjd`>zhy2X=gf+9wgeh<8u>Q-~qEJ5C>6!;qZ- zST_B-F4w1ErN<9VO2u@_s_`VQ-r0Mx8S+CLgL6Wceo66-(tvs7ES{26SZ^Bx;iB0gkUEY>d$lHVSMEF9 z4xR1oKDYsy%Z+arf2%`L1nP(3e{@NtIjxnEJG?%<_4e|2l^5FH;rwSvyzSr|apBx` z5-(}}SU*H=Lzpowr0{KQtV&NYm5)~R(b#}-hRkq7B8u}tkIP$cKl%kum&k8k)ZA&{ zdYSPE>ZW>wuB2nZAWB0DCO_+xzpYKt@6gcoq21_J_vPxo7x)wi62g0H6j$BNsGc)Pn93P~2iST()p9RJOQ>6VvP06|lxf z70t)(4&%p!WNrcctwpTwN=J@y$P?Dc9vVo>-ZwqVzjY|%?`_we^y!)OApOAXX35_K z_!3{o=bFcURc7F6EVJk2!GwANG$p-RL|-<_r1@wF@ZV7>kj3q_#l(c0ayq`EHdJ9Z ztteznH*QD}AUUPVHg<_~PXBs!=X^RxN8XY>HlGhA(|OGr&yOnGYDn64jk}g2XeSun z=Ef(d#XtVuIW8Dhq0v`%2t#Q{We9fA(EUI+IHfUdPsdENGP*Z~yg)8{J4E-Sc5~-# z-!cKg#I35tOi9k6msp9@`G#5U-dtV{QhMcv?_U|7^ybFnCA>*XsJ!m6(TPWjwtXrYk$x74N7m)#Ys|Xz zvBhVB_Sd&>mPEV=!*Y)+$04xQiL^6X9e3GSq2BmxH0XGR-~F1`cC*Z3K}Ta|nvKtf z=DLx$;mh0}9T|>}wehdP4@+!rT5=7DSyq?YY#wclJ5}#kc!Dd5vgJzB>1gHA7ndC~ z@fi}WOP%6vDx}HpvmwB*P~=Ezd2CqpxQCmUR89cvWL9yW5Nq>{$ME-cv>4st6>ZQD z$7q;;x09Q1Hz~e)3*AN%T6mv_U*6i z?GvjGZZxd$5}ASHgi?783Q-vVfDi^_O;LaXjR+hHgnylQgMtN6fItn?pbDh`03Lfu zr@%Q0Xc#@vpAZa#0ka5oFe#4z4QDC<;GfR@Cx8InKPMaE6s8GWCnzf-fPI8OMHq00 zP^~D;@lRI={~6~Df4nNgKkz^C-y2$lZABGe9zg=G3>+Z1!6i8U=V_V#@ckG1FLs(x l4c8@;q9>@)LkaXsjGX`b%F+IRCwe#N-+O+Xwa(f5oagzm*Iv)w@>=(*>H>meh^H_GY#&e<{r0&-R6Qt7 zQI5V0_BnFJjoSG~hP}_};S)=fo3TlYuTOu?JSQH1evi|u(yePkNbf{b+;f+D^=9Z>1bAB+xv1{b>uYRv^N?!cQ{`fK4Fit2;yvb#ZL*XY#4Lw8j8POC`uTMY#BXrmR}gn-oHwD4gOlYX;g^!$i?$of zl@w`e%Qb%(msbR6>|mfiwzc1f>hj&y2q)VXyR&fV`K{|GA%8G-Od~uaBz`Rg%(0;_ zB|@i9q7UyD%w~O<$FIW4^3q10S8RRfk^P3Yk6doWDawf)WLnwIdwf*;zIUIcX^UXq zJyJohJ+YhFsUN%jojo?RdDyI#C$WI>s8Rru18zzu-O0~)7TB?|*D3Dk;?7~@?k6W? z`SPk%KjkuTf~779rIv+?d6s$pR_AQgqD-+BYp*e88&z2@O|x0Z7%_#*flxCVv|(sw zv8jc&$jyB1B2qmFc8iskU_HTM%refAYowJf#w8h_t~KtEy=Za;7aa7ZUa0nj{Z7)H zs#DB2PlA*iSluo&UW+#$d~WfqY8o-yCU1J!MxDOc0=>426zbunChR+Xl*oYbjD1{G zk)|OX^#tzz9LdUduXR@b$jlU-hGuuIHK5m19;aFo?nWxtQ+;se6|@%>2?-0eaPjzS z_1K9zf&c3f`@&e6i4-oaWHStg)0LY`D5V6S7t0r3Pz9KT1hk^tOPc zdMe8O^J}J+M81x{;#aMdxtLb;m2$c z@aY+pAe}>ZuVv_3TQ9mW*_T2Uz#o^ptGF%#!Tt}E)xrMHctx7qb1r+_D(pL0U|YGh zIn7(>0-c|!MsyD2MShA*&cpb!Q`wy0Z#&E0Ecgf9#WfzTS7)b|jb-oHy~O8PsB$PB z$$Q}~eduOcUwvY+;0T*@KtoN!%H`dFr5L-1=|HIUQ0v-H{!ju>_lX%^feP_g(zE-eh8ss5-{W(WiR9fs<)P}z=>~bsh!~%M?sU3 ztBwtlSFcLUP^+#sdac~eSH4E$I#nu~%%j%G+uFQKwDAy}OtK5}@~mWQmQ?W3_qiA7 z{v*F2(59pzqs?{jn`eCA4tN?(J;Gerh>GKTHti_Zb z0&sVIeOIhH-LLzmb4V{vg`xMLMck2X;Nv=m10V`jYXd8vt+eAdD z6A3)sN&4nb#pDri4_sK9{Az>JMdU&}XR~#t{^l~Jl_GS~fy`U@t_@9iM=OH-5fS{? z^CAc3sQp)jn~j=D=Vu=j!ki-5i4=1(RTDJSiXC!2;h5ot#)=_Qr?UM|-TT%xBDB9q zXuF}}jaeW7z=i7Hp2>`syzS@el4fj~lznBK)=rn8{Xiask|6ADRzz~esMgp^rNB1L zVL;JB#9Hf4I~j>!b55}4!qH3;YCdoPzx+6zO~%-mawym?Tf(mD?viIpUhw`z-eUAk zyGLPou?PNxLHjvIE6aZ-tfi$ytxKseXV%b%6Mt@Xc&!I5XDec%6W9u%@nvSgJa z37IdPxy>WE{c;`MB)#!Q9M>{nSEc-?*Uk=IPC7&ahfTSyPzH&VZwcyF#SMIC7f?7} znfjBcO=2N_p=)Y+E%%zT^@WX49BG_Byz{BnLL_k_>WDqxZ22(*TaqM0Pr{a2)`@*9 zf;ku~wu=E6bK4%xs8Kt74-!ep$RS8E2j*U2JC~NQQfug{dH?emfz>z!yn^!b3_il| zm^YPBXnGJ6)gGhwwh2>=iLmC=&U$kbiJVX6W&Y~ZUkD;M>ivxKrUG%wdbdFb12*|z8_Y~)cx}QSJf=~@>0Bf|9hUlD zp_o`3i16%64OU-M^KG-lZ6vzV(!q#g0-LZL^v`7gYYg&}_IKeKg&nzPy9I1>Cpe$$ z%ad1Ke4X1sYP+ufr6g)&U|0UmdoOGwr7-ZSKrvb%lGCE~m<2OvQSF%!7MY<+ym zqQbWhQ-p()AHk2XA@upVV(lc;y+$r`yV!d}imB6}pvA4XTq4`Vk&bcQ%NXKwKb)uTA}Yj@;OZST)IUFrNtu%b6D zk7Vd99Yf!ALj#hzYVb@5GD=A+W!nQ10Kgk7%C3MeRHzx$iD}|-O6V4%Agv{fBLgo+ zQ32&@p`t&gL`*)1)if(6PyI=G;ETPOM<3x&FEcfhTIz|tO#Gu?V7MX%O{386wxY-n zH-3LTnhgI|qH+Tv*o`8USZCK5gPd>YNEYfqsxePSIZ%UDMf!Z?t_a4-Pz@+!#$-rL zD?hqaKN?{(!V%Fw=nU#v;Ts@hF<=H=r|)}5M{ZOYQf2~{WxEk&P?B4eo-4R?Xc0ts z>_D|5v5qhpJE#pMX25ht8B+~HBjas5d9Pbpx>!_1y2&A6E}4ems-YtGlze(WRWeAC zB4zE~tuJR9rw>?sj@DJoQ9%0QWGd=826QCihwVB*^_C6>$&(pY^77IOetiGr;FoVR zgQa`UsdZ_PL(jb8k#F^)IO1j=kX<+WfERe)A%9uVnorBmBJFNxb-dCP#DO$782#$_ zIcR!NF7|=!tQn4_Uu9Q3C(q6QUYtxIKZ-%EuurUa;YhQOaw+PZbw=VKiq3jx;G{&jwd^BpgCg7e~7xV zTIax%>GIp>_R(T<#*1w&3em^xj?M`+3GZ^mS;XRu1yL7YVoYv*E#s#1E5r|No)Bxq z#~WMrCl1-_vRW@+?Ywfxa32a#4@7?$djP#9qw34Z=pV01*G$PdZU~dH4S$t!(B9eZ zpi}>oxfnWl&lochk#9Q%r8ZRbdng=tpTEVX6xTe+l;y}(HH`L{xd;0h}uIXva>p`i`O_K1hrbx)eNgjS@z%&`lXo9|fDS$fI9DZU@MP?QpPFqKyTyD+XZo289%a}d(-BgRxyDZm{k zJ{|TA%%)JJpMTmzla zhD0{;PX4tAPe~gFVvUebR*@_90M*i2oITwAd|I+7^*E?WFPK^WokeviBJG%qF@Oo4 zUn%A( zfAx55^+%tH~Y3=p)&Cr}Ai`e01pC%!;P)01AJ7{_^a?`$d3Q zt6z4^2 zr&>riLH`VBjKg}7nMeind6_M-+xk%>HkGC MkYgqbl>8g`AD&75jQ{`u