From 8f74a3c6020fa851159fe8519df5bdf1344cce90 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 23 Dec 2022 13:09:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E6=AC=BE=E5=8D=95+=E9=94=80=E5=94=AE?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=B8=8A=E8=A3=85=E9=83=A8=E5=88=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9+=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E9=80=80=E5=BA=93=E4=BF=AE=E5=A4=8D+=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=E5=BE=85=E5=8A=9E=E5=88=97=E8=A1=A8=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/AppBaseVehicleOrderVo.java | 2 + .../AppBusVehicleApplyListVo.java | 5 + .../biz/basevehicle/BaseVehicleService.java | 15 ++ .../basevehinstall/BaseVehinstallMapper.java | 2 + .../basevehinstall/BaseVehinstallMapper.xml | 4 + .../basevehinstall/BaseVehinstallService.java | 4 + .../BusVehicleApplyDetailMapper.xml | 2 +- .../BusVehicleApplyDetailService.java | 10 + .../app/model/AppNowCarListVo.java | 3 + .../bussalesorder/app/model/AppNowCarVo.java | 2 + .../app/model/AppReadyCarListVo.java | 2 + .../app/model/AppReadyCarVo.java | 3 + .../BusSalesOrderVehicle.java | 3 + .../app/AppBusSalesOrderVehicleDto.java | 3 + .../BusSalesVehicleOrder.java | 3 + .../app/AppBusSalesVehicleOrderDto.java | 2 + .../bussalesorder/BusSalesOrderService.java | 37 ++- .../BusSalesOrderModelService.java | 146 +++++++++- .../BusSalesOrderVehicleMapper.xml | 3 +- .../BusSalesVehicleOrderMapper.xml | 11 +- .../FinSelectedReceivablesDetailedVo.java | 2 + .../FinCollectionConfirmationService.java | 250 +++++++++++------- .../FinSelectedReceivablesDetailedMapper.xml | 3 +- .../biz/flowtask/FlowTaskService.java | 16 +- .../ScmVehicleReturnDetailsVo.java | 2 + .../ScmVehicleReturnMapper.xml | 2 +- .../saleOrders/model/NowCarVo.java | 2 + .../saleOrders/model/OrderInfoVo.java | 1 + .../saleOrders/model/ReadyCarVo.java | 2 + .../saleOrders/vehicle/VehicleDto.java | 2 + .../vehicleorder/VehicleOrderDto.java | 2 + .../VehicleReturnDetailsVo.java | 2 +- 32 files changed, 416 insertions(+), 132 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/app/AppBaseVehicleOrderVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/app/AppBaseVehicleOrderVo.java index ed9d6c48a0..66458e21db 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/app/AppBaseVehicleOrderVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/app/AppBaseVehicleOrderVo.java @@ -29,5 +29,7 @@ public class AppBaseVehicleOrderVo implements Vo { @ApiModelProperty(value = "mysql数据库中查询是否是虚拟订单锁定") private Boolean isFictitious; + private String topSid; + } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/AppBusVehicleApplyListVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/AppBusVehicleApplyListVo.java index 8809cfc9f5..c305f75462 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/AppBusVehicleApplyListVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/AppBusVehicleApplyListVo.java @@ -28,4 +28,9 @@ public class AppBusVehicleApplyListVo implements Vo { private String msg; @ApiModelProperty(value = "锁定数量") private String lockingNum; + @ApiModelProperty("上装sid") + private String topSid; + @ApiModelProperty("排产车型sid") + private String purchaseApplyMediumModelSid; + } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 54d1ad90aa..2006dd8df2 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -18,6 +18,7 @@ import com.yxt.anrui.base.api.basevehicle.app.InputVinListQuery; import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo; import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate; import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo; +import com.yxt.anrui.base.api.basevehinstall.BaseVehinstall; import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo; import com.yxt.anrui.base.api.commonappendix.CommonAppendix; import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; @@ -2034,6 +2035,13 @@ public class BaseVehicleService extends MybatisBaseService baseVehinstallsList = baseVehinstallService.selectByOrgSidAndVin(orgSid,orderVoList.get(i).getVin()); + baseVehinstallsList.removeAll(Collections.singleton(null)); + if(!baseVehinstallsList.isEmpty()){ + BaseVehinstall baseVehinstall = baseVehinstallsList.get(0); + orderVoList.get(i).setTopSid(baseVehinstall.getMainSid()); + } } return rb.success().setData(orderVoList); } @@ -2053,6 +2061,13 @@ public class BaseVehicleService extends MybatisBaseService baseVehinstallsList = baseVehinstallService.selectByOrgSidAndVin(orgSid,orderVoList.get(i).getVin()); + baseVehinstallsList.removeAll(Collections.singleton(null)); + if(!baseVehinstallsList.isEmpty()){ + BaseVehinstall baseVehinstall = baseVehinstallsList.get(0); + orderVoList.get(i).setTopSid(baseVehinstall.getMainSid()); + } } return rb.success().setData(orderVoList); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.java index a0378d97ee..f08138670b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.java @@ -62,4 +62,6 @@ public interface BaseVehinstallMapper extends BaseMapper { @Select("select vinNo from base_vehinstall where createOrg = #{createOrgSid}") List selectListVo(String createOrgSid); + + List selectByOrgSidAndVin(@Param("useOrgSid") String orgSid, @Param("vinNo") String vin); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.xml index 5aa4b27367..a987a4248a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.xml @@ -31,4 +31,8 @@ + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java index 686e48a7f7..52971ade42 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java @@ -209,4 +209,8 @@ public class BaseVehinstallService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; } + + public List selectByOrgSidAndVin(String orgSid, String vin) { + return baseMapper.selectByOrgSidAndVin(orgSid,vin); + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml index 3a6c0a0773..ac06c46d52 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml @@ -50,7 +50,7 @@ diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.xml index 51bb4560fb..a0918235b9 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.xml @@ -37,7 +37,8 @@ select linkNo as orderId, linkText as date, linkSid as sid, - usingNum as selectNum + usingNum as selectNum, + topSid from bus_sales_vehicle_order where salesOrderSid = #{saleOrderSid} @@ -49,10 +50,12 @@ - select * + select *,sum(subscriptionMoney) as sumAll from fin_selected_receivables_detailed where collSid = #{sid} and auditState = #{state} and receivablesName = #{type} + group by concat(customerName,customerPhone) \ No newline at end of file diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java index 4ac9fef53a..2b7ff1ebfe 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java @@ -1970,13 +1970,17 @@ public class FlowTaskService extends MybatisBaseService sysUserVoResultBean = sysUserFeign.fetchBySid(historicProcessInstance.getStartUserId()); - flowTask.setStartUserSid(sysUserVoResultBean.getData().getSid()); - flowTask.setStartUserName(sysUserVoResultBean.getData().getName()); - flowTask.setStartDeptName(sysUserVoResultBean.getData().getOrganizationName()); + if(sysUserVoResultBean.getData() != null) { + flowTask.setStartUserSid(sysUserVoResultBean.getData().getSid()); + flowTask.setStartUserName(sysUserVoResultBean.getData().getName()); + flowTask.setStartDeptName(sysUserVoResultBean.getData().getOrganizationName()); + } ResultBean sysUserVoResultBean2 = sysUserFeign.fetchBySid(userSid); - flowTask.setAssigneeName(sysUserVoResultBean2.getData().getName()); - flowTask.setAssigneeSid(sysUserVoResultBean2.getData().getSid()); - flowTask.setDeptName(sysUserVoResultBean2.getData().getOrganizationName()); + if(sysUserVoResultBean2.getData() != null) { + flowTask.setAssigneeName(sysUserVoResultBean2.getData().getName()); + flowTask.setAssigneeSid(sysUserVoResultBean2.getData().getSid()); + flowTask.setDeptName(sysUserVoResultBean2.getData().getOrganizationName()); + } String procDefId = flowTask.getProcDefId(); String taskDefKey = flowTask.getTaskDefKey(); ResultBean> listResultBean = sysProUrlService.selectUrlByKey(procDefId, taskDefKey, "1", "2"); diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDetailsVo.java index 878b1ad8b6..992d2e359e 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDetailsVo.java @@ -45,4 +45,6 @@ public class ScmVehicleReturnDetailsVo implements Vo { @ApiModelProperty("申请人组织路径") private String orgSidPath; // 申请人组织路径 + + private String instanceId; } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnMapper.xml index 03391a120c..c359c5c3c3 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnMapper.xml @@ -17,7 +17,7 @@ diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/NowCarVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/NowCarVo.java index 0b044c7d22..746edebcf5 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/NowCarVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/NowCarVo.java @@ -27,4 +27,6 @@ public class NowCarVo implements Vo { @ApiModelProperty("是否虚拟订单锁定的") private String virtual; + @ApiModelProperty("上装配置sid") + private String topSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/OrderInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/OrderInfoVo.java index 9c91aefe11..7b86ca6513 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/OrderInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/OrderInfoVo.java @@ -50,4 +50,5 @@ public class OrderInfoVo implements Vo { private String publicModelSid; @ApiModelProperty("公告型号") private String publicModel; + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/ReadyCarVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/ReadyCarVo.java index 0f9c43fe9b..c85ecc6658 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/ReadyCarVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/ReadyCarVo.java @@ -33,4 +33,6 @@ public class ReadyCarVo implements Vo { @ApiModelProperty("提示消息") private String msg; + @ApiModelProperty("上装配置sid") + private String topSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vehicle/VehicleDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vehicle/VehicleDto.java index 416d1b3c56..f598b233e1 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vehicle/VehicleDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vehicle/VehicleDto.java @@ -25,4 +25,6 @@ public class VehicleDto implements Dto { @ApiModelProperty(value = "车辆sid") @JsonProperty(value = "carSid") private String linkSid; + + private String topSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vehicleorder/VehicleOrderDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vehicleorder/VehicleOrderDto.java index ca6bc28b4d..a0aefc2096 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vehicleorder/VehicleOrderDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vehicleorder/VehicleOrderDto.java @@ -26,4 +26,6 @@ public class VehicleOrderDto implements Dto { @ApiModelProperty(value = "选择数量") @JsonProperty(value = "selectNum") private String usingNum; + + private String topSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/purchaseReturn/VehicleReturnDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/purchaseReturn/VehicleReturnDetailsVo.java index 112a65608c..e0bd20a5a0 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/purchaseReturn/VehicleReturnDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/purchaseReturn/VehicleReturnDetailsVo.java @@ -44,7 +44,7 @@ public class VehicleReturnDetailsVo implements Vo { private String createOrgSid; @ApiModelProperty(value = "taskId") private String taskId; - @ApiModelProperty("procInsId") + @JsonProperty("procInsId") private String instanceId; }