From cc402d79d3edfe3127cc72d35c033aa2c451667a Mon Sep 17 00:00:00 2001 From: yxt_djz <313618925@qq.com> Date: Wed, 6 Jul 2022 11:34:04 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=88=B7=E6=96=B0?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=89=8D=E7=AB=AF=E6=97=B6=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java index f96400f4e9..510e0d61be 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java @@ -363,6 +363,7 @@ public class ScmApplyInboundService extends MybatisBaseService Date: Wed, 6 Jul 2022 11:47:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E8=A1=A8=E4=B8=AD?= =?UTF-8?q?=E5=B7=B2=E8=A2=AB=E5=88=A0=E9=99=A4=E7=9A=84=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/basevehicle/BaseVehicleMapper.xml | 69 +++++++++---------- 1 file changed, 33 insertions(+), 36 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index 2b706a4c9a..4d7b32f897 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -18,7 +18,6 @@ bv.engineNo, bv.vehicleStateValue, bv.locationName, - bv.libraryAge, bv.modelConfigSid FROM base_vehicle bv @@ -55,9 +54,7 @@ bv.location, - DATE_FORMAT(bv.manufactureDate, '%Y-%m-%d') as firstStartDate, - - bv.libraryAge + DATE_FORMAT(bv.manufactureDate, '%Y-%m-%d') as firstStartDate FROM base_vehicle bv LEFT JOIN base_vehicle_model bvm ON bvm.sid = bv.modelSid LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid @@ -102,19 +99,19 @@ bvm.engineTypeValue, - bvm.seriesValue, + - bvm.suspensionValue, + - bvm.rearAxleValue, + - bvm.speedRatioValue, + - bvm.wheelbase, + - bvm.tyreSpecification, + - bmc.vehicleCode, + bmc.carColor, @@ -134,19 +131,19 @@ bmc.otherConfig, - bmc.isColorPanel, + - bmc.basedUnit, + - bmc.companyGuidePrice, + bmc.remarks, bvm.useOrg, - bvm.useOrgName, + bvm.useOrgName - bvm.isValidity, - bvm.isValidityValue + FROM base_vehicle_model bvm LEFT JOIN base_model_config bmc ON bmc.vehicleSid = bvm.sid LEFT JOIN base_manufacturer bm ON bvm.manufacturer = bm.sid @@ -193,52 +190,52 @@ bv.engineNo, - DATE_FORMAT(bv.manufactureDate, '%Y-%m-%d') as manufactureDate, + bv.vehicleState, bv.vehicleStateValue, bv.location, - DATE_FORMAT(bv.firstStartDate, '%Y-%m-%d') as firstStartDate, + - bv.libraryAge, + - bv.useOrg, + bv.useOrgSid, bv.useOrgName, - bv.acceptPeople, + bv.orderingNo, - bv.exFactoryPrice, + - bv.priced, + DATE_FORMAT(bv.priceDate, '%Y-%m-%d') as priceDate, - DATE_FORMAT(bv.solidDate, '%Y-%m-%d') as solidDate, + DATE_FORMAT(bv.solidDate, '%Y-%m-%d') as solidDate - DATE_FORMAT(bv.deliveryDate, '%Y-%m-%d') as deliveryDate, + - bv.deliveryType, + - bv.deliveryPrice, + - bv.salesContractNo, + - bv.salesType, + - bv.guidedPrice, + - bv.financialFare, + - bv.subsidies, + - bv.isUse, + - bv.otherRemarks + from base_vehicle bv where bv.sid = #{sid} @@ -581,7 +578,7 @@ AND (SELECT count (*) FROM base_vehicle bv WHERE bv.modelSid = bvm.sid AND bv.lockedState = #{state} - AND bv.useOrg = #{useOrgSid} ) + AND bv.useOrgSid = #{useOrgSid} ) > 0 From 0a2d9d9e7c22345f7b89ed2f8773bb06a928621b Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 6 Jul 2022 11:49:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=B4=B9=E7=94=A8?= =?UTF-8?q?=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/busvehicleapply/flow/SubmitBusVehicleApplyDto.java | 4 ++-- .../base/biz/busvehicleapply/BusVehicleApplyService.java | 2 +- .../anrui/fin/api/fincostapply/flow/SubmitFinCostDto.java | 5 ++--- .../yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/SubmitBusVehicleApplyDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/SubmitBusVehicleApplyDto.java index 518c671217..5f57097631 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/SubmitBusVehicleApplyDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/SubmitBusVehicleApplyDto.java @@ -14,8 +14,8 @@ import javax.validation.constraints.NotBlank; @Data public class SubmitBusVehicleApplyDto extends BusVehicleApplyDto { private static final long serialVersionUID = 378585162071125756L; - @ApiModelProperty("意见") - private String comment; + /*@ApiModelProperty("意见") + private String comment;*/ @ApiModelProperty("流程实例id") private String instanceId; @ApiModelProperty("任务id") diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java index 2e17e557f5..c144561dbe 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java @@ -288,7 +288,7 @@ public class BusVehicleApplyService extends MybatisBaseService