From 6ef3585468f6f4c5906e75d8a4795bd6d6c06cb4 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 30 Sep 2024 11:37:33 +0800 Subject: [PATCH] 1 --- .../bussalesorder/BusSalesOrderService.java | 19 +- .../riskcenter/api/loanaudit/LoanAudit.java | 65 ++++++ .../api/loanaudit/LoanAuditDetailsVo.java | 65 ++++++ .../api/loanaudit/LoanAuditDto.java | 65 ++++++ .../api/loanaudit/LoanAuditFeign.java | 69 +++++++ .../api/loanaudit/LoanAuditQuery.java | 53 +++++ .../api/loanaudit/LoanAuditResulitDto.java | 44 ++++ .../riskcenter/api/loanaudit/LoanAuditVo.java | 56 +++++ .../biz/loanaudit/LoanAuditMapper.java | 61 ++++++ .../biz/loanaudit/LoanAuditMapper.xml | 11 + .../biz/loanaudit/LoanAuditRest.java | 89 ++++++++ .../biz/loanaudit/LoanAuditService.java | 164 +++++++++++++++ .../scm/api/scmvehrebate/ScmVehRebate.java | 6 +- .../scmvehrebate/ScmVehRebateDetailsVo.java | 8 +- .../api/scmvehrebate/ScmVehRebateFeign.java | 2 +- .../scmvehrebate/ScmVehRebateVehAdjDto.java | 23 ++- .../api/scmvehrebate/ScmVehRebateVehDto.java | 6 +- .../scm/api/scmvehrebate/ScmVehRebateVo.java | 14 +- .../ScmVehrebateCheckapplyDetailsVo.java | 4 + .../ScmVehrebateCheckapplyDto.java | 6 +- .../ScmVehrebateCheckapplyVo.java | 2 + .../ScmVehrebateCheckapplydetail.java | 84 ++++++++ ...ScmVehrebateCheckapplydetailDetailsVo.java | 8 +- .../ScmVehrebateCheckapplydetailDto.java | 92 ++++++++- .../ScmVehrebateCheckapplydetailVo.java | 90 ++++++++- .../biz/scmvehrebate/ScmVehRebateMapper.java | 4 +- .../biz/scmvehrebate/ScmVehRebateMapper.xml | 33 ++- .../biz/scmvehrebate/ScmVehRebateRest.java | 6 +- .../biz/scmvehrebate/ScmVehRebateService.java | 89 ++++---- .../ScmVehrebateCheckapplyMapper.xml | 3 +- .../ScmVehrebateCheckapplyService.java | 83 ++------ .../ScmVehrebateCheckapplydetailMapper.java | 3 + .../ScmVehrebateCheckapplydetailMapper.xml | 49 ++--- .../ScmVehrebateCheckapplydetailRest.java | 46 +---- .../ScmVehrebateCheckapplydetailService.java | 39 +--- .../ScmVehRebateWithService.java | 9 +- .../ScmVehRebateWithApplyService.java | 1 + .../AppBusclaimCheckApplyDetailVo.java | 85 ++++++++ .../AppBusclaimCheckApplyDetailsVo.java | 27 +++ .../AppBusclaimCheckApplyFeign.java | 60 ++++++ .../flowable/AppDelegateQuery.java | 25 +++ .../flowable/AppFlowDto.java | 37 ++++ .../flowable/AppFlowQuery.java | 28 +++ .../flowable/AppFlowTaskQuery.java | 47 +++++ .../anrui/terminal/TerminalApplication.java | 2 +- .../AppBusclaimCheckApplyRest.java | 85 ++++++++ .../AppBusclaimCheckApplyService.java | 191 ++++++++++++++++++ .../AsBusclaimCheckApplyDetailVo.java | 90 +++++++++ .../AsBusclaimCheckApplyDetailsVo.java | 50 +++++ .../AsBusclaimCheckApplyFegin.java | 59 ++++++ .../AsBusclaimCheckApplyFile.java | 14 ++ .../BusclaimCheckApplyDelegateQuery.java | 23 +++ .../flowable/BusclaimCheckApplyNodeQuery.java | 18 ++ .../flowable/BusclaimCheckApplyNodeVo.java | 24 +++ .../flowable/BusclaimCheckApplyTaskQuery.java | 43 ++++ .../CompleteBusclaimCheckApplyDto.java | 35 ++++ .../AsBusclaimCheckApplyDetail.java | 28 +-- .../AsBusclaimCheckApplyDetailDto.java | 18 +- .../AsBusclaimCheckApplyDetailVo.java | 26 ++- .../AsBusclaimInvoiceBillDetail.java | 2 - .../AsBusclaimCheckApplyService.java | 34 +++- .../AsBusclaimCheckApplyDetailMapper.xml | 4 +- 62 files changed, 2182 insertions(+), 344 deletions(-) create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAudit.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditDetailsVo.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditDto.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditFeign.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditQuery.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditResulitDto.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditVo.java create mode 100644 anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanaudit/LoanAuditMapper.java create mode 100644 anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanaudit/LoanAuditMapper.xml create mode 100644 anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanaudit/LoanAuditRest.java create mode 100644 anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanaudit/LoanAuditService.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busclaimcheckapply/AppBusclaimCheckApplyDetailVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busclaimcheckapply/AppBusclaimCheckApplyDetailsVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busclaimcheckapply/AppBusclaimCheckApplyFeign.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busclaimcheckapply/flowable/AppDelegateQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busclaimcheckapply/flowable/AppFlowDto.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busclaimcheckapply/flowable/AppFlowQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busclaimcheckapply/flowable/AppFlowTaskQuery.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/busclaimcheckapply/AppBusclaimCheckApplyRest.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/busclaimcheckapply/AppBusclaimCheckApplyService.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaimcheckapply/AsBusclaimCheckApplyDetailVo.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaimcheckapply/AsBusclaimCheckApplyDetailsVo.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaimcheckapply/AsBusclaimCheckApplyFegin.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaimcheckapply/AsBusclaimCheckApplyFile.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaimcheckapply/flowable/BusclaimCheckApplyDelegateQuery.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaimcheckapply/flowable/BusclaimCheckApplyNodeQuery.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaimcheckapply/flowable/BusclaimCheckApplyNodeVo.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaimcheckapply/flowable/BusclaimCheckApplyTaskQuery.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaimcheckapply/flowable/CompleteBusclaimCheckApplyDto.java diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 4ba1166571..228ace25a8 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -851,6 +851,7 @@ public class BusSalesOrderService extends MybatisBaseService sysStaffOrgVos = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(sysUserVo.getStaffSid()).getData(); - StringBuilder deptName = new StringBuilder(); - for (SysStaffOrgVo sysStaffOrgVo : sysStaffOrgVos) { - //部门名称 - String deptOrgName = sysStaffOrgVo.getOrgName(); - String deptOrgSid = sysStaffOrgVo.getOrgSid(); - SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(deptOrgSid).getData(); - String psid = sysOrganizationVo.getPsid(); - SysOrganizationVo sysOrganizationVo1 = sysOrganizationFeign.fetchBySid(psid).getData(); - String orgName = sysOrganizationVo1.getName(); - String psid1 = sysOrganizationVo1.getPsid(); - SysOrganizationVo sysOrganizationVo2 = sysOrganizationFeign.fetchBySid(psid1).getData(); - String pname = sysOrganizationVo2.getName(); - deptName.append(pname).append("-").append(orgName).append("-").append(deptOrgName).append(" "); - } //获取审批编号 dataMap.put("billNo", busSalesOrder.getBillNo()); //获取审批记录 @@ -7271,7 +7256,7 @@ public class BusSalesOrderService extends MybatisBaseService_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.riskcenter.api.loanaudit; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "审计监管", description = "审计监管") +@TableName("loan_audit") +public class LoanAudit extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("创建人sid") + private String createByName; // 创建人sid + @ApiModelProperty("审计事项") + private String auditMatters; // 审计事项 + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("审计开始日期") + private Date createStartDate; // 审计开始日期 + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("审计结束日期") + private Date createEndDate; // 审计结束日期 + @ApiModelProperty("审计人") + private String auditor; // 审计人 + @ApiModelProperty("审计结果") + private String auditResults; // 审计结果 + @ApiModelProperty("分公司sid") + private String useOrgSid; // 分公司sid + @ApiModelProperty("分公司名称") + private String useOrgName; // 分公司名称 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditDetailsVo.java new file mode 100644 index 0000000000..1f4c7d4154 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditDetailsVo.java @@ -0,0 +1,65 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.riskcenter.api.loanaudit; + +import com.yxt.common.core.vo.Vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "审计监管 视图数据详情", description = "审计监管 视图数据详情") +public class LoanAuditDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("创建人sid") + private String createByName; // 创建人sid + @ApiModelProperty("审计事项") + private String auditMatters; // 审计事项 + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("审计开始日期") + private Date createStartDate; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("审计结束日期") + private Date createEndDate; // 审计结束日期 + @ApiModelProperty("审计人") + private String auditor; // 审计人 + @ApiModelProperty("审计结果") + private String auditResults; // 审计结果 + @ApiModelProperty("分公司sid") + private String useOrgSid; // 分公司sid + @ApiModelProperty("分公司名称") + private String useOrgName; // 分公司名称 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + +} \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditDto.java new file mode 100644 index 0000000000..2b8da15e48 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditDto.java @@ -0,0 +1,65 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.riskcenter.api.loanaudit; + +import com.yxt.common.core.dto.Dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "审计监管 数据传输对象", description = "审计监管 数据传输对象") +public class LoanAuditDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("创建人sid") + private String createByName; // 创建人sid + @ApiModelProperty("审计事项") + private String auditMatters; // 审计事项 + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("审计开始日期") + private Date createStartDate; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("审计结束日期") + private Date createEndDate; + @ApiModelProperty("审计人") + private String auditor; // 审计人 + @ApiModelProperty("审计结果") + private String auditResults; // 审计结果 + @ApiModelProperty("分公司sid") + private String useOrgSid; // 分公司sid + @ApiModelProperty("分公司名称") + private String useOrgName; // 分公司名称 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + +} \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditFeign.java new file mode 100644 index 0000000000..a4c37d9bfb --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditFeign.java @@ -0,0 +1,69 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.riskcenter.api.loanaudit; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@Api(tags = "审计监管") +@FeignClient( + contextId = "anrui-riskcenter-LoanAudit", + name = "anrui-riskcenter", + path = "v1/auditSupervision") +public interface LoanAuditFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + @ResponseBody + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增或修改") + @PostMapping("/saveOrUpdate") + @ResponseBody + public ResultBean save(@RequestBody LoanAuditDto dto); + + @ApiOperation("保存审计结果") + @PostMapping("/saveResult") + @ResponseBody + public ResultBean saveResult(@RequestBody LoanAuditResulitDto dto); + + @ApiOperation("根据sid删除记录") + @DeleteMapping("/saveResult") + @ResponseBody + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/gteInitBySid/{sid}") + @ResponseBody + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); +} \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditQuery.java new file mode 100644 index 0000000000..05035ea81c --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditQuery.java @@ -0,0 +1,53 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.riskcenter.api.loanaudit; + +import com.yxt.common.core.query.Query; + +import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "审计监管 查询条件", description = "审计监管 查询条件") +public class LoanAuditQuery implements Query { + + @ApiModelProperty("分公司名称") + private String useOrgName; + @ApiModelProperty("审计事项") + private String auditMatters; + @ApiModelProperty("审计开始日期") + private String createStartDate; + @ApiModelProperty("审计结束日期") + private String createEndDate; + + private String userSid; + private String orgPath; + private String menuUrl; + private String menuSid; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditResulitDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditResulitDto.java new file mode 100644 index 0000000000..d6dbd8674d --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditResulitDto.java @@ -0,0 +1,44 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.riskcenter.api.loanaudit; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +@Data +@ApiModel(value = "审计监管 数据传输对象", description = "审计监管 数据传输对象") +public class LoanAuditResulitDto implements Dto { + + private List sids; + @ApiModelProperty("审计结果") + private String auditResults; // 审计结果 +} \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditVo.java new file mode 100644 index 0000000000..ae0d980315 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditVo.java @@ -0,0 +1,56 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.riskcenter.api.loanaudit; + +import com.yxt.common.core.vo.Vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "审计监管 视图数据对象", description = "审计监管 视图数据对象") +public class LoanAuditVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("分公司名称") + private String useOrgName; + @ApiModelProperty("审计事项") + private String auditMatters; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("审计开始日期") + private Date createStartDate; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("审计结束日期") + private Date createEndDate; + @ApiModelProperty("审计人") + private String auditor; + @ApiModelProperty("审计结果") + private String auditResults; +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanaudit/LoanAuditMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanaudit/LoanAuditMapper.java new file mode 100644 index 0000000000..0c315f0895 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanaudit/LoanAuditMapper.java @@ -0,0 +1,61 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.riskcenter.biz.loanaudit; + +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 org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import com.yxt.anrui.riskcenter.api.loanaudit.LoanAudit; +import com.yxt.anrui.riskcenter.api.loanaudit.LoanAuditVo; +import org.apache.ibatis.annotations.Update; + +import java.util.List; + +/** + * Project: 111(111)
+ * File: LoanAuditMapper.java
+ * Class: com.yxt.anrui.riskcenter.biz.loanaudit.LoanAuditMapper
+ * Description: 审计监管.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-09-29 16:25:57
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface LoanAuditMapper extends BaseMapper { + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + @Update("update loan_audit set auditResults = #{auditResults} where sid = #{sid}") + void updateResulit(@Param("auditResults") String auditResults,@Param("sid") String sid); +} \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanaudit/LoanAuditMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanaudit/LoanAuditMapper.xml new file mode 100644 index 0000000000..33075ce9c5 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanaudit/LoanAuditMapper.xml @@ -0,0 +1,11 @@ + + + + + + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanaudit/LoanAuditRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanaudit/LoanAuditRest.java new file mode 100644 index 0000000000..44c8037128 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanaudit/LoanAuditRest.java @@ -0,0 +1,89 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.riskcenter.biz.loanaudit; + +import com.yxt.anrui.riskcenter.api.loanaudit.*; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@Api(tags = "审计监管") +@RestController +@RequestMapping("v1/auditSupervision") +public class LoanAuditRest implements LoanAuditFeign { + + @Autowired + private LoanAuditService loanAuditService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = loanAuditService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody LoanAuditDto dto){ + ResultBean rb = ResultBean.fireFail(); + loanAuditService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + public ResultBean saveResult(LoanAuditResulitDto dto) { + ResultBean rb = ResultBean.fireFail(); + loanAuditService.saveResult(dto); + return rb.success(); + } + + @Override + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + loanAuditService.delBySids(sids); + return rb.success(); + } + + @Override + @ApiOperation("根据SID获取一条记录") + @GetMapping("/gteInitBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + LoanAuditDetailsVo vo = loanAuditService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanaudit/LoanAuditService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanaudit/LoanAuditService.java new file mode 100644 index 0000000000..c38273e8e3 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanaudit/LoanAuditService.java @@ -0,0 +1,164 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.riskcenter.biz.loanaudit; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.riskcenter.api.loanaudit.*; +import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyVo; +import org.apache.commons.lang3.StringUtils; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: 111(111)
+ * File: LoanAuditService.java
+ * Class: com.yxt.anrui.riskcenter.biz.loanaudit.LoanAuditService
+ * Description: 审计监管 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-09-29 16:25:57
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class LoanAuditService extends MybatisBaseService { + + @Autowired + private SysUserFeign sysUserFeign; + + public PagerVo listPageVo(PagerQuery pq) { + LoanAuditQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + //========================================数据授权开始 + if (StringUtils.isNotBlank(query.getMenuUrl())) { + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setMenuSid(query.getMenuSid()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("u.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("u.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("u.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("u.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("la.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } + if(StringUtils.isNotBlank(query.getUseOrgName())){ + qw.like("la.useOrgName",query.getUseOrgName()); + } + if(StringUtils.isNotBlank(query.getAuditMatters())){ + qw.like("la.auditMatters",query.getAuditMatters()); + } + String createStartTime = query.getCreateStartDate(); + String createEndTime = query.getCreateEndDate(); + qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (la.createStartDate,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(createEndTime), "date_format (la.createEndTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" + ); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(LoanAuditDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(LoanAuditDto dto){ + LoanAudit entity = new LoanAudit(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(LoanAuditDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + LoanAudit entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public LoanAuditDetailsVo fetchDetailsVoBySid(String sid){ + LoanAudit entity = fetchBySid(sid); + LoanAuditDetailsVo vo = new LoanAuditDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public void saveResult(LoanAuditResulitDto dto) { + List sids = dto.getSids(); + for (String sid : sids) { + baseMapper.updateResulit(dto.getAuditResults(),sid); + } + } +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebate.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebate.java index bc140a0fa1..cda877ded5 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebate.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebate.java @@ -92,8 +92,10 @@ public class ScmVehRebate extends BaseEntity { private String secondaryUploadDate; // 二次上传日期 @ApiModelProperty("二次上传金额") private String secondaryUploadMoney; // 二次上传金额 - @ApiModelProperty("待确定金额") - private String stayDetermineMoney; // 待确定金额 + @ApiModelProperty("待确定金额(动态)") + private String stayDetermineMoney; + @ApiModelProperty("待确定金额(常量)") + private String stayDetermineMoneyNew; @ApiModelProperty("是否调整") private String isAdjustment; // 是否调整 @ApiModelProperty("调整金额") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDetailsVo.java index 5e567e8fd3..fe1d425d28 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDetailsVo.java @@ -102,8 +102,12 @@ public class ScmVehRebateDetailsVo implements Vo { private String secondaryUploadDate; // 二次上传日期 @ApiModelProperty("二次上传金额") private String secondaryUploadMoney; // 二次上传金额 - @ApiModelProperty("待确定金额") - private String stayDetermineMoney; // 待确定金额 + @ApiModelProperty("待确定金额(动态)") + private String stayDetermineMoney; + @ApiModelProperty("待确定金额(常量)") + private String stayDetermineMoneyNew; + @ApiModelProperty("费用") + private String money; // 费用 @ApiModelProperty("是否调整") private String isAdjustment; // 是否调整 @ApiModelProperty("调整金额") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java index b9e13c3f87..2402ca01af 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java @@ -108,7 +108,7 @@ public interface ScmVehRebateFeign { @ApiOperation("修改") @PostMapping("/update") @ResponseBody - public ResultBean update(@RequestBody ScmVehRebateVehDto dto); + public ResultBean update(@RequestBody ScmVehRebateVehDto dto); @ApiOperation("调整") @PostMapping("/adjustment") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVehAdjDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVehAdjDto.java index 3b320889ce..6122aefad6 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVehAdjDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVehAdjDto.java @@ -31,20 +31,35 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + @Data @ApiModel(value = "单车返利表 数据传输对象", description = "单车返利表 数据传输对象") public class ScmVehRebateVehAdjDto implements Dto { private String sid; // sid + @ApiModelProperty("一次待支付费用") + private BigDecimal onceTreatCost; + @ApiModelProperty("一次抵顶费用") + private BigDecimal onceSuppCost; + @ApiModelProperty("一次抵顶费用说明") + private String onceSuppRemark; + @ApiModelProperty("二次待支付费用") + private BigDecimal secondTreatCost; + @ApiModelProperty("二次抵顶费用") + private BigDecimal secondSuppCost; + @ApiModelProperty("二次抵顶费用说明") + private String secondSuppRemark; + @ApiModelProperty("二次上传日期") private String secondaryUploadDate; // 二次上传日期 @ApiModelProperty("二次上传金额") private String secondaryUploadMoney; // 二次上传金额 - @ApiModelProperty("待确定金额") - private String stayDetermineMoney; // 待确定金额 - @ApiModelProperty("费用") - private String cost; // 费用 + @ApiModelProperty("待确定金额(动态)") + private String stayDetermineMoney; @ApiModelProperty("调整金额") private String adjustmentMoney; // 调整金额 + @ApiModelProperty("调整说明") + private String adjustmentRemarks; } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVehDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVehDto.java index 67397568f4..b4df567830 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVehDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVehDto.java @@ -95,8 +95,10 @@ public class ScmVehRebateVehDto implements Dto { private String secondaryUploadDate; // 二次上传日期 @ApiModelProperty("二次上传金额") private String secondaryUploadMoney; // 二次上传金额 - @ApiModelProperty("待确定金额") - private String stayDetermineMoney; // 待确定金额 + @ApiModelProperty("待确定金额(动态)") + private String stayDetermineMoney; + @ApiModelProperty("待确定金额(常量)") + private String stayDetermineMoneyNew; @ApiModelProperty("是否调整") private String isAdjustment; // 是否调整 @ApiModelProperty("调整金额") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java index f479217b56..b0b0590b50 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java @@ -88,8 +88,6 @@ public class ScmVehRebateVo implements Vo { private String estimateRebate; // 预计返利 @ApiModelProperty("所属年月") private String palceGenDate; // 所属年月 - @ApiModelProperty("所属年月(页面展示)") - private String palceGenDateCopy; // 所属年月(页面展示) @ApiModelProperty("预提日期") private String withholdingDate; // 预提日期 @ApiModelProperty("上传日期") @@ -122,8 +120,6 @@ public class ScmVehRebateVo implements Vo { private String createOrgName; // 创建组织名称 @ApiModelProperty("上传状态(0未上传、1已上传)") private String uploadState; // 上传状态 - @ApiModelProperty("是否可以点击是否调整") - private Boolean adjustOrNot; @ApiModelProperty("调整状态") private Integer adjustmentState; @@ -139,4 +135,14 @@ public class ScmVehRebateVo implements Vo { private BigDecimal expectSuppCost; @ApiModelProperty("差异金额") private BigDecimal diffAmount; + @ApiModelProperty("其中费用") + private BigDecimal money; + @ApiModelProperty("一次待支付费用") + private BigDecimal onceTreatCost; + @ApiModelProperty("一次抵顶费用") + private BigDecimal onceSuppCost; + @ApiModelProperty("二次待支付费用") + private BigDecimal secondTreatCost; + @ApiModelProperty("二次抵顶费用") + private BigDecimal secondSuppCost; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyDetailsVo.java index 31ed488b33..866815b236 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyDetailsVo.java @@ -27,6 +27,8 @@ package com.yxt.anrui.scm.api.scmvehrebatecheckapply; import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDetailsVo; +import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDto; +import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; @@ -90,4 +92,6 @@ public class ScmVehrebateCheckapplyDetailsVo implements Vo { private List scmWhenVehrebateCheckapplydetailDetails; // 本月核对本月已上传单车返利信息 @ApiModelProperty("本月核对往月已上传单车返利信息") private List scmLastVehrebateCheckapplydetailDetails; // 本月核对往月已上传单车返利信息 + @ApiModelProperty("返利信息") + private List scmVehrebateCheckapplydetailList; } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyDto.java index 87da8035d7..f065c45571 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyDto.java @@ -86,8 +86,6 @@ public class ScmVehrebateCheckapplyDto implements Dto { private String taskId; // taskId @ApiModelProperty("组织全路径") private String orgPath; - @ApiModelProperty("本月核对本月已上传单车返利信息") - private List scmWhenVehrebateCheckapplydetailDetails; // 本月核对本月已上传单车返利信息 - @ApiModelProperty("本月核对往月已上传单车返利信息") - private List scmLastVehrebateCheckapplydetailDetails; // 本月核对往月已上传单车返利信息 + @ApiModelProperty("返利信息") + private List scmVehrebateCheckapplydetailList; } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyVo.java index 4c3782aa1a..7c18c5f6b0 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyVo.java @@ -67,6 +67,8 @@ public class ScmVehrebateCheckapplyVo implements Vo { private String createOrgName; // 创建组织名称 @ApiModelProperty("预计返利") private String estimateRebate; // 预计返利 + @ApiModelProperty("其中预提费用") + private String expectCost; @ApiModelProperty("上传金额") private String uploadMoney; // 上传金额 @ApiModelProperty("待确定金额") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetail.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetail.java index 393019baac..047e9feeea 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetail.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetail.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(单车返利核对)
* File: ScmVehrebateCheckapplydetail.java
@@ -55,4 +57,86 @@ public class ScmVehrebateCheckapplydetail extends BaseEntity { @ApiModelProperty("核对申请sid") private String mainSid; // 核对申请sid + @ApiModelProperty("品牌sid") + private String brandSid; // 品牌sid + @ApiModelProperty("品牌名称") + private String brandName; // 品牌名称 + @ApiModelProperty("车型sid") + private String vehModelSid; // 车型sid + @ApiModelProperty("车型名称") + private String vehModelName; // 车型名称 + @ApiModelProperty("车辆sid") + private String vehSid; // 车辆sid + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("厂家结算价") + private String manufactorSettlementPrice; // 厂家结算价 + @ApiModelProperty("运费") + private String freight; // 运费 + @ApiModelProperty("返利类型key") + private String rebateTypeKey; // 返利类型key + @ApiModelProperty("返利类型value") + private String rebateTypeValue; // 返利类型value + @ApiModelProperty("返利名称") + private String rebateName; // 返利名称 + @ApiModelProperty("计算标准") + private String calculationStandard; // 计算标准 + @ApiModelProperty("预计返利") + private String estimateRebate; // 预计返利 + @ApiModelProperty("所属年月") + private String palceGenDate; // 所属年月 + @ApiModelProperty("预提日期") + private String withholdingDate; // 预提日期 + @ApiModelProperty("上传日期") + private String uploadDate; // 上传日期 + @ApiModelProperty("上传金额") + private String uploadMoney; // 上传金额 + @ApiModelProperty("二次上传日期") + private String secondaryUploadDate; // 二次上传日期 + @ApiModelProperty("二次上传金额") + private String secondaryUploadMoney; // 二次上传金额 + @ApiModelProperty("待确定金额(动态)") + private String stayDetermineMoney; + @ApiModelProperty("待确定金额(常量)") + private String stayDetermineMoneyNew; + @ApiModelProperty("是否调整") + private String isAdjustment; // 是否调整 + @ApiModelProperty("调整金额") + private String adjustmentMoney; // 调整金额 + @ApiModelProperty("调整说明") + private String adjustmentRemarks; // 调整说明 + @ApiModelProperty("计算方式key") + private String calculationModeKey; // 计算方式key + @ApiModelProperty("计算方式Value") + private String calculationModeValue; // 计算方式Value + @ApiModelProperty("调整状态") + private Integer adjustmentState; + + @ApiModelProperty("一次核对状态") + private Integer onceCheckState; + @ApiModelProperty("其中预计费用") + private BigDecimal expectCost; + @ApiModelProperty("差异金额") + private BigDecimal diffAmount; + @ApiModelProperty("预计待支付费用") + private BigDecimal expectTreatCost; + @ApiModelProperty("预计抵顶费用") + private BigDecimal expectSuppCost; + @ApiModelProperty("预计抵顶费用说明") + private String expectSuppRemark; + @ApiModelProperty("上装金额") + private BigDecimal topAmount; + + @ApiModelProperty("一次待支付费用") + private BigDecimal onceTreatCost; + @ApiModelProperty("一次抵顶费用") + private BigDecimal onceSuppCost; + @ApiModelProperty("一次抵顶费用说明") + private String onceSuppRemark; + @ApiModelProperty("二次待支付费用") + private BigDecimal secondTreatCost; + @ApiModelProperty("二次抵顶费用") + private BigDecimal secondSuppCost; + @ApiModelProperty("二次抵顶费用说明") + private String secondSuppRemark; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailDetailsVo.java index 3fc7120767..dcb85a9d7b 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailDetailsVo.java @@ -63,14 +63,12 @@ public class ScmVehrebateCheckapplydetailDetailsVo implements Vo { private String rebateTypeKey; // 返利类型key @ApiModelProperty("返利类型value") private String rebateTypeValue; // 返利类型value - @ApiModelProperty("台数") + @ApiModelProperty("数量") private String num; // 台数 - @ApiModelProperty("预提数量") - private String withholdingAmount; // 预提数量 - @ApiModelProperty("上传数量") - private String uploadAmount; // 上传数量 @ApiModelProperty("预提金额") private String withRebate; // 预提金额 + @ApiModelProperty("其中预提费用") + private String expectCost; @ApiModelProperty("上传金额") private String uploadMoney; // 上传金额 @ApiModelProperty("待确定金额") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailDto.java index 66eac7e50d..62529cbab4 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailDto.java @@ -32,6 +32,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; import java.util.List; /** @@ -51,11 +52,92 @@ import java.util.List; @ApiModel(value = "单车返利核对申请表_返利列表 数据传输对象", description = "单车返利核对申请表_返利列表 数据传输对象") public class ScmVehrebateCheckapplydetailDto implements Dto { - private String sid; // sid - - @ApiModelProperty("单车返利sid") - private List vehRebateSids; // 单车返利sid - @ApiModelProperty("核对申请sid") + @ApiModelProperty("单车返利sid") + private String vehRebateSid; // 单车返利sid + @ApiModelProperty("核对申请sid") private String mainSid; // 核对申请sid + @ApiModelProperty("品牌sid") + private String brandSid; // 品牌sid + @ApiModelProperty("品牌名称") + private String brandName; // 品牌名称 + @ApiModelProperty("车型sid") + private String vehModelSid; // 车型sid + @ApiModelProperty("车型名称") + private String vehModelName; // 车型名称 + @ApiModelProperty("车辆sid") + private String vehSid; // 车辆sid + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("厂家结算价") + private String manufactorSettlementPrice; // 厂家结算价 + @ApiModelProperty("运费") + private String freight; // 运费 + @ApiModelProperty("返利类型key") + private String rebateTypeKey; // 返利类型key + @ApiModelProperty("返利类型value") + private String rebateTypeValue; // 返利类型value + @ApiModelProperty("返利名称") + private String rebateName; // 返利名称 + @ApiModelProperty("计算标准") + private String calculationStandard; // 计算标准 + @ApiModelProperty("预计返利") + private String estimateRebate; // 预计返利 + @ApiModelProperty("所属年月") + private String palceGenDate; // 所属年月 + @ApiModelProperty("预提日期") + private String withholdingDate; // 预提日期 + @ApiModelProperty("上传日期") + private String uploadDate; // 上传日期 + @ApiModelProperty("上传金额") + private String uploadMoney; // 上传金额 + @ApiModelProperty("二次上传日期") + private String secondaryUploadDate; // 二次上传日期 + @ApiModelProperty("二次上传金额") + private String secondaryUploadMoney; // 二次上传金额 + @ApiModelProperty("待确定金额(动态)") + private String stayDetermineMoney; + @ApiModelProperty("待确定金额(常量)") + private String stayDetermineMoneyNew; + @ApiModelProperty("是否调整") + private String isAdjustment; // 是否调整 + @ApiModelProperty("调整金额") + private String adjustmentMoney; // 调整金额 + @ApiModelProperty("调整说明") + private String adjustmentRemarks; // 调整说明 + @ApiModelProperty("计算方式key") + private String calculationModeKey; // 计算方式key + @ApiModelProperty("计算方式Value") + private String calculationModeValue; // 计算方式Value + @ApiModelProperty("调整状态") + private Integer adjustmentState; + + @ApiModelProperty("一次核对状态") + private Integer onceCheckState; + @ApiModelProperty("其中预计费用") + private BigDecimal expectCost; + @ApiModelProperty("差异金额") + private BigDecimal diffAmount; + @ApiModelProperty("预计待支付费用") + private BigDecimal expectTreatCost; + @ApiModelProperty("预计抵顶费用") + private BigDecimal expectSuppCost; + @ApiModelProperty("预计抵顶费用说明") + private String expectSuppRemark; + @ApiModelProperty("上装金额") + private BigDecimal topAmount; + + @ApiModelProperty("一次待支付费用") + private BigDecimal onceTreatCost; + @ApiModelProperty("一次抵顶费用") + private BigDecimal onceSuppCost; + @ApiModelProperty("一次抵顶费用说明") + private String onceSuppRemark; + @ApiModelProperty("二次待支付费用") + private BigDecimal secondTreatCost; + @ApiModelProperty("二次抵顶费用") + private BigDecimal secondSuppCost; + @ApiModelProperty("二次抵顶费用说明") + private String secondSuppRemark; + } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailVo.java index f8f817e569..e3ef5504bd 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailVo.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(单车返利核对)
* File: ScmVehrebateCheckapplydetailVo.java
@@ -49,11 +51,91 @@ import lombok.Data; @ApiModel(value = "单车返利核对申请表_返利列表 视图数据对象", description = "单车返利核对申请表_返利列表 视图数据对象") public class ScmVehrebateCheckapplydetailVo implements Vo { - private String sid; // sid - - @ApiModelProperty("单车返利sid") + @ApiModelProperty("单车返利sid") private String vehRebateSid; // 单车返利sid - @ApiModelProperty("核对申请sid") + @ApiModelProperty("核对申请sid") private String mainSid; // 核对申请sid + @ApiModelProperty("品牌sid") + private String brandSid; // 品牌sid + @ApiModelProperty("品牌名称") + private String brandName; // 品牌名称 + @ApiModelProperty("车型sid") + private String vehModelSid; // 车型sid + @ApiModelProperty("车型名称") + private String vehModelName; // 车型名称 + @ApiModelProperty("车辆sid") + private String vehSid; // 车辆sid + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("厂家结算价") + private String manufactorSettlementPrice; // 厂家结算价 + @ApiModelProperty("运费") + private String freight; // 运费 + @ApiModelProperty("返利类型key") + private String rebateTypeKey; // 返利类型key + @ApiModelProperty("返利类型value") + private String rebateTypeValue; // 返利类型value + @ApiModelProperty("返利名称") + private String rebateName; // 返利名称 + @ApiModelProperty("计算标准") + private String calculationStandard; // 计算标准 + @ApiModelProperty("预计返利") + private String estimateRebate; // 预计返利 + @ApiModelProperty("所属年月") + private String palceGenDate; // 所属年月 + @ApiModelProperty("预提日期") + private String withholdingDate; // 预提日期 + @ApiModelProperty("上传日期") + private String uploadDate; // 上传日期 + @ApiModelProperty("上传金额") + private String uploadMoney; // 上传金额 + @ApiModelProperty("二次上传日期") + private String secondaryUploadDate; // 二次上传日期 + @ApiModelProperty("二次上传金额") + private String secondaryUploadMoney; // 二次上传金额 + @ApiModelProperty("待确定金额(动态)") + private String stayDetermineMoney; + @ApiModelProperty("待确定金额(常量)") + private String stayDetermineMoneyNew; + @ApiModelProperty("是否调整") + private String isAdjustment; // 是否调整 + @ApiModelProperty("调整金额") + private String adjustmentMoney; // 调整金额 + @ApiModelProperty("调整说明") + private String adjustmentRemarks; // 调整说明 + @ApiModelProperty("计算方式key") + private String calculationModeKey; // 计算方式key + @ApiModelProperty("计算方式Value") + private String calculationModeValue; // 计算方式Value + @ApiModelProperty("调整状态") + private Integer adjustmentState; + + @ApiModelProperty("一次核对状态") + private Integer onceCheckState; + @ApiModelProperty("其中预计费用") + private BigDecimal expectCost; + @ApiModelProperty("差异金额") + private BigDecimal diffAmount; + @ApiModelProperty("预计待支付费用") + private BigDecimal expectTreatCost; + @ApiModelProperty("预计抵顶费用") + private BigDecimal expectSuppCost; + @ApiModelProperty("预计抵顶费用说明") + private String expectSuppRemark; + @ApiModelProperty("上装金额") + private BigDecimal topAmount; + + @ApiModelProperty("一次待支付费用") + private BigDecimal onceTreatCost; + @ApiModelProperty("一次抵顶费用") + private BigDecimal onceSuppCost; + @ApiModelProperty("一次抵顶费用说明") + private String onceSuppRemark; + @ApiModelProperty("二次待支付费用") + private BigDecimal secondTreatCost; + @ApiModelProperty("二次抵顶费用") + private BigDecimal secondSuppCost; + @ApiModelProperty("二次抵顶费用说明") + private String secondSuppRemark; } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java index a960aa297c..63205020f4 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java @@ -74,9 +74,7 @@ public interface ScmVehRebateMapper extends BaseMapper { List excelListTwo(@Param(Constants.WRAPPER) QueryWrapper qw); - ScmVehRebateVo selectExcelInfo(@Param("vinNo") String vinNo, @Param("rebateName") String rebateName, @Param("palceGenDate") String palceGenDate); - - void updateOneExcelInfo(@Param("uploadDate") String uploadDate, @Param("uploadMoney") String uploadMoney, @Param("stayDetermineMoney") String stayDetermineMoney, @Param("onceTreatCost") String onceTreatCost, @Param("onceSuppCost") String onceSuppCost, @Param("onceSuppRemark") String onceSuppRemark, @Param("adjustmentRemarks") String adjustmentRemarks, @Param("sid") String sid); + void updateOneExcelInfo(@Param("uploadDate") String uploadDate, @Param("uploadMoney") String uploadMoney, @Param("stayDetermineMoney") String stayDetermineMoney, @Param("onceTreatCost") String onceTreatCost, @Param("onceSuppCost") String onceSuppCost, @Param("onceSuppRemark") String onceSuppRemark, @Param("adjustmentRemarks") String adjustmentRemarks, @Param("isAdjustment") String isAdjustment, @Param("adjustmentMoney") String adjustmentMoney, @Param("diffAmount") String diffAmount, @Param("sid") String sid); void updateTwoExcelInfo(@Param("secondaryUploadDate") String secondaryUploadDate, @Param("secondaryUploadMoney") String secondaryUploadMoney, @Param("secondTreatCost") String secondTreatCost, @Param("secondSuppCost") String secondSuppCost, @Param("secondSuppRemark") String secondSuppRemark, @Param("adjustmentRemarks") String adjustmentRemarks, @Param("sid") String sid); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml index 91d640bafc..202b3f7f34 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml @@ -20,7 +20,7 @@ - - UPDATE scm_veh_rebate - SET uploadDate = #{uploadDate}, - uploadMoney = #{uploadMoney}, - onceTreatCost = #{onceTreatCost}, - onceSuppCost = #{onceSuppCost}, - onceSuppRemark = #{onceSuppRemark}, - stayDetermineMoney = #{stayDetermineMoney}, - adjustmentRemarks = #{adjustmentRemarks} + SET uploadDate = #{uploadDate}, + uploadMoney = #{uploadMoney}, + onceTreatCost = #{onceTreatCost}, + onceSuppCost = #{onceSuppCost}, + onceSuppRemark = #{onceSuppRemark}, + stayDetermineMoney = #{stayDetermineMoney}, + stayDetermineMoneyNew = #{stayDetermineMoney}, + adjustmentRemarks = #{adjustmentRemarks}, + isAdjustment = #{isAdjustment}, + adjustmentMoney = #{adjustmentMoney}, + diffAmount = #{diffAmount} WHERE sid = #{sid} @@ -78,7 +74,10 @@ secondTreatCost = #{secondTreatCost}, secondSuppCost = #{secondSuppCost}, secondSuppRemark = #{secondSuppRemark}, - adjustmentRemarks = #{adjustmentRemarks} + adjustmentRemarks = #{adjustmentRemarks}, + isAdjustment = #{isAdjustment}, + adjustmentMoney = #{adjustmentMoney}, + diffAmount = #{diffAmount} WHERE sid = #{sid} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java index 02a106c3c8..cbc78098a5 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java @@ -147,11 +147,7 @@ public class ScmVehRebateRest implements ScmVehRebateFeign { @Override public ResultBean update(ScmVehRebateVehDto dto) { ResultBean rb = ResultBean.fireFail(); - if ("是".equals(dto.getIsAdjustment())){ - dto.setAdjustmentState(1); - }else { - dto.setAdjustmentState(2); - } + dto.setStayDetermineMoneyNew(dto.getStayDetermineMoney()); scmVehRebateService.updateBySid(dto,dto.getSid()); return rb.success().setMsg("修改成功"); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java index 2c45fe990b..03eee2aeb4 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java @@ -263,18 +263,13 @@ public class ScmVehRebateService extends MybatisBaseService= date_format('" + createStartTime + "','%Y-%m-%d')"). apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" ); qw.eq("state", 2); - if (StringUtils.isNotBlank(query.getState())) { - qw.eq("state", query.getState()); - } + qw.eq("adjustmentState", 0); qw.orderByDesc("createTime"); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); @@ -285,30 +280,8 @@ public class ScmVehRebateService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; @@ -486,16 +459,15 @@ public class ScmVehRebateService extends MybatisBaseService wrapper.eq("onceCheckState", 1).eq("isAdjustment", "是")).or(wrapper -> wrapper.eq("onceCheckState", 0).isNotNull("uploadDate")); if (query.getSidList().size() > 0) { qw.notIn("sid", query.getSidList()); } IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); for (ScmVehRebateVo record : pagging.getRecords()) { - //所属年月 - String palceGenDate = record.getPalceGenDate(); - String[] split = palceGenDate.split("-"); - record.setPalceGenDateCopy(split[0] + "年" + split[1] + "月"); + //其中费用 + record.setMoney(record.getOnceTreatCost().add(record.getOnceSuppCost()).add(record.getSecondTreatCost()).add(record.getSecondSuppCost())); } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; @@ -561,12 +533,18 @@ public class ScmVehRebateService extends MybatisBaseService infos = importReturn.getInfos(); for (OneExcelInfo info : infos) { - ScmVehRebateVo scmVehRebateVo = baseMapper.selectExcelInfo(info.getVinNo(), info.getRebateName(), info.getPalceGenDate()); - 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.getOnceTreatCost(), info.getOnceSuppCost(), info.getOnceSuppRemark(), info.getAdjustmentRemarks(), scmVehRebateVo.getSid()); + ScmVehRebateVo scmVehRebateVo = baseMapper.selectByVinNoAndOrgSid(info.getVinNo(), info.getRebateTypeValue(), info.getRebateName(), info.getPalceGenDate(), info.getEstimateRebate(), useOrgSid); + String uploadDate = ""; + if (isNumber(info.getUploadDate())) { + Date javaDate = new Date((long) ((Double.valueOf(info.getUploadDate()) - 25569) * 86400 * 1000)); + uploadDate = DateUtil.formatDate(javaDate); + } else { + uploadDate = info.getUploadDate(); + } + baseMapper.updateOneExcelInfo(uploadDate, info.getUploadMoney(), info.getStayDetermineMoney(), info.getOnceTreatCost(), info.getOnceSuppCost(), info.getOnceSuppRemark(), info.getAdjustmentRemarks(), info.getIsAdjustment(), info.getAdjustmentMoney(), info.getDiffAmount(), scmVehRebateVo.getSid()); } return rb.success().setMsg("成功导入数据，请点击确定按钮"); } } - private VehRebateOneExcelInfo getSheetValOne(Sheet sheet, int[] resultCell, String userSid) { + private VehRebateOneExcelInfo getSheetValOne(Sheet sheet, int[] resultCell, String userSid, String useOrgSid) { VehRebateOneExcelInfo importReturn = new VehRebateOneExcelInfo(); List importVoList = new ArrayList<>(); Set checkWord = new HashSet<>(); @@ -1083,13 +1067,13 @@ public class ScmVehRebateService extends MybatisBaseService infos = importReturn.getInfos(); for (TwoExcelInfo info : infos) { - ScmVehRebateVo scmVehRebateVo = baseMapper.selectExcelInfo(info.getVinNo(), info.getRebateName(), info.getPalceGenDate()); + ScmVehRebateVo scmVehRebateVo = baseMapper.selectByVinNoAndOrgSid(info.getVinNo(), info.getRebateTypeValue(), info.getRebateName(), info.getPalceGenDate(), info.getEstimateRebate(), useOrgSid); Date javaDate = new Date((long) ((Double.valueOf(info.getSecondaryUploadDate()) - 25569) * 86400 * 1000)); String secondaryUploadDate = DateUtil.formatDate(javaDate); baseMapper.updateTwoExcelInfo(secondaryUploadDate, info.getSecondaryUploadMoney(), info.getSecondTreatCost(), info.getSecondSuppCost(), info.getSecondSuppRemark(), info.getAdjustmentRemarks(), scmVehRebateVo.getSid()); @@ -1378,7 +1363,7 @@ public class ScmVehRebateService extends MybatisBaseService importVoList = new ArrayList<>(); Set checkWord = new HashSet<>(); @@ -1539,13 +1524,13 @@ public class ScmVehRebateService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); - List records = pagging.getRecords(); - for (ScmVehrebateCheckapplyVo record : records) { - record.setEstimateRebate(record.getEstimateRebate().substring(0, record.getEstimateRebate().lastIndexOf("."))); - record.setUploadMoney(record.getUploadMoney().substring(0, record.getUploadMoney().lastIndexOf("."))); - record.setStayDetermineMoney(record.getStayDetermineMoney().substring(0, record.getStayDetermineMoney().lastIndexOf("."))); - record.setAdjustmentMoney(record.getAdjustmentMoney().substring(0, record.getAdjustmentMoney().lastIndexOf("."))); - record.setMoney(record.getMoney().substring(0, record.getMoney().lastIndexOf("."))); - } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } @@ -182,32 +174,15 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService scmWhenVehrebateCheckapplydetailDetails = dto.getScmWhenVehrebateCheckapplydetailDetails(); - List scmLastVehrebateCheckapplydetailDetails = dto.getScmLastVehrebateCheckapplydetailDetails(); - if (scmWhenVehrebateCheckapplydetailDetails.size() < 1 && scmLastVehrebateCheckapplydetailDetails.size() < 1) { + List scmVehrebateCheckapplydetailList = dto.getScmVehrebateCheckapplydetailList(); + if (scmVehrebateCheckapplydetailList.size() == 0) { return rb.setMsg("请选择已核对单车返利信息"); } if (StringUtils.isBlank(dtoSid)) { String sid = this.insertByDto(dto).getData(); - if (scmWhenVehrebateCheckapplydetailDetails.size() > 0) { - for (ScmVehrebateCheckapplydetailDto scmVehrebateCheckapplydetail : scmWhenVehrebateCheckapplydetailDetails) { - for (String vehRebateSid : scmVehrebateCheckapplydetail.getVehRebateSids()) { - ScmVehrebateCheckapplydetail scmVehrebateCheckapplydetail1 = new ScmVehrebateCheckapplydetail(); - scmVehrebateCheckapplydetail1.setVehRebateSid(vehRebateSid); - scmVehrebateCheckapplydetail1.setMainSid(sid); - scmVehrebateCheckapplydetailService.save(scmVehrebateCheckapplydetail1); - } - } - } - if (scmLastVehrebateCheckapplydetailDetails.size() > 0) { - for (ScmVehrebateCheckapplydetailDto scmVehrebateCheckapplydetail : scmLastVehrebateCheckapplydetailDetails) { - for (String vehRebateSid : scmVehrebateCheckapplydetail.getVehRebateSids()) { - ScmVehrebateCheckapplydetail scmVehrebateCheckapplydetail1 = new ScmVehrebateCheckapplydetail(); - scmVehrebateCheckapplydetail1.setVehRebateSid(vehRebateSid); - scmVehrebateCheckapplydetail1.setMainSid(sid); - scmVehrebateCheckapplydetailService.save(scmVehrebateCheckapplydetail1); - } - } + for (ScmVehrebateCheckapplydetailDto scmVehrebateCheckapplydetail : scmVehrebateCheckapplydetailList) { + scmVehrebateCheckapplydetail.setMainSid(sid); + scmVehrebateCheckapplydetailService.insertByDto(scmVehrebateCheckapplydetail); } return rb.success().setMsg("添加成功").setData(sid); } @@ -217,25 +192,9 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService 0) { - for (ScmVehrebateCheckapplydetailDto scmVehrebateCheckapplydetail : scmWhenVehrebateCheckapplydetailDetails) { - for (String vehRebateSid : scmVehrebateCheckapplydetail.getVehRebateSids()) { - ScmVehrebateCheckapplydetail scmVehrebateCheckapplydetail1 = new ScmVehrebateCheckapplydetail(); - scmVehrebateCheckapplydetail1.setVehRebateSid(vehRebateSid); - scmVehrebateCheckapplydetail1.setMainSid(dtoSid); - scmVehrebateCheckapplydetailService.save(scmVehrebateCheckapplydetail1); - } - } - } - if (scmLastVehrebateCheckapplydetailDetails.size() > 0) { - for (ScmVehrebateCheckapplydetailDto scmVehrebateCheckapplydetail : scmLastVehrebateCheckapplydetailDetails) { - for (String vehRebateSid : scmVehrebateCheckapplydetail.getVehRebateSids()) { - ScmVehrebateCheckapplydetail scmVehrebateCheckapplydetail1 = new ScmVehrebateCheckapplydetail(); - scmVehrebateCheckapplydetail1.setVehRebateSid(vehRebateSid); - scmVehrebateCheckapplydetail1.setMainSid(dtoSid); - scmVehrebateCheckapplydetailService.save(scmVehrebateCheckapplydetail1); - } - } + for (ScmVehrebateCheckapplydetailDto scmVehrebateCheckapplydetail : scmVehrebateCheckapplydetailList) { + scmVehrebateCheckapplydetail.setMainSid(dtoSid); + scmVehrebateCheckapplydetailService.insertByDto(scmVehrebateCheckapplydetail); } return rb.success().setMsg("修改成功").setData(dtoSid); } @@ -291,11 +250,6 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService scmVehrebateCheckapplydetailVos = scmVehrebateCheckapplydetailService.selByMainSid(sid); + scmVehrebateCheckapplyDetailsVo.setScmVehrebateCheckapplydetailList(scmVehrebateCheckapplydetailVos); return rb.success().setData(scmVehrebateCheckapplyDetailsVo); } @@ -372,7 +323,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService selByMainSid(String mainSid); + + @Select("select * from scm_vehrebate_checkapplydetail where vehRebateSid = #{vehRebateSid}") + ScmVehrebateCheckapplydetailVo selByVehRebteSid(String vehRebateSid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml index 5c2bf81874..0ed7eeb040 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml @@ -21,40 +21,35 @@ \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailRest.java index b902d686ab..00fbed4c99 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailRest.java @@ -25,22 +25,9 @@ *********************************************************/ package com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.List; -import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetail; -import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailQuery; -import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailVo; -import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDetailsVo; -import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDto; -import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailFeign; - /** * Project: anrui-scm(单车返利核对)
* File: ScmVehrebateCheckapplydetailFeignFallback.java
@@ -55,37 +42,8 @@ import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapply * @since 1.0 */ @Api(tags = "单车返利核对申请表_返利列表") -@RestController("com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailRest") +@RestController @RequestMapping("v1/scmvehrebatecheckapplydetail") -public class ScmVehrebateCheckapplydetailRest implements ScmVehrebateCheckapplydetailFeign { - - @Autowired - private ScmVehrebateCheckapplydetailService scmVehrebateCheckapplydetailService; - - @Override - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = scmVehrebateCheckapplydetailService.listPageVo(pq); - return rb.success().setData(pv); - } - - @Override - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody ScmVehrebateCheckapplydetailDto dto){ - ResultBean rb = ResultBean.fireFail(); - scmVehrebateCheckapplydetailService.saveOrUpdateDto(dto); - return rb.success(); - } +public class ScmVehrebateCheckapplydetailRest { - @Override - @ApiOperation("根据sid批量删除") - @PostMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - ResultBean rb = ResultBean.fireFail(); - scmVehrebateCheckapplydetailService.delBySids(sids); - return rb.success(); - } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailService.java index b56ccbf1ae..d224e9c0f7 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailService.java @@ -28,6 +28,7 @@ package com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebate; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -60,30 +61,6 @@ import java.util.List; */ @Service public class ScmVehrebateCheckapplydetailService extends MybatisBaseService { - private QueryWrapper createQueryWrapper(ScmVehrebateCheckapplydetailQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - return qw; - } - - public PagerVo listPageVo(PagerQuery pq) { - ScmVehrebateCheckapplydetailQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public void saveOrUpdateDto(ScmVehrebateCheckapplydetailDto dto){ - String dtoSid = dto.getSid(); - if (StringUtils.isBlank(dtoSid)) { - this.insertByDto(dto); - return; - } - this.updateByDto(dto); - } public void insertByDto(ScmVehrebateCheckapplydetailDto dto){ ScmVehrebateCheckapplydetail entity = new ScmVehrebateCheckapplydetail(); @@ -91,16 +68,6 @@ public class ScmVehrebateCheckapplydetailService extends MybatisBaseService selByMainSid(String mainSid) { return baseMapper.selByMainSid(mainSid); } + + public ScmVehrebateCheckapplydetailVo selByVehRebteSid(String vehRebateSid) { + return baseMapper.selByVehRebteSid(vehRebateSid); + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java index c2f632df28..d6c2434fb2 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java @@ -34,7 +34,9 @@ import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebate; import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDetailsVo; import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDto; import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateVehDto; +import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailVo; import com.yxt.anrui.scm.biz.scmvehrebate.ScmVehRebateService; +import com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailService; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -75,6 +77,8 @@ public class ScmVehRebateWithService extends MybatisBaseService createQueryWrapper(ScmVehRebateWithQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -144,9 +148,10 @@ public class ScmVehRebateWithService extends MybatisBaseService scmVehRebateDetailsVos = new ArrayList<>(); String[] sids = sid.split(","); for (String s : sids) { - ScmVehRebate scmVehRebate = scmVehRebateService.fetchBySid(s); + ScmVehrebateCheckapplydetailVo scmVehrebateCheckapplydetailVo = scmVehrebateCheckapplydetailService.selByVehRebteSid(s); ScmVehRebateDetailsVo scmVehRebateDetailsVo = new ScmVehRebateDetailsVo(); - BeanUtil.copyProperties(scmVehRebate,scmVehRebateDetailsVo); + BeanUtil.copyProperties(scmVehrebateCheckapplydetailVo,scmVehRebateDetailsVo); + scmVehRebateDetailsVo.setMoney(scmVehrebateCheckapplydetailVo.getOnceTreatCost().add(scmVehrebateCheckapplydetailVo.getOnceSuppCost()).add(scmVehrebateCheckapplydetailVo.getSecondTreatCost()).add(scmVehrebateCheckapplydetailVo.getSecondSuppCost()).toString()); scmVehRebateDetailsVos.add(scmVehRebateDetailsVo); } return rb.success().setData(scmVehRebateDetailsVos); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java index 0aae272d66..f193868a1d 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java @@ -191,6 +191,7 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService fileList = new ArrayList<>(); + private String remarks; + @ApiModelProperty("实例id") + private String procInsId; + @ApiModelProperty("任务iD") + private String taskId; + private List detailList = new ArrayList<>(); +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busclaimcheckapply/AppBusclaimCheckApplyFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busclaimcheckapply/AppBusclaimCheckApplyFeign.java new file mode 100644 index 0000000000..53368053ee --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busclaimcheckapply/AppBusclaimCheckApplyFeign.java @@ -0,0 +1,60 @@ +package com.yxt.anrui.terminal.api.as.busclaimcheckapply; + +import com.yxt.anrui.terminal.api.as.busclaimcheckapply.flowable.AppDelegateQuery; +import com.yxt.anrui.terminal.api.as.busclaimcheckapply.flowable.AppFlowDto; +import com.yxt.anrui.terminal.api.as.busclaimcheckapply.flowable.AppFlowQuery; +import com.yxt.anrui.terminal.api.as.busclaimcheckapply.flowable.AppFlowTaskQuery; +import com.yxt.anrui.terminal.api.as.busclaiminvoicebill.AppBusclaimInvoiceBillDetailsVo; +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; +import org.springframework.web.bind.annotation.*; + +@FeignClient( + contextId = "terminal-AppBusclaimCheckApply", + name = "anrui-terminal", + path = "v1/BusclaimCheckApply") +public interface AppBusclaimCheckApplyFeign { + + @ApiOperation("详情") + @GetMapping("/details") + public ResultBean fetchDetailsBySid(@RequestParam("sid") String sid); + + /**********************************************流程********************************************/ + + @ApiOperation("办理") + @PutMapping("/agreeCreditInfo") + @ResponseBody + ResultBean agreeCreditInfo(@RequestBody AppFlowDto dto); + + @ApiOperation("驳回") + @PutMapping("/rejectCreditInfo") + @ResponseBody + ResultBean rejectCreditInfo(@RequestBody AppFlowTaskQuery query); + + @ApiOperation("撤回") + @PutMapping("/recallCreditInfo") + @ResponseBody + ResultBean recallCreditInfo(@RequestBody AppFlowTaskQuery query); + + @ApiOperation("终止") + @PutMapping("/stopCreditInfo") + @ResponseBody + ResultBean stopCreditInfo(@RequestBody AppFlowTaskQuery query); + + @ApiOperation("获取流程操作标题") + @GetMapping("/getFlowOperateTitle") + @ResponseBody + ResultBean getFlowOperateTitle(@SpringQueryMap AppFlowQuery query); + + @ApiOperation(value = "加签") + @PutMapping(value = "/delegate") + @ResponseBody + public ResultBean delegate(@RequestBody AppDelegateQuery delegateQuery); + + @ApiOperation(value = "转办") + @PutMapping(value = "/assignTask") + @ResponseBody + public ResultBean assignTask(@RequestBody AppDelegateQuery delegateQuery); +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busclaimcheckapply/flowable/AppDelegateQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busclaimcheckapply/flowable/AppDelegateQuery.java new file mode 100644 index 0000000000..6c22cb080b --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busclaimcheckapply/flowable/AppDelegateQuery.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.terminal.api.as.busclaimcheckapply.flowable; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/9/28 10:16 + */ +@Data +public class AppDelegateQuery { + @ApiModelProperty + private String userSid; + @ApiModelProperty("流程实例id") + @JsonProperty("procInsId") + private String instanceId; + @ApiModelProperty("任务Id") + private String taskId; + @ApiModelProperty("审批人sid") + private String assignee; + @ApiModelProperty("填写意见") + private String views; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busclaimcheckapply/flowable/AppFlowDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busclaimcheckapply/flowable/AppFlowDto.java new file mode 100644 index 0000000000..49a558de93 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busclaimcheckapply/flowable/AppFlowDto.java @@ -0,0 +1,37 @@ +package com.yxt.anrui.terminal.api.as.busclaimcheckapply.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/8/9 14:09 + * @Description + */ +@Data +public class AppFlowDto implements Dto { + private static final long serialVersionUID = 3626473483180150495L; + + @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/as/busclaimcheckapply/flowable/AppFlowQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busclaimcheckapply/flowable/AppFlowQuery.java new file mode 100644 index 0000000000..572610f556 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busclaimcheckapply/flowable/AppFlowQuery.java @@ -0,0 +1,28 @@ +package com.yxt.anrui.terminal.api.as.busclaimcheckapply.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/8/9 14:15 + * @Description + */ +@Data +public class AppFlowQuery implements Query { + private static final long serialVersionUID = 5514095179438249641L; + + @ApiModelProperty(value = "节点key") + private String taskDefKey; + @ApiModelProperty(value = "业务sid") + private String businessSid; + @ApiModelProperty(value = "0 上一环节 1下一环节") + @NotNull(message = "参数错误：next") + private Integer next; + + @ApiModelProperty("组织机构全路径") + private String orgPath; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busclaimcheckapply/flowable/AppFlowTaskQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busclaimcheckapply/flowable/AppFlowTaskQuery.java new file mode 100644 index 0000000000..49b1a8fb98 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busclaimcheckapply/flowable/AppFlowTaskQuery.java @@ -0,0 +1,47 @@ +package com.yxt.anrui.terminal.api.as.busclaimcheckapply.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/8/9 14:11 + * @Description + */ +@Data +public class AppFlowTaskQuery implements Query { + private static final long serialVersionUID = -7082170710942810289L; + + /** + * 终止、驳回、撤回 + */ + @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/TerminalApplication.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java index dcb3142524..d90823c52d 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java @@ -15,7 +15,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; "com.yxt.anrui.terminal", "com.yxt.common.base.config" },exclude = {DataSourceAutoConfiguration.class}) -@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.anrui.buscenter","com.yxt.anrui.scm","com.yxt.anrui.fin", "com.yxt.anrui.terminal.fegin.wmsinventorycheckbill","com.yxt.anrui.terminal.fegin.wmsinventoryprofitin","com.yxt.anrui.terminal.fegin.wmsinventoryprofitout","com.yxt.anrui.terminal.fegin.basegoodssku","com.yxt.anrui.terminal.fegin.basesupplierinfo","com.yxt.anrui.terminal.fegin.wmsInventory","com.yxt.anrui.terminal.fegin.asbusrepairbill","com.yxt.anrui.terminal.fegin.pmspurchasebill","com.yxt.anrui.terminal.fegin.pmspurchasebackbill","com.yxt.anrui.terminal.fegin.smspricestrategybill","com.yxt.anrui.terminal.fegin.astechtitleapply","com.yxt.anrui.terminal.fegin.asserviceaccommapply","com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill","com.yxt.anrui.terminal.fegin.wmsinventoryallocatebill","com.yxt.anrui.terminal.fegin.asoldpartreturnapply","com.yxt.anrui.terminal.fegin.asoldparthandleapply","com.yxt.anrui.terminal.fegin.asbwdiffapply","com.yxt.anrui.terminal.fegin.asbwinvoiceapply","com.yxt.anrui.terminal.fegin.ashosesuppapply"}) +@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.anrui.buscenter","com.yxt.anrui.scm","com.yxt.anrui.fin", "com.yxt.anrui.terminal.fegin.wmsinventorycheckbill","com.yxt.anrui.terminal.fegin.wmsinventoryprofitin","com.yxt.anrui.terminal.fegin.wmsinventoryprofitout","com.yxt.anrui.terminal.fegin.basegoodssku","com.yxt.anrui.terminal.fegin.basesupplierinfo","com.yxt.anrui.terminal.fegin.wmsInventory","com.yxt.anrui.terminal.fegin.asbusrepairbill","com.yxt.anrui.terminal.fegin.pmspurchasebill","com.yxt.anrui.terminal.fegin.pmspurchasebackbill","com.yxt.anrui.terminal.fegin.smspricestrategybill","com.yxt.anrui.terminal.fegin.astechtitleapply","com.yxt.anrui.terminal.fegin.asserviceaccommapply","com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill","com.yxt.anrui.terminal.fegin.wmsinventoryallocatebill","com.yxt.anrui.terminal.fegin.asoldpartreturnapply","com.yxt.anrui.terminal.fegin.asoldparthandleapply","com.yxt.anrui.terminal.fegin.asbwdiffapply","com.yxt.anrui.terminal.fegin.asbwinvoiceapply","com.yxt.anrui.terminal.fegin.ashosesuppapply","com.yxt.anrui.terminal.fegin.asbusclaimcheckapply"}) public class TerminalApplication { public static void main(String[] args) { diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/busclaimcheckapply/AppBusclaimCheckApplyRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/busclaimcheckapply/AppBusclaimCheckApplyRest.java new file mode 100644 index 0000000000..bbd8ab0f82 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/busclaimcheckapply/AppBusclaimCheckApplyRest.java @@ -0,0 +1,85 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.biz.as.busclaimcheckapply; + +import com.yxt.anrui.terminal.api.as.busclaimcheckapply.AppBusclaimCheckApplyDetailsVo; +import com.yxt.anrui.terminal.api.as.busclaimcheckapply.AppBusclaimCheckApplyFeign; +import com.yxt.anrui.terminal.api.as.busclaimcheckapply.flowable.AppDelegateQuery; +import com.yxt.anrui.terminal.api.as.busclaimcheckapply.flowable.AppFlowDto; +import com.yxt.anrui.terminal.api.as.busclaimcheckapply.flowable.AppFlowQuery; +import com.yxt.anrui.terminal.api.as.busclaimcheckapply.flowable.AppFlowTaskQuery; +import com.yxt.common.core.result.ResultBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("v1/BusclaimCheckApply") +public class AppBusclaimCheckApplyRest implements AppBusclaimCheckApplyFeign { + + @Autowired + private AppBusclaimCheckApplyService appBusclaimCheckApplyService; + + @Override + public ResultBean fetchDetailsBySid(String sid) { + return appBusclaimCheckApplyService.fetchDetailsBySid(sid); + } + + @Override + public ResultBean agreeCreditInfo(AppFlowDto dto) { + return appBusclaimCheckApplyService.agreeCreditInfo(dto); + } + + @Override + public ResultBean rejectCreditInfo(AppFlowTaskQuery query) { + return appBusclaimCheckApplyService.rejectCreditInfo(query); + } + + @Override + public ResultBean recallCreditInfo(AppFlowTaskQuery query) { + return appBusclaimCheckApplyService.recallCreditInfo(query); + } + + @Override + public ResultBean stopCreditInfo(AppFlowTaskQuery query) { + return appBusclaimCheckApplyService.stopCreditInfo(query); + } + + @Override + public ResultBean getFlowOperateTitle(AppFlowQuery query) { + return appBusclaimCheckApplyService.getFlowOperateTitle(query); + } + + @Override + public ResultBean delegate(AppDelegateQuery delegateQuery) { + return appBusclaimCheckApplyService.delegate(delegateQuery); + } + + @Override + public ResultBean assignTask(AppDelegateQuery delegateQuery) { + return appBusclaimCheckApplyService.assignTask(delegateQuery); + } +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/busclaimcheckapply/AppBusclaimCheckApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/busclaimcheckapply/AppBusclaimCheckApplyService.java new file mode 100644 index 0000000000..ffc352c5cd --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/busclaimcheckapply/AppBusclaimCheckApplyService.java @@ -0,0 +1,191 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.biz.as.busclaimcheckapply; + +import cn.hutool.core.bean.BeanUtil; +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.as.busclaimcheckapply.AppBusclaimCheckApplyDetailVo; +import com.yxt.anrui.terminal.api.as.busclaimcheckapply.AppBusclaimCheckApplyDetailsVo; +import com.yxt.anrui.terminal.api.as.busclaimcheckapply.flowable.AppDelegateQuery; +import com.yxt.anrui.terminal.api.as.busclaimcheckapply.flowable.AppFlowDto; +import com.yxt.anrui.terminal.api.as.busclaimcheckapply.flowable.AppFlowQuery; +import com.yxt.anrui.terminal.api.as.busclaimcheckapply.flowable.AppFlowTaskQuery; +import com.yxt.anrui.terminal.fegin.asbusclaimcheckapply.AsBusclaimCheckApplyDetailVo; +import com.yxt.anrui.terminal.fegin.asbusclaimcheckapply.AsBusclaimCheckApplyDetailsVo; +import com.yxt.anrui.terminal.fegin.asbusclaimcheckapply.AsBusclaimCheckApplyFegin; +import com.yxt.anrui.terminal.fegin.asbusclaimcheckapply.AsBusclaimCheckApplyFile; +import com.yxt.anrui.terminal.fegin.asbusclaimcheckapply.flowable.*; +import com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill.flowable.*; +import com.yxt.common.core.result.ResultBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +@Service +public class AppBusclaimCheckApplyService { + + @Resource + private AsBusclaimCheckApplyFegin asBusclaimCheckApplyFegin; + @Autowired + private SysStaffOrgFeign sysStaffOrgFeign; + @Autowired + private SysUserFeign sysUserFeign; + + public ResultBean fetchDetailsBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + AsBusclaimCheckApplyDetailsVo data = asBusclaimCheckApplyFegin.details(sid).getData(); + AppBusclaimCheckApplyDetailsVo appBusclaimCheckApplyDetailsVo = new AppBusclaimCheckApplyDetailsVo(); + BeanUtil.copyProperties(data,appBusclaimCheckApplyDetailsVo,"fileList"); + appBusclaimCheckApplyDetailsVo.setProcInsId(data.getProcInstId()); + appBusclaimCheckApplyDetailsVo.setCreateDeptName(data.getDeptName()); + List fileList = data.getFileList(); + ArrayList files = new ArrayList<>(); + for (AsBusclaimCheckApplyFile asBusclaimCheckApplyFile : fileList) { + files.add(asBusclaimCheckApplyFile.getUrl()); + } + appBusclaimCheckApplyDetailsVo.setFileList(files); + List detailsList = data.getDetailsList(); + List appBusclaimCheckApplyDetailVos = new ArrayList<>(); + for (AsBusclaimCheckApplyDetailVo asBusclaimCheckApplyDetailVo : detailsList) { + AppBusclaimCheckApplyDetailVo appBusclaimCheckApplyDetailVo = new AppBusclaimCheckApplyDetailVo(); + BeanUtil.copyProperties(asBusclaimCheckApplyDetailVo,appBusclaimCheckApplyDetailVo); + appBusclaimCheckApplyDetailVos.add(appBusclaimCheckApplyDetailVo); + } + appBusclaimCheckApplyDetailsVo.setDetailList(appBusclaimCheckApplyDetailVos); + return rb.success().setData(appBusclaimCheckApplyDetailsVo); + } + + public ResultBean agreeCreditInfo(AppFlowDto 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(); + CompleteBusclaimCheckApplyDto completeBusclaimCheckApplyDto = new CompleteBusclaimCheckApplyDto(); + BeanUtil.copyProperties(dto, completeBusclaimCheckApplyDto); + completeBusclaimCheckApplyDto.setOrgSidPath(orgSidPath); + ResultBean resultBean = asBusclaimCheckApplyFegin.complete(completeBusclaimCheckApplyDto); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean rejectCreditInfo(AppFlowTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + BusclaimCheckApplyTaskQuery busclaimCheckApplyTaskQuery = new BusclaimCheckApplyTaskQuery(); + BeanUtil.copyProperties(query, busclaimCheckApplyTaskQuery); + ResultBean resultBean = asBusclaimCheckApplyFegin.taskReject(busclaimCheckApplyTaskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean recallCreditInfo(AppFlowTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + BusclaimCheckApplyTaskQuery busclaimCheckApplyTaskQuery = new BusclaimCheckApplyTaskQuery(); + BeanUtil.copyProperties(query, busclaimCheckApplyTaskQuery); + ResultBean resultBean = asBusclaimCheckApplyFegin.revokeProcess(busclaimCheckApplyTaskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean stopCreditInfo(AppFlowTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + BusclaimCheckApplyTaskQuery busclaimCheckApplyTaskQuery = new BusclaimCheckApplyTaskQuery(); + BeanUtil.copyProperties(query, busclaimCheckApplyTaskQuery); + ResultBean resultBean = asBusclaimCheckApplyFegin.breakProcess(busclaimCheckApplyTaskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean getFlowOperateTitle(AppFlowQuery query) { + ResultBean rb = ResultBean.fireFail(); + //0 上一环节 1下一环节 + int next = query.getNext(); + BusclaimCheckApplyNodeQuery getNodeQuery = new BusclaimCheckApplyNodeQuery(); + BeanUtil.copyProperties(query, getNodeQuery); + String data = ""; + if (next == 0) { + ResultBean> getPreviousNodesForReject = asBusclaimCheckApplyFegin.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 = asBusclaimCheckApplyFegin.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); + } + + public ResultBean delegate(AppDelegateQuery delegateQuery) { + ResultBean rb = ResultBean.fireFail(); + BusclaimCheckApplyDelegateQuery delegateQuery1 = new + BusclaimCheckApplyDelegateQuery(); + BeanUtil.copyProperties(delegateQuery, delegateQuery1); + asBusclaimCheckApplyFegin.delegate(delegateQuery1); + return rb.success(); + } + + public ResultBean assignTask(AppDelegateQuery delegateQuery) { + ResultBean rb = ResultBean.fireFail(); + BusclaimCheckApplyDelegateQuery delegateQuery1 = new + BusclaimCheckApplyDelegateQuery(); + BeanUtil.copyProperties(delegateQuery, delegateQuery1); + asBusclaimCheckApplyFegin.assignTask(delegateQuery1); + return rb.success(); + } +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaimcheckapply/AsBusclaimCheckApplyDetailVo.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaimcheckapply/AsBusclaimCheckApplyDetailVo.java new file mode 100644 index 0000000000..2c48c7d199 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaimcheckapply/AsBusclaimCheckApplyDetailVo.java @@ -0,0 +1,90 @@ +package com.yxt.anrui.terminal.fegin.asbusclaimcheckapply; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/5/11 + **/ +@Data +public class AsBusclaimCheckApplyDetailVo { + + @ApiModelProperty("索赔单号") + private String claimBillNo; + @ApiModelProperty("维修工单号") + private String repairBillNo; + @ApiModelProperty("车牌号") + private String vehMark; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("开票申请sid") + private String billInvoiceSid; + @ApiModelProperty("开票明细sid") + private String billInvoiceDetailSid; + @ApiModelProperty("差异调整工时费") + private String claimHourAmount; + @ApiModelProperty("差异调整材料费") + private String claimGoodsAmount; + @ApiModelProperty("差异调整外出费") + private String claimOutAmount; + @ApiModelProperty("差异调整厂家补助") + private String claimSubsidyAmount; + @ApiModelProperty("差异调整其他费用") + private String claimOtherAmount; + @ApiModelProperty("差异调整施救费") + private String claimRescueAmount; + @ApiModelProperty("预留") + private String reserved; + @ApiModelProperty("原因") + private String reason; + + //工单：工时费 + private String hourAmount1; + + //工单材料费 + private String goodsAmount1; + + //工单外出费 + private String claimOutAmount1; + + //工单厂家补助 + private String claimSubsidyAmount1; + + //工单其他费用 + private String claimOtherAmount1; + + //工单施救费 + private String claimRescueAmount1; + + //工单合计 + private String all1; + + //索赔开票工时费 + private String claimHourAmount2; + + //索赔开票材料费 + private String claimGoodsAmount2; + + //索赔开票外出费 + private String claimOutAmount2; + + //索赔开票厂家补助 + private String claimSubsidyAmount2; + + //索赔开票其他金额 + private String claimOtherAmount2; + + //索赔开票施救费 + private String claimRescueAmount2; + + //合计 + private String all2; + + //差异合计 + private String all3; + + //差异调整合计 + private String all4; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaimcheckapply/AsBusclaimCheckApplyDetailsVo.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaimcheckapply/AsBusclaimCheckApplyDetailsVo.java new file mode 100644 index 0000000000..0ff741caa1 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaimcheckapply/AsBusclaimCheckApplyDetailsVo.java @@ -0,0 +1,50 @@ +package com.yxt.anrui.terminal.fegin.asbusclaimcheckapply; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +@Data +public class AsBusclaimCheckApplyDetailsVo { + + private String sid; + private String createBySid; + private String createByName; + + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date createTime; + + @ApiModelProperty("申请部门sid") + private String deptSid; + @ApiModelProperty("申请部门名称") + private String deptName; + + private List fileList = new ArrayList<>(); + private String remarks; + + private String billNo; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("分公司") + private String useOrgName; + @ApiModelProperty("办结日期") + private String closeDate; + @ApiModelProperty("实例id") + private String procInstId; + @ApiModelProperty("流程定义id") + private String procDefId; + @ApiModelProperty("任务iD") + private String taskId; + @ApiModelProperty("环节iD") + private String taskDefKey; + @ApiModelProperty("流程状态") + private String nodeState; + + private List detailsList = new ArrayList<>(); +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaimcheckapply/AsBusclaimCheckApplyFegin.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaimcheckapply/AsBusclaimCheckApplyFegin.java new file mode 100644 index 0000000000..5a8f0137ec --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaimcheckapply/AsBusclaimCheckApplyFegin.java @@ -0,0 +1,59 @@ +package com.yxt.anrui.terminal.fegin.asbusclaimcheckapply; + +import com.yxt.anrui.terminal.fegin.asbusclaimcheckapply.flowable.*; +import com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill.AsBusclaimInvoiceBillDetailsVo; +import com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill.flowable.*; +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; + +@FeignClient( + contextId = "yxt-as-AsBusclaimCheckApply", + name = "yxt-as", + path = "v1/AsBusclaimCheckApply" +) +public interface AsBusclaimCheckApplyFegin { + + @GetMapping("/details") + @ApiOperation("详情") + ResultBean details(@RequestParam("sid") String sid); + + @ApiOperation(value = "办理（同意）") + @PostMapping("/complete") + public ResultBean complete(@Valid @RequestBody CompleteBusclaimCheckApplyDto query); + + @ApiOperation(value = "获取上一个环节") + @GetMapping(value = "/getPreviousNodesForReject") + ResultBean> getPreviousNodesForReject(@Valid @SpringQueryMap BusclaimCheckApplyNodeQuery query); + + @ApiOperation(value = "获取下一个环节") + @GetMapping(value = "/getNextNodesForSubmit") + ResultBean> getNextNodesForSubmit(@Valid @SpringQueryMap BusclaimCheckApplyNodeQuery query); + + @ApiOperation(value = "驳回任务") + @PostMapping(value = "/reject") + public ResultBean taskReject(@Valid @RequestBody BusclaimCheckApplyTaskQuery query); + + @ApiOperation(value = "撤回流程") + @PostMapping(value = "/revokeProcess") + public ResultBean revokeProcess(@Valid @RequestBody BusclaimCheckApplyTaskQuery query); + + @ApiOperation(value = "终止任务") + @PostMapping(value = "/breakProcess") + public ResultBean breakProcess(@Valid @RequestBody BusclaimCheckApplyTaskQuery query); + + @ApiOperation(value = "加签") + @PostMapping(value = "/delegate") + @ResponseBody + public ResultBean delegate(@RequestBody BusclaimCheckApplyDelegateQuery query); + + @ApiOperation(value = "转办") + @PutMapping(value = "/assignTask") + @ResponseBody + public ResultBean assignTask(@RequestBody BusclaimCheckApplyDelegateQuery query); +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaimcheckapply/AsBusclaimCheckApplyFile.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaimcheckapply/AsBusclaimCheckApplyFile.java new file mode 100644 index 0000000000..c74426a99f --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaimcheckapply/AsBusclaimCheckApplyFile.java @@ -0,0 +1,14 @@ +package com.yxt.anrui.terminal.fegin.asbusclaimcheckapply; + +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/5/11 + **/ +@Data +public class AsBusclaimCheckApplyFile { + + private String url; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaimcheckapply/flowable/BusclaimCheckApplyDelegateQuery.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaimcheckapply/flowable/BusclaimCheckApplyDelegateQuery.java new file mode 100644 index 0000000000..cb06fb9ba0 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaimcheckapply/flowable/BusclaimCheckApplyDelegateQuery.java @@ -0,0 +1,23 @@ +package com.yxt.anrui.terminal.fegin.asbusclaimcheckapply.flowable; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/5/11 + **/ +@Data +public class BusclaimCheckApplyDelegateQuery { + + private String userSid; + @ApiModelProperty("流程实例id") + private String instanceId; + @ApiModelProperty("任务Id") + private String taskId; + @ApiModelProperty("审批人sid") + private String assignee; + @ApiModelProperty("填写意见") + private String views; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaimcheckapply/flowable/BusclaimCheckApplyNodeQuery.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaimcheckapply/flowable/BusclaimCheckApplyNodeQuery.java new file mode 100644 index 0000000000..bf2d2470cd --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaimcheckapply/flowable/BusclaimCheckApplyNodeQuery.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.terminal.fegin.asbusclaimcheckapply.flowable; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/5/11 + **/ +@Data +public class BusclaimCheckApplyNodeQuery { + + @ApiModelProperty(value = "环节定义id") + private String taskDefKey; + @ApiModelProperty(value = "业务sid") + private String businessSid; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaimcheckapply/flowable/BusclaimCheckApplyNodeVo.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaimcheckapply/flowable/BusclaimCheckApplyNodeVo.java new file mode 100644 index 0000000000..a2aaddeb38 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaimcheckapply/flowable/BusclaimCheckApplyNodeVo.java @@ -0,0 +1,24 @@ +package com.yxt.anrui.terminal.fegin.asbusclaimcheckapply.flowable; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/5/11 + **/ +@Data +public class BusclaimCheckApplyNodeVo { + + @ApiModelProperty(value = "节点名称") + private String name; + @ApiModelProperty(value = "节点id") + private String id; + @ApiModelProperty(value = "审批组") + private List candidateGroups; + @ApiModelProperty(value = "是否是最后环节") + private String endTask; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaimcheckapply/flowable/BusclaimCheckApplyTaskQuery.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaimcheckapply/flowable/BusclaimCheckApplyTaskQuery.java new file mode 100644 index 0000000000..ac906ac9ec --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaimcheckapply/flowable/BusclaimCheckApplyTaskQuery.java @@ -0,0 +1,43 @@ +package com.yxt.anrui.terminal.fegin.asbusclaimcheckapply.flowable; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/5/11 + **/ +@Data +public class BusclaimCheckApplyTaskQuery { + + /** + * 终止、驳回、撤回 + */ + @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") + private String instanceId; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaimcheckapply/flowable/CompleteBusclaimCheckApplyDto.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaimcheckapply/flowable/CompleteBusclaimCheckApplyDto.java new file mode 100644 index 0000000000..b4ff0d6921 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaimcheckapply/flowable/CompleteBusclaimCheckApplyDto.java @@ -0,0 +1,35 @@ +package com.yxt.anrui.terminal.fegin.asbusclaimcheckapply.flowable; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/5/11 + **/ +@Data +public class CompleteBusclaimCheckApplyDto { + + @ApiModelProperty(value = "用户sid") + @NotBlank(message = "参数错误：userSid") + private String userSid; + @ApiModelProperty(value = "用户全路径sid") + private String orgSidPath; + @ApiModelProperty(value = "节点id") + @NotBlank(message = "参数错误：taskDefKey") + private String taskDefKey; + @ApiModelProperty(value = "任务id") + @NotBlank(message = "参数错误：taskId") + private String taskId; + @ApiModelProperty(value = "流程id") + @NotBlank(message = "参数错误：instanceId") + private String instanceId; + @ApiModelProperty(value = "意见") + private String comment; + @ApiModelProperty(value = "业务sid") + @NotBlank(message = "参数错误：businessSid") + private String businessSid; +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetail.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetail.java index 57553cbc08..42d8e2eb5e 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetail.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetail.java @@ -29,21 +29,21 @@ public class AsBusclaimCheckApplyDetail extends BaseEntity { private String billInvoiceSid; @ApiModelProperty("开票明细sid") private String billInvoiceDetailSid; - @ApiModelProperty("索赔工时费") - private BigDecimal claimHourAmount; - @ApiModelProperty("索赔材料费") - private BigDecimal claimGoodsAmount; - @ApiModelProperty("外出费") - private BigDecimal claimOutAmount; - @ApiModelProperty("厂家补助费") - private BigDecimal claimSubsidyAmount; - @ApiModelProperty("其他费用") - private BigDecimal claimOtherAmount; + @ApiModelProperty("差异调整工时费") + private String claimHourAmount; + @ApiModelProperty("差异调整材料费") + private String claimGoodsAmount; + @ApiModelProperty("差异调整外出费") + private String claimOutAmount; + @ApiModelProperty("差异调整厂家补助") + private String claimSubsidyAmount; + @ApiModelProperty("差异调整其他费用") + private String claimOtherAmount; + @ApiModelProperty("差异调整施救费") + private BigDecimal claimRescueAmount; @ApiModelProperty("预留") private BigDecimal reserved; - @ApiModelProperty("原因key") - private String reasonKey; - @ApiModelProperty("原因value") - private String reasonValue; + @ApiModelProperty("原因") + private String reason; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetailDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetailDto.java index df7e1a9de0..fdd19e6c8d 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetailDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetailDto.java @@ -25,20 +25,20 @@ public class AsBusclaimCheckApplyDetailDto { private String billInvoiceSid; @ApiModelProperty("开票明细sid") private String billInvoiceDetailSid; - @ApiModelProperty("索赔工时费") + @ApiModelProperty("差异调整工时费") private String claimHourAmount; - @ApiModelProperty("索赔材料费") + @ApiModelProperty("差异调整材料费") private String claimGoodsAmount; - @ApiModelProperty("外出费") + @ApiModelProperty("差异调整外出费") private String claimOutAmount; - @ApiModelProperty("厂家补助费") + @ApiModelProperty("差异调整厂家补助") private String claimSubsidyAmount; - @ApiModelProperty("其他费用") + @ApiModelProperty("差异调整其他费用") private String claimOtherAmount; + @ApiModelProperty("差异调整施救费") + private BigDecimal claimRescueAmount; @ApiModelProperty("预留") private String reserved; - @ApiModelProperty("原因key") - private String reasonKey; - @ApiModelProperty("原因value") - private String reasonValue; + @ApiModelProperty("原因") + private String reason; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetailVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetailVo.java index aa744e9a95..f0fa284813 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetailVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetailVo.java @@ -25,22 +25,22 @@ public class AsBusclaimCheckApplyDetailVo { private String billInvoiceSid; @ApiModelProperty("开票明细sid") private String billInvoiceDetailSid; - @ApiModelProperty("调整工时费") + @ApiModelProperty("差异调整工时费") private String claimHourAmount; - @ApiModelProperty("调整材料费") + @ApiModelProperty("差异调整材料费") private String claimGoodsAmount; - @ApiModelProperty("外出费") + @ApiModelProperty("差异调整外出费") private String claimOutAmount; - @ApiModelProperty("厂家补助费") + @ApiModelProperty("差异调整厂家补助") private String claimSubsidyAmount; - @ApiModelProperty("其他费用") + @ApiModelProperty("差异调整其他费用") private String claimOtherAmount; + @ApiModelProperty("差异调整施救费") + private String claimRescueAmount; @ApiModelProperty("预留") private String reserved; - @ApiModelProperty("原因key") - private String reasonKey; - @ApiModelProperty("原因value") - private String reasonValue; + @ApiModelProperty("原因") + private String reason; //工单：工时费 private String hourAmount1; @@ -57,6 +57,9 @@ public class AsBusclaimCheckApplyDetailVo { //工单其他费用 private String claimOtherAmount1; + //工单施救费 + private String claimRescueAmount1; + //工单合计 private String all1; @@ -75,7 +78,10 @@ public class AsBusclaimCheckApplyDetailVo { //索赔开票其他金额 private String claimOtherAmount2; - //合计 + //索赔开票施救费 + private String claimRescueAmount2; + + //索赔合计 private String all2; //差异合计 diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetail.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetail.java index bd813c661c..f9f83df33e 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetail.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetail.java @@ -36,6 +36,4 @@ public class AsBusclaimInvoiceBillDetail extends BaseEntity { private BigDecimal claimRescueAmount; @ApiModelProperty("其他费用") private BigDecimal claimOtherAmount; - @ApiModelProperty("费用是否一致") - private Boolean isUnanimous; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheckapply/AsBusclaimCheckApplyService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheckapply/AsBusclaimCheckApplyService.java index e286975863..006f910ec5 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheckapply/AsBusclaimCheckApplyService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheckapply/AsBusclaimCheckApplyService.java @@ -273,25 +273,43 @@ public class AsBusclaimCheckApplyService extends MybatisBaseService