Merge remote-tracking branch 'origin/master'

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

@@ -377,7 +377,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
             FinPaymentrecord finPaymentrecord = fetchBySid(sids.get(i));
             //更新还款计划表垫款金额和逾期利息
             if ("007".equals(finPaymentrecord.getCostTypeKey())) {
-                List<LoanBePadsincereVehDetailsVo> loanBePadsincereVehDetailsVos = loanBePadsincereVehFeign.selByMainSid(finPaymentrecord.getBusSid()).getData();
+                List<LoanBePadsincereVehDetailsVo> loanBePadsincereVehDetailsVos = loanBePadsincereVehFeign.selByBankCont(finPaymentrecord.getApplySid(),finPaymentrecord.getBusSid()).getData();
                 for (LoanBePadsincereVehDetailsVo loanBePadsincereVehDetailsVo : loanBePadsincereVehDetailsVos) {
                     log.info("车辆sid++++++++++++++++++++++++++++++++++++++++++" + loanBePadsincereVehDetailsVo.getBusVinSid());
                     log.info("期数++++++++++++++++++++++++++++++++++++++++++" + loanBePadsincereVehDetailsVo.getPeriod());
@@ -393,7 +393,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                     SysUserVo userVo = sysUserFeign.fetchBySid(finPaymentrecord.getCreateBySid()).getData();
                     jr.setCreateByName(userVo.getName());
                     jr.setBusSid(planDetails.getSid());
-                    jr.setApplySid(finPaymentrecord.getBusSid());
+                    jr.setApplySid(finPaymentrecord.getApplySid());
                     jr.setCurrentReceivableMoney(new BigDecimal(paymentInterest));
                     jr.setReveivableMoney(new BigDecimal(paymentInterest));
                     jr.setPayCostTitleKey("005");

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVehFeign.java

@@ -65,12 +65,12 @@ public interface LoanBePadsincereVehFeign {
     @PostMapping("/save")
     @ResponseBody
     public ResultBean save(@RequestBody LoanBePadsincereVehDto dto);
-        
+
     @ApiOperation("根据sid删除记录")
     @DeleteMapping("/delBySids")
     @ResponseBody
     public ResultBean delBySids(@RequestBody String[] sids);
-      
+
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
@@ -80,4 +80,9 @@ public interface LoanBePadsincereVehFeign {
     @GetMapping("/selByMainSid")
     @ResponseBody
     ResultBean<List<LoanBePadsincereVehDetailsVo>> selByMainSid(@RequestParam("applySid") String applySid);
+
+    @ApiOperation("根据sid和资方合同号查询")
+    @GetMapping("/selByBankCont")
+    @ResponseBody
+    ResultBean<List<LoanBePadsincereVehDetailsVo>> selByBankCont(@RequestParam("applySid") String applySid, @RequestParam("busSid") String busSid);
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVehFeignFallback.java

@@ -74,4 +74,9 @@ public class LoanBePadsincereVehFeignFallback implements LoanBePadsincereVehFeig
 	public ResultBean<List<LoanBePadsincereVehDetailsVo>> selByMainSid(String applySid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<List<LoanBePadsincereVehDetailsVo>> selByBankCont(String applySid, String busSid) {
+		return null;
+	}
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java

@@ -964,7 +964,7 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
                 List<LoanBePadsincereVehDetailsVo> loanBePadsincereVehDetailsVos1 = mergeListByBankCon(loanBePadsincereVehDetailsVos);
                 for (LoanBePadsincereVehDetailsVo loanBePadsincereVehDetailsVo : loanBePadsincereVehDetailsVos1) {
                     FinPaymentrecordDto finPaymentrecordDto = new FinPaymentrecordDto();
-                    finPaymentrecordDto.setApplySid("");
+                    finPaymentrecordDto.setApplySid(loanBePadsincereApply.getSid());
                     finPaymentrecordDto.setPayCompanySid("");
                     finPaymentrecordDto.setPayType(1);
                     finPaymentrecordDto.setCreateOrgSid(loanBePadsincereApply.getUseOrgSid());
@@ -978,7 +978,7 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
                     finPaymentrecordDto.setReceiveCompany(loanBePadsincereVehDetailsVo.getBankCollectionAcc());
                     finPaymentrecordDto.setCost(loanBePadsincereVehDetailsVo.getPadMoney());
                     finPaymentrecordDto.setAccountsReceive(loanBePadsincereVehDetailsVo.getPadMoney());
-                    finPaymentrecordDto.setBusSid(loanBePadsincereApply.getSid());
+                    finPaymentrecordDto.setBusSid(loanBePadsincereVehDetailsVo.getBankContractNo());
                     finPaymentrecordDto.setPayRemark(loanBePadsincereApply.getPaymentRemarks());
                     finPaymentrecordDto.setPayCode("");
                     finPaymentrecordDto.setCreateBySid(loanBePadsincereApply.getCreateBySid());

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehMapper.java

@@ -52,24 +52,27 @@ import java.util.List;
 @Mapper
 public interface LoanBePadsincereVehMapper extends BaseMapper<LoanBePadsincereVeh> {
 
-	//@Update("update loan_be_padsincere_veh set name=#{msg} where id=#{id}")
+    //@Update("update loan_be_padsincere_veh set name=#{msg} where id=#{id}")
-	//IPage<LoanBePadsincereVehVo> voPage(IPage<LoanBePadsincereVeh> page, @Param(Constants.WRAPPER) QueryWrapper<LoanBePadsincereVeh> qw);
+    //IPage<LoanBePadsincereVehVo> voPage(IPage<LoanBePadsincereVeh> page, @Param(Constants.WRAPPER) QueryWrapper<LoanBePadsincereVeh> qw);
-	
-	IPage<LoanBePadsincereVehVo> selectPageVo(IPage<LoanBePadsincereVeh> page, @Param(Constants.WRAPPER) Wrapper<LoanBePadsincereVeh> qw);
-	
-	List<LoanBePadsincereVehVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<LoanBePadsincereVeh> qw);
-	
-	@Select("select * from loan_be_padsincere_veh")
-	List<LoanBePadsincereVehVo> selectListVo();
 
-	@Delete("delete from loan_be_padsincere_veh where mainSid = #{mainSid}")
+    IPage<LoanBePadsincereVehVo> selectPageVo(IPage<LoanBePadsincereVeh> page, @Param(Constants.WRAPPER) Wrapper<LoanBePadsincereVeh> qw);
+
+    List<LoanBePadsincereVehVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<LoanBePadsincereVeh> qw);
+
+    @Select("select * from loan_be_padsincere_veh")
+    List<LoanBePadsincereVehVo> selectListVo();
+
+    @Delete("delete from loan_be_padsincere_veh where mainSid = #{mainSid}")
     void delByMainSid(String mainSid);
 
-	@Select("select *,saleVehSid AS busVinSid from loan_be_padsincere_veh where mainSid = #{sid}")
+    @Select("select *,saleVehSid AS busVinSid from loan_be_padsincere_veh where mainSid = #{sid}")
-	List<LoanBePadsincereVehDetailsVo> selByMainSid(String sid);
+    List<LoanBePadsincereVehDetailsVo> selByMainSid(String sid);
+
+    @Update("update loan_be_padsincere_veh set paySid = #{paySid} where mainSid = #{mainSid}")
+    void updatePaySid(@Param("paySid") String paySid, @Param("mainSid") String mainSid);
 
-	@Update("update loan_be_padsincere_veh set paySid = #{paySid} where mainSid = #{mainSid}")
+    List<LoanBePadsincereVeh> selByMainSidAndPaySid(@Param("sid") String sid, @Param("paySid") String paySid);
-    void updatePaySid(@Param("paySid") String paySid,@Param("mainSid") String mainSid);
 
-    List<LoanBePadsincereVeh> selByMainSidAndPaySid(@Param("sid") String sid,@Param("paySid") String paySid);
+    @Select("select *,saleVehSid AS busVinSid from loan_be_padsincere_veh where mainSid = #{applySid} and bankContractNo = #{busSid}")
+    List<LoanBePadsincereVehDetailsVo> selByBankCont(@Param("applySid") String applySid, @Param("busSid") String busSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehRest.java

@@ -34,6 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+
 import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVeh;
 import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVehQuery;
 import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVehVo;
@@ -59,49 +60,56 @@ import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVehFeign
 @RequestMapping("v1/loanbepadsincereveh")
 public class LoanBePadsincereVehRest implements LoanBePadsincereVehFeign {
 
-	@Autowired
+    @Autowired
-	private LoanBePadsincereVehService loanBePadsincereVehService;
+    private LoanBePadsincereVehService loanBePadsincereVehService;
 
-	@Override
+    @Override
-	@ApiOperation("根据条件分页查询数据的列表")
+    @ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
+    @PostMapping("/listPage")
-	public ResultBean<PagerVo<LoanBePadsincereVehVo>> listPage(@RequestBody PagerQuery<LoanBePadsincereVehQuery> pq){
+    public ResultBean<PagerVo<LoanBePadsincereVehVo>> listPage(@RequestBody PagerQuery<LoanBePadsincereVehQuery> pq) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		PagerVo<LoanBePadsincereVehVo> pv = loanBePadsincereVehService.listPageVo(pq);
+        PagerVo<LoanBePadsincereVehVo> pv = loanBePadsincereVehService.listPageVo(pq);
-		return rb.success().setData(pv);
+        return rb.success().setData(pv);
-	}
+    }
 
-	@Override
+    @Override
-	@ApiOperation("新增或修改")
+    @ApiOperation("新增或修改")
-	@PostMapping("/save")
+    @PostMapping("/save")
-	public ResultBean save(@RequestBody LoanBePadsincereVehDto dto){
+    public ResultBean save(@RequestBody LoanBePadsincereVehDto dto) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		loanBePadsincereVehService.saveOrUpdateDto(dto);
+        loanBePadsincereVehService.saveOrUpdateDto(dto);
-		return rb.success();
+        return rb.success();
-	}
+    }
 
-	@Override
+    @Override
-	@ApiOperation("根据sid批量删除")
+    @ApiOperation("根据sid批量删除")
     @PostMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
+    public ResultBean delBySids(@RequestBody String[] sids) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		loanBePadsincereVehService.delBySids(sids);
+        loanBePadsincereVehService.delBySids(sids);
-		return rb.success();
+        return rb.success();
-	}
+    }
 
-	@Override
+    @Override
-	@ApiOperation("根据SID获取一条记录")
+    @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<LoanBePadsincereVehDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+    public ResultBean<LoanBePadsincereVehDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		LoanBePadsincereVehDetailsVo vo = loanBePadsincereVehService.fetchDetailsVoBySid(sid);
+        LoanBePadsincereVehDetailsVo vo = loanBePadsincereVehService.fetchDetailsVoBySid(sid);
-		return rb.success().setData(vo);
+        return rb.success().setData(vo);
-	}
+    }
+
+    @Override
+    public ResultBean<List<LoanBePadsincereVehDetailsVo>> selByMainSid(String applySid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<LoanBePadsincereVehDetailsVo> loanBePadsincereVehDetailsVos = loanBePadsincereVehService.selByMainSid(applySid);
+        return rb.success().setData(loanBePadsincereVehDetailsVos);
+    }
 
-	@Override
+    @Override
-	public ResultBean<List<LoanBePadsincereVehDetailsVo>> selByMainSid(String applySid) {
+    public ResultBean<List<LoanBePadsincereVehDetailsVo>> selByBankCont(String applySid, String busSid) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		List<LoanBePadsincereVehDetailsVo> loanBePadsincereVehDetailsVos = loanBePadsincereVehService.selByMainSid(applySid);
+        List<LoanBePadsincereVehDetailsVo> loanBePadsincereVehDetailsVos = loanBePadsincereVehService.selByBankCont(applySid, busSid);
-		return rb.success().setData(loanBePadsincereVehDetailsVos);
+        return rb.success().setData(loanBePadsincereVehDetailsVos);
-	}
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehService.java

@@ -104,10 +104,14 @@ public class LoanBePadsincereVehService extends MybatisBaseService<LoanBePadsinc
     }
 
     public void updatePaySid(String paySid, String mainSid) {
-        baseMapper.updatePaySid(paySid,mainSid);
+        baseMapper.updatePaySid(paySid, mainSid);
     }
 
     public List<LoanBePadsincereVeh> selByMainSidAndPaySid(String sid, String paySid) {
-        return baseMapper.selByMainSidAndPaySid(sid,paySid);
+        return baseMapper.selByMainSidAndPaySid(sid, paySid);
+    }
+
+    public List<LoanBePadsincereVehDetailsVo> selByBankCont(String applySid, String busSid) {
+        return baseMapper.selByBankCont(applySid, busSid);
     }
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/OneExcelInfo.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.scm.api.scmspecialrebate;
 
+import com.yxt.common.core.utils.ExportEntityMap;
 import lombok.Data;
 
 /**
@@ -10,6 +11,10 @@ import lombok.Data;
 @Data
 public class OneExcelInfo {
 
+    //采购系统
+    private String purchaseSystemName;
+    //品牌名称
+    private String brandName;
     //创建日期
     private String createTime;
     //返利名称
@@ -18,14 +23,24 @@ public class OneExcelInfo {
     private String rebateTypeValue;
     //预提返利
     private String estimateRebate;
+    //其中预提费用
+    private String expectCost;
+    //所属年月
+    private String palceGenDate;
     //上传日期
     private String uploadDate;
     //上传金额
     private String uploadMoney;
     //待确定金额
     private String stayDetermineMoney;
-    //费用
+    //一次支出费用
-    private String money;
+    private String onceItureCost;
+    //一次待支付费用
+    private String onceTreatCost;
+    //一次抵顶费用
+    private String onceSuppCost;
+    //一次抵顶费用说明
+    private String onceSuppRemark;
     //调整说明
     private String adjustmentRemarks;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/OneExcelVo.java

@@ -11,39 +11,51 @@ import lombok.Data;
 @Data
 public class OneExcelVo {
 
-    //创建日期
+    @ExportEntityMap(CnName = "采购系统", EnName = "purchaseSystemName")
+    private String purchaseSystemName;
+
+    @ExportEntityMap(CnName = "品牌名称", EnName = "brandName")
+    private String brandName;
+
     @ExportEntityMap(CnName = "创建日期", EnName = "createTime")
     private String createTime;
 
-    //返利名称
     @ExportEntityMap(CnName = "返利名称", EnName = "rebateName")
     private String rebateName;
 
-    //返利类型
     @ExportEntityMap(CnName = "返利类型", EnName = "rebateTypeValue")
     private String rebateTypeValue;
 
-    //预提返利
     @ExportEntityMap(CnName = "预提返利", EnName = "estimateRebate")
     private String estimateRebate;
 
-    //上传日期
+    @ExportEntityMap(CnName = "其中预提费用", EnName = "expectCost")
+    private String expectCost;
+
+    @ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate")
+    private String palceGenDate;
+
     @ExportEntityMap(CnName = "上传日期", EnName = "uploadDate")
     private String uploadDate;
 
-    //上传金额
     @ExportEntityMap(CnName = "上传金额", EnName = "uploadMoney")
     private String uploadMoney;
 
-    //待确定金额
     @ExportEntityMap(CnName = "待确定金额", EnName = "stayDetermineMoney")
     private String stayDetermineMoney;
 
-    //费用
+    @ExportEntityMap(CnName = "一次支出费用", EnName = "onceItureCost")
-    @ExportEntityMap(CnName = "费用", EnName = "money")
+    private String onceItureCost;
-    private String money;
+
+    @ExportEntityMap(CnName = "一次待支付费用", EnName = "onceTreatCost")
+    private String onceTreatCost;
+
+    @ExportEntityMap(CnName = "一次抵顶费用", EnName = "onceSuppCost")
+    private String onceSuppCost;
+
+    @ExportEntityMap(CnName = "一次抵顶费用说明", EnName = "onceSuppRemark")
+    private String onceSuppRemark;
 
-    //调整说明
     @ExportEntityMap(CnName = "调整说明", EnName = "adjustmentRemarks")
     private String adjustmentRemarks;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebate.java

@@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * Project: anrui-scm(专项返利管理) <br/>
  * File: ScmSpecialRebate.java <br/>
@@ -60,8 +62,6 @@ public class ScmSpecialRebate extends BaseEntity {
     private String rebateTypeValue; // 返利类型value
 	@ApiModelProperty("返利名称")
     private String rebateName; // 返利名称
-	@ApiModelProperty("计算标准")
-    private String calculationStandard; // 计算标准
 	@ApiModelProperty("预计返利")
     private String estimateRebate; // 预计返利
 	@ApiModelProperty("预提日期")
@@ -74,10 +74,6 @@ public class ScmSpecialRebate extends BaseEntity {
     private String secondaryUploadDate; // 二次上传日期
 	@ApiModelProperty("二次上传金额")
     private String secondaryUploadMoney; // 二次上传金额
-	@ApiModelProperty("待确定金额")
-    private String stayDetermineMoney; // 待确定金额
-	@ApiModelProperty("费用")
-    private String money; // 费用
 	@ApiModelProperty("是否调整")
     private String isAdjustment; // 是否调整
 	@ApiModelProperty("调整金额")
@@ -90,6 +86,47 @@ public class ScmSpecialRebate extends BaseEntity {
     private String calculationModeKey; // 计算方式key
 	@ApiModelProperty("计算方式Value")
     private String calculationModeValue; // 计算方式Value
+
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
+    @ApiModelProperty("所属年月")
+    private String palceGenDate;
+    @ApiModelProperty("一次核对状态")
+    private Integer onceCheckState;
+    @ApiModelProperty("待确定金额(动态)")
+    private String stayDetermineMoney;
+    @ApiModelProperty("待确定金额(常量)")
+    private String stayDetermineMoneyNew;
+    @ApiModelProperty("差异金额")
+    private BigDecimal diffAmount;
+    @ApiModelProperty("预计支出费用")
+    private BigDecimal expectItureCost;
+    @ApiModelProperty("预计待支付费用")
+    private BigDecimal expectTreatCost;
+    @ApiModelProperty("预计抵顶费用")
+    private BigDecimal expectSuppCost;
+    @ApiModelProperty("预计抵顶费用说明")
+    private String expectSuppRemark;
+
+    @ApiModelProperty("一次支出费用")
+    private BigDecimal onceItureCost;
+    @ApiModelProperty("一次待支付费用")
+    private BigDecimal onceTreatCost;
+    @ApiModelProperty("一次抵顶费用")
+    private BigDecimal onceSuppCost;
+    @ApiModelProperty("一次抵顶费用说明")
+    private String onceSuppRemark;
+    @ApiModelProperty("二次支出费用")
+    private BigDecimal secondItureCost;
+    @ApiModelProperty("二次待支付费用")
+    private BigDecimal secondTreatCost;
+    @ApiModelProperty("二次抵顶费用")
+    private BigDecimal secondSuppCost;
+    @ApiModelProperty("二次抵顶费用说明")
+    private String secondSuppRemark;
+
 	@ApiModelProperty("使用组织sid")
     private String useOrgSid; // 使用组织sid
 	@ApiModelProperty("使用组织名称")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDetailsVo.java

@@ -33,6 +33,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -85,8 +86,6 @@ public class ScmSpecialRebateDetailsVo implements Vo {
     private String secondaryUploadDate; // 二次上传日期
 	@ApiModelProperty("二次上传金额")
     private String secondaryUploadMoney; // 二次上传金额
-	@ApiModelProperty("待确定金额")
-    private String stayDetermineMoney; // 待确定金额
 	@ApiModelProperty("费用")
     private String money; // 费用
 	@ApiModelProperty("是否调整")
@@ -101,6 +100,41 @@ public class ScmSpecialRebateDetailsVo implements Vo {
     private String calculationModeKey; // 计算方式key
 	@ApiModelProperty("计算方式Value")
     private String calculationModeValue; // 计算方式Value
+
+    @ApiModelProperty("待确定金额(动态)")
+    private String stayDetermineMoney;
+    @ApiModelProperty("待确定金额(常量)")
+    private String stayDetermineMoneyNew;
+    @ApiModelProperty("其中预计费用")
+    private BigDecimal expectCost;
+    @ApiModelProperty("差异金额")
+    private BigDecimal diffAmount;
+    @ApiModelProperty("预计支出费用")
+    private BigDecimal expectItureCost;
+    @ApiModelProperty("预计待支付费用")
+    private BigDecimal expectTreatCost;
+    @ApiModelProperty("预计抵顶费用")
+    private BigDecimal expectSuppCost;
+    @ApiModelProperty("预计抵顶费用说明")
+    private String expectSuppRemark;
+
+    @ApiModelProperty("一次支出费用")
+    private BigDecimal onceItureCost;
+    @ApiModelProperty("一次待支付费用")
+    private BigDecimal onceTreatCost;
+    @ApiModelProperty("一次抵顶费用")
+    private BigDecimal onceSuppCost;
+    @ApiModelProperty("一次抵顶费用说明")
+    private String onceSuppRemark;
+    @ApiModelProperty("二次支出费用")
+    private BigDecimal secondItureCost;
+    @ApiModelProperty("二次待支付费用")
+    private BigDecimal secondTreatCost;
+    @ApiModelProperty("二次抵顶费用")
+    private BigDecimal secondSuppCost;
+    @ApiModelProperty("二次抵顶费用说明")
+    private String secondSuppRemark;
+
 	@ApiModelProperty("使用组织sid")
     private String useOrgSid; // 使用组织sid
 	@ApiModelProperty("使用组织名称")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDto.java

@@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * Project: anrui-scm(专项返利管理) <br/>
  * File: ScmSpecialRebateDto.java <br/>
@@ -79,8 +81,6 @@ public class ScmSpecialRebateDto implements Dto {
     private String secondaryUploadDate; // 二次上传日期
 	@ApiModelProperty("二次上传金额")
     private String secondaryUploadMoney; // 二次上传金额
-	@ApiModelProperty("待确定金额")
-    private String stayDetermineMoney; // 待确定金额
 	@ApiModelProperty("费用")
     private String money; // 费用
 	@ApiModelProperty("是否调整")
@@ -95,6 +95,41 @@ public class ScmSpecialRebateDto implements Dto {
     private String calculationModeKey; // 计算方式key
 	@ApiModelProperty("计算方式Value")
     private String calculationModeValue; // 计算方式Value
+
+    @ApiModelProperty("待确定金额(动态)")
+    private String stayDetermineMoney;
+    @ApiModelProperty("待确定金额(常量)")
+    private String stayDetermineMoneyNew;
+    @ApiModelProperty("其中预计费用")
+    private BigDecimal expectCost;
+    @ApiModelProperty("差异金额")
+    private BigDecimal diffAmount;
+    @ApiModelProperty("预计支出费用")
+    private BigDecimal expectItureCost;
+    @ApiModelProperty("预计待支付费用")
+    private BigDecimal expectTreatCost;
+    @ApiModelProperty("预计抵顶费用")
+    private BigDecimal expectSuppCost;
+    @ApiModelProperty("预计抵顶费用说明")
+    private String expectSuppRemark;
+
+    @ApiModelProperty("一次支出费用")
+    private BigDecimal onceItureCost;
+    @ApiModelProperty("一次待支付费用")
+    private BigDecimal onceTreatCost;
+    @ApiModelProperty("一次抵顶费用")
+    private BigDecimal onceSuppCost;
+    @ApiModelProperty("一次抵顶费用说明")
+    private String onceSuppRemark;
+    @ApiModelProperty("二次支出费用")
+    private BigDecimal secondItureCost;
+    @ApiModelProperty("二次待支付费用")
+    private BigDecimal secondTreatCost;
+    @ApiModelProperty("二次抵顶费用")
+    private BigDecimal secondSuppCost;
+    @ApiModelProperty("二次抵顶费用说明")
+    private String secondSuppRemark;
+
 	@ApiModelProperty("使用组织sid")
     private String useOrgSid; // 使用组织sid
 	@ApiModelProperty("使用组织名称")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateQuery.java

@@ -51,8 +51,15 @@ import java.util.List;
 @ApiModel(value = "专项返利表 查询条件", description = "专项返利表 查询条件")
 public class ScmSpecialRebateQuery implements Query {
 
-	@ApiModelProperty("品牌sid")
+    @ApiModelProperty("分公司sid")
-    private String brandSid; // 品牌sid
+    private String createOrgSid;
+    @ApiModelProperty("分公司名称")
+    private String createOrgName;
+	@ApiModelProperty("品牌名称")
+    private String brandName;
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
+
 	@ApiModelProperty("返利类型key")
     private String rebateTypeKey; // 返利类型key
 	@ApiModelProperty("返利名称")
@@ -62,9 +69,8 @@ public class ScmSpecialRebateQuery implements Query {
     @ApiModelProperty("创建结束日期")
     private String createEndTime; // 创建结束日期
     @ApiModelProperty("状态")
-    private String state; // 状态
+    private String state;
-    @ApiModelProperty("分公司sid")
+
-    private String createOrgSid;
     @ApiModelProperty("专项返利sid")
     private List<String> sidList; // 专项返利sid
 

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java

@@ -33,6 +33,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -52,66 +53,76 @@ import java.util.Date;
 @ApiModel(value = "专项返利表 视图数据对象", description = "专项返利表 视图数据对象")
 public class ScmSpecialRebateVo implements Vo {
 
-    private String sid; // sid
+    private String sid;
 
+    @ApiModelProperty("状态")
+    private String state;
+    @ApiModelProperty("创建组织名称")
+    private String createOrgName;
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
+    @ApiModelProperty("品牌名称")
+    private String brandName;
     @ApiModelProperty("创建日期")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date createTime; // 创建日期
+    private Date createTime;
-    @ApiModelProperty("状态")
-    private String state; // 状态
-	@ApiModelProperty("品牌sid")
-    private String brandSid; // 品牌sid
-	@ApiModelProperty("品牌名称")
-    private String brandName; // 品牌名称
-	@ApiModelProperty("返利类型key")
-    private String rebateTypeKey; // 返利类型key
 	@ApiModelProperty("返利类型value")
-    private String rebateTypeValue; // 返利类型value
+    private String rebateTypeValue;
 	@ApiModelProperty("返利名称")
-    private String rebateName; // 返利名称
+    private String rebateName;
-	@ApiModelProperty("计算标准")
-    private String calculationStandard; // 计算标准
 	@ApiModelProperty("预计返利")
-    private String estimateRebate; // 预计返利
+    private String estimateRebate;
 	@ApiModelProperty("预提日期")
-    private String withholdingDate; // 预提日期
+    private String withholdingDate;
-    @ApiModelProperty("预提日期(页面展示)")
-    private String withholdingDateCopy; // 预提日期(页面展示)
 	@ApiModelProperty("上传日期")
-    private String uploadDate; // 上传日期
+    private String uploadDate;
 	@ApiModelProperty("上传金额")
-    private String uploadMoney; // 上传金额
+    private String uploadMoney;
 	@ApiModelProperty("二次上传日期")
-    private String secondaryUploadDate; // 二次上传日期
+    private String secondaryUploadDate;
 	@ApiModelProperty("二次上传金额")
-    private String secondaryUploadMoney; // 二次上传金额
+    private String secondaryUploadMoney;
-	@ApiModelProperty("待确定金额")
-    private String stayDetermineMoney; // 待确定金额
-	@ApiModelProperty("费用")
-    private String money; // 费用
 	@ApiModelProperty("是否调整")
-    private String isAdjustment; // 是否调整
+    private String isAdjustment;
 	@ApiModelProperty("调整金额")
-    private String adjustmentMoney; // 调整金额
+    private String adjustmentMoney;
 	@ApiModelProperty("调整说明")
-    private String adjustmentRemarks; // 调整说明
+    private String adjustmentRemarks;
-    @ApiModelProperty("调整状态")
+    @ApiModelProperty("待确定金额(动态)")
-    private Integer adjustmentState;
+    private String stayDetermineMoney;
-	@ApiModelProperty("计算方式key")
+    @ApiModelProperty("其中预计费用")
-    private String calculationModeKey; // 计算方式key
+    private BigDecimal expectCost;
-	@ApiModelProperty("计算方式Value")
+    @ApiModelProperty("所属年月")
-    private String calculationModeValue; // 计算方式Value
+    private String palceGenDate;
-	@ApiModelProperty("使用组织sid")
+    @ApiModelProperty("其中费用")
-    private String useOrgSid; // 使用组织sid
+    private String money;
-	@ApiModelProperty("使用组织名称")
+    @ApiModelProperty("差异金额")
-    private String useOrgName; // 使用组织名称
+    private BigDecimal diffAmount;
-	@ApiModelProperty("创建组织sid")
+    @ApiModelProperty("预计支出费用")
-    private String createOrgSid; // 创建组织sid
+    private BigDecimal expectItureCost;
-	@ApiModelProperty("创建组织名称")
+    @ApiModelProperty("预计待支付费用")
-    private String createOrgName; // 创建组织名称
+    private BigDecimal expectTreatCost;
-    @ApiModelProperty("上传状态(0未上传、1已上传)")
+    @ApiModelProperty("预计抵顶费用")
-    private String uploadState; // 上传状态
+    private BigDecimal expectSuppCost;
-    @ApiModelProperty("是否可以点击是否调整")
+    @ApiModelProperty("预计抵顶费用说明")
-    private Boolean adjustOrNot;
+    private String expectSuppRemark;
 
+    @ApiModelProperty("一次支出费用")
+    private BigDecimal onceItureCost;
+    @ApiModelProperty("一次待支付费用")
+    private BigDecimal onceTreatCost;
+    @ApiModelProperty("一次抵顶费用")
+    private BigDecimal onceSuppCost;
+    @ApiModelProperty("一次抵顶费用说明")
+    private String onceSuppRemark;
+    @ApiModelProperty("二次支出费用")
+    private BigDecimal secondItureCost;
+    @ApiModelProperty("二次待支付费用")
+    private BigDecimal secondTreatCost;
+    @ApiModelProperty("二次抵顶费用")
+    private BigDecimal secondSuppCost;
+    @ApiModelProperty("二次抵顶费用说明")
+    private String secondSuppRemark;
+    @ApiModelProperty("上传状态(0未上传、1已上传)")
+    private String uploadState;
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java

@@ -117,8 +117,14 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 return p;
             }
         }
-        if (StringUtils.isNotBlank(query.getBrandSid())) {
+        if (StringUtils.isNotBlank(query.getCreateOrgName())) {
-            qw.eq("brandSid", query.getBrandSid());
+            qw.like("createOrgName", query.getCreateOrgName());
+        }
+        if (StringUtils.isNotBlank(query.getBrandName())) {
+            qw.like("brandName", query.getBrandName());
+        }
+        if (StringUtils.isNotBlank(query.getPurchaseSystemName())) {
+            qw.like("purchaseSystemName", query.getPurchaseSystemName());
         }
         if (StringUtils.isNotBlank(query.getRebateTypeKey())) {
             qw.eq("rebateTypeKey", query.getRebateTypeKey());
@@ -187,8 +193,11 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
         ScmSpecialRebateQuery query = pq.getParams();
         QueryWrapper<ScmSpecialRebate> qw = new QueryWrapper<>();
         qw.eq("createOrgSid",query.getCreateOrgSid());
-        if (StringUtils.isNotBlank(query.getBrandSid())) {
+        if (StringUtils.isNotBlank(query.getBrandName())) {
-            qw.eq("brandSid", query.getBrandSid());
+            qw.like("brandName", query.getBrandName());
+        }
+        if (StringUtils.isNotBlank(query.getPurchaseSystemName())) {
+            qw.like("purchaseSystemName", query.getPurchaseSystemName());
         }
         if (StringUtils.isNotBlank(query.getRebateTypeKey())) {
             qw.eq("rebateTypeKey", query.getRebateTypeKey());
@@ -254,8 +263,11 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 return p;
             }
         }
-        if (StringUtils.isNotBlank(query.getBrandSid())) {
+        if (StringUtils.isNotBlank(query.getBrandName())) {
-            qw.eq("brandSid", query.getBrandSid());
+            qw.like("brandName", query.getBrandName());
+        }
+        if (StringUtils.isNotBlank(query.getPurchaseSystemName())) {
+            qw.like("purchaseSystemName", query.getPurchaseSystemName());
         }
         if (StringUtils.isNotBlank(query.getRebateTypeKey())) {
             qw.eq("rebateTypeKey", query.getRebateTypeKey());
@@ -278,30 +290,6 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
             } else {//上传状态：已上传
                 record.setUploadState("1");
             }
-            //是否调整
-            if (0 == record.getAdjustmentState()) {
-                if (new BigDecimal(record.getStayDetermineMoney()).compareTo(BigDecimal.ZERO) == 0) {
-                    BigDecimal decimal = new BigDecimal(StringUtils.isNotBlank(record.getUploadMoney()) ? record.getUploadMoney() : "0").add(new BigDecimal(StringUtils.isNotBlank(record.getSecondaryUploadMoney()) ? record.getSecondaryUploadMoney() : "0")).subtract(new BigDecimal(StringUtils.isNotBlank(record.getMoney()) ? record.getMoney() : "0")).subtract(new BigDecimal(StringUtils.isNotBlank(record.getStayDetermineMoney()) ? record.getStayDetermineMoney() : "0")).subtract(new BigDecimal(StringUtils.isNotBlank(record.getEstimateRebate()) ? record.getEstimateRebate() : "0"));
-                    int i = decimal.compareTo(BigDecimal.ZERO);
-                    if (i < 0) {//小于
-                        record.setIsAdjustment("否");
-                        record.setAdjustmentMoney("0");
-                        record.setAdjustOrNot(true);
-                    } else if (i == 0) {//等于
-                        record.setIsAdjustment("是");
-                        record.setAdjustmentMoney("0");
-                        record.setAdjustOrNot(false);
-                    } else {//大于
-                        record.setIsAdjustment("是");
-                        record.setAdjustmentMoney(decimal.toString());
-                        record.setAdjustOrNot(true);
-                    }
-                } else {
-                    record.setIsAdjustment("否");
-                    record.setAdjustmentMoney("0");
-                    record.setAdjustOrNot(false);
-                }
-            }
         }
         PagerVo<ScmSpecialRebateVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
@@ -350,10 +338,12 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 return p;
             }
         }
-        if (StringUtils.isNotBlank(query.getBrandSid())) {
+        if (StringUtils.isNotBlank(query.getBrandName())) {
-            qw.eq("brandSid", query.getBrandSid());
+            qw.like("brandName", query.getBrandName());
+        }
+        if (StringUtils.isNotBlank(query.getPurchaseSystemName())) {
+            qw.like("purchaseSystemName", query.getPurchaseSystemName());
         }
-
         if (StringUtils.isNotBlank(query.getRebateTypeKey())) {
             qw.eq("rebateTypeKey", query.getRebateTypeKey());
         }
@@ -372,15 +362,6 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
         }
         IPage<ScmSpecialRebate> page = PagerUtil.queryToPage(pq);
         IPage<ScmSpecialRebateVo> pagging = baseMapper.selectPageVo(page, qw);
-        for (ScmSpecialRebateVo record : pagging.getRecords()) {
-            if (StringUtils.isNotBlank(record.getWithholdingDate())){
-                Date withholdingDate = DateUtil.parseDate(record.getWithholdingDate());
-                int year = DateUtil.year(withholdingDate);
-                int month = DateUtil.month(withholdingDate) + 1;
-                String withholdingDateCopy = year + "年" + month + "月";
-                record.setWithholdingDateCopy(withholdingDateCopy);
-            }
-        }
         PagerVo<ScmSpecialRebateVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
@@ -452,8 +433,11 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 return p;
             }
         }
-        if (StringUtils.isNotBlank(query.getBrandSid())) {
+        if (StringUtils.isNotBlank(query.getBrandName())) {
-            qw.eq("ssr.brandSid", query.getBrandSid());
+            qw.like("brandName", query.getBrandName());
+        }
+        if (StringUtils.isNotBlank(query.getPurchaseSystemName())) {
+            qw.like("purchaseSystemName", query.getPurchaseSystemName());
         }
         if (StringUtils.isNotBlank(query.getRebateTypeKey())) {
             qw.eq("ssr.rebateTypeKey", query.getRebateTypeKey());
@@ -500,7 +484,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
             return rb.fail().setMsg("上传文件不正确");
         }
 
-        int[] resultCell = new int[]{0, 1, 2, 3, 4, 5, 6, 7, 8};
+        int[] resultCell = new int[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
         boolean isExcel2003 = true;
         if (fileName.matches("^.+\\.(?i)(xlsx)$")) {
             isExcel2003 = false;
@@ -522,7 +506,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 ScmSpecialRebateVo scmSpecialRebateVo = baseMapper.selectExcelInfo(info.getCreateTime(), info.getRebateName(), info.getRebateTypeValue(), info.getEstimateRebate());
                 Date javaDate = new Date((long) ((Double.valueOf(info.getUploadDate()) - 25569) * 86400 * 1000));
                 String uploadDate = DateUtil.formatDate(javaDate);
-                baseMapper.updateOneExcelInfo(uploadDate, info.getUploadMoney(), info.getStayDetermineMoney(), info.getMoney(), info.getAdjustmentRemarks(), scmSpecialRebateVo.getSid());
+                baseMapper.updateOneExcelInfo(uploadDate, info.getUploadMoney(), info.getStayDetermineMoney(), info.getOnceItureCost(), info.getAdjustmentRemarks(), scmSpecialRebateVo.getSid());
             }
             return rb.success().setMsg("成功导入数据，请点击确定按钮");
         }
@@ -553,9 +537,15 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                     for (int j = 0; j < resultCell.length; j++) {
                         if (i == resultCell[j]) {
                             switch (i) {
+                                /*case 0:
+                                    //importVo.set(temp);
+                                    break;
                                 case 0:
                                     importVo.setCreateTime(temp);
                                     break;
+                                case 0:
+                                    importVo.setCreateTime(temp);
+                                    break;*/
                                 case 1:
                                     importVo.setRebateName(temp);
                                     break;
@@ -575,7 +565,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                                     importVo.setStayDetermineMoney(temp);
                                     break;
                                 case 7:
-                                    importVo.setMoney(temp);
+                                    //importVo.setMoney(temp);
                                     break;
                                 case 8:
                                     importVo.setAdjustmentRemarks(temp);
@@ -634,10 +624,10 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                     checkWord.add("返利名称" + excelInfo.getRebateName() + "导入的返利信息不存在");
                     break;
                 }
-                if (scmSpecialRebateVo.getAdjustmentState() == 1) {
+                /*if (scmSpecialRebateVo.get() == 1) {
                     checkWord.add("返利名称" + excelInfo.getRebateName() + "导入的返利信息已调整");
                     break;
-                }
+                }*/
                 if (StringUtils.isBlank(excelInfo.getCreateTime())) {
                     checkWord.add("创建日期不能为空");
                     break;
@@ -734,19 +724,6 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                         break;
                     }
                 }
-                if (StringUtils.isBlank(excelInfo.getMoney())) {
-                    checkWord.add("费用不能为空");
-                    break;
-                }
-                if (StringUtils.isNotBlank(excelInfo.getMoney())) {
-                    String money = excelInfo.getMoney();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
-                    boolean matches = pattern.matcher(money).matches();
-                    if (!matches) {
-                        checkWord.add("费用必须为数字");
-                        break;
-                    }
-                }
                 if (StringUtils.isBlank(excelInfo.getAdjustmentRemarks())) {
                     checkWord.add("调整说明不能为空");
                     break;
@@ -991,10 +968,10 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                     checkWord.add("返利名称" + excelInfo.getRebateName() + "导入的返利信息不存在");
                     break;
                 }
-                if (scmSpecialRebateVo.getAdjustmentState() == 1) {
+               /* if (excelInfo.getOnceCheckState() == 1) {
-                    checkWord.add("返利名称" + excelInfo.getRebateName() + "导入的返利信息已调整");
+                    checkWord.add("车架号" + excelInfo.getRebateName() + "导入的返利信息已核对");
                     break;
-                }
+                }*/
                 if (StringUtils.isBlank(excelInfo.getCreateTime())) {
                     checkWord.add("创建日期不能为空");
                     break;
@@ -1205,8 +1182,11 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 return p;
             }
         }
-        if (StringUtils.isNotBlank(query.getBrandSid())) {
+        if (StringUtils.isNotBlank(query.getBrandName())) {
-            qw.eq("brandSid", query.getBrandSid());
+            qw.like("brandName", query.getBrandName());
+        }
+        if (StringUtils.isNotBlank(query.getPurchaseSystemName())) {
+            qw.like("purchaseSystemName", query.getPurchaseSystemName());
         }
         if (StringUtils.isNotBlank(query.getRebateTypeKey())) {
             qw.eq("rebateTypeKey", query.getRebateTypeKey());
@@ -1274,8 +1254,11 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 return p;
             }
         }
-        if (StringUtils.isNotBlank(query.getBrandSid())) {
+        if (StringUtils.isNotBlank(query.getBrandName())) {
-            qw.eq("brandSid", query.getBrandSid());
+            qw.like("brandName", query.getBrandName());
+        }
+        if (StringUtils.isNotBlank(query.getPurchaseSystemName())) {
+            qw.like("purchaseSystemName", query.getPurchaseSystemName());
         }
         if (StringUtils.isNotBlank(query.getRebateTypeKey())) {
             qw.eq("rebateTypeKey", query.getRebateTypeKey());