From ee1fdfe8e037f0cda10718d8b31b65660f6c0b30 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 25 Jul 2022 20:00:22 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=BA=93=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScmVehicleGressionMapper.java | 2 +- .../ScmVehicleGressionMapper.xml | 81 ++++++++++--------- .../ScmVehicleGressionService.java | 23 +++--- 3 files changed, 59 insertions(+), 47 deletions(-) diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.java index 2716cb6d10..4e5f506ff6 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.java @@ -112,7 +112,7 @@ public interface ScmVehicleGressionMapper extends BaseMapper void updateStateBySid(@Param("sid") String sid, @Param("state") String state); - int selectNum(String bill); + String selectNum(String bill); List getlastTimeEqual(@Param("vinNo") String vinNo, @Param("targetLocationSid") String targetLocationSid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml index a7069bbcff..e62a3f7446 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml @@ -5,29 +5,34 @@ - SELECT - svg.sid, - svg.vinNo as vin, - svg.applicantNo as applyId, - if(length(svg.nodeState) > 0, nodeState, '待提交') as `state`, - if(length(svg.nodeState) > 0, false , true) as showDetectBtn, - if(length(svg.nodeState) > 0, false , true) as showUpdateBtn, - if(length(svg.nodeState) > 0, true , false) as showUploadBtn, - if(length(svg.nodeState) > 0, true , false) as showDownloadBtn, - svg.applicantName as applyName, - svg.applicantDate as applyDate, - svg.applicantFunds as applyPrice, - svg.temporaryCard as downloadUrl + SELECT svg.sid, + svg.vinNo as vin, + svg.applicantNo as applyId, + if(length(svg.nodeState) > 0, nodeState, '待提交') as `state`, + if(length(svg.nodeState) > 0, false, true) as showDetectBtn, + if(length(svg.nodeState) > 0, false, true) as showUpdateBtn, + if(length(svg.nodeState) > 0, true, false) as showUploadBtn, + if(length(svg.nodeState) > 0, true, false) as showDownloadBtn, + svg.applicantName as applyName, + svg.applicantDate as applyDate, + svg.applicantFunds as applyPrice, + svg.temporaryCard as downloadUrl FROM scm_vehicle_gression svg ${ew.sqlSegment} - - and concat(svg.applicantNo,svg.vinNo) LIKE concat('%', #{names}, '%') + + and concat(svg.applicantNo + , svg.vinNo) LIKE concat('%' + , #{names} + , '%') ORDER BY id DESC @@ -90,11 +97,12 @@ and find_in_set(sid, #{list}) - + select RIGHT(applicantNo, 4) from scm_vehicle_gression where applicantNo LIKE concat(#{bill}, '%') - order by id desc limit 1 + order by id desc + limit 1 UPDATE scm_vehicle_gression SET nodeState=#{nodeState} - , nodeId=#{taskDefKey} + , nodeId=#{taskDefKey} , procDefId=#{procDefId} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java index 0d1e198c0c..1937bbb429 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java @@ -29,11 +29,11 @@ import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.anrui.base.api.basevehicle.*; -import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel; -import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelDetailsVo; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo; +import com.yxt.anrui.base.api.basevehicle.ExiCarConfigDetailVo; +import com.yxt.anrui.base.api.basevehicle.VehicleGression; import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign; -import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyDto; import com.yxt.anrui.base.common.enums.BillTypeEnum; import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.base.common.utils.domain.BillNo; @@ -44,7 +44,6 @@ import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign; -import com.yxt.anrui.portal.api.dictcommon.DictCommonVo; import com.yxt.anrui.portal.api.sysorganization.SysOrganization; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; @@ -54,13 +53,11 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo; -import com.yxt.anrui.portal.config.DictCommonType; import com.yxt.anrui.scm.api.scmfile.ScmFile; import com.yxt.anrui.scm.api.scmvehiclegression.*; import com.yxt.anrui.scm.biz.scmfile.ScmFileService; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.DateUtils; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -362,10 +359,11 @@ public class ScmVehicleGressionService extends MybatisBaseService