diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/AppFinCostApplyVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/AppFinCostApplyVo.java index daf5caafc8..5ba1612606 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/AppFinCostApplyVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/AppFinCostApplyVo.java @@ -36,7 +36,9 @@ public class AppFinCostApplyVo implements Vo { //是否涉及车辆 @ApiModelProperty("是否涉及车辆:1是，0否") - private Boolean isVeh; + private String isVeh; + + private String isVehKey; //涉及车辆 private String vins; diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/AppFinPaymentApplyVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/AppFinPaymentApplyVo.java new file mode 100644 index 0000000000..51bae17d71 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/AppFinPaymentApplyVo.java @@ -0,0 +1,58 @@ +package com.yxt.anrui.fin.api.finpaymentapply; + +import com.yxt.anrui.fin.api.finpaymentapplydetails.AppFinPaymentapplyDetailVo; +import com.yxt.anrui.fin.api.finpaymentapplyvehicle.AppFinPaymentapplyVehicleVo; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/10/6 10:35 + * @Description + */ +@Data +public class AppFinPaymentApplyVo implements Vo { + private static final long serialVersionUID = -7421450588161214608L; + + @ApiModelProperty("款项名称") + private String costTitleValue; + //创建时间 + private String createTime; + //申请人 + private String name; + //款项类别 + private String costTypeValue; + //业务编号 + private String busSid; + //金额 + private String cost; + //付款单位名称 + private String payCompany; + //收款单位名称 + private String receiveCompany; + //付款备注 + private String remarks; + //是否涉及车辆 + private String isVeh; + private String isVehValue; + //付款明细List + private List paymentList = new ArrayList<>(); + @ApiModelProperty("付款明细合计") + private String paymentTotal; + + //车辆列表 + private List carList = new ArrayList<>(); + @ApiModelProperty("车辆金额合计") + private String carTotal; + + private String createBySid; + private String taskId; + private String procInstId; + + private String sid; + +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyFeign.java index 643d8746c7..d202e6f408 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyFeign.java @@ -109,5 +109,9 @@ public interface FinPaymentapplyFeign { @PostMapping(value = "/breakProcess") public ResultBean breakProcess(@Valid @RequestBody FinPayTaskQuery query); + @ApiOperation(value = "终止任务") + @GetMapping(value = "/getPaymentApply/{sid}") + ResultBean getPaymentApply(@PathVariable("sid") String sid) + } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyFeignFallback.java index 96efdf6aeb..bdd41f2f71 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyFeignFallback.java @@ -105,4 +105,9 @@ public class FinPaymentapplyFeignFallback implements FinPaymentapplyFeign { public ResultBean breakProcess(FinPayTaskQuery query) { return null; } + + @Override + public ResultBean getPaymentApply(String sid) { + return null; + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/AppFinPaymentapplyDetailVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/AppFinPaymentapplyDetailVo.java new file mode 100644 index 0000000000..f81f59648e --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/AppFinPaymentapplyDetailVo.java @@ -0,0 +1,27 @@ +package com.yxt.anrui.fin.api.finpaymentapplydetails; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/10/6 14:41 + * @Description + */ +@Data +public class AppFinPaymentapplyDetailVo implements Vo { + private static final long serialVersionUID = -5474423439043642156L; + @ApiModelProperty("厂家销售通路") + private String actualPay; + @ApiModelProperty("付款方式") + private String paymentType; + @ApiModelProperty("开户行") + private String bank; + @ApiModelProperty("收款银行账号") + private String receivingAccount; + @ApiModelProperty("付款金额") + private String payAccount; + @ApiModelProperty("备注") + private String remarks; +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetails.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetails.java new file mode 100644 index 0000000000..4d94c1c988 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetails.java @@ -0,0 +1,33 @@ +package com.yxt.anrui.fin.api.finpaymentapplydetails; + +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @Author dimengzhe + * @Date 2022/10/6 14:11 + * @Description + */ +@Data +public class FinPaymentapplyDetails extends BaseEntity { + private static final long serialVersionUID = -4576193401443241659L; + + private String applySid; + @ApiModelProperty("付款方式key") + private String paymentTypeKey; + @ApiModelProperty("付款方式") + private String paymentType; + @ApiModelProperty("厂家销售通路") + private String actualPay; + @ApiModelProperty("开户行") + private String bank; + + @ApiModelProperty("收款银行账号") + private String receivingAccount; + @ApiModelProperty("付款金额") + private BigDecimal payAccount; + +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyvehicle/AppFinPaymentapplyVehicleVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyvehicle/AppFinPaymentapplyVehicleVo.java new file mode 100644 index 0000000000..bd5f8b4c3b --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyvehicle/AppFinPaymentapplyVehicleVo.java @@ -0,0 +1,21 @@ +package com.yxt.anrui.fin.api.finpaymentapplyvehicle; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/10/6 14:56 + * @Description + */ +@Data +public class AppFinPaymentapplyVehicleVo implements Vo { + private static final long serialVersionUID = -3232965325256220009L; + @ApiModelProperty("车型") + private String modelName; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("厂家结算价") + private String money; +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyvehicle/FinPaymentapplyVehicle.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyvehicle/FinPaymentapplyVehicle.java new file mode 100644 index 0000000000..7d2dd17bcd --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyvehicle/FinPaymentapplyVehicle.java @@ -0,0 +1,32 @@ +package com.yxt.anrui.fin.api.finpaymentapplyvehicle; + +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @Author dimengzhe + * @Date 2022/10/6 14:23 + * @Description + */ +@Data +public class FinPaymentapplyVehicle extends BaseEntity { + private static final long serialVersionUID = 6931224151880251447L; + + @ApiModelProperty("付款申请") + private String applySid; + @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 BigDecimal money; +} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyMapper.xml index fe210d8b5c..87bc76ce1c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyMapper.xml @@ -89,12 +89,14 @@ fc.cost, fc.useTypeValue, fc.remarks, - fc.isVeh, + fc.isVeh as isVehKey, fc.taskId, fc.procInstId, fc.sid, fc.createBySid, - case fc.isOutDoor when 1 then '是' when 0 then '否' end as isOutDoor + case fc.isOutDoor when 1 then '是' when 0 then '否' end as isOutDoor, + case fc.isVeh when 1 then '是' when 0 then '否' end as isVeh + from fin_costapply fc where fc.sid = #{sid} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java index ce3bc3ebe3..a81a2e61df 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java @@ -544,7 +544,7 @@ public class FinCostapplyService extends MybatisBaseService appDetails(String sid) { ResultBean rb = ResultBean.fireFail(); AppFinCostApplyVo appFinCostApplyVo = baseMapper.appDetails(sid); - if (appFinCostApplyVo.getIsVeh()) {//涉及车辆 + if ('1'.equals(appFinCostApplyVo.getIsVehKey())) {//涉及车辆 List vinNoList = finCostapplyVehicleService.selectByApplySid(sid); String vins = StringUtils.join(vinNoList.toArray(), "\n"); appFinCostApplyVo.setVins(vins); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.java index a03a4a3336..79a615bce9 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.java @@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.fin.api.finpaymentapply.AppFinPaymentApplyVo; import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapplyDetailsVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -76,4 +77,6 @@ public interface FinPaymentapplyMapper extends BaseMapper { List selectCodeBySid(@Param("list") List applySids); int updateStateBySid(@Param("sid") String applySid, @Param("state") int state); + + AppFinPaymentApplyVo getPaymentApply(String sid); } \ No newline at end of file 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 89e8c7ae5e..d9f94b3f9a 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 @@ -47,9 +47,11 @@ + select fp.costTitleValue, + DATE_FORMAT(fp.createTime, '%Y-%m-%d') as createTime, + fp.createBySid, + fp.name, + fp.costTypeValue, + fp.busSid, + fp.cost, + fp.payCompany, + fp.receiveCompany, + fp.remarks, + fp.isVeh, + case fp.isVeh when 1 then '是' when 0 then '否' end as isVehValue, + fp.paymentTotal, + fp.carTotal, + fp.sid, + fp.createBySid, + fp.taskId, + fp.procInstId + from fin_paymentapply fp + where sid = #{sid} + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyRest.java index f7ba3ae5dd..7586c9d4b7 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyRest.java @@ -126,4 +126,9 @@ public class FinPaymentapplyRest implements FinPaymentapplyFeign { public ResultBean breakProcess(FinPayTaskQuery query) { return finPaymentapplyService.breakProcess(query); } + + @Override + public ResultBean getPaymentApply(String sid) { + return finPaymentapplyService.getPaymentApply(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 e01baecf14..35aec2a132 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 @@ -37,7 +37,11 @@ import com.yxt.anrui.fin.api.finpaymentapply.flow.FinPayGetNodeQuery; 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.finpaymentapplyvehicle.AppFinPaymentapplyVehicleVo; import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordDto; +import com.yxt.anrui.fin.biz.finpaymentapplydetails.FinPaymentapplyDetailsService; +import com.yxt.anrui.fin.biz.finpaymentapplyvehicle.FinPaymentapplyVehicleService; import com.yxt.anrui.fin.biz.finpaymentrecord.FinPaymentrecordService; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; @@ -96,6 +100,11 @@ public class FinPaymentapplyService extends MybatisBaseService listPageVo(PagerQuery pq) { FinPaymentapplyQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); @@ -498,4 +507,16 @@ public class FinPaymentapplyService extends MybatisBaseService getPaymentApply(String sid) { + ResultBean rb = ResultBean.fireFail(); + AppFinPaymentApplyVo vo = baseMapper.getPaymentApply(sid); + List paymentList = finPaymentapplyDetailsService.getDetailsList(sid); + vo.setPaymentList(paymentList); + if ("1".equals(vo.getIsVeh())) {//涉及车辆 + List carList = finPaymentapplyVehicleService.getCarList(sid); + vo.setCarList(carList); + } + return rb.success().setData(vo); + } } \ No newline at end of file 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 new file mode 100644 index 0000000000..8ad5d25168 --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsMapper.java @@ -0,0 +1,18 @@ +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.FinPaymentapplyDetails; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/10/6 15:16 + * @Description + */ +@Mapper +public interface FinPaymentapplyDetailsMapper extends BaseMapper { + List getDetailsList(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 new file mode 100644 index 0000000000..3d873fe49b --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsMapper.xml @@ -0,0 +1,14 @@ + + + + + \ 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 new file mode 100644 index 0000000000..0f487bcfa0 --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.fin.biz.finpaymentapplydetails; + +import com.yxt.anrui.fin.api.finpaymentapplydetails.AppFinPaymentapplyDetailVo; +import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetails; +import com.yxt.common.base.service.MybatisBaseService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/10/6 15:16 + * @Description + */ +@Service +public class FinPaymentapplyDetailsService extends MybatisBaseService { + public List getDetailsList(String sid) { + return baseMapper.getDetailsList(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 new file mode 100644 index 0000000000..3b0780c1e9 --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleMapper.java @@ -0,0 +1,18 @@ +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 org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/10/6 15:18 + * @Description + */ +@Mapper +public interface FinPaymentapplyVehicleMapper extends BaseMapper { + List getCarList(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 new file mode 100644 index 0000000000..eb25712a58 --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleMapper.xml @@ -0,0 +1,11 @@ + + + + + \ 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 new file mode 100644 index 0000000000..54de3622b9 --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleService.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.fin.biz.finpaymentapplyvehicle; + +import com.yxt.anrui.fin.api.finpaymentapplyvehicle.AppFinPaymentapplyVehicleVo; +import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicle; +import com.yxt.common.base.service.MybatisBaseService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/10/6 15:18 + * @Description + */ +@Service +public class FinPaymentapplyVehicleService extends MybatisBaseService { + public List getCarList(String sid) { + return baseMapper.getCarList(sid); + } +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyDetailsVo.java new file mode 100644 index 0000000000..a7009f912e --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyDetailsVo.java @@ -0,0 +1,28 @@ +package com.yxt.anrui.terminal.api.finance.paymentapply; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/10/6 15:52 + * @Description + */ +@Data +public class PaymentApplyDetailsVo implements Vo { + private static final long serialVersionUID = -3182165897761808808L; + + @ApiModelProperty("厂家销售通路") + private String actualPay; + @ApiModelProperty("付款方式") + private String paymentType; + @ApiModelProperty("开户行") + private String bank; + @ApiModelProperty("收款银行账号") + private String receivingAccount; + @ApiModelProperty("付款金额") + private String payAccount; + @ApiModelProperty("备注") + private String remarks; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyFeign.java new file mode 100644 index 0000000000..4c30586f70 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyFeign.java @@ -0,0 +1,56 @@ +package com.yxt.anrui.terminal.api.finance.paymentapply; + +import com.yxt.anrui.terminal.api.finance.paymentapply.flowable.PaymentApplyDto; +import com.yxt.anrui.terminal.api.finance.paymentapply.flowable.PaymentApplyQuery; +import com.yxt.anrui.terminal.api.finance.paymentapply.flowable.PaymentApplyTaskQuery; +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; +import org.springframework.web.bind.annotation.*; + +/** + * @Author dimengzhe + * @Date 2022/10/6 9:57 + * @Description + */ +@Api(tags = "付款申请") +@FeignClient( + contextId = "terminal-PaymentApply", + name = "anrui-terminal", + path = "/finance/v1/paymentApply", + fallback = PaymentApplyFeignFallback.class) +public interface PaymentApplyFeign { + + @ApiOperation("办理") + @GetMapping("/getPaymentApply/{sid}") + @ResponseBody + ResultBean getPaymentApply(@PathVariable("sid") String sid); + + + @ApiOperation("办理") + @PutMapping("/agreePaymentApplyInfo") + @ResponseBody + ResultBean agreePayApplyInfo(@RequestBody PaymentApplyDto dto); + + @ApiOperation("驳回") + @PutMapping("/rejectPaymentApplyInfo") + @ResponseBody + ResultBean rejectPayApplyInfo(@RequestBody PaymentApplyTaskQuery query); + + @ApiOperation("撤回") + @PutMapping("/recallPaymentApplyInfo") + @ResponseBody + ResultBean recallPayApplyInfo(@RequestBody PaymentApplyTaskQuery query); + + @ApiOperation("终止") + @PutMapping("/stopPaymentApplyInfo") + @ResponseBody + ResultBean stopPayApplyInfo(@RequestBody PaymentApplyTaskQuery query); + + @ApiOperation("获取流程操作标题") + @GetMapping("/getFlowOperateTitle") + @ResponseBody + ResultBean getFlowOperateTitle(@SpringQueryMap PaymentApplyQuery query); +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyFeignFallback.java new file mode 100644 index 0000000000..d1c67074ec --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyFeignFallback.java @@ -0,0 +1,9 @@ +package com.yxt.anrui.terminal.api.finance.paymentapply; + +/** + * @Author dimengzhe + * @Date 2022/10/6 9:58 + * @Description + */ +public class PaymentApplyFeignFallback { +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVehicleVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVehicleVo.java new file mode 100644 index 0000000000..db2dd3fd90 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVehicleVo.java @@ -0,0 +1,22 @@ +package com.yxt.anrui.terminal.api.finance.paymentapply; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/10/6 15:53 + * @Description + */ +@Data +public class PaymentApplyVehicleVo implements Vo { + private static final long serialVersionUID = -8919822312166380804L; + + @ApiModelProperty("车型") + private String modelName; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("厂家结算价") + private String money; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVo.java new file mode 100644 index 0000000000..fa41461c7d --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVo.java @@ -0,0 +1,54 @@ +package com.yxt.anrui.terminal.api.finance.paymentapply; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/10/6 9:59 + * @Description + */ +@Data +public class PaymentApplyVo implements Vo { + private static final long serialVersionUID = 1191604961683000023L; + + @ApiModelProperty("款项名称") + private String costTitleValue; + //创建时间 + private String createTime; + //申请人 + private String name; + //款项类别 + private String costTypeValue; + //业务编号 + private String busSid; + //金额 + private String cost; + //付款单位名称 + private String payCompany; + //收款单位名称 + private String receiveCompany; + //付款备注 + private String remarks; + //是否涉及车辆 + private String isVeh; + private String isVehValue; + //付款明细List + private List paymentList = new ArrayList<>(); + @ApiModelProperty("付款明细合计") + private String paymentTotal; + + //车辆列表 + private List carList = new ArrayList<>(); + @ApiModelProperty("车辆金额合计") + private String carTotal; + + private String createBySid; + private String taskId; + private String procInstId; + +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/flowable/PaymentApplyDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/flowable/PaymentApplyDto.java new file mode 100644 index 0000000000..a79129090e --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/flowable/PaymentApplyDto.java @@ -0,0 +1,37 @@ +package com.yxt.anrui.terminal.api.finance.paymentapply.flowable; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Author dimengzhe + * @Date 2022/10/6 9:59 + * @Description + */ +@Data +public class PaymentApplyDto implements Dto { + private static final long serialVersionUID = 7798653263828204569L; + + @ApiModelProperty(value = "任务id") + @NotBlank(message = "参数错误：taskId") + private String taskId; + @ApiModelProperty(value = "流程id") + @NotBlank(message = "参数错误：procInsId") + @JsonProperty("procInsId") + private String instanceId; + @ApiModelProperty(value = "意见") + private String comment; + @ApiModelProperty(value = "业务sid") + @NotBlank(message = "参数错误：businessSid") + private String businessSid; + @ApiModelProperty(value = "用户sid") + @NotBlank(message = "参数错误：userSid") + private String userSid; + @ApiModelProperty(value = "节点id") + @NotBlank(message = "参数错误：taskDefKey") + private String taskDefKey; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/flowable/PaymentApplyQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/flowable/PaymentApplyQuery.java new file mode 100644 index 0000000000..b2ea38b523 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/flowable/PaymentApplyQuery.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.terminal.api.finance.paymentapply.flowable; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Author dimengzhe + * @Date 2022/10/6 10:00 + * @Description + */ +@Data +public class PaymentApplyQuery implements Query { + private static final long serialVersionUID = 6112966480482869923L; + + @ApiModelProperty(value = "节点key") + private String taskDefKey; + @ApiModelProperty(value = "业务sid") + private String businessSid; + @ApiModelProperty(value = "0 上一环节 1下一环节") + @NotNull(message = "参数错误：next") + private Integer next; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/flowable/PaymentApplyTaskQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/flowable/PaymentApplyTaskQuery.java new file mode 100644 index 0000000000..9679c7b9f9 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/flowable/PaymentApplyTaskQuery.java @@ -0,0 +1,47 @@ +package com.yxt.anrui.terminal.api.finance.paymentapply.flowable; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Author dimengzhe + * @Date 2022/10/6 10:00 + * @Description + */ +@Data +public class PaymentApplyTaskQuery implements Query { + + private static final long serialVersionUID = 4492173829846824226L; + /** + * 终止、驳回、撤回 + */ + @ApiModelProperty("任务Id") + @NotBlank(message = "参数错误：taskId") + private String taskId; + /** + * 终止、驳回、撤回 + */ + @ApiModelProperty("业务sid") + @NotBlank(message = "参数错误：businessSid") + private String businessSid; + /** + * 终止、驳回 + */ + @ApiModelProperty("任务意见") + private String comment; + /** + * 终止、撤回、驳回 + */ + @ApiModelProperty("用户Sid") + private String userSid; + /** + * 终止 + */ + @ApiModelProperty("流程实例Id") + @JsonProperty("procInsId") + private String instanceId; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/paymentapply/PaymentApplyRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/paymentapply/PaymentApplyRest.java new file mode 100644 index 0000000000..4eb45269ad --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/paymentapply/PaymentApplyRest.java @@ -0,0 +1,54 @@ +package com.yxt.anrui.terminal.biz.finance.paymentapply; + +import com.yxt.anrui.terminal.api.finance.paymentapply.PaymentApplyFeign; +import com.yxt.anrui.terminal.api.finance.paymentapply.PaymentApplyVo; +import com.yxt.anrui.terminal.api.finance.paymentapply.flowable.PaymentApplyDto; +import com.yxt.anrui.terminal.api.finance.paymentapply.flowable.PaymentApplyQuery; +import com.yxt.anrui.terminal.api.finance.paymentapply.flowable.PaymentApplyTaskQuery; +import com.yxt.common.core.result.ResultBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +/** + * @Author dimengzhe + * @Date 2022/10/6 10:15 + * @Description + */ +@Controller +@RequestMapping("/finance/v1/paymentApply") +public class PaymentApplyRest implements PaymentApplyFeign { + + @Autowired + private PaymentApplyService paymentApplyService; + + @Override + public ResultBean getPaymentApply(String sid) { + return paymentApplyService.getPaymentApply(sid); + } + + @Override + public ResultBean agreePayApplyInfo(PaymentApplyDto dto) { + return paymentApplyService.agreePayApplyInfo(dto); + } + + @Override + public ResultBean rejectPayApplyInfo(PaymentApplyTaskQuery query) { + return paymentApplyService.rejectPayApplyInfo(query); + } + + @Override + public ResultBean recallPayApplyInfo(PaymentApplyTaskQuery query) { + return paymentApplyService.recallPayApplyInfo(query); + } + + @Override + public ResultBean stopPayApplyInfo(PaymentApplyTaskQuery query) { + return paymentApplyService.stopPayApplyInfo(query); + } + + @Override + public ResultBean getFlowOperateTitle(PaymentApplyQuery query) { + return paymentApplyService.getFlowOperateTitle(query); + } +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/paymentapply/PaymentApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/paymentapply/PaymentApplyService.java new file mode 100644 index 0000000000..088f8ab276 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/paymentapply/PaymentApplyService.java @@ -0,0 +1,137 @@ +package com.yxt.anrui.terminal.biz.finance.paymentapply; + +import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.fin.api.fincostapply.flow.FinCostGetNodeVo; +import com.yxt.anrui.fin.api.finpaymentapply.AppFinPaymentApplyVo; +import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapplyFeign; +import com.yxt.anrui.fin.api.finpaymentapply.flow.FinPayCompleteDto; +import com.yxt.anrui.fin.api.finpaymentapply.flow.FinPayGetNodeQuery; +import com.yxt.anrui.fin.api.finpaymentapply.flow.FinPayGetNodeVo; +import com.yxt.anrui.fin.api.finpaymentapply.flow.FinPayTaskQuery; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.anrui.terminal.api.finance.paymentapply.PaymentApplyVo; +import com.yxt.anrui.terminal.api.finance.paymentapply.flowable.PaymentApplyDto; +import com.yxt.anrui.terminal.api.finance.paymentapply.flowable.PaymentApplyQuery; +import com.yxt.anrui.terminal.api.finance.paymentapply.flowable.PaymentApplyTaskQuery; +import com.yxt.common.core.result.ResultBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Collections; +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/10/6 10:16 + * @Description + */ +@Service +public class PaymentApplyService { + + @Autowired + private FinPaymentapplyFeign finPaymentapplyFeign; + @Autowired + private SysUserFeign sysUserFeign; + @Autowired + private SysStaffOrgFeign sysStaffOrgFeign; + + public ResultBean getPaymentApply(String sid) { + ResultBean rb = ResultBean.fireFail(); + PaymentApplyVo vo = new PaymentApplyVo(); + ResultBean resultBean = finPaymentapplyFeign.getPaymentApply(sid); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + BeanUtil.copyProperties(resultBean.getData(), vo); + return rb.success().setData(vo); + } + + public ResultBean agreePayApplyInfo(PaymentApplyDto dto) { + ResultBean rb = ResultBean.fireFail(); + //根据用户sid获取staffSid + ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + //根据staffSid获取用户的组织全路径 + ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); + if (!staffOrgResultBean.getSuccess()) { + return rb.setMsg(staffOrgResultBean.getMsg()); + } + //用户的组织全路径 + String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); + FinPayCompleteDto finPayCompleteDto = new FinPayCompleteDto(); + BeanUtil.copyProperties(dto, finPayCompleteDto); + finPayCompleteDto.setOrgSidPath(orgSidPath); + ResultBean resultBean = finPaymentapplyFeign.complete(finPayCompleteDto); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean rejectPayApplyInfo(PaymentApplyTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + FinPayTaskQuery finPayTaskQuery = new FinPayTaskQuery(); + BeanUtil.copyProperties(query, finPayTaskQuery); + ResultBean resultBean = finPaymentapplyFeign.taskReject(finPayTaskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean recallPayApplyInfo(PaymentApplyTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + FinPayTaskQuery finPayTaskQuery = new FinPayTaskQuery(); + BeanUtil.copyProperties(query, finPayTaskQuery); + ResultBean resultBean = finPaymentapplyFeign.revokeProcess(finPayTaskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean stopPayApplyInfo(PaymentApplyTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + FinPayTaskQuery finPayTaskQuery = new FinPayTaskQuery(); + BeanUtil.copyProperties(query, finPayTaskQuery); + ResultBean resultBean = finPaymentapplyFeign.breakProcess(finPayTaskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean getFlowOperateTitle(PaymentApplyQuery query) { + ResultBean rb = ResultBean.fireFail(); + //0 上一环节 1下一环节 + int next = query.getNext(); + FinPayGetNodeQuery getNodeQuery = new FinPayGetNodeQuery(); + BeanUtil.copyProperties(query, getNodeQuery); + String data = ""; + if (next == 0) { + ResultBean> getPreviousNodesForReject = finPaymentapplyFeign.getPreviousNodesForReject(getNodeQuery); + if (getPreviousNodesForReject.getSuccess()) { + getPreviousNodesForReject.getData().removeAll(Collections.singleton(null)); + data = getPreviousNodesForReject.getData().get(0).getName(); + } else { + return rb.setMsg(getPreviousNodesForReject.getMsg()); + } + } else if (next == 1) { + ResultBean> getNextNodesForSubmit = finPaymentapplyFeign.getNextNodesForSubmit(getNodeQuery); + if (getNextNodesForSubmit.getSuccess()) { + getNextNodesForSubmit.getData().removeAll(Collections.singleton(null)); + data = getNextNodesForSubmit.getData().get(0).getName(); + } else { + return rb.setMsg(getNextNodesForSubmit.getMsg()); + } + } else { + return rb.setMsg("参数错误：next"); + } + return rb.success().setData(data); + } +} diff --git a/doc/databases/fin_tables.sql b/doc/databases/fin_tables.sql index eb03edbee0..c9d7fb54d0 100644 --- a/doc/databases/fin_tables.sql +++ b/doc/databases/fin_tables.sql @@ -1032,4 +1032,61 @@ CREATE TABLE `fin_manufacturer_bank` PRIMARY KEY (`id`), KEY `id` (`id`) ) ENGINE = INNODB - DEFAULT CHARSET = utf8 COMMENT ='公司开户账号表'; \ No newline at end of file + DEFAULT CHARSET = utf8 COMMENT ='公司开户账号表'; + + + +DROP TABLE IF EXISTS `fin_paymentapply_details`; +CREATE TABLE `fin_paymentapply_details` +( + `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id', + `sid` varchar(64) NOT NULL COMMENT 'sid', + `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁', + `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `isEnable` int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用', + `state` int(32) DEFAULT '1' COMMENT '状态', + `isDelete` int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除', + `remarks` varchar(255) DEFAULT NULL COMMENT '备注', + `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid', + `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid', + `applySid` VARCHAR(64) DEFAULT NULL COMMENT '付款申请sid', + `paymentTypeKey` VARCHAR(64) DEFAULT NULL COMMENT '付款方式key', + `paymentType` VARCHAR(64) DEFAULT NULL COMMENT '付款方式value', + `actualPay` varchar(64) DEFAULT NULL COMMENT '厂家销售通路', + `bank` varchar(64) DEFAULT NULL COMMENT '开户行', + `receivingAccount` varchar(64) DEFAULT NULL COMMENT '收款银行账号', + `payAccount` varchar(64) DEFAULT NULL COMMENT '付款金额', + PRIMARY KEY (`id`), + KEY `id` (`id`) +) ENGINE = INNODB + DEFAULT CHARSET = utf8 COMMENT ='付款申请明细'; + +DROP TABLE IF EXISTS `fin_paymentapply_vehicle`; +CREATE TABLE `fin_paymentapply_vehicle` +( + `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id', + `sid` varchar(64) NOT NULL COMMENT 'sid', + `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁', + `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `isEnable` int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用', + `state` int(32) DEFAULT '1' COMMENT '状态', + `isDelete` int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除', + `remarks` varchar(255) DEFAULT NULL COMMENT '备注', + `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid', + `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid', + `applySid` VARCHAR(64) DEFAULT NULL COMMENT '付款申请sid', + `modelName` VARCHAR(64) DEFAULT NULL COMMENT '车型', + `vinNo` VARCHAR(64) DEFAULT NULL COMMENT '车架号', + `vehiSid` varchar(64) DEFAULT NULL COMMENT '车辆sid', + `modelSid` varchar(64) DEFAULT NULL COMMENT '车型sid', + `configSid` varchar(64) DEFAULT NULL COMMENT '配置sid', + `money` varchar(64) DEFAULT NULL COMMENT '厂家结算价', + PRIMARY KEY (`id`), + KEY `id` (`id`) +) ENGINE = INNODB + DEFAULT CHARSET = utf8 COMMENT ='付款申请车辆'; + + +