pc端付款申请以及汉字获取首字母修改

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

@@ -26,12 +26,16 @@
 package com.yxt.anrui.fin.api.finpaymentapply;
 
 
+import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailVo;
+import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleVo;
 import com.yxt.common.core.vo.Vo;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Project: anrui-fin(财务) <br/>
  * File: FinPaymentapplyVo.java <br/>
@@ -88,4 +92,9 @@ public class FinPaymentapplyDetailsVo implements Vo {
     @ApiModelProperty(value = "备注")
     private String remarks;
 
+    private List<FinPaymentapplyDetailVo> detailsList = new ArrayList<>();
+
+    private List<FinPaymentapplyVehicleVo> vehicleList = new ArrayList<>();
+    private String isVeh;
+
 }

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

@@ -26,12 +26,15 @@
 package com.yxt.anrui.fin.api.finpaymentapply;
 
 
+import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailDto;
+import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleDto;
 import com.yxt.common.core.dto.Dto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * Project: anrui-fin(财务) <br/>
  * File: FinPaymentapplyDto.java <br/>
@@ -83,4 +86,10 @@ public class FinPaymentapplyDto implements Dto {
     @ApiModelProperty(value = "业务关联:编号")
     private String busSid;
 
+    private List<FinPaymentapplyDetailDto> detailsList;
+
+    private List<FinPaymentapplyVehicleDto> vehicleList;
+    @ApiModelProperty("是否涉及车辆，1是，0否")
+    private String isVeh;
+
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetailDto.java

@@ -0,0 +1,31 @@
+package com.yxt.anrui.fin.api.finpaymentapplydetails;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/10/6 21:26
+ * @Description
+ */
+@Data
+public class FinPaymentapplyDetailDto implements Dto {
+    private static final long serialVersionUID = -5488673242509961312L;
+
+    @ApiModelProperty("付款方式key")
+    private String paymentTypeKey;
+    @ApiModelProperty("付款方式")
+    private String paymentType;
+    @ApiModelProperty("厂家销售通路")
+    private String actualPay;
+    @ApiModelProperty("开户行")
+    private String bank;
+
+    @ApiModelProperty("收款银行账号")
+    private String receivingAccount;
+    @ApiModelProperty("付款金额")
+    private String payAccount;
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetailVo.java

@@ -0,0 +1,31 @@
+package com.yxt.anrui.fin.api.finpaymentapplydetails;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/10/6 22:13
+ * @Description
+ */
+@Data
+public class FinPaymentapplyDetailVo implements Vo {
+    private static final long serialVersionUID = 2763515857490645883L;
+
+    @ApiModelProperty("付款方式key")
+    private String paymentTypeKey;
+    @ApiModelProperty("付款方式")
+    private String paymentType;
+    @ApiModelProperty("厂家销售通路")
+    private String actualPay;
+    @ApiModelProperty("开户行")
+    private String bank;
+
+    @ApiModelProperty("收款银行账号")
+    private String receivingAccount;
+    @ApiModelProperty("付款金额")
+    private String payAccount;
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyvehicle/FinPaymentapplyVehicleDto.java

@@ -0,0 +1,30 @@
+package com.yxt.anrui.fin.api.finpaymentapplyvehicle;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/10/6 21:28
+ * @Description
+ */
+@Data
+public class FinPaymentapplyVehicleDto implements Dto {
+    private static final long serialVersionUID = 5067723170213631020L;
+
+    @ApiModelProperty("车型名称")
+    private String modelName;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车辆sid")
+    private String vehiSid;
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+    @ApiModelProperty("配置sid")
+    private String configSid;
+    @ApiModelProperty("厂家结算价")
+    private String money;
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyvehicle/FinPaymentapplyVehicleVo.java

@@ -0,0 +1,30 @@
+package com.yxt.anrui.fin.api.finpaymentapplyvehicle;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/10/6 22:14
+ * @Description
+ */
+@Data
+public class FinPaymentapplyVehicleVo implements Vo {
+    private static final long serialVersionUID = 3601884852528436759L;
+
+    @ApiModelProperty("车型名称")
+    private String modelName;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车辆sid")
+    private String vehiSid;
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+    @ApiModelProperty("配置sid")
+    private String configSid;
+    @ApiModelProperty("厂家结算价")
+    private String money;
+}

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

@@ -73,7 +73,8 @@
                fp.receiveCompanySid,
                fp.remarks,
                fp.name,
-               DATE_FORMAT(fp.createTime, '%Y-%m-%d') as createTime
+               DATE_FORMAT(fp.createTime, '%Y-%m-%d') as createTime,
+               fp.isVeh
         from fin_paymentapply fp
         where fp.sid = #{sid}
     </select>

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

@@ -38,7 +38,11 @@ import com.yxt.anrui.fin.api.finpaymentapply.flow.FinPayGetNodeVo;
 import com.yxt.anrui.fin.api.finpaymentapply.flow.FinPayTaskQuery;
 import com.yxt.anrui.fin.api.finpaymentapply.flow.SubmitFinPayDto;
 import com.yxt.anrui.fin.api.finpaymentapplydetails.AppFinPaymentapplyDetailVo;
+import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailDto;
+import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailVo;
 import com.yxt.anrui.fin.api.finpaymentapplyvehicle.AppFinPaymentapplyVehicleVo;
+import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleDto;
+import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleVo;
 import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordDto;
 import com.yxt.anrui.fin.biz.finpaymentapplydetails.FinPaymentapplyDetailsService;
 import com.yxt.anrui.fin.biz.finpaymentapplyvehicle.FinPaymentapplyVehicleService;
@@ -157,6 +161,12 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
             String billNo = getApplyCode(dto);
             finPaymentapply.setBillNo(billNo);
             baseMapper.insert(finPaymentapply);
+            List<FinPaymentapplyDetailDto> detailsList = dto.getDetailsList();
+            finPaymentapplyDetailsService.saveDetailsList(detailsList, finPaymentapply.getSid());
+            if ("1".equals(dto.getIsVeh())) {
+                List<FinPaymentapplyVehicleDto> vehicleDtoList = dto.getVehicleList();
+                finPaymentapplyVehicleService.saveVehicleList(vehicleDtoList, finPaymentapply.getSid());
+            }
             dtoSid = finPaymentapply.getSid();
         } else {
             FinPaymentapply finPaymentapply = fetchBySid(dtoSid);
@@ -165,6 +175,14 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
             }
             BeanUtil.copyProperties(dto, finPaymentapply);
             baseMapper.updateById(finPaymentapply);
+            List<FinPaymentapplyDetailDto> detailsList = dto.getDetailsList();
+            finPaymentapplyDetailsService.saveDetailsList(detailsList, finPaymentapply.getSid());
+            if ("1".equals(dto.getIsVeh())) {
+                List<FinPaymentapplyVehicleDto> vehicleDtoList = dto.getVehicleList();
+                finPaymentapplyVehicleService.saveVehicleList(vehicleDtoList, finPaymentapply.getSid());
+            } else {
+                finPaymentapplyVehicleService.deleteVehicle(dtoSid);
+            }
         }
         return rb.success().setData(dtoSid);
     }
@@ -191,6 +209,10 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
 
     public FinPaymentapplyDetailsVo fetchDetailsVoBySid(String sid) {
         FinPaymentapplyDetailsVo vo = baseMapper.fetchDetailsVoBySid(sid);
+        List<FinPaymentapplyDetailVo> detailsList = finPaymentapplyDetailsService.getDetails(sid);
+        List<FinPaymentapplyVehicleVo> vehicleList = finPaymentapplyVehicleService.getVehicleList(sid);
+        vo.setDetailsList(detailsList);
+        vo.setVehicleList(vehicleList);
         return vo;
     }
 
@@ -232,9 +254,9 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
         BusinessVariables bv = new BusinessVariables();
         //流程中的参数赋值
         Map<String, Object> variables = new HashMap<>();
-        Map<String,Object> appMap = new HashMap<>();
+        Map<String, Object> appMap = new HashMap<>();
-        appMap.put("sid",businessSid);
+        appMap.put("sid", businessSid);
-        variables.put("app",appMap);
+        variables.put("app", appMap);
         //用户的部门全路径sid
         bv.setOrgSidPath(orgSidPath);
         //业务sid
@@ -376,7 +398,7 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
                 finPaymentrecordDto.setReceiveCompany(finPaymentapply.getReceiveCompany());
                 finPaymentrecordDto.setReceiveBankAccount(finPaymentapply.getReceiveBankAccount());
                 finPaymentrecordService.saveDto(finPaymentrecordDto);
-            }else{
+            } else {
                 //极光推送
                 UpdateFlowFieldVo ufVo = resultBean.getData();
                 finPaymentapply = fetchBySid(bv.getBusinessSid());
@@ -569,6 +591,11 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
             return rb.setMsg("删除的数据中包含已经提交审批的数据，删除失败");
         }
         delBySids(sids);
+        List<String> sidsList = Arrays.asList(sids);
+        for (String s : sidsList) {
+            finPaymentapplyDetailsService.deleteByApplySid(s);
+            finPaymentapplyVehicleService.deleteVehicle(s);
+        }
         return rb.success().setMsg("删除成功");
     }
 

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsMapper.java

@@ -2,6 +2,7 @@ package com.yxt.anrui.fin.biz.finpaymentapplydetails;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yxt.anrui.fin.api.finpaymentapplydetails.AppFinPaymentapplyDetailVo;
+import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailVo;
 import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetails;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -15,4 +16,8 @@ import java.util.List;
 @Mapper
 public interface FinPaymentapplyDetailsMapper extends BaseMapper<FinPaymentapplyDetails> {
     List<AppFinPaymentapplyDetailVo> getDetailsList(String sid);
+
+    int deleteDetail(String sid);
+
+    List<FinPaymentapplyDetailVo> getDetails(String sid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsMapper.xml

@@ -11,4 +11,22 @@
         from fin_paymentapply_details fd
         where fd.applySid = #{sid}
     </select>
+
+    <delete id="deleteDetail">
+        delete
+        from fin_paymentapply_details
+        where applySid = #{sid}
+    </delete>
+
+    <select id="getDetails" resultType="com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailVo">
+        select fd.actualPay,
+        fd.paymentType,
+        fd.bank,
+        fd.receivingAccount,
+        fd.payAccount,
+        fd.remarks,
+        fd.paymentTypeKey
+        from fin_paymentapply_details fd
+        where fd.applySid = #{sid}
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java

@@ -1,10 +1,14 @@
 package com.yxt.anrui.fin.biz.finpaymentapplydetails;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.fin.api.finpaymentapplydetails.AppFinPaymentapplyDetailVo;
+import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailDto;
+import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailVo;
 import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetails;
 import com.yxt.common.base.service.MybatisBaseService;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -17,4 +21,25 @@ public class FinPaymentapplyDetailsService extends MybatisBaseService<FinPayment
     public List<AppFinPaymentapplyDetailVo> getDetailsList(String sid) {
         return baseMapper.getDetailsList(sid);
     }
+
+    public void saveDetailsList(List<FinPaymentapplyDetailDto> detailsList, String sid) {
+        //删除
+        baseMapper.deleteDetail(sid);
+        for (FinPaymentapplyDetailDto dto : detailsList) {
+            FinPaymentapplyDetails finPaymentapplyDetails = new FinPaymentapplyDetails();
+            BeanUtil.copyProperties(dto, finPaymentapplyDetails, "sid");
+            finPaymentapplyDetails.setApplySid(sid);
+            finPaymentapplyDetails.setPayAccount(new BigDecimal(dto.getPayAccount()));
+            baseMapper.insert(finPaymentapplyDetails);
+        }
+
+    }
+
+    public void deleteByApplySid(String s) {
+        baseMapper.deleteDetail(s);
+    }
+
+    public List<FinPaymentapplyDetailVo> getDetails(String sid) {
+        return baseMapper.getDetails(sid);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleMapper.java

@@ -3,6 +3,7 @@ package com.yxt.anrui.fin.biz.finpaymentapplyvehicle;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yxt.anrui.fin.api.finpaymentapplyvehicle.AppFinPaymentapplyVehicleVo;
 import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicle;
+import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleVo;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -15,4 +16,8 @@ import java.util.List;
 @Mapper
 public interface FinPaymentapplyVehicleMapper extends BaseMapper<FinPaymentapplyVehicle> {
     List<AppFinPaymentapplyVehicleVo> getCarList(String sid);
+
+    int deleteVehicle(String sid);
+
+    List<FinPaymentapplyVehicleVo> getVehicleList(String sid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleMapper.xml

@@ -8,4 +8,21 @@
         from fin_paymentapply_vehicle fv
         where applySid = #{sid}
     </select>
+
+    <delete id="deleteVehicle">
+        delete
+        from fin_paymentapply_vehicle
+        where applySid = #{sid}
+    </delete>
+
+    <select id="getVehicleList" resultType="com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleVo">
+        select fv.modelName,
+               fv.vinNo,
+               fv.money,
+               fv.modelSid,
+               fv.vehiSid,
+               fv.configSid
+        from fin_paymentapply_vehicle fv
+        where applySid = #{sid}
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleService.java

@@ -1,10 +1,15 @@
 package com.yxt.anrui.fin.biz.finpaymentapplyvehicle;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.fin.api.finpaymentapplyvehicle.AppFinPaymentapplyVehicleVo;
 import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicle;
+import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleDto;
+import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleVo;
 import com.yxt.common.base.service.MybatisBaseService;
+import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -17,4 +22,23 @@ public class FinPaymentapplyVehicleService extends MybatisBaseService<FinPayment
     public List<AppFinPaymentapplyVehicleVo> getCarList(String sid) {
         return baseMapper.getCarList(sid);
     }
+
+    public void saveVehicleList(List<FinPaymentapplyVehicleDto> vehicleDtoList, String sid) {
+        baseMapper.deleteVehicle(sid);
+        for (FinPaymentapplyVehicleDto dto : vehicleDtoList) {
+            FinPaymentapplyVehicle finPaymentapplyVehicle = new FinPaymentapplyVehicle();
+            BeanUtil.copyProperties(dto, finPaymentapplyVehicle, "sid");
+            finPaymentapplyVehicle.setMoney(new BigDecimal(dto.getMoney()));
+            baseMapper.insert(finPaymentapplyVehicle);
+        }
+
+    }
+
+    public void deleteVehicle(String dtoSid) {
+        baseMapper.deleteVehicle(dtoSid);
+    }
+
+    public List<FinPaymentapplyVehicleVo> getVehicleList(String sid) {
+        return baseMapper.getVehicleList(sid);
+    }
 }