From b4502917550327375c2298934315153a89a6091f Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Sun, 28 Apr 2024 13:42:47 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AA=8C=E8=BD=A6=E9=87=8D=E5=A4=8D=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E4=BF=AE=E6=94=B9=20=E5=9E=AB=E6=AC=BE=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E5=AF=BC=E5=85=A5=E4=BC=98=E5=8C=96=20=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E5=BC=80=E7=A5=A8=E6=8C=82=E8=BD=A6=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E9=87=91=E9=A2=9D=E8=8E=B7=E5=8F=96=E4=BF=AE=E6=94=B9=20?= =?UTF-8?q?=E6=97=A7=E4=BB=B6=E5=A4=84=E7=90=86=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusBillApplicationService.java | 4 ++-- .../LoanBePadsincereApplyService.java | 18 +++++++++++------- .../ScmVehicleExamineMapper.java | 1 - .../ScmVehicleExamineMapper.xml | 13 +++++++++++++ .../ScmVehicleExamineService.java | 17 +++++------------ .../AsOldparthandleApplyDetailsVo.java | 7 +++++++ .../AsOldparthandleApplyDto.java | 7 +++++++ 7 files changed, 45 insertions(+), 22 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java index 940bc87fa6..3fd746cec7 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java @@ -176,7 +176,7 @@ public class BusBillApplicationService extends MybatisBaseService loanRepaymentScheduleDetailsVos = loanRepaymentScheduleService.selectByBankContractNo(bePadsincereExcelInfo.getBankContractNo()); + if (loanRepaymentScheduleDetailsVos == null || loanRepaymentScheduleDetailsVos.size() == 0) { + if (StringUtils.isNotBlank(bePadsincereExcelInfo.getBankContractNo())) { + msg = msg + bePadsincereExcelInfo.getBankContractNo() + ","; + continue; + } + } for (LoanRepaymentScheduleDetailsVo loanRepaymentScheduleDetailsVo : loanRepaymentScheduleDetailsVos) { LoanBePadsincereVehDetailsVo loanBePadsincereVehDetailsVo = new LoanBePadsincereVehDetailsVo(); loanBePadsincereVehDetailsVo.setVinNo(loanRepaymentScheduleDetailsVo.getVinNo()); @@ -498,6 +505,10 @@ public class LoanBePadsincereApplyService extends MybatisBaseService loanRepaymentScheduleDetailsVos = loanRepaymentScheduleService.selectByBankContractNo(excelInfo.getBankContractNo()); - if (loanRepaymentScheduleDetailsVos == null || loanRepaymentScheduleDetailsVos.size() == 0) { - if (StringUtils.isNotBlank(excelInfo.getBankContractNo())) { - checkWord.add("资方合同号" + excelInfo.getBankContractNo() + "在还款计划表中不存在"); - break; - } - } } } StringBuffer sbcheck1 = new StringBuffer(); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.java index 5df10a5ecb..869badbc2a 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.java @@ -105,7 +105,6 @@ public interface ScmVehicleExamineMapper extends BaseMapper { @Select("SELECT count(*) FROM scm_vehicle_examine WHERE useOrgSid = #{useOrgSid} and inspectionResult = '1' ") int getToDoNum(@Param("useOrgSid") String useOrgSid); - @Select("SELECT count(*) FROM scm_vehicle_examine WHERE vinNo = #{vinNo} and useOrgSid = #{orgPath} and inspectionResult = '2' ") int getCountByVinNo(@Param("vinNo") String vinNo, @Param("orgPath") String orgPath); @Select("SELECT COUNT(*) FROM scm_vehicle_examine WHERE businessSid = #{businessSid} AND inspectionResult = 1") diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.xml index 4e14896353..9e52138480 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.xml @@ -118,4 +118,17 @@ ORDER BY id DESC + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java index 462bcc0f55..1cca55412c 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java @@ -546,12 +546,12 @@ public class ScmVehicleExamineService extends MybatisBaseService 0) { - return rb.setMsg("该车架号已存在，请勿重复验车！"); - } - }else { - return rb.setMsg("该车架号已存在，请勿重复验车！"); - } + int countByVinNo = baseMapper.getCountByVinNo(vinNo, orgSid); + if (countByVinNo > 0) { + return rb.setMsg("该车架号已存在，请勿重复验车！"); } String staffSid = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData().getStaffSid(); SysStaffinfoVo data = sysUserFeign.getSysUserByMobile(staffSid).getData(); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyDetailsVo.java index 2dd9278c72..9d76b05914 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyDetailsVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyDetailsVo.java @@ -59,12 +59,19 @@ public class AsOldparthandleApplyDetailsVo implements Vo { private String sid; // sid + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("制单人sid") + private String createBySid; @ApiModelProperty("制单人姓名") private String createByName; // 制单人姓名 @ApiModelProperty("发起部门sid") private String createDeptSid; // 发起部门sid @ApiModelProperty("发起部门名称") private String createDeptName; // 发起部门名称 + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("申请日期") + private Date createTime; @ApiModelProperty("单据编号") private String billNo; // 单据编号 @ApiModelProperty("附件路径(多个附件之间英文逗号隔开)") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyDto.java index 62aba3ce02..70ea517f4c 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyDto.java @@ -58,12 +58,19 @@ public class AsOldparthandleApplyDto implements Dto { private String sid; // sid + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("制单人sid") + private String createBySid; @ApiModelProperty("制单人姓名") private String createByName; // 制单人姓名 @ApiModelProperty("发起部门sid") private String createDeptSid; // 发起部门sid @ApiModelProperty("发起部门名称") private String createDeptName; // 发起部门名称 + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("申请日期") + private Date createTime; @ApiModelProperty("单据编号") private String billNo; // 单据编号 @ApiModelProperty("附件路径(多个附件之间英文逗号隔开)")