diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDetailsVo.java index 506f4037ee..c3acb36dfb 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDetailsVo.java +++ b/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(财务)
* File: FinPaymentapplyVo.java
@@ -88,4 +92,9 @@ public class FinPaymentapplyDetailsVo implements Vo { @ApiModelProperty(value = "备注") private String remarks; + private List detailsList = new ArrayList<>(); + + private List vehicleList = new ArrayList<>(); + private String isVeh; + } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java index f02a8efb60..fdbcd991af 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java +++ b/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(财务)
* File: FinPaymentapplyDto.java
@@ -83,4 +86,10 @@ public class FinPaymentapplyDto implements Dto { @ApiModelProperty(value = "业务关联:编号") private String busSid; + private List detailsList; + + private List vehicleList; + @ApiModelProperty("是否涉及车辆,1是,0否") + private String isVeh; + } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetailDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetailDto.java new file mode 100644 index 0000000000..29a90ae04e --- /dev/null +++ b/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; +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetailVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetailVo.java new file mode 100644 index 0000000000..9d9d85b15e --- /dev/null +++ b/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; +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyvehicle/FinPaymentapplyVehicleDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyvehicle/FinPaymentapplyVehicleDto.java new file mode 100644 index 0000000000..27a32b690f --- /dev/null +++ b/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; +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyvehicle/FinPaymentapplyVehicleVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyvehicle/FinPaymentapplyVehicleVo.java new file mode 100644 index 0000000000..fc05d7aa8b --- /dev/null +++ b/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; +} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml index d9f94b3f9a..361364fa15 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml +++ b/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} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java index 9f5e2ee3c3..6241d85f1d 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java +++ b/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 detailsList = dto.getDetailsList(); + finPaymentapplyDetailsService.saveDetailsList(detailsList, finPaymentapply.getSid()); + if ("1".equals(dto.getIsVeh())) { + List 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 detailsList = dto.getDetailsList(); + finPaymentapplyDetailsService.saveDetailsList(detailsList, finPaymentapply.getSid()); + if ("1".equals(dto.getIsVeh())) { + List 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 detailsList = finPaymentapplyDetailsService.getDetails(sid); + List vehicleList = finPaymentapplyVehicleService.getVehicleList(sid); + vo.setDetailsList(detailsList); + vo.setVehicleList(vehicleList); return vo; } @@ -232,9 +254,9 @@ public class FinPaymentapplyService extends MybatisBaseService variables = new HashMap<>(); - Map appMap = new HashMap<>(); - appMap.put("sid",businessSid); - variables.put("app",appMap); + Map appMap = new HashMap<>(); + appMap.put("sid", businessSid); + variables.put("app", appMap); //用户的部门全路径sid bv.setOrgSidPath(orgSidPath); //业务sid @@ -376,7 +398,7 @@ public class FinPaymentapplyService extends MybatisBaseService sidsList = Arrays.asList(sids); + for (String s : sidsList) { + finPaymentapplyDetailsService.deleteByApplySid(s); + finPaymentapplyVehicleService.deleteVehicle(s); + } return rb.success().setMsg("删除成功"); } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsMapper.java index 8ad5d25168..2da35bb8f0 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsMapper.java +++ b/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 { List getDetailsList(String sid); + + int deleteDetail(String sid); + + List getDetails(String sid); } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsMapper.xml index 3d873fe49b..f1ed8f6755 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsMapper.xml +++ b/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} + + + delete + from fin_paymentapply_details + where applySid = #{sid} + + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java index 0f487bcfa0..0b4f617272 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java +++ b/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 getDetailsList(String sid) { return baseMapper.getDetailsList(sid); } + + public void saveDetailsList(List 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 getDetails(String sid) { + return baseMapper.getDetails(sid); + } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleMapper.java index 3b0780c1e9..64fe84340d 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleMapper.java +++ b/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 { List getCarList(String sid); + + int deleteVehicle(String sid); + + List getVehicleList(String sid); } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleMapper.xml index eb25712a58..7df2da8f25 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleMapper.xml +++ b/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} + + + delete + from fin_paymentapply_vehicle + where applySid = #{sid} + + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleService.java index 54de3622b9..6d1d06f36f 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleService.java +++ b/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 getCarList(String sid) { return baseMapper.getCarList(sid); } + + public void saveVehicleList(List 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 getVehicleList(String sid) { + return baseMapper.getVehicleList(sid); + } }