From 8309e13366d040534547cc0d416cb385e4bac261 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 19 May 2022 11:40:03 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=8E=92=E6=9F=A5?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=20sql=E8=AF=AD=E5=8F=A5=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE=EF=BC=8C=E5=B7=B2=E6=9B=B4=E6=AD=A3?= =?UTF-8?q?=20=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E8=A1=A8=E7=BC=BA?= =?UTF-8?q?=E5=B0=91=E8=AE=A2=E5=8D=95=E7=B1=BB=E5=9E=8Bkey=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E9=9C=80=E8=A6=81=E8=A1=A5=E5=85=85=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=BB=A5=E5=8F=8A=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E3=80=81=E4=BF=9D=E5=AD=98=E3=80=81=E4=BF=AE=E6=94=B9=E3=80=81?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=9B=9E=E6=98=BE=20=E5=A4=96=E9=87=87?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=B5=81=E7=A8=8B=E6=B7=BB=E5=8A=A0taskId?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseOutsourcingApplication.java | 3 ++- .../BaseOutsourcingApplicationDto.java | 2 ++ .../BaseOutsourcingApplicationVo.java | 1 + .../api/busvehicleorder/BusVehicleOrder.java | 5 +++- .../busvehicleorder/BusVehicleOrderDto.java | 7 ++++-- .../busvehicleorder/BusVehicleOrderQuery.java | 4 ++-- .../busvehicleorder/BusVehicleOrderVo.java | 9 +++++-- .../BaseOutsourcingApplicationMapper.xml | 3 +++ .../BaseOutsourcingApplicationService.java | 1 + .../busvehicleorder/BusVehicleOrderMapper.xml | 8 ++++--- .../BusVehicleOrderService.java | 8 +++---- .../anrui/base/biz/flow/FlowableService.java | 2 ++ .../FinBillApplicationService.java | 24 ++++++++++--------- 13 files changed, 51 insertions(+), 26 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java index 1c978f31a7..11de25e809 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java @@ -97,7 +97,8 @@ public class BaseOutsourcingApplication extends BaseEntity { @ApiModelProperty(value = "节点状态") private String nodeState; - + @ApiModelProperty("任务id") + private String taskId; @ApiModelProperty("分公司sid") private String useOrgSid; // 分公司sid } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java index a6b3b6eed8..ad35c903a6 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java @@ -104,6 +104,8 @@ public class BaseOutsourcingApplicationDto implements Dto { @ApiModelProperty(value = "节点状态") private String nodeState; + @ApiModelProperty("任务id") + private String taskId; @ApiModelProperty("分公司sid") private String useOrgSid; // 分公司sid diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationVo.java index e9cdc8e7b5..498d335b1a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationVo.java @@ -65,4 +65,5 @@ public class BaseOutsourcingApplicationVo implements Vo { private String guidedPrice; // 销售指导价 @ApiModelProperty("节点状态") private String nodeState; // 节点状态 + } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrder.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrder.java index e42cf6c405..7b684951cb 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrder.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrder.java @@ -56,7 +56,10 @@ public class BusVehicleOrder extends BaseEntity { @ApiModelProperty("订单编号") private String orderNo; // 订单编号 - + + @ApiModelProperty("订单类型key") + private String orderTypeKey; // 订单类型key + @ApiModelProperty("订单类型") private String orderType; // 订单类型 diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderDto.java index c7e6577481..adab36811d 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderDto.java @@ -62,13 +62,16 @@ public class BusVehicleOrderDto implements Dto { @ApiModelProperty("业务员sid") private String staffSid; - + @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid @ApiModelProperty("订单编号") private String orderNo; // 订单编号 - + + @ApiModelProperty("订单类型key") + private String orderTypeKey; // 订单类型key + @ApiModelProperty("订单类型") @NotBlank(message = "订单类型不能为空") private String orderType; // 订单类型 diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderQuery.java index 7047d326b8..168828fe7a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderQuery.java @@ -60,8 +60,8 @@ public class BusVehicleOrderQuery implements Query { @ApiModelProperty("订单编号") private String orderNo; - @ApiModelProperty("订单类型") - private String orderType; + @ApiModelProperty("订单类型key") + private String orderTypeKey; @ApiModelProperty("订单状态") private String orderStatus; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderVo.java index c7f1289c69..1603d3ab6f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderVo.java @@ -48,6 +48,8 @@ import lombok.Data; @Data public class BusVehicleOrderVo implements Vo { + @ApiModelProperty("采购订单sid") + private String sid; // 采购订单sid @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid @@ -57,8 +59,11 @@ public class BusVehicleOrderVo implements Vo { @ApiModelProperty("订单编号") private String orderNo; // 订单编号 - - @ApiModelProperty("订单类型") + + @ApiModelProperty("订单类型key") + private String orderTypeKey; // 订单类型key + + @ApiModelProperty("订单类型") private String orderType; // 订单类型 @ApiModelProperty("订单日期") diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.xml index 67d46b1c34..097cf5d6b8 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.xml @@ -29,6 +29,9 @@ , procInstSid=#{procInsId} + + , taskId=#{taskId} + WHERE sid=#{sid} \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java index ec46eed405..7d1c2e324f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java @@ -298,6 +298,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService SELECT bvo.createOrgSid, + bvo.sid, bvo.orderNo, bvo.orderType, + bvo.orderTypeKey, bvo.orderDate, bvo.purchaseApplyMediumModelSid, + bvo.purchaseRequisitionSid, bvo.platformNo, bvo.coatPrice, bvo.treasuryPrice, @@ -179,9 +182,8 @@ bva.applicationCode, bvo.remarks FROM bus_vehicle_order bvo - LEFT JOIN base_vehicle_model bvm ON bvo.purchaseApplyMediumModelSid = bvm.sid - LEFT JOIN bus_vehicle_apply_detail bvad ON bvo.purchaseApplyMediumModelSid = bvad.sid - LEFT JOIN bus_vehicle_apply bva ON bvad.applySid = bva.sid + LEFT JOIN base_vehicle_model bvm ON bvo.purchaseApplyMediumModelSid = bvm.sid + LEFT JOIN bus_vehicle_apply bva ON bvo.purchaseRequisitionSid = bva.sid WHERE bvo.sid = #{sid} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java index db1cd7317b..7b8c7c4ea6 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java @@ -104,14 +104,14 @@ public class BusVehicleOrderService extends MybatisBaseService createQueryWrapper(BusVehicleOrderQuery query) { // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); QueryWrapper qw = new QueryWrapper<>(); - qw.eq("createBySid",query.getUserSid()); - qw.eq("useOrg",query.getUseOrgSid()); + qw.eq("bvo.createBySid",query.getUserSid()); + qw.eq("bvo.useOrg",query.getUseOrgSid()); if (StringUtils.isNotBlank(query.getOrderNo())) { qw.like("bvo.orderNo", query.getOrderNo()); } - if (StringUtils.isNotBlank(query.getOrderType())) { - qw.like("bvo.orderType", query.getOrderType()); + if (StringUtils.isNotBlank(query.getOrderTypeKey())) { + qw.like("bvo.orderTypeKey", query.getOrderTypeKey()); } if (StringUtils.isNotBlank(query.getOrderStatus())) { diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/flow/FlowableService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/flow/FlowableService.java index 034cc7e5f0..35fcae1bda 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/flow/FlowableService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/flow/FlowableService.java @@ -56,11 +56,13 @@ public class FlowableService extends MybatisBaseService list = flowTaskFeign.getLatestTasks(procId).getData(); String nodeState = list.get(0).getName_(); String task_def_key_ = list.get(0).getTask_def_key_(); + String taskId = list.get(0).getId_(); Map map = new HashMap<>(); map.put("sid", variables.get("businessSid").toString()); map.put("nodeState", nodeState); map.put("procInsId", rb.getData().getProcInsId()); map.put("taskDefKey", task_def_key_); + map.put("taskId",taskId); return new ResultBean().success().setData(map); } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index fa19d2b0aa..455bd275fd 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -170,9 +170,11 @@ public class FinBillApplicationService extends MybatisBaseService commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath); CommonAppendixVo data = commonAppendixVoResultBean.getData(); - if (data == null){ + if (data == null) { return rb.setMsg("请上传相关附件"); } String sid1 = data.getSid(); @@ -327,7 +329,7 @@ public class FinBillApplicationService extends MybatisBaseService commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath); CommonAppendixVo data = commonAppendixVoResultBean.getData(); - if (data == null){ + if (data == null) { return rb.setMsg("请上传相关附件"); } String sid1 = data.getSid(); @@ -352,7 +354,7 @@ public class FinBillApplicationService extends MybatisBaseService commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath); CommonAppendixVo data = commonAppendixVoResultBean.getData(); - if (data == null){ + if (data == null) { return rb.setMsg("请上传相关附件"); } String sid1 = data.getSid(); @@ -405,9 +407,9 @@ public class FinBillApplicationService extends MybatisBaseService busSalesOrderDetailsVoResultBean = busSalesOrderFeign.fetchDetailsBySid(busSid); BusSalesOrderDetailsVo data1 = busSalesOrderDetailsVoResultBean.getData(); String oneBillMoney = data1.getOneBillMoney(); - if (StringUtils.isBlank(oneBillMoney)){ + if (StringUtils.isBlank(oneBillMoney)) { vo.setOneBillState("0"); - }else { + } else { vo.setOneBillMoney(oneBillMoney); vo.setOneBillState("1"); } @@ -453,9 +455,9 @@ public class FinBillApplicationService extends MybatisBaseService priceByOrderSid = busSalesOrderPriceFeign.getPriceByOrderSid(busSid); String price = priceByOrderSid.getData(); if (price.equals(oneBillMoney)) { - variables.put("isHighAndLowOpen",false); + variables.put("isHighAndLowOpen", false); } else { - variables.put("isHighAndLowOpen",true); + variables.put("isHighAndLowOpen", true); } if (StringUtils.isBlank(dto.getTaskId())) { // 新提交 String proDefId = ProcDefEnum.SEALAPPLY.getProDefId(); @@ -557,7 +559,7 @@ public class FinBillApplicationService extends MybatisBaseService commonContractVoResultBean = commonContractFeign.fetchBySid(sid1); CommonContractVo data = commonContractVoResultBean.getData(); String orderSid = data.getBusSid(); - busSalesOrderFeign.updateOneBillMoneyByOrderSid(orderSid,oneBillMoney); + busSalesOrderFeign.updateOneBillMoneyByOrderSid(orderSid, oneBillMoney); } } paramMap.put("nodeState", nodeState);