更改

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<AppCompanyAdjustList> records = new ArrayList<>();
 }

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<AppSubVersionVo> getLastRiskByAppSid(@RequestParam("appSid") String appSid, @RequestParam("moduleAction")String moduleAction);
+    ResultBean<AppSubVersionVo> getLastRiskByAppSid(@RequestParam("appSid") String appSid, @RequestParam("moduleAction") String moduleAction);
 
 }

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,

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<LoanBeOverdueVehVo> listPageVo(PagerQuery<LoanBeOverdueVehQuery> pq) {
         LoanBeOverdueVehQuery query = pq.getParams();

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) <br/>
- * File: ScmVehicleEnterlibraryFeign.java <br/>
- * Class: scm.api.scmvehicleenterlibrary.ScmVehicleEnterlibraryFeign <br/>
- * Description: 入库单. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-06-06 09:53:39 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "入库单")
 @FeignClient(
         contextId = "scm-ScmVehicleEnterlibrary",

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<CompanyAdjustList> records = new ArrayList<>();
 }