Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml

@@ -287,7 +287,7 @@
         from base_manufacturer
         where createOrg = #{orgSid}
           and manBankSid = #{mankSid}
-          and supplyTypeValue = #{type}
+          and supplierTypeValue = #{type}
         AND isDelete = 0
     </select>
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java

@@ -466,6 +466,9 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         String manBankSid = baseVehicleBrandService.selectByManufacturerSid(carBrandSid);
         if (StringUtils.isNotBlank(manBankSid)) {
             vo = baseMapper.getManufacturerSidAndSupplierSid(manBankSid, useOrgSid);
+            if(vo == null){
+                vo = new BaseManufacturerSidVo();
+            }
             vo.setManufacturerSid(manBankSid);
         }
         return rb.success().setData(vo);

anrui-base/anrui-base-biz/src/main/resources/application-test.yml

@@ -23,7 +23,7 @@ spring:
 
 image:
   upload:
-    path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload
+    path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload/
   url:
     prefix: http://anrui.yyundong.com/upload/
 templateUrl:

anrui-buscenter/anrui-buscenter-biz/src/main/resources/application-test.yml

@@ -23,7 +23,7 @@ spring:
 
 image:
   upload:
-    path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload
+    path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload/
   url:
     prefix: http://anrui.yyundong.com/upload/
 

anrui-crm/anrui-crm-biz/src/main/resources/application-test.yml

@@ -24,7 +24,7 @@ spring:
 
 image:
   upload:
-    path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload
+    path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload/
   url:
     prefix: http://anrui.yyundong.com/upload/
 

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDetailedVo.java

@@ -13,6 +13,9 @@ public class AppFinCollectionConfirmationDetailedVo implements Vo {
 
     private static final long serialVersionUID = 1283485126933789095L;
 
+
+    private String sid;
+
     @ApiModelProperty("收款银行")
     private String collectionBank;
 

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDto.java

@@ -1,11 +1,13 @@
 package com.yxt.anrui.fin.api.fincollectionconfirmation;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.AppFinSelectedReceivablesDetailedDto;
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 
 @Data
@@ -16,53 +18,55 @@ public class AppFinCollectionConfirmationDto implements Dto {
 
     @ApiModelProperty("收款银行")
     private String collectionBank;
-
     @ApiModelProperty("收款银行key")
     private String collectionBankKey;
 
-    @ApiModelProperty("汇款确认")
-    private List<String> payConfirmFiles;
-
     @ApiModelProperty("付款金额")
-    private BigDecimal paymentMoney;
+    @JsonProperty("paymentMoney")
+    private BigDecimal collectionMoney;
 
     @ApiModelProperty("收款日期")
     private String collectionDate;
 
     @ApiModelProperty("付款方名称")
-    private String paymentName;
+    @JsonProperty("paymentName")
+    private String payerName;
 
     @ApiModelProperty("收款账号")
-    private String collectionNum;
+    @JsonProperty("collectionNum")
+    private String collectionBankNum;
 
     @ApiModelProperty("收款账号key")
-    private String collectionNumKey;
+    @JsonProperty("collectionNumKey")
+    private String collectionBankNumKey;
 
     @ApiModelProperty("收款记录sid")
+    @JsonProperty("collectionBillSid")
     private String collectionBillSid;
 
-    @ApiModelProperty("下载模板")
-    private String downLoadUrl;
-
     @ApiModelProperty("备注")
     private String remarks;
 
     @ApiModelProperty("收款方式")
-    private String collectionType;
+    @JsonProperty("collectionType")
+    private String collectionTypeValue;
 
     @ApiModelProperty("收款方式key")
+    @JsonProperty("collectionTypeKey")
     private String collectionTypeKey;
 
-    @ApiModelProperty("打款凭证")
-    private List<String> payFiles;
-
-    @ApiModelProperty("款项明细")
-    private List<AppFinSelectedReceivablesDetailedDto> paymentDetail;
-
     @ApiModelProperty("余额")
     private String balance;
 
     @ApiModelProperty("用户sid")
     private String userSid;
 
+    @ApiModelProperty("汇款确认")
+    private List<String> payConfirmFiles = new ArrayList<>();
+
+    @ApiModelProperty("打款凭证")
+    private List<String> payFiles;
+
+    @ApiModelProperty("款项明细")
+    private List<AppFinSelectedReceivablesDetailedDto> contractList;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationInitVo.java

@@ -5,6 +5,7 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Data
@@ -20,7 +21,7 @@ public class AppFinCollectionConfirmationInitVo implements Vo {
     private String collectionBankKey;
 
     @ApiModelProperty("汇款确认")
-    private List<String> payConfirmFiles;
+    private List<String> payConfirmFiles = new ArrayList<>();
 
     @ApiModelProperty("付款金额")
     private String paymentMoney;
@@ -53,10 +54,10 @@ public class AppFinCollectionConfirmationInitVo implements Vo {
     private String collectionTypeKey;
 
     @ApiModelProperty("打款凭证")
-    private List<String> payFiles;
+    private List<String> payFiles = new ArrayList<>();
 
     @ApiModelProperty("款项明细")
-    private List<AppFinSelectedReceivablesDetailedDto> paymentDetail;
+    private List<AppFinSelectedReceivablesDetailedDto> contractList = new ArrayList<>();
 
     @ApiModelProperty("余额")
     private String balance;
@@ -65,5 +66,4 @@ public class AppFinCollectionConfirmationInitVo implements Vo {
     private String userSid;
 
 
-
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationPageVo.java

@@ -1,40 +1,44 @@
 package com.yxt.anrui.fin.api.fincollectionconfirmation;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Data
 public class AppFinCollectionConfirmationPageVo implements Vo {
 
     @ApiModelProperty("确认单sid")
-    private String collectionBillSid;
+    private String sid;
     @ApiModelProperty("收款账号")
-    private String collectionNum;
+    private String collectionBankNum;
-    @ApiModelProperty("状态")
+    @ApiModelProperty("审核状态")
-    private int collectionBillState;
+    private int auditState;
     @ApiModelProperty("收款银行")
     private String collectionBank;
     @ApiModelProperty("收款类型")
-    private String collectionType;
+    private String collectionTypeValue;
     @ApiModelProperty("收款时间")
     private String collectionDate;
-    @ApiModelProperty("付款人")
-    private String paymentName;
     @ApiModelProperty("收款金额")
     private String collectionMoney;
+    @ApiModelProperty("付款人")
+    private String payerName;
     @ApiModelProperty("备注")
     private String remarks;
-    @ApiModelProperty("余额")
+    @ApiModelProperty("认款状态")
-    private Integer balance;
+    private int paymentState;
     @ApiModelProperty("是否显示办理")
     private boolean showHandle;
     @ApiModelProperty("是否显示下载")
     private boolean showDownload;
     @ApiModelProperty("是否显示删除")
     private boolean showDelete;
-    @ApiModelProperty("认款状态")
+
-    private int state;
+    @ApiModelProperty("余额")
+    private BigDecimal balance;
 
 
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml

@@ -19,14 +19,14 @@
     <select id="getCollectionConfirmList"
             resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinCollectionConfirmationPageVo">
         SELECT
-        sid AS collectionBillSid,
+        sid,
-        collectionBankNum AS collectionNum,
+        collectionBankNum,
-        auditState AS collectionBillState,
+        auditState,
-        paymentState AS `state`,
+        paymentState,
         collectionBank,
-        collectionTypeValue AS collectionType,
+        collectionTypeValue,
         collectionDate,
-        payerName AS paymentName,
+        payerName,
         collectionMoney,
         remarks,
         balance
@@ -42,7 +42,6 @@
             resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinCollectionConfirmationInitVo">
         SELECT sid                 AS collectionBillSid,
                collectionBankNum   AS collectionNum,
-               subscriptionState   AS collectionBillState,
                collectionBank,
                collectionTypeValue AS collectionType,
                collectionDate,
@@ -56,7 +55,8 @@
     </select>
     <select id="getCollectionConfirmDetail"
             resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinCollectionConfirmationDetailedVo">
-        SELECT collectionBank,
+        SELECT sid,
+               collectionBank,
                collectionDate,
                payerName           AS paymentName,
                collectionBankNum   AS collectionNum,

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java

@@ -34,6 +34,7 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -132,7 +133,12 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF
      */
     @Override
     public ResultBean<AppFinCollectionConfirmationInitVo> initCollectionConfirm(String collectionBillSid, String userSid) {
-        return finCollectionConfirmationService.initCollectionConfirm(collectionBillSid, userSid);
+        ResultBean<AppFinCollectionConfirmationInitVo> rb = ResultBean.fireFail();
+        if (StringUtils.isBlank(userSid)) {
+            return rb.setMsg("用户sid不能为空");
+        }
+        AppFinCollectionConfirmationInitVo data = finCollectionConfirmationService.initCollectionConfirm(collectionBillSid, userSid).getData();
+        return rb.success().setData(data);
     }
 
     /**

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -346,13 +346,14 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         QueryWrapper<AppFinCollectionConfirmationPageVo> qw = appBuildQueryWrapper(pagerQuery.getParams());
         IPage<AppFinCollectionConfirmationPageVo> collectionConfirmList = baseMapper.getCollectionConfirmList(page, qw);
         for (AppFinCollectionConfirmationPageVo record : collectionConfirmList.getRecords()) {
-            Integer balance = record.getBalance();
+            BigDecimal balance = record.getBalance();
-            int collectionBillState = record.getCollectionBillState();
+            int i = balance.intValue();
-            if (balance <= 0 || collectionBillState == 1 || collectionBillState == 3) {
+            int collectionBillState = record.getAuditState();
+            if (i <= 0 || collectionBillState == 1 || collectionBillState == 3) {
                 record.setShowHandle(false);
             }
             record.setShowDownload(false);
-            List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(record.getCollectionBillSid());
+            List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(record.getSid());
             if (finSelectedReceivablesDetailedVos.size() > 0 || collectionBillState != 1) {
                 record.setShowDelete(false);
             }
@@ -369,8 +370,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
     private QueryWrapper<AppFinCollectionConfirmationPageVo> appBuildQueryWrapper(AppFinCollectionConfirmationQuery pagerQuery) {
         QueryWrapper<AppFinCollectionConfirmationPageVo> qw = new QueryWrapper<>();
         if (pagerQuery != null) {
-            if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getName())) {//车架号
+            if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getName())) {//付款方名称
-                qw.like("bv.vinNo", pagerQuery.getName());
+                qw.like("payerName", pagerQuery.getName());
             }
         }
         return qw;
@@ -386,27 +387,21 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
     public ResultBean addCollectionConfirm(AppFinCollectionConfirmationDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String staffSid = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData().getStaffSid();
+        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
         FinCollectionConfirmation finCollectionConfirmation = new FinCollectionConfirmation();
         CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
-        String sid = finCollectionConfirmation.getSid();
+        BeanUtil.copyProperties(dto, finCollectionConfirmation,"sid");
-        finCollectionConfirmation.setSid(sid);
+        finCollectionConfirmation.setUseOrgSid(useOrgSid);
-        finCollectionConfirmation.setCollectionDate(dto.getCollectionDate());
+
-        finCollectionConfirmation.setCollectionBank(dto.getCollectionBank());
-        finCollectionConfirmation.setCollectionBankNum(dto.getCollectionNum());
-        finCollectionConfirmation.setCollectionMoney(dto.getPaymentMoney());
-        finCollectionConfirmation.setCollectionTypeKey(dto.getCollectionTypeKey());
-        finCollectionConfirmation.setCollectionTypeValue(dto.getCollectionType());
-        finCollectionConfirmation.setPayerName(dto.getPaymentName());
-        finCollectionConfirmation.setCollectionMoney(dto.getPaymentMoney());
-        finCollectionConfirmation.setRemarks(dto.getRemarks());
         List<String> payFiles = dto.getPayFiles();
         String payFilePath = "";
         for (String payFile : payFiles) {
             if (payFile != null) {
                 payFilePath = payFile.replace(fileUploadComponent.getUrlPrefix(), "");
-                commonAppendixDto.setLinkSid(sid);
+                commonAppendixDto.setLinkSid(finCollectionConfirmation.getSid());
                 commonAppendixDto.setFilePath(payFilePath);
                 commonAppendixDto.setCreateBySid(staffSid);
+                commonAppendixDto.setFileName("打款凭证");
                 commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
                 commonAppendixFeign.save(commonAppendixDto);
             }
@@ -415,7 +410,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         if (StringUtils.isNotBlank(payFilePath)) {
             finCollectionConfirmation.setPaymentVoucherUrl(payFilePath);
         }
-        List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid);
+        List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(finCollectionConfirmation.getSid());
         BigDecimal totalSubscriptionMone = new BigDecimal(0);
         for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) {
             BigDecimal subscriptionMoney = new BigDecimal(finSelectedReceivablesDetailedVo.getSubscriptionMoney());
@@ -430,7 +425,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         finCollectionConfirmation.setPaymentState(1);
         finCollectionConfirmation.setAuditState(1);
         save(finCollectionConfirmation);
-        return rb.success();
+        return rb.success().setData(finCollectionConfirmation.getSid());
     }
 
     /**
@@ -442,11 +437,15 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
      */
     public ResultBean<AppFinCollectionConfirmationInitVo> initCollectionConfirm(String collectionBillSid, String userSid) {
         ResultBean<AppFinCollectionConfirmationInitVo> rb = ResultBean.fireFail();
-        if (StringUtils.isNotBlank(userSid)) {
-            return rb.fail().setMsg("用户sid不能为空");
-        }
         String useOrgSid = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
         AppFinCollectionConfirmationInitVo vo = baseMapper.initCollectionConfirm(collectionBillSid, useOrgSid);
+        List<CommonAppendixVo> commonAppendixVoList = commonAppendixFeign.getAppAppendixList(vo.getCollectionBillSid(), CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType()).getData();
+        List<String> payFiles = new ArrayList<>();
+        for (CommonAppendixVo commonAppendixVo : commonAppendixVoList) {
+            String url = fileUploadComponent.getUrlPrefix() + commonAppendixVo.getFilePath();
+            payFiles.add(url);
+        }
+        vo.setPayFiles(payFiles);
         return rb.success().setData(vo);
     }
 
@@ -458,15 +457,21 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
      */
     public ResultBean<AppFinCollectionConfirmationDetailedVo> getCollectionConfirmDetail(String collectionBillSid) {
         ResultBean<AppFinCollectionConfirmationDetailedVo> rb = ResultBean.fireFail();
-        List<String> payFiles = new ArrayList<>();
         AppFinCollectionConfirmationDetailedVo vo = baseMapper.getCollectionConfirmDetail(collectionBillSid);
-        if (StringUtils.isNotBlank(vo.getPaymentVoucherUrl())) {
+        List<CommonAppendixVo> commonAppendixVoList = commonAppendixFeign.getAppAppendixList(vo.getSid(), CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType()).getData();
-            String[] split = vo.getPaymentVoucherUrl().split(",");
+        List<String> payFiles = new ArrayList<>();
-            for (String s : split) {
+        for (CommonAppendixVo commonAppendixVo : commonAppendixVoList) {
-                payFiles.add(fileUploadComponent.getUrlPrefix() + s);
+            String url = fileUploadComponent.getUrlPrefix() + commonAppendixVo.getFilePath();
+            payFiles.add(url);
         }
         vo.setPayFiles(payFiles);
+        List<CommonAppendixVo> commonAppendixVoList1 = commonAppendixFeign.getAppAppendixList(vo.getSid(), CommonAttachTypeEnum.REMITTAN_CECONFIRMATION.getAttachType()).getData();
+        List<String> images = new ArrayList<>();
+        for (CommonAppendixVo commonAppendixVo : commonAppendixVoList1) {
+            String url = fileUploadComponent.getUrlPrefix() + commonAppendixVo.getFilePath();
+            images.add(url);
         }
+        vo.setImages(images);
         return rb.success().setData(vo);
     }
 
@@ -479,18 +484,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
     public ResultBean submitCollectionConfirm(AppFinCollectionConfirmationDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String staffSid = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData().getStaffSid();
-        List<AppFinSelectedReceivablesDetailedDto> paymentDetails = dto.getPaymentDetail();
+        List<AppFinSelectedReceivablesDetailedDto> paymentDetails = dto.getContractList();
         CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
         FinCollectionConfirmation finCollectionConfirmation = new FinCollectionConfirmation();
-        finCollectionConfirmation.setCollectionDate(dto.getCollectionDate());
+        BeanUtil.copyProperties(dto, finCollectionConfirmation);
-        finCollectionConfirmation.setCollectionBank(dto.getCollectionBank());
-        finCollectionConfirmation.setCollectionBankNum(dto.getCollectionNum());
-        finCollectionConfirmation.setCollectionMoney(dto.getPaymentMoney());
-        finCollectionConfirmation.setCollectionTypeKey(dto.getCollectionTypeKey());
-        finCollectionConfirmation.setCollectionTypeValue(dto.getCollectionType());
-        finCollectionConfirmation.setPayerName(dto.getPaymentName());
-        finCollectionConfirmation.setCollectionMoney(dto.getPaymentMoney());
-        finCollectionConfirmation.setRemarks(dto.getRemarks());
         for (AppFinSelectedReceivablesDetailedDto paymentDetail : paymentDetails) {
             FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = new FinSelectedReceivablesDetailed();
             finSelectedReceivablesDetailed.setCurrentReceivableMoney(paymentDetail.getReceivable());
@@ -530,6 +527,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 commonAppendixDto.setLinkSid(dto.getSid());
                 commonAppendixDto.setFilePath(payFilePath);
                 commonAppendixDto.setCreateBySid(staffSid);
+                commonAppendixDto.setFileName("汇款确认");
                 commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
                 commonAppendixFeign.save(commonAppendixDto);
             }
@@ -588,10 +586,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw = new QueryWrapper<>();
         if (pagerQuery != null) {
             if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getName())) {
-                qw.like("furd.name", pagerQuery.getName());
+                qw.like("customerName", pagerQuery.getName());
             }
             if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getUseOrgSid())) {
-                qw.eq("furd.useOrgSid", pagerQuery.getUseOrgSid());
+                qw.eq("useOrgSid", pagerQuery.getUseOrgSid());
             }
         }
         return qw;

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml

@@ -32,10 +32,13 @@
         currentReceivableMoney AS confirmMoney,
         VIN AS vin
         FROM
-        fin_uncollected_receivables_detailed furd WHERE furd.sid NOT IN
+        fin_uncollected_receivables_detailed furd
+        <where>
+            ${ew.sqlSegment}
             <foreach collection="sidList" item="sids" index="index" separator="," open="(" close=")">
                 #{sids}
             </foreach>
+        </where>
     </select>
 
     <select id="selectGroupConAndRecAndPay"

anrui-fin/anrui-fin-biz/src/main/resources/application-test.yml

@@ -21,6 +21,6 @@ spring:
     timeout: 0  # 连接超时时间（毫秒）
 image:
   upload:
-    path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload
+    path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload/
   url:
     prefix: http://anrui.yyundong.com/upload/

anrui-flowable/anrui-flowable-biz/src/main/resources/application-test.yml

@@ -23,7 +23,7 @@ spring:
 
 image:
   upload:
-    path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload
+    path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload/
   url:
     prefix: http://anrui.yyundong.com/upload/
 

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java

@@ -240,8 +240,8 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
         if (!oldPasswordMd5.equals(user.getPassword())) {
             return rb.setMsg("原始密码输入错误");
         }
-        if (!newPassword.matches("^(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])[a-zA-Z0-9]{8,10}$")) {
+        if (!newPassword.matches("^(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])[a-zA-Z0-9]{8,16}$")) {
-            return rb.setMsg("密码格式错误，必须为8至10位大小写字母和数字的组合");
+            return rb.setMsg("密码格式错误，必须为8至16位大小写字母和数字的组合");
         }
         int i = baseMapper.updatePasswordApp(user.getSid(), Encodes.md5(newPassword));
         SysUserVo sysUserVo = selectUserOne(user);
@@ -261,7 +261,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
             sysUserVo.setNeedResetPsd(isTrue);
         }
         if (i == 1) {
-            redisUtil.remove(token);
+//            redisUtil.remove(token);
             return rb.success().setData(sysUserVo);
         } else {
             return rb.setMsg("修改失败");

anrui-portal/anrui-portal-biz/src/main/resources/application-test.yml

@@ -23,7 +23,7 @@ spring:
 
 image:
   upload:
-    path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload
+    path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload/
   url:
     prefix: http://anrui.yyundong.com/upload/
   login:

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml

@@ -68,6 +68,7 @@
                   , '%')
             </if>
         </where>
+        GROUP BY svg.sid
         ORDER BY svg.id DESC
     </select>
 

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java

@@ -321,10 +321,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         for (AppScmVehicleGressionPageVo record : records) {
 
             List<ScmVehicleGressionVehVo> scmVehicleGressionVehVos = scmVehicleGressionVehService.selectInfoVoByMainSid(record.getSid());
-//            int size = vins.size();
+
-//            record.setVinNum(String.valueOf(size));
-//            String vin = StringUtils.join(vins, ",");
-//            record.setVin(vin);
             record.setScmVehicleGressionVehs(scmVehicleGressionVehVos);
 
             if ("已办结".equals(record.getState())) {

anrui-scm/anrui-scm-biz/src/main/resources/application-test.yml

@@ -21,6 +21,6 @@ spring:
     timeout: 0  # 连接超时时间（毫秒）
 image:
   upload:
-    path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload
+    path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload/
   url:
     prefix: http://anrui.yyundong.com/upload/

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeign.java

@@ -82,7 +82,7 @@ public interface AppFinCollectionConfirmationFeign {
 
     @ApiOperation("手机端—查询可使用款项明细列表")
     @PostMapping("/getPaymentDetailsList")
-    public ResultBean<PagerVo<AppFinUncollectedReceivablesDetailedVo>> getPaymentDetailsList(@RequestBody PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery);
+    public ResultBean<PagerVo<UncollectedReceivablesDetailedVo>> getPaymentDetailsList(@RequestBody PagerQuery<ReceivablesPaymentDetailsQuery> pagerQuery);
 
     @ApiOperation("app获取客户账单列表")
     @PostMapping("/getCustomerBillList")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeignFallback.java

@@ -80,7 +80,7 @@ public class AppFinCollectionConfirmationFeignFallback implements AppFinCollecti
 	}
 
 	@Override
-	public ResultBean<PagerVo<AppFinUncollectedReceivablesDetailedVo>> getPaymentDetailsList(PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
+	public ResultBean<PagerVo<UncollectedReceivablesDetailedVo>> getPaymentDetailsList(PagerQuery<ReceivablesPaymentDetailsQuery> pagerQuery) {
 		return null;
 	}
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDto.java

@@ -1,11 +1,13 @@
 package com.yxt.anrui.terminal.api.finance.collectionConfirm;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.AppFinSelectedReceivablesDetailedDto;
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 
 @Data
@@ -22,43 +24,47 @@ public class ConfirmationDto implements Dto {
     private String collectionBankKey;
 
     @ApiModelProperty("汇款确认")
-    private List<String> payConfirmFiles;
+    private List<String> payConfirmFiles = new ArrayList<>();
 
     @ApiModelProperty("付款金额")
-    private BigDecimal paymentMoney;
+    @JsonProperty("paymentMoney")
+    private BigDecimal collectionMoney;
 
     @ApiModelProperty("收款日期")
     private String collectionDate;
 
     @ApiModelProperty("付款方名称")
-    private String paymentName;
+    @JsonProperty("paymentName")
+    private String payerName;
 
     @ApiModelProperty("收款账号")
-    private String collectionNum;
+    @JsonProperty("collectionNum")
+    private String collectionBankNum;
 
     @ApiModelProperty("收款账号key")
-    private String collectionNumKey;
+    @JsonProperty("collectionNumKey")
+    private String collectionBankNumKey;
 
     @ApiModelProperty("收款记录sid")
+    @JsonProperty("collectionBillSid")
     private String collectionBillSid;
 
-    @ApiModelProperty("下载模板")
-    private String downLoadUrl;
-
     @ApiModelProperty("备注")
     private String remarks;
 
     @ApiModelProperty("收款方式")
-    private String collectionType;
+    @JsonProperty("collectionType")
+    private String collectionTypeValue;
 
     @ApiModelProperty("收款方式key")
+    @JsonProperty("collectionTypeKey")
     private String collectionTypeKey;
 
     @ApiModelProperty("打款凭证")
     private List<String> payFiles;
 
     @ApiModelProperty("款项明细")
-    private List<AppFinSelectedReceivablesDetailedDto> paymentDetail;
+    private List<AppFinSelectedReceivablesDetailedDto> contractList;
 
     @ApiModelProperty("余额")
     private String balance;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationInitVo.java

@@ -5,6 +5,7 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Data
@@ -21,7 +22,7 @@ public class ConfirmationInitVo implements Vo {
     private String collectionBankKey;
 
     @ApiModelProperty("汇款确认")
-    private List<String> payConfirmFiles;
+    private List<String> payConfirmFiles = new ArrayList<>();
 
     @ApiModelProperty("付款金额")
     private String paymentMoney;
@@ -54,10 +55,10 @@ public class ConfirmationInitVo implements Vo {
     private String collectionTypeKey;
 
     @ApiModelProperty("打款凭证")
-    private List<String> payFiles;
+    private List<String> payFiles = new ArrayList<>() ;
 
     @ApiModelProperty("款项明细")
-    private List<AppFinSelectedReceivablesDetailedDto> paymentDetail;
+    private List<AppFinSelectedReceivablesDetailedDto> contractList = new ArrayList<>();
 
     @ApiModelProperty("余额")
     private String balance;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationPageVo.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.api.finance.collectionConfirm;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,31 +11,38 @@ public class ConfirmationPageVo implements Vo {
     private static final long serialVersionUID = -4426699322787264581L;
 
     @ApiModelProperty("确认单sid")
-    private String collectionBillSid;
+    @JsonProperty("collectionBillSid")
+    private String sid;
     @ApiModelProperty("收款账号")
-    private String collectionNum;
+    @JsonProperty("collectionNum")
-    @ApiModelProperty("状态")
+    private String collectionBankNum;
-    private String collectionBillState;
+
+    @ApiModelProperty("审核状态")
+    @JsonProperty("collectionBillState")
+    private String auditState;
+
     @ApiModelProperty("收款银行")
     private String collectionBank;
     @ApiModelProperty("收款类型")
-    private String collectionType;
+    @JsonProperty("collectionType")
+    private String collectionTypeValue;
     @ApiModelProperty("收款时间")
     private String collectionDate;
-    @ApiModelProperty("付款人")
-    private String paymentName;
     @ApiModelProperty("收款金额")
     private String collectionMoney;
+    @ApiModelProperty("付款人")
+    @JsonProperty("paymentName")
+    private String payerName;
     @ApiModelProperty("备注")
     private String remarks;
-    @ApiModelProperty("余额")
+    @ApiModelProperty("认款状态")
-    private Integer balance;
+    @JsonProperty("state")
+    private String paymentState;
     @ApiModelProperty("是否显示办理")
     private boolean showHandle;
     @ApiModelProperty("是否显示下载")
     private boolean showDownload;
     @ApiModelProperty("是否显示删除")
     private boolean showDelete;
-    @ApiModelProperty("认款状态")
+
-    private String state;
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationRest.java

@@ -131,7 +131,7 @@ public class AppFinCollectionConfirmationRest implements AppFinCollectionConfirm
      * @return
      */
     @Override
-    public ResultBean<PagerVo<AppFinUncollectedReceivablesDetailedVo>> getPaymentDetailsList(PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
+    public ResultBean<PagerVo<UncollectedReceivablesDetailedVo>> getPaymentDetailsList(PagerQuery<ReceivablesPaymentDetailsQuery> pagerQuery) {
         return appfinCollectionConfirmationService.getPaymentDetailsList(pagerQuery);
     }
 

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationService.java

@@ -27,9 +27,14 @@ package com.yxt.anrui.terminal.biz.finance.collectionConfirm;
 
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*;
+import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExaminePageQuery;
+import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExaminePageVo;
+import com.yxt.anrui.terminal.api.autoservice.intermediary.MiddlemanVo;
 import com.yxt.anrui.terminal.api.finance.collectionConfirm.*;
+import com.yxt.anrui.terminal.api.supplychain.scmvehicleexamine.AppExaminePageVo;
 import com.yxt.anrui.terminal.config.CoverUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -38,6 +43,11 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
 /**
  * Project: anrui-fin(销售相关) <br/>
  * File: FinCollectionConfirmationService.java <br/>
@@ -68,9 +78,12 @@ public class AppFinCollectionConfirmationService {
     public ResultBean<PagerVo<ConfirmationPageVo>> getCollectionConfirmList(PagerQuery<ConfirmationPageQuery> pagerQuery) {
         ResultBean<PagerVo<ConfirmationPageVo>> rb = ResultBean.fireFail();
         PagerQuery<AppFinCollectionConfirmationQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
-        ResultBean<PagerVo<AppFinCollectionConfirmationPageVo>> collectionConfirmList = finCollectionConfirmationFeign.getCollectionConfirmList(pq);
+        ResultBean<PagerVo<AppFinCollectionConfirmationPageVo>> resultBean = finCollectionConfirmationFeign.getCollectionConfirmList(pq);
-        PagerVo<ConfirmationPageVo> vo = CoverUtils.selectPagerVo(collectionConfirmList.getData());
+        List<ConfirmationPageVo> voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), ConfirmationPageVo.class)).collect(Collectors.toList());
-        return rb.success().setData(vo);
+        PagerVo<ConfirmationPageVo> v = new PagerVo<>();
+        BeanUtil.copyProperties(resultBean.getData(), v);
+        v.setRecords(voList);
+        return rb.success().setData(v);
     }
 
     /**
@@ -153,8 +166,12 @@ public class AppFinCollectionConfirmationService {
      * @param pagerQuery
      * @return
      */
-    public ResultBean<PagerVo<AppFinUncollectedReceivablesDetailedVo>> getPaymentDetailsList(PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
+    public ResultBean<PagerVo<UncollectedReceivablesDetailedVo>> getPaymentDetailsList(PagerQuery<ReceivablesPaymentDetailsQuery> pagerQuery) {
-        return finCollectionConfirmationFeign.getPaymentDetailsList(pagerQuery);
+        ResultBean<PagerVo<UncollectedReceivablesDetailedVo>> rb = ResultBean.fireFail();
+        PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
+        ResultBean<PagerVo<AppFinUncollectedReceivablesDetailedVo>> paymentDetailsList = finCollectionConfirmationFeign.getPaymentDetailsList(pq);
+        PagerVo<UncollectedReceivablesDetailedVo> vo = CoverUtils.selectPagerVo(paymentDetailsList.getData());
+        return rb.success().setData(vo);
     }
 
     /**

anrui-terminal/anrui-terminal-biz/src/main/resources/application-test.yml

@@ -19,7 +19,7 @@ spring:
 
 image:
   upload:
-    path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload
+    path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload/
   url:
     prefix: http://anrui.yyundong.com/upload/