From a0a556ff061c0472d450a5c291dd0d615d79350f Mon Sep 17 00:00:00 2001 From: ligaode Date: Tue, 25 Mar 2025 15:39:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/baseaccadjapply/AppCompanyAdjustVo.java | 4 ++-- .../api/appsubsetversion/AppSubsetVersionFeign.java | 4 ++-- .../biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml | 6 ++++-- .../loanbeoverdueveh/LoanBeOverdueVehService.java | 2 -- .../ScmVehicleEnterlibraryFeign.java | 13 ------------- .../supplychain/companyAdjust/CompanyAdjustVo.java | 8 ++++---- 6 files changed, 12 insertions(+), 25 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/AppCompanyAdjustVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/AppCompanyAdjustVo.java index e721dfaf1e..b4cdd44422 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/AppCompanyAdjustVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/AppCompanyAdjustVo.java @@ -26,10 +26,10 @@ public class AppCompanyAdjustVo implements Vo { private String callOutOrgName; @ApiModelProperty("调车类型key") @JsonProperty("typeKey") - private String shuntingTypeKey; + private String accadjTypeKey; @ApiModelProperty("调车类型") @JsonProperty("type") - private String shuntingTypeValue; + private String accadjTypeValue; private List records = new ArrayList<>(); } diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/appsubsetversion/AppSubsetVersionFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/appsubsetversion/AppSubsetVersionFeign.java index 288215e29d..45a18a5c9e 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/appsubsetversion/AppSubsetVersionFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/appsubsetversion/AppSubsetVersionFeign.java @@ -38,7 +38,7 @@ public interface AppSubsetVersionFeign { @ResponseBody @PostMapping("/save") public ResultBean save(AppSubsetVersionDto appSubsetVersionDto); - + @ApiOperation(value = "更新主框架的子应用") @ResponseBody @PostMapping("/update") @@ -62,6 +62,6 @@ public interface AppSubsetVersionFeign { @ApiOperation("查询插件最新模块信息") @GetMapping("/getLastRiskByAppSid") - ResultBean getLastRiskByAppSid(@RequestParam("appSid") String appSid, @RequestParam("moduleAction")String moduleAction); + ResultBean getLastRiskByAppSid(@RequestParam("appSid") String appSid, @RequestParam("moduleAction") String moduleAction); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml index e543a7b405..c71747041d 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml @@ -36,7 +36,8 @@ lrpd.sid FROM loan_repayment_plan_details lrpd - WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') < CURDATE())), + WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') < CURDATE() + AND lrpd.busVinSid = a1.busVinSid)), 0 ) ) AS beOverdueMoney, @@ -59,7 +60,8 @@ lrpd.sid FROM loan_repayment_plan_details lrpd - WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') < CURDATE())), + WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') < CURDATE() + AND lrpd.busVinSid = a1.busVinSid)), 0 ) ) / a1.qjyh, diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehService.java index 3782464e6a..a461530ba7 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehService.java @@ -26,8 +26,6 @@ public class LoanBeOverdueVehService { private SysUserFeign sysUserFeign; @Autowired private LoanBeOverdueVehMapper loanBeOverdueVehMapper; - @Autowired - private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign; public PagerVo listPageVo(PagerQuery pq) { LoanBeOverdueVehQuery query = pq.getParams(); diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryFeign.java index 0e2fd00552..ea9afad34d 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryFeign.java @@ -35,19 +35,6 @@ import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; -/** - * Project: scm(scm)
- * File: ScmVehicleEnterlibraryFeign.java
- * Class: scm.api.scmvehicleenterlibrary.ScmVehicleEnterlibraryFeign
- * Description: 入库单.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-06-06 09:53:39
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Api(tags = "入库单") @FeignClient( contextId = "scm-ScmVehicleEnterlibrary", diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyAdjust/CompanyAdjustVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyAdjust/CompanyAdjustVo.java index 6e776e1776..7911e2c477 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyAdjust/CompanyAdjustVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyAdjust/CompanyAdjustVo.java @@ -20,16 +20,16 @@ public class CompanyAdjustVo implements Vo { private String procInsId; @ApiModelProperty("调入分公司名称") @JsonProperty("company2") - private String buyerOrgName; + private String callInOrgName; @ApiModelProperty("调出分公司名称") @JsonProperty("company") - private String sellerOrgName; + private String callOutOrgName; @ApiModelProperty("调车类型key") @JsonProperty("typeKey") - private String shuntingTypeKey; + private String accadjTypeKey; @ApiModelProperty("调车类型") @JsonProperty("type") - private String shuntingTypeValue; + private String accadjTypeValue; private List records = new ArrayList<>(); }