排产、财务出纳

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java

@@ -40,9 +40,9 @@ public class BusVehicleApply extends BaseEntity {
     @ApiModelProperty("申请编号")
     private String applicationCode;
     @ApiModelProperty("创建组织sid")
-    private String createByDeptSid;
+    private String createOrgSid;
     @ApiModelProperty("当前订金金额")
-    private BigDecimal currentAmount;
+    private Integer currentAmount;
 
     @ApiModelProperty(value = "节点状态")
     private String nodeState;
@@ -55,4 +55,7 @@ public class BusVehicleApply extends BaseEntity {
     @ApiModelProperty(value = "任务id")
     private String taskId;
 
+    @ApiModelProperty(value = "分公司名称")
+    private String createOrgName;
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java

@@ -18,6 +18,8 @@ import java.util.List;
 @Data
 public class BusVehicleApplyDetailsVo implements Vo {
     private static final long serialVersionUID = 4245006554844990468L;
+    @ApiModelProperty(value = "sid")
+    private String sid;
     @ApiModelProperty(value = "任务id")
     private String taskId;
     @ApiModelProperty(value = "流程实例id")
@@ -40,5 +42,10 @@ public class BusVehicleApplyDetailsVo implements Vo {
     @JsonSerialize(using = ToStringSerializer.class)
     private String currentAmount;
     @ApiModelProperty("车辆排产申请详情")
-    private List<BusVehicleApplyDetailVo> busVehicleApplyDetailVoList = new ArrayList<>();
+    private List<BusVehicleApplyDetailVo> busVehicleApplyDetailList = new ArrayList<>();
+
+    @ApiModelProperty(value = "分公司名称")
+    private String createOrgName;
+    @ApiModelProperty(value = "分公司sid")
+    private String createOrgSid;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java

@@ -7,7 +7,9 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
 import java.util.List;
 
 /**
@@ -46,9 +48,14 @@ public class BusVehicleApplyDto implements Dto {
     @ApiModelProperty("当前订金金额")
     private String currentAmount;
     @ApiModelProperty("车辆排产申请详情")
-    private List<BusVehicleApplyDetailDto> busVehicleApplyDetailDtoList;
+    private List<BusVehicleApplyDetailDto> busVehicleApplyDetailList;
 
     @ApiModelProperty("销售订单sid 可为空，只有客户订单时才有")
     private String salesSid;
 
+    @ApiModelProperty(value = "分公司sid")
+    private String createOrgSid;
+    @ApiModelProperty(value = "分公司名称")
+    private String createOrgName;
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java

@@ -47,7 +47,7 @@ public interface BusVehicleApplyFeign {
 
     @ApiOperation("新增修改")
     @PostMapping("/saveOrUpdate")
-    ResultBean<String> saveOrUpdate(@RequestBody BusVehicleApplyDto dto);
+    ResultBean<String> saveOrUpdate(@Valid @RequestBody BusVehicleApplyDto dto);
 
     @ApiOperation("获取一条记录")
     @GetMapping("/fetchSid/{sid}")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyVo.java

@@ -39,22 +39,7 @@ public class BusVehicleApplyVo implements Vo {
     private String remarks;
     @ApiModelProperty("申请金额")
     private String applyForDeposit;
-    /* @ApiModelProperty("本次需使用金额")
-     private String amountToBeUsedThisTime;
-     @ApiModelProperty("本次申请金额")
-     private String amountAppliedThisTime;*/
-   /* @ApiModelProperty("申请人sid")
-    private String createBySid;
-    @ApiModelProperty("销售订单sid 可为空，只有客户订单时才有")
-    private String salesSid;
-    @ApiModelProperty("创建组织sid")
-    private String createByDeptSid;
-    @ApiModelProperty("当前订金金额")
-    private String currentAmount;
-    @ApiModelProperty("内部编码")
-    private String insideCode;
-
-    @ApiModelProperty("车辆排产申请详情")
-    private List<BusVehicleApplyDetailVo> busVehicleApplyDetailVoList;*/
+    @ApiModelProperty(value = "分公司")
+    private String createOrgName;
 
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetail.java

@@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 /**
  * Project: anrui-scm(进销存) <br/>
  * File: BusVehicleApplyDetail.java <br/>
@@ -36,7 +34,7 @@ public class BusVehicleApplyDetail extends BaseEntity {
 	@ApiModelProperty("排产数量")
     private String quantity;
     @ApiModelProperty("使用订金")
-    private BigDecimal useDeposit;
+    private Integer useDeposit;
     @ApiModelProperty("销售指导价")
     private String saleGuPrice;
     @ApiModelProperty("常用配置sid")
@@ -44,9 +42,9 @@ public class BusVehicleApplyDetail extends BaseEntity {
     @ApiModelProperty("常用配置名称")
     private String configName;
     @ApiModelProperty("申请订金")
-    private BigDecimal applyForDeposit;
+    private Integer applyForDeposit;
     @ApiModelProperty("内部编码")
     private String insideCode;
     @ApiModelProperty(value = "厂家合同价")
-    private BigDecimal contractPrice;
+    private Integer contractPrice;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailDto.java

@@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.Pattern;
+
 /**
  * Project: anrui-scm(进销存) <br/>
  * File: BusVehicleApplyDetailDto.java <br/>
@@ -24,6 +26,7 @@ import lombok.Data;
 public class BusVehicleApplyDetailDto implements Dto {
 
 
+    private static final long serialVersionUID = 2709166242374552195L;
     @ApiModelProperty("排产申请sid")
     private String applySid;
     @ApiModelProperty("车型sid")

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java

@@ -222,7 +222,7 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService<BaseMa
             List<BusVehicleOrderListDto> dtoList = new ArrayList<>();
             //根据申请人查询分公司sid
             ResultBean<String> stringResultBean = sysStaffOrgFeign.getPathSidByUserSid(busVehicleApplyDetailsVo.getCreateBySid());
-            List<BusVehicleApplyDetailVo> busVehicleApplyDetailVoList = busVehicleApplyDetailsVo.getBusVehicleApplyDetailVoList();
+            List<BusVehicleApplyDetailVo> busVehicleApplyDetailVoList = busVehicleApplyDetailsVo.getBusVehicleApplyDetailList();
             busVehicleApplyDetailVoList.removeAll(Collections.singleton(null));
             for (BusVehicleApplyDetailVo vo : busVehicleApplyDetailVoList) {
                 BusVehicleOrderListDto listDto = new BusVehicleOrderListDto();

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml

@@ -10,7 +10,9 @@
                         bva.applicationDate,
                         bva.createByName,
                         bva.remarks,
-                        if(length(nodeState) > 0, nodeState, '待提交') as nodeState
+                        if(length(nodeState) > 0, nodeState, '待提交') as nodeState,
+                        bva.createOrgName,
+                        bva.currentAmount                              applyForDeposit
         FROM bus_vehicle_apply bva
                  LEFT JOIN bus_vehicle_apply_detail bvad
                            ON bva.sid = bvad.`applySid`

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@@ -19,6 +19,8 @@ import com.yxt.anrui.base.biz.busvehicleapplydetail.BusVehicleApplyDetailService
 import com.yxt.anrui.base.common.enums.BillTypeEnum;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.base.common.utils.domain.BillNo;
+import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordDto;
+import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordFeign;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
@@ -76,6 +78,8 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
     private BaseManufactorSubscriptionService baseManufactorSubscriptionService;
     @Autowired
     private SysOrganizationFeign sysOrganizationFeign;
+    @Autowired
+    private FinPaymentrecordFeign finPaymentrecordFeign;
 
     /**
      * 分页列表
@@ -103,20 +107,6 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         qw.orderByDesc("bva.id");
         IPage<BusVehicleApply> page = PagerUtil.queryToPage(pq);
         IPage<BusVehicleApplyVo> pagging = baseMapper.selectPageVo(page, qw);
-        List<BusVehicleApplyVo> voList = pagging.getRecords();
-        voList.removeAll(Collections.singleton(null));
-        for (BusVehicleApplyVo v : voList) {
-            List<BusVehicleApplyDetailVo> vo = busVehicleApplyDetailService.fetchByApplySid(v.getSid());
-            vo.removeAll(Collections.singleton(null));
-            BigDecimal bigDecimal = new BigDecimal("0");
-            for (BusVehicleApplyDetailVo o : vo) {
-                String applyForDeposit = o.getApplyForDeposit();
-                if (StringUtils.isNotBlank(applyForDeposit)) {
-                    bigDecimal = bigDecimal.add(new BigDecimal(applyForDeposit));
-                }
-            }
-            v.setApplyForDeposit(bigDecimal.toString());
-        }
         PagerVo<BusVehicleApplyVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
@@ -150,7 +140,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         BusVehicleApply busVehicleApply = this.fetchBySid(sid);
         BeanUtil.copyProperties(busVehicleApply, busVehicleApplyDetailsVo);
         List<BusVehicleApplyDetailVo> busVehicleApplyDetailVos = busVehicleApplyDetailService.fetchByApplySid(sid);
-        busVehicleApplyDetailsVo.setBusVehicleApplyDetailVoList(busVehicleApplyDetailVos);
+        busVehicleApplyDetailsVo.setBusVehicleApplyDetailList(busVehicleApplyDetailVos);
         return busVehicleApplyDetailsVo;
     }
 
@@ -159,7 +149,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         BusVehicleApply busVehicleApply = baseMapper.selectByCode(code);
         BeanUtil.copyProperties(busVehicleApply, busVehicleApplyDetailsVo);
         List<BusVehicleApplyDetailVo> busVehicleApplyDetailVos = busVehicleApplyDetailService.fetchByApplySid(busVehicleApply.getSid());
-        busVehicleApplyDetailsVo.setBusVehicleApplyDetailVoList(busVehicleApplyDetailVos);
+        busVehicleApplyDetailsVo.setBusVehicleApplyDetailList(busVehicleApplyDetailVos);
         return busVehicleApplyDetailsVo;
     }
 
@@ -181,21 +171,21 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             String billNo = getApplyCode(dto);
             entity.setApplicationCode(billNo);
             entity.setApplicationDate(DateUtil.today());
-            BigDecimal bigDecimalAll = new BigDecimal("0");
-            List<BusVehicleApplyDetailDto> busVehicleApplyDetailDtoList = dto.getBusVehicleApplyDetailDtoList();
+            int i = 0;
+            List<BusVehicleApplyDetailDto> busVehicleApplyDetailDtoList = dto.getBusVehicleApplyDetailList();
             for (BusVehicleApplyDetailDto busVehicleApplyDetailDto : busVehicleApplyDetailDtoList) {
                 BusVehicleApplyDetail busVehicleApplyDetail = new BusVehicleApplyDetail();
                 BeanUtil.copyProperties(busVehicleApplyDetailDto, busVehicleApplyDetail, "sid");
                 busVehicleApplyDetail.setApplySid(entity.getSid());
                 if (StringUtils.isNotBlank(busVehicleApplyDetailDto.getApplyForDeposit())) {
-                    bigDecimalAll = bigDecimalAll.add(new BigDecimal(busVehicleApplyDetailDto.getApplyForDeposit()));
+                    i = i + Integer.valueOf(busVehicleApplyDetailDto.getApplyForDeposit()).intValue();
                 }
                 busVehicleApplyDetailService.insert(busVehicleApplyDetail);
             }
-            if (bigDecimalAll.compareTo(new BigDecimal(dto.getCurrentAmount())) != 0) {
+            if (i != Integer.valueOf(dto.getCurrentAmount()).intValue()) {
                 return rb.setMsg("申请订金合计计算错误");
             }
-            entity.setCurrentAmount(bigDecimalAll);
+            entity.setCurrentAmount(i);
             baseMapper.insert(entity);
             sid = entity.getSid();
         } else {//修改
@@ -205,21 +195,23 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             }
             BeanUtil.copyProperties(dto, busVehicleApply);
             busVehicleApplyDetailService.delByApplySid(dto.getSid());
-            BigDecimal bigDecimalAll = new BigDecimal("0");
-            List<BusVehicleApplyDetailDto> busVehicleApplyDetailDtoList = dto.getBusVehicleApplyDetailDtoList();
+            int i = 0;
+            List<BusVehicleApplyDetailDto> busVehicleApplyDetailDtoList = dto.getBusVehicleApplyDetailList();
             for (BusVehicleApplyDetailDto busVehicleApplyDetailDto : busVehicleApplyDetailDtoList) {
                 BusVehicleApplyDetail busVehicleApplyDetail = new BusVehicleApplyDetail();
                 BeanUtil.copyProperties(busVehicleApplyDetailDto, busVehicleApplyDetail, "sid");
                 busVehicleApplyDetail.setApplySid(dto.getSid());
-                if (StringUtils.isNotBlank(busVehicleApplyDetailDto.getApplyForDeposit())) {
-                    bigDecimalAll = bigDecimalAll.add(new BigDecimal(busVehicleApplyDetailDto.getApplyForDeposit()));
+//                NumberFormat numberFormat2 = NumberFormat.getNumberInstance();
+//                numberFormat2.setGroupingUsed(false);
+                if (busVehicleApplyDetailDto.getApplyForDeposit() != null) {
+                    i = i + Integer.valueOf(busVehicleApplyDetailDto.getApplyForDeposit()).intValue();
                 }
                 busVehicleApplyDetailService.insert(busVehicleApplyDetail);
             }
-            if (bigDecimalAll.compareTo(new BigDecimal(dto.getCurrentAmount())) != 0) {
+            if (i != Integer.valueOf(dto.getCurrentAmount()).intValue()) {
                 return rb.setMsg("申请订金合计计算错误");
             }
-            busVehicleApply.setCurrentAmount(bigDecimalAll);
+            busVehicleApply.setCurrentAmount(i);
             baseMapper.updateById(busVehicleApply);
 
         }
@@ -397,6 +389,20 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
                 baseManufactorSubscriptionDto.setPaymentMoney(bigDecimal.toString());//打款金额
                 baseManufactorSubscriptionDto.setProSchAppNo(busVehicleApply.getApplicationCode());//排产申请编号
                 ResultBean r = baseManufactorSubscriptionService.saveDto(baseManufactorSubscriptionDto);
+
+                //推送到财务出纳
+                FinPaymentrecordDto finPaymentrecordDto = new FinPaymentrecordDto();
+                finPaymentrecordDto.setApplySid(busVehicleApply.getSid());
+                finPaymentrecordDto.setPayCompanySid(busVehicleApply.getCreateOrgSid());
+                finPaymentrecordDto.setPayType(1);
+                finPaymentrecordDto.setCreateOrgSid(stringResultBean.getData());
+                finPaymentrecordDto.setUseOrgSid(stringResultBean.getData());
+                finPaymentrecordDto.setCost(busVehicleApply.getCurrentAmount().intValue());
+                finPaymentrecordDto.setCostTitleKey("1");
+                finPaymentrecordDto.setCostTitleValue("车款");
+                finPaymentrecordDto.setCostTypeKey("2");
+                finPaymentrecordDto.setCostTypeValue("排产");
+                finPaymentrecordFeign.save(finPaymentrecordDto);
             }
             return rb.success().setData(resultBean.getData());
         } else {
@@ -521,7 +527,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         if (StringUtils.isBlank(query.getUserSid())) {
             return rb.setMsg("参数错误：userSid");
         }
-        if(StringUtils.isBlank(query.getComment())){
+        if (StringUtils.isBlank(query.getComment())) {
             return rb.setMsg("请填写意见");
         }
         BusVehicleApply busVehicleApply = fetchBySid(query.getBusinessSid());

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailService.java

@@ -17,6 +17,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -121,6 +122,20 @@ public class BusVehicleApplyDetailService extends MybatisBaseService<BusVehicleA
 
     public List<BusVehicleApplyDetailVo> fetchByApplySid(String sid) {
         List<BusVehicleApplyDetailVo> busVehicleApplyDetailVos = baseMapper.fetchByApplySid(sid);
+        busVehicleApplyDetailVos.removeAll(Collections.singleton(null));
+        if (!busVehicleApplyDetailVos.isEmpty()) {
+            for (BusVehicleApplyDetailVo vo : busVehicleApplyDetailVos) {
+                if (vo.getApplyForDeposit() != null) {
+//                    vo.setApplyForDeposit(DecimalFormat.getNumberInstance().format(Integer.valueOf(vo.getApplyForDeposit()).intValue()));
+                    vo.setApplyForDeposit(vo.getApplyForDeposit());
+                }
+                if (vo.getApplyForDeposit() != null) {
+//                    vo.setContractPrice(DecimalFormat.getNumberInstance().format(Integer.valueOf(vo.getContractPrice()).intValue()));
+                    vo.setContractPrice(vo.getContractPrice());
+                }
+
+            }
+        }
         return busVehicleApplyDetailVos;
     }
 

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapply.java

@@ -65,7 +65,7 @@ public class FinPaymentapply extends BaseEntity {
     @ApiModelProperty("款项名称")
     private String costTitleValue;
     @ApiModelProperty("金额，小数点2位")
-    private BigDecimal cost;
+    private Integer cost;
     @ApiModelProperty("付款单位sid")
     private String payCompanySid;
     @ApiModelProperty("付款单位名称")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java

@@ -26,7 +26,6 @@
 package com.yxt.anrui.fin.api.finpaymentrecord;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -81,4 +80,22 @@ public class FinPaymentrecord extends BaseEntity {
     @ApiModelProperty("使用组织sid")
     private String useOrgSid;
 
+
+    @ApiModelProperty("款项类别，数据字典")
+    private String costTypeKey;
+    @ApiModelProperty("款项类别")
+    private String costTypeValue;
+    @ApiModelProperty("款项名称，数据字典")
+    private String costTitleKey;
+    @ApiModelProperty("款项名称")
+    private String costTitleValue;
+    @ApiModelProperty("收款银行账号")
+    private String receiveBankAccount;
+    @ApiModelProperty("收款单位名称")
+    private String receiveCompany;
+    @ApiModelProperty(value = "金额")
+    private Integer cost;
+    @ApiModelProperty(value = "业务编号")
+    private String busSid;
+
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java

@@ -60,4 +60,21 @@ public class FinPaymentrecordDto implements Dto {
     @ApiModelProperty("使用组织sid")
     private String useOrgSid;
 
+    @ApiModelProperty("款项类别，数据字典")
+    private String costTypeKey;
+    @ApiModelProperty("款项类别")
+    private String costTypeValue;
+    @ApiModelProperty("款项名称，数据字典")
+    private String costTitleKey;
+    @ApiModelProperty("款项名称")
+    private String costTitleValue;
+    @ApiModelProperty("收款银行账号")
+    private String receiveBankAccount;
+    @ApiModelProperty("收款单位名称")
+    private String receiveCompany;
+    @ApiModelProperty(value = "金额")
+    private Integer cost;
+    @ApiModelProperty(value = "业务编号")
+    private String busSid;
+
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java

@@ -212,7 +212,7 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
         BusinessVariables bv = new BusinessVariables();
         //流程中的参数赋值
         Map<String, Object> variables = BeanUtil.beanToMap(dto);
-        variables.put("businessSid",businessSid);
+        variables.put("businessSid", businessSid);
         //用户的部门全路径sid
         bv.setOrgSidPath(orgSidPath);
         //业务sid
@@ -329,6 +329,13 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
                 finPaymentrecordDto.setPayType(1);
                 finPaymentrecordDto.setCreateOrgSid(stringResultBean.getData());
                 finPaymentrecordDto.setUseOrgSid(stringResultBean.getData());
+                finPaymentrecordDto.setCost(finPaymentapply.getCost());
+                finPaymentrecordDto.setCostTitleKey(finPaymentapply.getCostTitleKey());
+                finPaymentrecordDto.setCostTitleValue(finPaymentapply.getCostTitleValue());
+                finPaymentrecordDto.setCostTypeKey(finPaymentapply.getCostTypeKey());
+                finPaymentrecordDto.setCostTypeValue(finPaymentapply.getCostTypeValue());
+                finPaymentrecordDto.setReceiveCompany(finPaymentapply.getReceiveCompany());
+                finPaymentrecordDto.setReceiveBankAccount(finPaymentapply.getReceiveBankAccount());
                 finPaymentrecordService.saveDto(finPaymentrecordDto);
             }
             return rb.success().setData(resultBean.getData());
@@ -449,7 +456,7 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
         if (StringUtils.isBlank(query.getUserSid())) {
             return rb.setMsg("参数错误：userSid");
         }
-        if(StringUtils.isBlank(query.getComment())){
+        if (StringUtils.isBlank(query.getComment())) {
             return rb.setMsg("请填写意见");
         }
         FinPaymentapply finPaymentapply = fetchBySid(query.getBusinessSid());

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.java

@@ -64,4 +64,6 @@ public interface FinPaymentrecordMapper extends BaseMapper<FinPaymentrecord> {
     List<FinPaymentrecordVo> selectListVo();
 
     List<String> selectApplySids(@Param("list") List<String> sids);
+
+    int updateStateBySid(@Param("sid") String sid, @Param("state") int i);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml

@@ -10,19 +10,16 @@
                fp.name,
                DATE_FORMAT(fp.payDate, '%Y-%m-%d')    as payDate,
                fp.payRemark,
-               case fa.state
-                   when 1 then '未支付'
-                   when 2 then '已支付' end              as state,
+               fp.state,
                DATE_FORMAT(fp.createTime, '%Y-%m-%d') as createTime,
-               fa.billNo,
-               fa.costTitleValue,
-               fa.costTypeValue,
-               fa.receiveCompany,
-               fa.receiveBankAccount,
-               fa.cost,
+               fp.busSid                                 billNo,
+               fp.costTitleValue,
+               fp.costTypeValue,
+               fp.receiveCompany,
+               fp.receiveBankAccount,
+               fp.cost,
                fp.payFile
         FROM fin_paymentrecord fp
-                 left join fin_paymentapply fa on fa.sid = fp.applySid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -37,10 +34,16 @@
     </select>
 
     <select id="selectApplySids" resultType="java.lang.String">
-        select applySid
+        select IFNULL(receiveBankAccount,'NULL')
         from fin_paymentrecord WHERE sid IN
         <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
             #{item}
         </foreach>
     </select>
+
+    <update id="updateStateBySid">
+        update fin_paymentrecord
+        set state = #{state}
+        where sid = #{sid}
+    </update>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@@ -28,6 +28,7 @@ package com.yxt.anrui.fin.biz.finpaymentrecord;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapply;
 import com.yxt.anrui.fin.api.finpaymentrecord.*;
 import com.yxt.anrui.fin.biz.finpaymentapply.FinPaymentapplyService;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
@@ -72,15 +73,15 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         if (pageQuery != null) {
             //付款状态
             if (StringUtils.isNotBlank(pageQuery.getState())) {
-                qw.eq("fa.state", pageQuery.getState());
+                qw.eq("fp.state", pageQuery.getState());
             }
             //款项类别
             if (StringUtils.isNotBlank(pageQuery.getCostTypeKey())) {
-                qw.eq("fa.costTypekey", pageQuery.getCostTypeKey());
+                qw.eq("fp.costTypekey", pageQuery.getCostTypeKey());
             }
             //款项名称
             if (StringUtils.isNotBlank(pageQuery.getCostTitleKey())) {
-                qw.eq("fa.costTitleKey", pageQuery.getCostTitleKey());
+                qw.eq("fp.costTitleKey", pageQuery.getCostTitleKey());
             }
             //申请日期
             qw.apply(StringUtils.isNotBlank(pageQuery.getCreateStartDate()), "date_format (fp.createTime,'%Y-%m-%d') >= date_format('" + pageQuery.getCreateStartDate() + "','%Y-%m-%d')").
@@ -111,20 +112,30 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         List<String> sids = dto.getSids();
         //判断选择的sids的付款申请的收款单位是否一致
         List<String> applySids = baseMapper.selectApplySids(sids);
-        List<String> applyCodes = finPaymentapplyService.selectCodeBySid(applySids);
-        if(applyCodes.size()>1){
-            applyCodes = applyCodes.stream().distinct().collect(Collectors.toList());
-            if (applyCodes.size() > 1) {
+//        List<String> applyCodes = finPaymentapplyService.selectCodeBySid(applySids);
+        if (applySids.size() > 1) {
+            applySids = applySids.stream().distinct().collect(Collectors.toList());
+            if (applySids.size() > 1) {
                 return rb.setMsg("批量处理的数据中存在收款账号不一致");
             }
         }
+        if (applySids.contains("NULL")) {
+            return rb.setMsg("批量处理的数据中包含收款账号不存在的数据");
+        }
         List<String> list = new ArrayList<>();
         for (int i = 0; i < sids.size(); i++) {
             FinPaymentrecord finPaymentrecord = fetchBySid(sids.get(i));
             BeanUtil.copyProperties(dto, finPaymentrecord, "sid");
             baseMapper.updateById(finPaymentrecord);
             //更新付款申请中的状态
-            finPaymentapplyService.updateStateBySid(finPaymentrecord.getApplySid(), 2);
+            FinPaymentapply finPaymentapply = finPaymentapplyService.fetchBySid(finPaymentrecord.getApplySid());
+            if (finPaymentapply != null) {
+                finPaymentapplyService.updateStateBySid(finPaymentrecord.getApplySid(), 2);
+                baseMapper.updateStateBySid(finPaymentrecord.getSid(), 2);
+            } else {
+                baseMapper.updateStateBySid(finPaymentrecord.getSid(), 2);
+            }
+
         }
         return rb.success();
     }