款项确认问题修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAppendixFeign.java

@@ -145,4 +145,9 @@ public interface CommonAppendixFeign {
     @ApiOperation("根据文件相对路径查询文件名称")
     @PostMapping("/fetchByFilePath")
     ResultBean<CommonAppendixVo> fetchByFilePath(@RequestParam(value = "s") String s);
+
+    @ApiOperation(value = "根据业务sid和附件类型批量删除")
+    @PostMapping("/delFilesByLinkSidAndAttachType")
+    ResultBean delFilesByLinkSidAndAttachType(@RequestParam(value = "linkSid") String linkSid,@RequestParam(value = "attachType") String attachType);
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAppendixFeignFallback.java

@@ -167,4 +167,9 @@ public class CommonAppendixFeignFallback implements CommonAppendixFeign {
 	public ResultBean<CommonAppendixVo> fetchByFilePath(String s) {
 		return null;
 	}
+
+	@Override
+	public ResultBean delFilesByLinkSidAndAttachType(String linkSid, String attachType) {
+		return null;
+	}
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixMapper.java

@@ -66,4 +66,7 @@ public interface CommonAppendixMapper extends BaseMapper<CommonAppendix> {
     CommonAppendixVo fetchByFilePath(String s);
 
     List<PrintConfirmVo> selectByType(@Param("sid") String sid, @Param("attachType") String attachType, @Param("path") String path);
+
+    @Delete("delete from common_appendix where linkSid = #{linkSid} and  attachType = #{attachType} ")
+    int delFilesByLinkSidAndAttachType(@Param("linkSid") String linkSid, @Param("attachType") String attachType);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixRest.java

@@ -247,4 +247,11 @@ public class CommonAppendixRest implements CommonAppendixFeign {
 	public ResultBean<CommonAppendixVo> fetchByFilePath(String s) {
 		return commonAppendixService.fetchByFilePath(s);
 	}
+
+	@Override
+	public ResultBean delFilesByLinkSidAndAttachType(String linkSid, String attachType) {
+		ResultBean rb = ResultBean.fireFail();
+		int i = commonAppendixService.delFilesByLinkSidAndAttachType(linkSid,attachType);
+		return rb.success().setMsg("删除成功");
+	}
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixService.java

@@ -489,4 +489,9 @@ public class CommonAppendixService extends MybatisBaseService<CommonAppendixMapp
     public List<PrintConfirmVo> selectByType(String sid, String attachType,String path) {
         return baseMapper.selectByType(sid,attachType,path);
     }
+
+    public int delFilesByLinkSidAndAttachType(String linkSid, String attachType) {
+        return baseMapper.delFilesByLinkSidAndAttachType(linkSid,attachType);
+
+    }
 }

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

@@ -57,7 +57,7 @@ public class AppFinCollectionConfirmationInitVo implements Vo {
     private List<String> payFiles = new ArrayList<>();
 
     @ApiModelProperty("款项明细")
-    private List<AppFinSelectedReceivablesDetailedDto> contractList = new ArrayList<>();
+    private List<AppFinSelectedReceivablesPaymentDetailsVo> contractList = new ArrayList<>();
 
     @ApiModelProperty("余额")
     private String balance;

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

@@ -41,12 +41,15 @@
     <select id="initCollectionConfirm"
             resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinCollectionConfirmationInitVo">
         SELECT sid                  AS collectionBillSid,
+               collectionBankNumKey AS collectionNumKey,
                collectionBankNum    AS collectionNum,
                collectionBank,
+               collectionBankKey,
                collectionTypeValue  AS collectionType,
+               collectionTypeKey    AS collectionTypeKey,
                collectionDate,
                payerName            AS paymentName,
-               collectionMoney,
+               collectionMoney      AS paymentMoney,
                remarks,
                balance
         FROM fin_collection_confirmation

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

@@ -54,6 +54,7 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -349,12 +350,26 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             BigDecimal balance = record.getBalance();
             int i = balance.intValue();
             int collectionBillState = record.getAuditState();
-            if (i <= 0 || collectionBillState == 1 || collectionBillState == 3) {
+            if (i <= 0) {
+                if (collectionBillState == 1 && collectionBillState == 3) {
                     record.setShowHandle(false);
                 }
+                record.setShowHandle(false);
+            } else {
+                record.setShowHandle(true);
+            }
+            if (collectionBillState == 3) {
                 record.setShowDownload(false);
+            }
             List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(record.getSid());
-            if (finSelectedReceivablesDetailedVos.size() > 0 || collectionBillState != 1) {
+            if (finSelectedReceivablesDetailedVos.size() > 0 || collectionBillState == 1) {
+                record.setShowDelete(false);
+            } else {
+                record.setShowDelete(true);
+            }
+            if (collectionBillState == 3) {
+                record.setShowDelete(true);
+            } else {
                 record.setShowDelete(false);
             }
         }
@@ -421,9 +436,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         if (subtract.compareTo(BigDecimal.ZERO) < 0) {
             return rb.setMsg("已选应收款项金额已超出该确认单应收金额总额，请重新核对");
         }
-        finCollectionConfirmation.setBalance(totalSubscriptionMone);
+        finCollectionConfirmation.setBalance(subtract);
         finCollectionConfirmation.setPaymentState(1);
-        finCollectionConfirmation.setAuditState(1);
         save(finCollectionConfirmation);
         return rb.success().setData(finCollectionConfirmation.getSid());
     }
@@ -439,6 +453,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         ResultBean<AppFinCollectionConfirmationInitVo> rb = ResultBean.fireFail();
         String useOrgSid = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
         AppFinCollectionConfirmationInitVo vo = baseMapper.initCollectionConfirm(collectionBillSid, useOrgSid);
+        List<AppFinSelectedReceivablesPaymentDetailsVo> list = finSelectedReceivablesDetailedService.selectByCollSid(collectionBillSid);
+        vo.setContractList(list);
         List<CommonAppendixVo> commonAppendixVoList = commonAppendixFeign.getAppAppendixList(vo.getCollectionBillSid(), CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType()).getData();
         List<String> payFiles = new ArrayList<>();
         for (CommonAppendixVo commonAppendixVo : commonAppendixVoList) {
@@ -446,6 +462,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             payFiles.add(url);
         }
         vo.setPayFiles(payFiles);
+        vo.setUserSid(userSid);
         return rb.success().setData(vo);
     }
 
@@ -458,6 +475,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
     public ResultBean<AppFinCollectionConfirmationDetailedVo> getCollectionConfirmDetail(String collectionBillSid) {
         ResultBean<AppFinCollectionConfirmationDetailedVo> rb = ResultBean.fireFail();
         AppFinCollectionConfirmationDetailedVo vo = baseMapper.getCollectionConfirmDetail(collectionBillSid);
+        List<AppFinSelectedReceivablesPaymentDetailsVo> list = finSelectedReceivablesDetailedService.selectByCollSid(collectionBillSid);
+        vo.setContractList(list);
         List<CommonAppendixVo> commonAppendixVoList = commonAppendixFeign.getAppAppendixList(vo.getSid(), CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType()).getData();
         List<String> payFiles = new ArrayList<>();
         for (CommonAppendixVo commonAppendixVo : commonAppendixVoList) {
@@ -486,6 +505,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         String staffSid = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData().getStaffSid();
         List<AppFinSelectedReceivablesDetailedDto> paymentDetails = dto.getContractList();
         CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
+        if (StringUtils.isBlank(dto.getCollectionBillSid())) {
             FinCollectionConfirmation finCollectionConfirmation = new FinCollectionConfirmation();
             BeanUtil.copyProperties(dto, finCollectionConfirmation);
             for (AppFinSelectedReceivablesDetailedDto paymentDetail : paymentDetails) {
@@ -499,7 +519,61 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 finSelectedReceivablesDetailed.setCustomerName(paymentDetail.getName());
                 finSelectedReceivablesDetailed.setCustomerPhone(paymentDetail.getMobile());
                 finSelectedReceivablesDetailed.setSubscriptionDate(paymentDetail.getConfirmDate());
-            finSelectedReceivablesDetailed.setCollSid(dto.getSid());
+                finSelectedReceivablesDetailed.setCollSid(dto.getCollectionBillSid());
+                finSelectedReceivablesDetailed.setAuditState(1);
+                finSelectedReceivablesDetailedService.save(finSelectedReceivablesDetailed);
+                //已选应收款项-车架号
+                String vin = finSelectedReceivablesDetailed.getVIN();
+                //已选应收款项-应收项目名称
+                String receivablesName = finSelectedReceivablesDetailed.getReceivablesName();
+                FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName);
+                //应收未收款项-当前应收金额
+                BigDecimal currentReceivableMoney = new BigDecimal(finUncollectedReceivablesDetailedVo.getCurrentReceivableMoney());
+                //已选应收款项-认款金额
+                BigDecimal subscriptionMoney = finSelectedReceivablesDetailed.getSubscriptionMoney();
+                BigDecimal subtract = currentReceivableMoney.subtract(subscriptionMoney);
+                if (subtract.compareTo(BigDecimal.ZERO) < 0) {
+                    return rb.setMsg("认款金额超出应收金额，请重新输入");
+                }
+                finUncollectedReceivablesDetailedVo.setCurrentReceivableMoney(String.format("%.0f", subtract));
+                FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto();
+                BeanUtil.copyProperties(finUncollectedReceivablesDetailedVo, finUncollectedReceivablesDetailedDto);
+                finUncollectedReceivablesDetailedService.updateBySid(finUncollectedReceivablesDetailedDto, finUncollectedReceivablesDetailedDto.getSid());
+            }
+            List<String> payConfirmFiles = dto.getPayConfirmFiles();
+            String remFilePath = "";
+            for (String payFilePath : payConfirmFiles) {
+                if (payFilePath != null) {
+                    remFilePath = payFilePath.replace(fileUploadComponent.getUrlPrefix(), "");
+                    commonAppendixDto.setLinkSid(dto.getSid());
+                    commonAppendixDto.setFilePath(payFilePath);
+                    commonAppendixDto.setCreateBySid(staffSid);
+                    commonAppendixDto.setFileName("汇款确认");
+                    commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
+                    commonAppendixFeign.save(commonAppendixDto);
+                }
+                remFilePath += remFilePath + ",";
+            }
+            finCollectionConfirmation.setRemittanceConfirmationUrl(remFilePath);
+            finCollectionConfirmation.setAuditState(1);
+            save(finCollectionConfirmation);
+        } else {
+            FinCollectionConfirmation finCollectionConfirmation = fetchBySid(dto.getCollectionBillSid());
+            BeanUtil.copyProperties(dto, finCollectionConfirmation, "sid");
+            finSelectedReceivablesDetailedService.deleteByCollSid(dto.getCollectionBillSid());
+            for (AppFinSelectedReceivablesDetailedDto paymentDetail : paymentDetails) {
+                FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = new FinSelectedReceivablesDetailed();
+                finSelectedReceivablesDetailed.setCurrentReceivableMoney(paymentDetail.getReceivable());
+                finSelectedReceivablesDetailed.setVIN(paymentDetail.getVin());
+                finSelectedReceivablesDetailed.setSubscriptionMoney(paymentDetail.getConfirmMoney());
+                finSelectedReceivablesDetailed.setContractNo(paymentDetail.getContractId());
+                finSelectedReceivablesDetailed.setReceivablesName(paymentDetail.getProjectName());
+                finSelectedReceivablesDetailed.setContractSid(paymentDetail.getContractSid());
+                finSelectedReceivablesDetailed.setCustomerName(paymentDetail.getName());
+                finSelectedReceivablesDetailed.setCustomerPhone(paymentDetail.getMobile());
+                finSelectedReceivablesDetailed.setSubscriptionDate(paymentDetail.getConfirmDate());
+                finSelectedReceivablesDetailed.setCollSid(dto.getCollectionBillSid());
+                finSelectedReceivablesDetailed.setAuditState(1);
                 finSelectedReceivablesDetailedService.save(finSelectedReceivablesDetailed);
                 //已选应收款项-车架号
                 String vin = finSelectedReceivablesDetailed.getVIN();
@@ -519,6 +593,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 BeanUtil.copyProperties(finUncollectedReceivablesDetailedVo, finUncollectedReceivablesDetailedDto);
                 finUncollectedReceivablesDetailedService.updateBySid(finUncollectedReceivablesDetailedDto, finUncollectedReceivablesDetailedDto.getSid());
             }
+            commonAppendixFeign.delFilesByLinkSidAndAttachType(dto.getCollectionBillSid(), CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
             List<String> payConfirmFiles = dto.getPayConfirmFiles();
             String remFilePath = "";
             for (String payFilePath : payConfirmFiles) {
@@ -534,6 +609,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 remFilePath += remFilePath + ",";
             }
             finCollectionConfirmation.setRemittanceConfirmationUrl(remFilePath);
+            finCollectionConfirmation.setAuditState(1);
+            updateById(finCollectionConfirmation);
+        }
         return rb.success();
     }
 
@@ -566,8 +644,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         }
         IPage<AppFinSelectedReceivablesPaymentDetailsQuery> page = PagerUtil.queryToPage(pagerQuery);
         QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw = appPaymentDetailsBuildQueryWrapper(pagerQuery.getParams());
-        List<String> sidList = pagerQuery.getParams().getSidList();
+        IPage<AppFinUncollectedReceivablesDetailedVo> collectionConfirmList = finSelectedReceivablesDetailedService.getPaymentDetailsList(page, qw);
-        IPage<AppFinUncollectedReceivablesDetailedVo> collectionConfirmList = finSelectedReceivablesDetailedService.getPaymentDetailsList(sidList, page, qw);
         List<AppFinUncollectedReceivablesDetailedVo> records = collectionConfirmList.getRecords();
         for (AppFinUncollectedReceivablesDetailedVo record : records) {
             record.setReceivable(record.getConfirmMoney());
@@ -586,10 +663,13 @@ 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("customerName", pagerQuery.getName());
+                qw.like("furd.customerName", pagerQuery.getName());
             }
             if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getUseOrgSid())) {
-                qw.eq("useOrgSid", pagerQuery.getUseOrgSid());
+                qw.eq("furd.useOrgSid", pagerQuery.getUseOrgSid());
+            }
+            if (pagerQuery.getSidList().size() > 0) {
+                qw.notIn("furd.contractSid", pagerQuery.getSidList());
             }
         }
         return qw;

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

@@ -79,7 +79,7 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper<FinSele
      * @param qw
      * @return
      */
-    IPage<AppFinUncollectedReceivablesDetailedVo> getPaymentDetailsList(@Param("sidList") List<String> sidList, IPage<AppFinSelectedReceivablesPaymentDetailsQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw);
+    IPage<AppFinUncollectedReceivablesDetailedVo> getPaymentDetailsList(IPage<AppFinSelectedReceivablesPaymentDetailsQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw);
 
 
     @Select("select * from fin_selected_receivables_detailed where collSid = #{sid} and auditState = #{auditState}")
@@ -94,4 +94,6 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper<FinSele
 
     @Update("update fin_selected_receivables_detailed set auditDate = NOW() where sid = #{sid1}")
     void updateAuditDateBySid(String sid1);
+
+    List<AppFinSelectedReceivablesPaymentDetailsVo> selectByCollSid(@Param("collectionBillSid") String collectionBillSid);
 }

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

@@ -28,16 +28,13 @@
         customerPhone AS mobile,
         customerName AS `name`,
         currentReceivableMoney AS receivable,
-        contractSid AS contractSid,
+        contractSid,
         currentReceivableMoney AS confirmMoney,
         VIN AS vin
         FROM
         fin_uncollected_receivables_detailed furd
         <where>
             ${ew.sqlSegment}
-            <foreach collection="sidList" item="sids" index="index" separator="," open="(" close=")">
-                #{sids}
-            </foreach>
         </where>
     </select>
 
@@ -62,4 +59,19 @@
                  receivablesName
         ORDER BY auditDate
     </select>
+    <select id="selectByCollSid"
+            resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsVo">
+        SELECT contractNo             as contractId,
+               receivablesName        as projectName,
+               customerPhone          as mobile,
+               customerName           as `name`,
+               currentReceivableMoney as receivable,
+               contractSid,
+               subscriptionMoney      as confirmMoney,
+               VIN                    as vin,
+               subscriptionDate       as confirmDate,
+               auditState             as `state`
+        FROM fin_selected_receivables_detailed
+        WHERE collSid = #{collectionBillSid}
+    </select>
 </mapper>

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

@@ -179,8 +179,8 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
      * @param qw
      * @return
      */
-    public IPage<AppFinUncollectedReceivablesDetailedVo> getPaymentDetailsList(List<String> sidList, IPage<AppFinSelectedReceivablesPaymentDetailsQuery> page, QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw) {
+    public IPage<AppFinUncollectedReceivablesDetailedVo> getPaymentDetailsList(IPage<AppFinSelectedReceivablesPaymentDetailsQuery> page, QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw) {
-        return baseMapper.getPaymentDetailsList(sidList, page, qw);
+        return baseMapper.getPaymentDetailsList(page, qw);
     }
 
     public List<FinSelectedReceivablesDetailedVo> fetchByAuditState(String sid,Integer auditState) {
@@ -202,4 +202,8 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
     public void updateAuditDateBySid(String sid1) {
         baseMapper.updateAuditDateBySid(sid1);
     }
+
+    public List<AppFinSelectedReceivablesPaymentDetailsVo> selectByCollSid(String collectionBillSid) {
+        return baseMapper.selectByCollSid(collectionBillSid);
+    }
 }