From 8bc5d27d3d26061b9c8aaa792b26050bba5d8d28 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Fri, 28 Apr 2023 17:44:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E6=8E=A5=E7=AE=A1=E7=90=86=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E3=80=81=E8=BD=A6=E5=9E=8B=E8=B0=83=E4=BB=B7?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=A8=A1=E6=9D=BF=E3=80=81=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E8=B4=A6=E5=8D=95=E6=98=8E=E7=BB=86=E6=98=BE=E7=A4=BA=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E4=B8=8B=E8=BD=BD=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseModelModpriceFeign.java | 6 +- .../BaseModelModpriceFeignFallback.java | 2 +- .../BaseModelModpriceRest.java | 2 +- .../BaseModelModpriceService.java | 4 +- .../static/excel/调价申请模板.xls | Bin 0 -> 18944 bytes .../api/buscenterfile/BuscenterFile.java | 1 - .../api/buscenterfile/BuscenterFileEnum.java | 1 + .../BusDiscountpackageHandoverDto.java | 3 +- .../BusDiscountpackageHandoverFeign.java | 8 +- ...sDiscountpackageHandoverFeignFallback.java | 8 +- ... => AppBusDiscountpackageHandoverDto.java} | 5 +- .../api/bushandover/BusHandoverDetailsVo.java | 1 - .../BusDiscountpackageHandoverRest.java | 26 ++--- .../BusDiscountpackageHandoverService.java | 74 +++++-------- ...nUncollectedReceivablesDetailedMapper.java | 2 +- ...inUncollectedReceivablesDetailedMapper.xml | 2 +- ...UncollectedReceivablesDetailedService.java | 43 ++++---- .../loansolutions/app/SolutionsDetailsVo.java | 1 - .../LoanVehicleInvoiceFeign.java | 2 +- .../loansolutions/LoanSolutionsService.java | 1 + ...=> AppBusDiscountpackageHandoversDto.java} | 4 +- ...BusFilesDto.java => AppBuscenterFile.java} | 9 +- .../AppDiscountPackageHandoverRest.java | 51 +++++++++ .../AppDiscountPackageHandoverService.java | 102 ++++++++++++++++++ 24 files changed, 242 insertions(+), 116 deletions(-) create mode 100644 anrui-base/anrui-base-biz/src/main/resources/static/excel/调价申请模板.xls rename anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/{AppBusDiscountpackageHandocerDto.java => AppBusDiscountpackageHandoverDto.java} (92%) rename anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/{AppBusDiscountpackageHandocersDto.java => AppBusDiscountpackageHandoversDto.java} (94%) rename anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/{BusFilesDto.java => AppBuscenterFile.java} (70%) create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageHandover/AppDiscountPackageHandoverRest.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageHandover/AppDiscountPackageHandoverService.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceFeign.java index dd5647b1d1..24421f9b88 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceFeign.java @@ -116,14 +116,14 @@ public interface BaseModelModpriceFeign { @ResponseBody public ResultBean getExcelInfo(@RequestParam("sid") String sid, @RequestParam("file") MultipartFile file, HttpServletRequest request)throws IOException,ParseException; - @PostMapping("/downloadExcel") + @PostMapping("/downloadModPriceExcel") @ApiOperation(value = "下载模板") @ResponseBody public void downloadExcel(); @ApiOperation(value = "下载模板") - @GetMapping("/downloadModPriceExcel") - public void downloadModPriceExcel(HttpServletResponse response); + @PostMapping("/downloadExcel") + public void downloadModPriceExcel(); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceFeignFallback.java index 08f51ff99a..d2f92db81d 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceFeignFallback.java @@ -126,7 +126,7 @@ public class BaseModelModpriceFeignFallback implements BaseModelModpriceFeign { } @Override - public void downloadModPriceExcel(HttpServletResponse response) { + public void downloadModPriceExcel() { } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceRest.java index 9ef5101f3b..27e74d6c9b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceRest.java @@ -169,7 +169,7 @@ public class BaseModelModpriceRest implements BaseModelModpriceFeign { } @Override - public void downloadModPriceExcel(HttpServletResponse response) { + public void downloadModPriceExcel() { try { InputStream resourceAsStream = this.getClass().getClassLoader().getResourceAsStream("static/excel/调价申请模板.xls"); //获取要下载的模板名称 diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java index 1fffc8baea..7c0900e56a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java @@ -704,10 +704,10 @@ public class BaseModelModpriceService extends MybatisBaseService7sV+ zcl(X%h)nV(D&&JmgQ!WtIq-~`N?L@N!2^~*h(sb9NC-UsH~oz)@E&Bf0OzSd=0R44 zj6PR~%!jN2xdY^mkUK%vgxnc&7swC-L>qEf$U2a9A?rcbhujUa0c1nSMv#pmcZX~O z*%UIy3}$n9wv;OWjZF7%A?iqy0DrTIfD9lr;hsoRz#HvP`VcXUA-F&$;Nz8$V(Ll; z(l`3*e6Z+bV#*DU0E)gCXpqK0>xpC%RV&b01^h8 zCxhmJBnqxk?O`B=qYLfh7>NC+z3n6URN72ny-@NQnE`)MlW_W5z3pRve$~oPgAct}O_daCUQjPd=MXjM{B?v&_VG&KO2{3^6UZmf?>T;C zGKd)u;>43#RH&eU=sv+;pZqBqqBtl+F&MZ%M-Ap0F4)0yuioM}a&Z3g8+F;2tdU zAb-9Bd~F5zIx=umo;{2UI)r0E8enp^Bo2@*i8JX(XvhTOC@nn8Xu1;z~G?5Z<(AcJL(87vcR#+uF9e zvtd|(bu1_idPOi?okSJVL3DPo-hF6ygT4_aL|S=%{n)2SQiE zh0$vYv4pZ?=TI7U3H&lZpih=RlEyGZQLN4#$Cz z4POx)TVuojcZPGQl?7^uiMA(!k%F?r8yd>Mah*cJ4-w)k@D&iA2IUuAyHN12wY67u zT-A~AdQor!J(Z0Qfna5W%k$T#_~5#zZM%-G{Owu!;5%1ae3}ogt0*|c4<)}?Ukz41 zxCUdx$8{M6&)3%0@2C&@8d37dw@cdr*Kllna9zg+$H-@c)g5!F(Rj)~)FD!X!IYDs-9_1@=7TW>W#T32_e_SiKh1)BT$4r4d z&I<626~Jje>T>PU@gonX?JRG9+HUf2HwEn~;!o=<&!@KnK8oyMK;g^t>7#%T-5=%g zX}Bs*vADLtO$;hA<5DXe15XOBM&W}u=W1(H{hC`Wn9J8Cb8%o2rvOr0s*;|{_amuo z;Ml8FU_V9|uEJQ{k71G~1(Vu`gNn}Zw#ZH8=gKg_E~pM0IIu*8r?j**@#44x3rw8_ z#%F<{P{>bIxkk(ng+iE*Pm&ncDwM2d*bf=aDudgpnJg3Rv@{b+lJcL#tum726E!hR zfh5>78A)8-*dzf2acX7aC}U&n##~q&)B58QoS{%afcsz)f^?EDOOPtl0>+z~*oy}a z91s&QUX+G0UX+G0UX+H3y(p>_^HX3a+_96`sdd|i(vpcqs?d5-pf+y#(Q4yH31%iK zATWb^iJd@3SutfjArKR^vjuZ8fo%6sUv48fw8Z0K47!9UH! zief?!53X*w^}{4a5~hrI1?u#GDn=5K4;zzqsAEkrVI)z<=30{yNn{5q8z7MkR6agF zVqY^ME)8QsTpGrNxHOCj@s}@Oius{X^gtzPqt!gJLfN(v>aQL>*@SwVDi`FkLiKDT zl(e>gg{2A#3gj#$y{D)kknBJxW`GdJ;)^kpm>9rC5|b1#v4?tw34IE|5HL)bGTs$1 zaeyj1q^Wr!og=3Xi;YLg47iTKga`2`-_4bE{dTD6L`lbl<(X&lvli^|i6vH`Vy`w# zM33^t1Wat_3xAi1vzQ6KUP!-rFvf0&IxbR7*oQ+v5GMudxB>#>c3~{rAk+>?+@zRP z2LDMW?ov#Iv24>^J0$UtVp19WCzVnQEG{t0#ZNinGm{*z(OVx+srp4hPDe3C9(-pL-AiY~%_^-$<3L#lkV+`KuG> z3y2%Aac#?rXD#XsyU2% z!*o8Sv{AY$bvI7efV&1PdBJXt)6eC~+pPoG4Qpr?=5V~PR66vWtoN*xN{15!28bpc zHt+~XJ#O`C0ho0K-?Xi@RCGizX}8ugB(VEKII)>S!WIi1rpS?SI|2z)OOt3oyn(LB zM^0CjE}$#c(5PLAIV`(5^-Ip>+DxMP3)+gr^$@8NNj)Q!g+vb*7Cp4Ydf)_0t8OVF zLF>t?t}P~EtYr=x@k$+mEz3GWpwtl(X?jSc!QLn5va~S88TGWHZqE1RJimzy>mmX};$ypS;g{(zQ z^(1!;LxdQf@o8k<3o1?If)G zD7PIOYkQ@(V_56K*|ePPu;<7s?kJ}?(_75pgjZ=ivUS8>N~M#q{s>tsenDYl?F_7y zQ80bHzr5l&2+Jz&BBwYm!sxlnTe;$FW4fDC#U-qLlq=50+FhyQH0v0?K8cZ<74#`x z@UoJBq0>sK8ib7qQsLpL2O*1x-SNdclWUxREW5Nj(pZni(}knCO%|W4dPL&<>{rTE2Cu-_6On;TcnCJ0SYN`8|cdk$`+7 zzw(V$8*W~2s9)gu({0`AbwQfr9P-sQmkKX9eRcHtT!*d3+kPI@{j|gMx^lgH50VWk z4lUEUJ^1XbkW|a+oQ&Ove-&IiY+r5u%;DFG$E>FI&-{2y{KN&YP!PrylWVgn&v5!yYPJU$RYN39_`;K)|*T5l5 zyKj$}x=MS_F+tCM$Mq`q`_9`Ge>rI0tgl?=`pV~;$Brkyj`BYlQ>hviU%oeD$6M23D*7wjAHJFM@q%opck6R(HMNC3 zpT3#p(6Y18?8{G7pPV(YsZn_s_ITrRv!FFk!t5;4qpY0vciQ@VdTH`}tGNv!J?=L0 zTC5Kp7`3~%y@tj1X9c#LqercEx=u=)Q+H%|$sD^3BfhPf-PU9i<6+Y}nBUtJbZkym zT=`-{|0LJaE(Om*tgJq2d^76({V_>dwYfG^7d8bXFfQ%|MsnC9vyaZ&iVA6+cf^paT|+#hyjqe)iQ{pJyZYm2UCt>=4HOfD~4Z(gGvw0Cc0%bT~S-JZS9 z+`2V;{RZ#14X<9*U-{VQ{*Ml)RK6a#rEcf5qBrku4nJA6KDFs##h95VoL>})UfoD2 z`tpHVsrPu-&zoOg@mcSa+I-=D+K1<5oZIzr(@Q_LDk&{oGWXD3~Vx- zqgK0U?fI{s$E_Urw4%AP>{q|W8jm^M3Pw+Tcd*l;ydNec#Z13^VrYn6$ih&E{;#u! zx+Lv->TN!HLiV8IHIsB6{AzQ{+v2C3tg|(C-xplw3>Ng7)y;3vVZC*mzqsYSdC#b( z=lho})SS0%K?^_BKI{6W;7w%>i3__;E(CE2S_ z23(zUR%M9imUpHlqmN(IpI^8!-?~6JZ<~$V)3Xg8mAl@W{PchqwcAzjc;!SJtNx)U z{$Y6Qd{X)C`m$pwoky2_uJhE#_HuvspoEwjy+@7@Px=>)i4&#my|nJPmoP3A=q?zt z^VFm-?_9h8Y;ygJFZ^vy&hSiY_h@TPQ#vgMD|${Sl74f#525Kj9%}%a%(j(X3Blehyvnc=Uy*lu{rj&3)qE9S0Sb4xdPCwIs5k(;-r z3%A@{`shr<_UeX$q~*ckR#}M$2REK=G_{V_y|bxrbz@50iTFJ?&woAsRhaG4u?Ftr zSBaLL9xzKYY3I+rp`ktF9)3H!Yizj!R2Gl_qyU6y4!qh_>7Lcx^H`2R~wgd{j6Wr6RY|P zo_bYqq01(VZ_`vWE*>sz4qF%5eV4lQfchMVK4kccb0qpx+!?7gq+`Am#>oYjQ$wmw z8T3f%Rge?VYjY~8vrUV$FurO0=;rWpwGM^+h2KAG+TQ=ep3LUDukQ==*X~d|btk~* zd|X{p|Dv?{6&c@e?ZFRE{$$bSFK!-=JTc<(=8rD87#9pW;`~k5E??akeq!Vv|H+pt zw5o;-xal5km9{na)5z;)tJfRW_71-CT7Tqq&q;f-w^fJ^o^q~SKfEMuuS3HC-b~N0 zgX8Z;f48kyedx)YZNeQ_O)nk(q4^p;E3&^Dbd{ME*-WB&IcLLOz%vGu;1QqnEK1|c zz5=wGYiNg3XWfNO^XKpr60RKA%C-LWt4q7Dsw}+gq1oHVD&+AK%{>l$r^Qh}u8A*P z^=*YtjO#6zxE)6Pz7M|nbZyCuA099F9jQNT$&G%K_f49=Ji+sc-jv)R+o9H0BW;~r zRws708IqTOX=zw<`W~;%*`x1TY~JE`w(!!Rrq5D0zF5bZd)n$`wAL5Z#Bk+^wW5RX zy^NMj>1C!L@gc--){P8R+f8RGYc1F92RI)w)$ z%$zNpIXf~e|2dVJ{tpOMd*5- z`8?X{r{r^&K5I^QoUT4P`-?u_YXiHl7~NE!sk5_6tF+c(-|Dp{9=C08_@6D9^<&=W z-KxHci<`C5dDNF`4yk)x*ESl3C1^FP4!rE_kX^R-k)5djqpV#C;Zyd%Na}Y^@UqX# zyKimox#eWJedv;+(NAM_bHbzHBZ4?wT{u-^-VJ3<1r@M+Ab_h6Y(ujcj%L6fkCLBn z;1AVw;go@i$hM8jc2huZZPZIlLq%cx8$%X!Xe*<^_hdSufL4&DyMr=H>}qsEN@I9? zm!@P_Q?~0NJ#E_{R(jTsNDC!#nCx4zgsCd@aA~2aXX+hUmWS+uK*9reeB^jYEe}Qn zsZvhXfZxLSK<|p90wD`NU&)eL&@AVVCCjB?Ilx&P{=(pRHJVI^AH;{k2NfyQ(@^T? z@$u9rIId&_d|Z(PA6(3q!UzV~6cPt87g%vl;^4`0286MNJIb!c357Z#{9!%9W2rTm zG~AVfzr+){Hu!F2E$sQPm68<9NG1HyV;1bPj)uPy4j(ch%iOu71%CaFhl-eC2Q7PI zQz&k5XJ?MlPva!R!@VS7IqGc3-O*tzHu6*9@7%uG>k6_2+dA+0uF2z7*>%p?@L2Xvmdu%OpOv4D~b-yC$Ip0(kMUkdU` z%k~#lL!(FdL{e}&3T{tb=Tne$z+qAkJT@W@oOw`FLM_bnpuB*>UPxW7#n_ELHd4>F z;^*f+J*A$%BNh-ilR-NCLz!TnJ~9dZ)%q}Z4#|g|fqaP=6c+ns6!74aRLV+(?1EqL zalv6&M($%eNy;j4`sr&VDf0j?-B3~nXL5*!A2b6xbJ6t(z=Uq*bFtUs^AHM{&haJh zDZdcnPu0*R4wMjqE^(oRI?^Q-DB-~zUE)Crt$Q7QRyH2)gm`nik|R{-@`ci51VPG# zu9Ycei^;&z1iY%kr^q>=K0NW(U_%;H_}$19DP#x({N;#Bpt2aEHKSXjW9UCEei(l< zHfZ$)RrH1H@A`r!q{D@f|N7#e=*#~KU(oLRS6(r6aHPQT0Y?QKb8skt0i7B>;Z=w7>p7eHX)J>KQz7eJdSMwd%o)m2{cnhjq1d86TDDtA%|81ZpI!3#3JXZb>w)fwwmNgynEVyFd>koq4W{@DLV z;00WzM>}Boy9w=_g~I+t>5sPm7d0zp^LK9_(rW@7>33Hubr&qB!f zuCTAQj4Q%-ESL<@6a$q0aF2&&_GDPb3ZVuQ^PVx71OQY%Cb92eU&Wuq zc)-;WmenrsyAsUK)E$4};08-^x<6XM-G#yoprGzha)#^=C3onjZln)9_lAtmu5b?k XY%l8YI1qaBK){WJ>&1 literal 0 HcmV?d00001 diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscenterfile/BuscenterFile.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscenterfile/BuscenterFile.java index c6c687eb58..272b05a47b 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscenterfile/BuscenterFile.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscenterfile/BuscenterFile.java @@ -12,7 +12,6 @@ import lombok.Data; @Data public class BuscenterFile extends BaseEntity { private static final long serialVersionUID = -1625798325169874963L; - @ApiModelProperty("关联sid") private String linkSid; @ApiModelProperty("文件类型") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscenterfile/BuscenterFileEnum.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscenterfile/BuscenterFileEnum.java index 99a96b4cca..e9e7f44d1b 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscenterfile/BuscenterFileEnum.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscenterfile/BuscenterFileEnum.java @@ -23,6 +23,7 @@ public enum BuscenterFileEnum { GUARANTEELETTER_DOWNLOADURL("014", "欠款提车担保承诺书"), GDLETTER_DOWNLOADURL("015", "股东会对外担保决议"), ZJLLETTER_DOWNLOADURL("016", "总经理担保书"), + DISCOUNTPACKAGE_HANDOVER("017","优惠包交接确认") ; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverDto.java index 010fd07663..af54ebeb80 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverDto.java @@ -1,6 +1,7 @@ package com.yxt.anrui.buscenter.api.busdiscountpackagehandover; import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile; import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverList; import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListDto; import com.yxt.anrui.buscenter.api.busfile.BusFile; @@ -62,6 +63,6 @@ public class BusDiscountpackageHandoverDto implements Dto { @ApiModelProperty("优惠包交接优惠包列表") private List busDiscountpackageHandoverLists; @ApiModelProperty("业务关联附件表") - private List busFiles; + private List busFiles; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeign.java index ee4a8efca5..34d7134545 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeign.java @@ -1,6 +1,6 @@ package com.yxt.anrui.buscenter.api.busdiscountpackagehandover; -import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandocerDto; +import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverDto; import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverQuery; import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverVo; import com.yxt.common.core.query.PagerQuery; @@ -72,15 +72,15 @@ public interface BusDiscountpackageHandoverFeign { @ApiOperation("移动端优惠包交接详情编辑回显") @GetMapping("/getDiscountHandoverInfo/{sid}") @ResponseBody - public ResultBean getDiscountHandoverInfo(@PathVariable("sid") String sid) throws InvocationTargetException, IllegalAccessException; + public ResultBean getDiscountHandoverInfo(@PathVariable("sid") String sid) throws InvocationTargetException, IllegalAccessException; @ApiOperation("移动端交接操作") @PostMapping("/todoPackageHandover") @ResponseBody - public ResultBean todoPackageHandover(@RequestBody AppBusDiscountpackageHandocerDto dto) throws ParseException, InvocationTargetException, IllegalAccessException; + public ResultBean todoPackageHandover(@RequestBody AppBusDiscountpackageHandoverDto dto) throws ParseException, InvocationTargetException, IllegalAccessException; @ApiOperation(("上传图片")) @PostMapping("/appUploadPicture") - public ResultBean appUploadPicture(@RequestBody AppBusDiscountpackageHandocerDto dto); + public ResultBean appUploadPicture(@RequestBody AppBusDiscountpackageHandoverDto dto); } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeignFallback.java index cf11441e09..eb1bf1de1f 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeignFallback.java @@ -1,6 +1,6 @@ package com.yxt.anrui.buscenter.api.busdiscountpackagehandover; -import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandocerDto; +import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverDto; import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverQuery; import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverVo; import com.yxt.common.core.query.PagerQuery; @@ -67,17 +67,17 @@ public class BusDiscountpackageHandoverFeignFallback implements BusDiscountpacka } @Override - public ResultBean getDiscountHandoverInfo(String sid) { + public ResultBean getDiscountHandoverInfo(String sid) { return null; } @Override - public ResultBean todoPackageHandover(AppBusDiscountpackageHandocerDto dto) throws ParseException, InvocationTargetException, IllegalAccessException { + public ResultBean todoPackageHandover(AppBusDiscountpackageHandoverDto dto) throws ParseException, InvocationTargetException, IllegalAccessException { return null; } @Override - public ResultBean appUploadPicture(AppBusDiscountpackageHandocerDto dto) { + public ResultBean appUploadPicture(AppBusDiscountpackageHandoverDto dto) { return null; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandocerDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverDto.java similarity index 92% rename from anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandocerDto.java rename to anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverDto.java index 323591764d..48132a1659 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandocerDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverDto.java @@ -1,6 +1,7 @@ package com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app; import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile; import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListDto; import com.yxt.anrui.buscenter.api.busfile.BusFileDto; import com.yxt.common.core.dto.Dto; @@ -16,7 +17,7 @@ import java.util.List; * @date 2023/4/25 16:47 */ @Data -public class AppBusDiscountpackageHandocerDto implements Dto { +public class AppBusDiscountpackageHandoverDto implements Dto { @ApiModelProperty("sid") private String sid; // sid @@ -50,6 +51,6 @@ public class AppBusDiscountpackageHandocerDto implements Dto { @ApiModelProperty("优惠包交接优惠包列表") private List busDiscountpackageHandoverLists; @ApiModelProperty("业务关联附件表") - private List busFiles; + private List busFiles; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverDetailsVo.java index 34e9214320..114c0faee2 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverDetailsVo.java @@ -15,7 +15,6 @@ import java.util.List; @Data public class BusHandoverDetailsVo implements Vo { private static final long serialVersionUID = -19660212281955914L; - @ApiModelProperty("记录sid") private String sid; @ApiModelProperty("合同编号") diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverRest.java index 842b2db564..6a96102661 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverRest.java @@ -1,7 +1,7 @@ package com.yxt.anrui.buscenter.biz.busdiscountpackagehandover; import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.*; -import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandocerDto; +import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverDto; import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverQuery; import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverVo; import com.yxt.common.core.query.PagerQuery; @@ -82,12 +82,8 @@ public class BusDiscountpackageHandoverRest implements BusDiscountpackageHandove @Override public ResultBean uploadPicture(BusDiscountpackageHandoverDto dto) { ResultBean rb = ResultBean.fireFail(); - boolean isUpload = busDiscountpackageHandoverService.uploadPicture(dto); - if (isUpload) { - return rb.success().setMsg("上传成功"); - } else { - return rb.fail().setMsg("上传失败"); - } + busDiscountpackageHandoverService.uploadPicture(dto); + return rb.success(); } /********************移动端接口**********************/ @@ -99,14 +95,14 @@ public class BusDiscountpackageHandoverRest implements BusDiscountpackageHandove } @Override - public ResultBean getDiscountHandoverInfo(String sid) throws InvocationTargetException, IllegalAccessException { + public ResultBean getDiscountHandoverInfo(String sid) throws InvocationTargetException, IllegalAccessException { ResultBean rb = ResultBean.fireFail(); - AppBusDiscountpackageHandocerDto dto = busDiscountpackageHandoverService.getDiscountHandoverInfo(sid); + AppBusDiscountpackageHandoverDto dto = busDiscountpackageHandoverService.getDiscountHandoverInfo(sid); return rb.success().setData(dto); } @Override - public ResultBean todoPackageHandover(AppBusDiscountpackageHandocerDto dto) throws ParseException, InvocationTargetException, IllegalAccessException { + public ResultBean todoPackageHandover(AppBusDiscountpackageHandoverDto dto) throws ParseException, InvocationTargetException, IllegalAccessException { ResultBean rb = ResultBean.fireFail(); int i = busDiscountpackageHandoverService.todoPackageHandover(dto); @@ -117,13 +113,9 @@ public class BusDiscountpackageHandoverRest implements BusDiscountpackageHandove } @Override - public ResultBean appUploadPicture(AppBusDiscountpackageHandocerDto dto) { + public ResultBean appUploadPicture(AppBusDiscountpackageHandoverDto dto) { ResultBean rb = ResultBean.fireFail(); - boolean isUpload = busDiscountpackageHandoverService.appUploadPicture(dto); - if (isUpload) { - return rb.success().setMsg("上传成功"); - } else { - return rb.fail().setMsg("上传失败"); - } + busDiscountpackageHandoverService.appUploadPicture(dto); + return rb.success(); } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java index 6fdc6a2e09..87da0d974c 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java @@ -5,17 +5,17 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.commoncontract.CommonContract; import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; +import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile; +import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFileEnum; import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.*; -import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandocerDto; +import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverDto; import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverListDto; import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverQuery; import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverVo; import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverList; import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListDto; -import com.yxt.anrui.buscenter.api.busfile.BusFile; -import com.yxt.anrui.buscenter.api.busfile.BusFileDto; +import com.yxt.anrui.buscenter.biz.buscenterfile.BuscenterFileService; import com.yxt.anrui.buscenter.biz.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListService; -import com.yxt.anrui.buscenter.biz.busfile.BusFileService; import com.yxt.anrui.portal.api.sysrole.SysRoleFeign; import com.yxt.anrui.portal.api.sysrole.SysRoleVo; import com.yxt.common.base.config.component.DocPdfComponent; @@ -53,7 +53,7 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService busFileDtos = busFileService.getPathByLinkSid(sid); + List buscenterFiles = buscenterFileService.selectByLinkSid(sid, BuscenterFileEnum.DISCOUNTPACKAGE_HANDOVER.getAttachType()); List lists = this.returnHandoverListVo(sid); String urlPrefix = fileUploadComponent.getUrlPrefix(); - if (null != busFileDtos) { - for (BusFileDto busFileDto : busFileDtos) { - busFileDto.setFilePath(urlPrefix + busFileDto.getFilePath()); + if (null != buscenterFiles) { + for (BuscenterFile buscenterFile : buscenterFiles) { + buscenterFile.setFilePath(urlPrefix + buscenterFile.getFilePath()); } - dto.setBusFiles(busFileDtos); + dto.setBusFiles(buscenterFiles); } dto.setBusDiscountpackageHandoverLists(lists); return dto; @@ -271,7 +271,7 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService busFiles = dto.getBusFiles(); + List busFiles = dto.getBusFiles(); if (null != busFiles && i > 0) { this.uploadPicture(dto); } @@ -478,23 +478,14 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService busFiles = dto.getBusFiles(); - for (BusFileDto busFile : busFiles) { - BusFile bf = new BusFile(); - busFile.setLinkSid(sid); - String uploadPath = fileUploadComponent.getUrlPrefix(); - String substring = busFile.getFilePath().substring(uploadPath.length()); - busFile.setFilePath(substring); - busFile.fillEntity(bf); - isSuccess = busFileService.save(bf); + List busFiles = dto.getBusFiles(); + for (BuscenterFile busFile : busFiles) { + buscenterFileService.saveFile(sid, busFile.getFilePath(), BuscenterFileEnum.DISCOUNTPACKAGE_HANDOVER.getAttachType()); } } - return isSuccess; } @@ -560,8 +551,8 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService busFileDtos = busFileService.getPathByLinkSid(sid); + List buscenterFiles = buscenterFileService.selectByLinkSid(sid, BuscenterFileEnum.DISCOUNTPACKAGE_HANDOVER.getAttachType()); List lists = this.returnHandoverListVo(sid); List appListDtos = new ArrayList<>(); if (null != lists) { @@ -619,11 +610,11 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService busFiles = bdhDto.getBusFiles(); + List busFiles = bdhDto.getBusFiles(); if (StringUtils.isNotBlank(bdhDto.getState())) { i = this.updateBySid(bdhDto.toMap(), sid); } @@ -675,21 +667,13 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService busFiles = dto.getBusFiles(); - for (BusFileDto busFile : busFiles) { - BusFile bf = new BusFile(); - busFile.setLinkSid(sid); - String uploadPath = fileUploadComponent.getUrlPrefix(); - String substring = busFile.getFilePath().substring(uploadPath.length()); - busFile.setFilePath(substring); - busFile.fillEntity(bf); - isSuccess = busFileService.save(bf); + List busFiles = dto.getBusFiles(); + for (BuscenterFile busFile : busFiles) { + buscenterFileService.saveFile(sid, busFile.getFilePath(), BuscenterFileEnum.DISCOUNTPACKAGE_HANDOVER.getAttachType()); } } - return isSuccess; } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java index 97a8e64803..b21d92316e 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java @@ -86,7 +86,7 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper fetchByContractNo(String contractId); - FinUncollectedReceivablesDetailedPdfVo selectPdf(String detailedSid); + FinUncollectedReceivablesDetailedPdfVo selectPdf(@Param("detailedSid") String detailedSid); List receivedSelect(String busVinSid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml index c794cf0e33..45d29f8342 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml @@ -103,6 +103,7 @@ from fin_uncollected_receivables_detailed where contractNo = #{contractNo} +