From 33a3295f2281e774b3979752be11ace38be44c64 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 5 Oct 2022 15:53:58 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E7=9A=84?= =?UTF-8?q?=E8=B4=B9=E7=94=A8=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/fincostapply/AppFinCostApplyVo.java | 60 ++++++++ .../api/fincostapply/FinCostapplyFeign.java | 7 + .../FinCostapplyFeignFallback.java | 5 + .../biz/fincostapply/FinCostapplyMapper.java | 3 + .../biz/fincostapply/FinCostapplyMapper.xml | 23 ++- .../biz/fincostapply/FinCostapplyRest.java | 5 + .../biz/fincostapply/FinCostapplyService.java | 15 +- .../api/finance/costapply/CostApplyFeign.java | 57 ++++++++ .../costapply/CostApplyFeignFallback.java | 9 ++ .../api/finance/costapply/CostDetailsVo.java | 66 +++++++++ .../costapply/flowable/CostApplyDto.java | 37 +++++ .../costapply/flowable/CostApplyQuery.java | 25 ++++ .../flowable/CostApplyTaskQuery.java | 47 ++++++ .../biz/finance/costapply/CostApplyRest.java | 54 +++++++ .../finance/costapply/CostApplyService.java | 136 ++++++++++++++++++ 15 files changed, 545 insertions(+), 4 deletions(-) create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/AppFinCostApplyVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/costapply/CostApplyFeign.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/costapply/CostApplyFeignFallback.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/costapply/CostDetailsVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/costapply/flowable/CostApplyDto.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/costapply/flowable/CostApplyQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/costapply/flowable/CostApplyTaskQuery.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/costapply/CostApplyRest.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/costapply/CostApplyService.java diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/AppFinCostApplyVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/AppFinCostApplyVo.java new file mode 100644 index 0000000000..daf5caafc8 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/AppFinCostApplyVo.java @@ -0,0 +1,60 @@ +package com.yxt.anrui.fin.api.fincostapply; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/10/4 18:07 + * @Description + */ +@Data +public class AppFinCostApplyVo implements Vo { + private static final long serialVersionUID = 7253342244052642678L; + + @ApiModelProperty("费用名称") + private String costTitleValue; + + @ApiModelProperty("创建时间") + private String createTime; + + //申请人 + private String name; + + //费用类型 + private String costTypeValue; + + //申请费用 + private String cost; + + //使用方式 + private String useTypeValue; + + //备注 + private String remarks; + + //是否涉及车辆 + @ApiModelProperty("是否涉及车辆:1是，0否") + private Boolean isVeh; + + //涉及车辆 + private String vins; + + //任务id + private String taskId; + + //实例id + private String procInstId; + + private String sid; + + @ApiModelProperty("是否需要出门:1是，0否.如果涉及车辆，则选择是否需要出门") + private String isOutDoor; + + @ApiModelProperty("创建人sid") + private String createBySid; + + +} + diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyFeign.java index 2300f9b65b..173381dfd4 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyFeign.java @@ -117,4 +117,11 @@ public interface FinCostapplyFeign { public ResultBean breakProcess(@Valid @RequestBody FinCostTaskQuery query); + /***********************************移动端************************************************/ + @ApiOperation(value = "app详情") + @GetMapping(value = "/appDetails/{sid}") + @ResponseBody + ResultBean appDetails(@PathVariable("sid")String sid); + + } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyFeignFallback.java index b1d1b2ecf6..8f62c6e14d 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyFeignFallback.java @@ -106,4 +106,9 @@ public class FinCostapplyFeignFallback implements FinCostapplyFeign { public ResultBean breakProcess(FinCostTaskQuery query) { return null; } + + @Override + public ResultBean appDetails(String sid) { + return null; + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyMapper.java index f5e9e4c19b..3da1246a79 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyMapper.java @@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.fin.api.fincostapply.AppFinCostApplyVo; import com.yxt.anrui.fin.api.fincostapply.FinCostapplyDetailsVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -81,4 +82,6 @@ public interface FinCostapplyMapper extends BaseMapper { int selectBySid(String list); String selectNum(String bill); + + AppFinCostApplyVo appDetails(String sid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyMapper.xml index ef7bac732e..f458915b7a 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyMapper.xml @@ -74,8 +74,27 @@ + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyRest.java index 8d8f6972fb..05a4d5ba6d 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyRest.java @@ -127,4 +127,9 @@ public class FinCostapplyRest implements FinCostapplyFeign { public ResultBean breakProcess(FinCostTaskQuery query) { return finCostapplyService.breakProcess(query); } + + @Override + public ResultBean appDetails(String sid) { + return finCostapplyService.appDetails(sid); + } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java index 4235c05fe9..a38974aa53 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java @@ -287,12 +287,12 @@ public class FinCostapplyService extends MybatisBaseService> userRoleList = sysUserRoleFeign.getUserRoleSidByUserSid(userSid); UserRoleQuery userRoleQuery = new UserRoleQuery(); - if(userRoleList.getData().size()>0){ + if (userRoleList.getData().size() > 0) { userRoleQuery.setRoleSid(userRoleList.getData().get(0)); } userRoleQuery.setOrgSid(staffOrgResultBean.getData().getOrgSid()); ResultBean> listResultBean = sysUserFeign.getUserByOrgRole(userRoleQuery); - if(!listResultBean.getSuccess()){ + if (!listResultBean.getSuccess()) { return rb.setMsg(listResultBean.getMsg()); } List sysUserVos = listResultBean.getData(); @@ -537,4 +537,15 @@ public class FinCostapplyService extends MybatisBaseService appDetails(String sid) { + ResultBean rb = ResultBean.fireFail(); + AppFinCostApplyVo appFinCostApplyVo = baseMapper.appDetails(sid); + if (appFinCostApplyVo.getIsVeh()) {//涉及车辆 + List vinNoList = finCostapplyVehicleService.selectByApplySid(sid); + String vins = StringUtils.join(vinNoList.toArray(), "\n"); + appFinCostApplyVo.setVins(vins); + } + return rb.success().setData(appFinCostApplyVo); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/costapply/CostApplyFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/costapply/CostApplyFeign.java new file mode 100644 index 0000000000..c4a9e5f904 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/costapply/CostApplyFeign.java @@ -0,0 +1,57 @@ +package com.yxt.anrui.terminal.api.finance.costapply; + +import com.yxt.anrui.terminal.api.finance.costapply.flowable.CostApplyDto; +import com.yxt.anrui.terminal.api.finance.costapply.flowable.CostApplyQuery; +import com.yxt.anrui.terminal.api.finance.costapply.flowable.CostApplyTaskQuery; +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; +import org.springframework.web.bind.annotation.*; + +/** + * @Author dimengzhe + * @Date 2022/10/4 19:11 + * @Description + */ +@Api(tags = "费用申请") +@FeignClient( + contextId = "terminal-CostApply", + name = "anrui-terminal", + path = "/finance/v1/costApply", + fallback = CostApplyFeignFallback.class) +public interface CostApplyFeign { + + @ApiOperation("费用申请详情") + @GetMapping("/getCostApply/{sid}") + @ResponseBody + ResultBean getCostApply(@PathVariable("sid") String sid); + + @ApiOperation("办理") + @PutMapping("/agreeCostApplyInfo") + @ResponseBody + ResultBean agreeCostApplyInfo(@RequestBody CostApplyDto dto); + + @ApiOperation("驳回") + @PutMapping("/rejectCostApplyInfo") + @ResponseBody + ResultBean rejectCostApplyInfo(@RequestBody CostApplyTaskQuery query); + + @ApiOperation("撤回") + @PutMapping("/recallCostApplyInfo") + @ResponseBody + ResultBean recallCostApplyInfo(@RequestBody CostApplyTaskQuery query); + + @ApiOperation("终止") + @PutMapping("/stopCostApplyInfo") + @ResponseBody + ResultBean stopCostApplyInfo(@RequestBody CostApplyTaskQuery query); + + @ApiOperation("获取流程操作标题") + @GetMapping("/getFlowOperateTitle") + @ResponseBody + ResultBean getFlowOperateTitle(@SpringQueryMap CostApplyQuery query); + + +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/costapply/CostApplyFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/costapply/CostApplyFeignFallback.java new file mode 100644 index 0000000000..97b95088ac --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/costapply/CostApplyFeignFallback.java @@ -0,0 +1,9 @@ +package com.yxt.anrui.terminal.api.finance.costapply; + +/** + * @Author dimengzhe + * @Date 2022/10/4 19:20 + * @Description + */ +public class CostApplyFeignFallback { +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/costapply/CostDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/costapply/CostDetailsVo.java new file mode 100644 index 0000000000..1736e63bc4 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/costapply/CostDetailsVo.java @@ -0,0 +1,66 @@ +package com.yxt.anrui.terminal.api.finance.costapply; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/10/4 18:58 + * @Description + */ +@Data +public class CostDetailsVo implements Vo { + private static final long serialVersionUID = 4230232069904074647L; + + @ApiModelProperty("费用名称") + @JsonProperty("applyName") + private String costTitleValue; + + @ApiModelProperty("创建时间") + @JsonProperty("applyDate") + private String createTime; + + //申请人 + @JsonProperty("applicant") + private String name; + + //费用类型 + @JsonProperty("costType") + private String costTypeValue; + + //申请费用 + @JsonProperty("applyPrice") + private String cost; + + //使用方式 + @JsonProperty("useType") + private String useTypeValue; + + //备注 + private String remarks; + + //是否涉及车辆 + + private boolean isVeh; + + + @ApiModelProperty(value = "车架号") + private String vins; + + //任务id + private String taskId; + + //实例id + @JsonProperty("procInsId") + private String procInstId; + + private String sid; + @ApiModelProperty("是否需要出门") + @JsonProperty("vinState") + private String isOutDoor; + @JsonProperty("userSid") + private String createBySid; + +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/costapply/flowable/CostApplyDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/costapply/flowable/CostApplyDto.java new file mode 100644 index 0000000000..4cec91d56b --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/costapply/flowable/CostApplyDto.java @@ -0,0 +1,37 @@ +package com.yxt.anrui.terminal.api.finance.costapply.flowable; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Author dimengzhe + * @Date 2022/10/4 18:06 + * @Description + */ +@Data +public class CostApplyDto implements Dto { + private static final long serialVersionUID = -5698304783095155182L; + + @ApiModelProperty(value = "任务id") + @NotBlank(message = "参数错误：taskId") + private String taskId; + @ApiModelProperty(value = "流程id") + @NotBlank(message = "参数错误：procInsId") + @JsonProperty("procInsId") + private String instanceId; + @ApiModelProperty(value = "意见") + private String comment; + @ApiModelProperty(value = "业务sid") + @NotBlank(message = "参数错误：businessSid") + private String businessSid; + @ApiModelProperty(value = "用户sid") + @NotBlank(message = "参数错误：userSid") + private String userSid; + @ApiModelProperty(value = "节点id") + @NotBlank(message = "参数错误：taskDefKey") + private String taskDefKey; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/costapply/flowable/CostApplyQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/costapply/flowable/CostApplyQuery.java new file mode 100644 index 0000000000..6826371390 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/costapply/flowable/CostApplyQuery.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.terminal.api.finance.costapply.flowable; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Author dimengzhe + * @Date 2022/10/5 15:26 + * @Description + */ +@Data +public class CostApplyQuery implements Query { + private static final long serialVersionUID = 5041782090284095194L; + + @ApiModelProperty(value = "节点key") + private String taskDefKey; + @ApiModelProperty(value = "业务sid") + private String businessSid; + @ApiModelProperty(value = "0 上一环节 1下一环节") + @NotNull(message = "参数错误：next") + private Integer next; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/costapply/flowable/CostApplyTaskQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/costapply/flowable/CostApplyTaskQuery.java new file mode 100644 index 0000000000..43661c092d --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/costapply/flowable/CostApplyTaskQuery.java @@ -0,0 +1,47 @@ +package com.yxt.anrui.terminal.api.finance.costapply.flowable; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Author dimengzhe + * @Date 2022/10/5 15:31 + * @Description + */ +@Data +public class CostApplyTaskQuery implements Query { + private static final long serialVersionUID = -3303215603844118072L; + + /** + * 终止、驳回、撤回 + */ + @ApiModelProperty("任务Id") + @NotBlank(message = "参数错误：taskId") + private String taskId; + /** + * 终止、驳回、撤回 + */ + @ApiModelProperty("业务sid") + @NotBlank(message = "参数错误：businessSid") + private String businessSid; + /** + * 终止、驳回 + */ + @ApiModelProperty("任务意见") + private String comment; + /** + * 终止、撤回、驳回 + */ + @ApiModelProperty("用户Sid") + private String userSid; + /** + * 终止 + */ + @ApiModelProperty("流程实例Id") + @JsonProperty("procInsId") + private String instanceId; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/costapply/CostApplyRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/costapply/CostApplyRest.java new file mode 100644 index 0000000000..be26526db3 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/costapply/CostApplyRest.java @@ -0,0 +1,54 @@ +package com.yxt.anrui.terminal.biz.finance.costapply; + +import com.yxt.anrui.terminal.api.finance.costapply.CostApplyFeign; +import com.yxt.anrui.terminal.api.finance.costapply.CostDetailsVo; +import com.yxt.anrui.terminal.api.finance.costapply.flowable.CostApplyDto; +import com.yxt.anrui.terminal.api.finance.costapply.flowable.CostApplyQuery; +import com.yxt.anrui.terminal.api.finance.costapply.flowable.CostApplyTaskQuery; +import com.yxt.common.core.result.ResultBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +/** + * @Author dimengzhe + * @Date 2022/10/5 15:12 + * @Description + */ +@Controller +@RequestMapping("/finance/v1/costApply") +public class CostApplyRest implements CostApplyFeign { + + @Autowired + private CostApplyService costApplyService; + + @Override + public ResultBean getCostApply(String sid) { + return costApplyService.getCostApply(sid); + } + + @Override + public ResultBean agreeCostApplyInfo(CostApplyDto dto) { + return costApplyService.agreeCostApplyInfo(dto); + } + + @Override + public ResultBean rejectCostApplyInfo(CostApplyTaskQuery query) { + return costApplyService.rejectCostApplyInfo(query); + } + + @Override + public ResultBean recallCostApplyInfo(CostApplyTaskQuery query) { + return costApplyService.recallCostApplyInfo(query); + } + + @Override + public ResultBean stopCostApplyInfo(CostApplyTaskQuery query) { + return costApplyService.stopCostApplyInfo(query); + } + + @Override + public ResultBean getFlowOperateTitle(CostApplyQuery query) { + return costApplyService.getFlowOperateTitle(query); + } +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/costapply/CostApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/costapply/CostApplyService.java new file mode 100644 index 0000000000..e9c7bcb3e9 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/costapply/CostApplyService.java @@ -0,0 +1,136 @@ +package com.yxt.anrui.terminal.biz.finance.costapply; + +import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.fin.api.fincostapply.AppFinCostApplyVo; +import com.yxt.anrui.fin.api.fincostapply.FinCostapplyFeign; +import com.yxt.anrui.fin.api.fincostapply.flow.FinCostCompleteDto; +import com.yxt.anrui.fin.api.fincostapply.flow.FinCostGetNodeQuery; +import com.yxt.anrui.fin.api.fincostapply.flow.FinCostGetNodeVo; +import com.yxt.anrui.fin.api.fincostapply.flow.FinCostTaskQuery; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.anrui.terminal.api.finance.costapply.CostDetailsVo; +import com.yxt.anrui.terminal.api.finance.costapply.flowable.CostApplyDto; +import com.yxt.anrui.terminal.api.finance.costapply.flowable.CostApplyQuery; +import com.yxt.anrui.terminal.api.finance.costapply.flowable.CostApplyTaskQuery; +import com.yxt.common.core.result.ResultBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Collections; +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/10/5 15:13 + * @Description + */ +@Service +public class CostApplyService { + + @Autowired + private FinCostapplyFeign finCostapplyFeign; + @Autowired + private SysUserFeign sysUserFeign; + @Autowired + private SysStaffOrgFeign sysStaffOrgFeign; + + public ResultBean getCostApply(String sid) { + ResultBean rb = ResultBean.fireFail(); + ResultBean resultBean = finCostapplyFeign.appDetails(sid); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + CostDetailsVo costDetailsVo = new CostDetailsVo(); + BeanUtil.copyProperties(resultBean.getData(), costDetailsVo); + return rb.success().setData(costDetailsVo); + } + + public ResultBean agreeCostApplyInfo(CostApplyDto 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(); + FinCostCompleteDto finCostCompleteDto = new FinCostCompleteDto(); + BeanUtil.copyProperties(dto, finCostCompleteDto); + finCostCompleteDto.setOrgSidPath(orgSidPath); + ResultBean resultBean = finCostapplyFeign.complete(finCostCompleteDto); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean rejectCostApplyInfo(CostApplyTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + FinCostTaskQuery finCostTaskQuery = new FinCostTaskQuery(); + BeanUtil.copyProperties(query, finCostTaskQuery); + ResultBean resultBean = finCostapplyFeign.taskReject(finCostTaskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean recallCostApplyInfo(CostApplyTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + FinCostTaskQuery finCostTaskQuery = new FinCostTaskQuery(); + BeanUtil.copyProperties(query, finCostTaskQuery); + ResultBean resultBean = finCostapplyFeign.revokeProcess(finCostTaskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean stopCostApplyInfo(CostApplyTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + FinCostTaskQuery finCostTaskQuery = new FinCostTaskQuery(); + BeanUtil.copyProperties(query, finCostTaskQuery); + ResultBean resultBean = finCostapplyFeign.breakProcess(finCostTaskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean getFlowOperateTitle(CostApplyQuery query) { + ResultBean rb = ResultBean.fireFail(); + //0 上一环节 1下一环节 + int next = query.getNext(); + FinCostGetNodeQuery getNodeQuery = new FinCostGetNodeQuery(); + BeanUtil.copyProperties(query, getNodeQuery); + String data = ""; + if (next == 0) { + ResultBean> getPreviousNodesForReject = finCostapplyFeign.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 = finCostapplyFeign.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); + } +} From 9c65b82bffd0d409d0604e843582b2e4c3d0621d Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 5 Oct 2022 18:54:34 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E7=9A=84?= =?UTF-8?q?=E8=B4=B9=E7=94=A8=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/AppVehicleApplyListVo.java | 3 + .../app/AppVehicleApplyVo.java | 2 + .../BaseVehicleActualSalesMapper.xml | 3 +- .../basevehicleout/BaseVehicleOutService.java | 66 +++++++++++++++++++ .../busvehicleapply/BusVehicleApplyMapper.xml | 6 +- .../BusVehicleApplyDetailMapper.xml | 6 +- .../biz/fincostapply/FinCostapplyMapper.xml | 1 + .../biz/fincostapply/FinCostapplyService.java | 3 + .../api/finance/costapply/CostDetailsVo.java | 2 +- 9 files changed, 86 insertions(+), 6 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/app/AppVehicleApplyListVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/app/AppVehicleApplyListVo.java index 793ae8e6a6..562c30f6e6 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/app/AppVehicleApplyListVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/app/AppVehicleApplyListVo.java @@ -41,4 +41,7 @@ public class AppVehicleApplyListVo implements Vo { @ApiModelProperty(value = "配置名称") private String configName; + + @ApiModelProperty("厂家销售通路") + private String actualPay; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/app/AppVehicleApplyVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/app/AppVehicleApplyVo.java index 58b5b54cb1..41b92e9c1e 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/app/AppVehicleApplyVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/app/AppVehicleApplyVo.java @@ -48,4 +48,6 @@ public class AppVehicleApplyVo implements Vo { private String applyType; @ApiModelProperty("订金付款备注") private String payRemarks; + @ApiModelProperty("采购系统") + private String orgDeptName; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesMapper.xml index a8021c9840..21325e4539 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesMapper.xml @@ -64,7 +64,8 @@ reason, money, case isPay when '1' then '1' when '0' then '0' end payStateKey, - case isPay when '1' then '是' when '0' then '否' end payState + case isPay when '1' then '是' when '0' then '否' end payState, + useOrgName from base_vehicle_actual_sales where sid = #{sid} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index 80334eb196..08fb599ce1 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -7,6 +7,10 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicle; import com.yxt.anrui.base.api.basevehicleout.*; import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService; import com.yxt.anrui.base.common.enums.VehicleState; +import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; +import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; @@ -17,7 +21,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.Date; +import java.util.List; /** * @Author dimengzhe @@ -29,6 +35,10 @@ public class BaseVehicleOutService extends MybatisBaseService resultBean = sysOrganizationFeign.fetchBySid(baseVehicle.getCreateOrgSid()); + if (!resultBean.getSuccess()) { + SysOrganizationVo vo = resultBean.getData(); + if (vo != null) { + salOutStock.setFSaleOrgId(vo.getOrgCode()); + } + } + //客户 + //销售部门id + ResultBean resultBean1 = sysOrganizationFeign.selectByPSid(baseVehicle.getCreateOrgSid(), "销售支持部"); + if (resultBean1.getSuccess()) { + SysOrganizationVo vo = resultBean1.getData(); + if (vo != null) { + salOutStock.setFSaleDeptID(vo.getOrgCode()); + } + } + //项目类别key和项目类别type + + //业务员 + + //中介单位 + + //物料列表 + List fEntityList = new ArrayList<>(); + + SalOutStock.FEntity fEntity = new SalOutStock.FEntity(); + //单价 + //物料编码 + //批号 + //仓库id + //销售折让 + //返利金额 + //备注 + fEntityList.add(fEntity); + if (fEntityList.size() > 0) { + salOutStock.setFEntity(fEntityList); + return salOutStock; + } else { + return null; + } + + } + public PagerVo pagerList(PagerQuery query) { IPage page = PagerUtil.queryToPage(query); BaseVehicleOutQuery params = query.getParams(); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml index 796bd32a82..c9a901295a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml @@ -74,7 +74,8 @@ ba.createOrgSid as userSid, ba.createOrgName, ba.applyType, - ba.payRemarks + ba.payRemarks, + ba.orgDeptName from bus_vehicle_apply ba where sid = #{sid} @@ -99,6 +100,7 @@ select count(*) from bus_vehicle_apply ba left join base_manufactor_subscription bs on ba.applicationCode = bs.proSchAppNo - where bs.state = 1 and find_in_set(ba.sid, #{join}) + where bs.state = 1 + and find_in_set(ba.sid, #{join}) \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml index 6c29662e3a..1dc25b7eb7 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml @@ -55,7 +55,8 @@ left join bus_vehicle_apply bv on bd.applySid = bv.sid left join bus_vehicle_order bo on bo.purchaseApplyMediumModelSid = bd.sid where bd.vehicleSid = #{modelSid} - and bd.configSid = #{configSid} and length(bo.platformNo)>0 + and bd.configSid = #{configSid} + and length(bo.platformNo) > 0 \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java index a38974aa53..ce3bc3ebe3 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java @@ -259,6 +259,9 @@ public class FinCostapplyService extends MybatisBaseService variables = new HashMap<>(); + Map appMap = new HashMap<>(); + appMap.put("sid",businessSid); + variables.put("app",appMap); //用户的部门全路径sid bv.setOrgSidPath(orgSidPath); //业务sid diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/costapply/CostDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/costapply/CostDetailsVo.java index 1736e63bc4..654e09bc3f 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/costapply/CostDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/costapply/CostDetailsVo.java @@ -42,7 +42,7 @@ public class CostDetailsVo implements Vo { private String remarks; //是否涉及车辆 - + @JsonProperty("isVeh") private boolean isVeh; From b4dd93b8c6fb08695165a92d6d3e878277ff2445 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 6 Oct 2022 09:24:53 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E7=9A=84?= =?UTF-8?q?=E5=8E=82=E5=AE=B6=E9=87=87=E8=B4=AD=E5=92=8C=E6=9C=AA=E5=94=AE?= =?UTF-8?q?=E4=B9=B0=E6=96=AD=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppBaseVehicleActualSalesVo.java | 3 +++ .../api/supplychain/unsoldBuyout/UnsoldBuyoutVo.java | 4 ++++ .../api/supplychain/vehicleApply/VehicleApplyListVo.java | 4 ++++ .../api/supplychain/vehicleApply/VehicleApplyVo.java | 7 +++++++ 4 files changed, 18 insertions(+) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/AppBaseVehicleActualSalesVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/AppBaseVehicleActualSalesVo.java index ee34f88a22..d75e78824f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/AppBaseVehicleActualSalesVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/AppBaseVehicleActualSalesVo.java @@ -44,4 +44,7 @@ public class AppBaseVehicleActualSalesVo implements Vo { private String payStateKey; @ApiModelProperty("付款明细合计") private String payDetailTotal; + + @ApiModelProperty("分公司") + private String useOrgName; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/unsoldBuyout/UnsoldBuyoutVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/unsoldBuyout/UnsoldBuyoutVo.java index e945969add..58022a2458 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/unsoldBuyout/UnsoldBuyoutVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/unsoldBuyout/UnsoldBuyoutVo.java @@ -44,4 +44,8 @@ public class UnsoldBuyoutVo implements Vo { private String payStateKey; @ApiModelProperty("付款明细合计") private String payDetailTotal; + + @ApiModelProperty("分公司") + @JsonProperty("company") + private String useOrgName; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplyListVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplyListVo.java index 85a7b7cc2b..0eaf5133b1 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplyListVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplyListVo.java @@ -40,4 +40,8 @@ public class VehicleApplyListVo implements Vo { @ApiModelProperty(value = "配置") @JsonProperty("config") private String configName; + + @ApiModelProperty("厂家销售通路") + @JsonProperty("saleRoad") + private String actualPay; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplyVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplyVo.java index f2174c1b38..0527a408dc 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplyVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplyVo.java @@ -51,5 +51,12 @@ public class VehicleApplyVo implements Vo { @JsonProperty("type") private String applyType; + @ApiModelProperty("采购系统") + @JsonProperty("system") + private String orgDeptName; + @ApiModelProperty("订金付款备注") + @JsonProperty("depositRemark") + private String payRemarks; + } From 14336f064609139ba463e9213423425639ac867d Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 6 Oct 2022 09:33:54 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E8=BD=A6?= =?UTF-8?q?=E5=9E=8B=E8=B0=83=E4=BB=B7=E8=AF=A6=E6=83=85=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/supplychain/modelAdjust/ModelModpriceModelVo.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/ModelModpriceModelVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/ModelModpriceModelVo.java index 1166fbbc50..e249a1b548 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/ModelModpriceModelVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/ModelModpriceModelVo.java @@ -22,8 +22,8 @@ public class ModelModpriceModelVo implements Vo { private String configName; // 常用配置名称 @ApiModelProperty("成本价") private String costPrice; // 成本价 - @ApiModelProperty("现销售指导价") - @JsonProperty("guidancePrice") + @ApiModelProperty("现全款销售指导价") + @JsonProperty("fullGuidancePrice") private String guidedPrice; // 现销售指导价 @ApiModelProperty("价格增减数额") @JsonProperty("adjustPrice") @@ -33,6 +33,9 @@ public class ModelModpriceModelVo implements Vo { @ApiModelProperty("车型页面信息") private ModelVehicleVersionVo carDetailPage; + @ApiModelProperty("现贷款销售指导价") + @JsonProperty("loanGuidancePrice") + private String manufactorSettlementPrice; // 现贷款销售指导价 From 9596c6f0f3952b92835a9f7f45d0d9897516b1a4 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 6 Oct 2022 09:55:25 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=A4=96?= =?UTF-8?q?=E9=87=87=E7=94=B3=E8=AF=B7=E8=AF=A6=E6=83=85=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppBaseOutsourcingApplicationVo.java | 17 ++++++++++-- .../BaseOutsourcingApplicationMapper.xml | 8 +++++- .../externalPurchase/ExternalPurchaseVo.java | 27 ++++++++++++++++--- 3 files changed, 45 insertions(+), 7 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/AppBaseOutsourcingApplicationVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/AppBaseOutsourcingApplicationVo.java index 24f1be90c4..787836baaf 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/AppBaseOutsourcingApplicationVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/AppBaseOutsourcingApplicationVo.java @@ -37,9 +37,9 @@ public class AppBaseOutsourcingApplicationVo implements Vo { private String insideCode; @ApiModelProperty("采购单位名称") private String purchasingUnitName; - @ApiModelProperty("开户银行") + @ApiModelProperty("车款开户银行") private String depositBankName; - @ApiModelProperty("银行账号") + @ApiModelProperty("车款银行账号") private String bankAccount; @ApiModelProperty("采购价格") private String purchasePrice; @@ -62,4 +62,17 @@ public class AppBaseOutsourcingApplicationVo implements Vo { private String configSid; private AppBaseVesionVo carDetailPage; + @ApiModelProperty("车款收款账户") + private String accountName; + @ApiModelProperty("订金开户银行") + private String modelBankName; + @ApiModelProperty("订金银行账号") + private String modelBankAccount; + @ApiModelProperty("订金收款账户名称") + private String modelAccountName; + @ApiModelProperty("是否先付款") + private String isBeforePaymentKey; + @ApiModelProperty("是否先付款 1是，0否") + private String isBeforePaymentValue; + } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.xml index 68c2ac1a08..2c0872471e 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.xml @@ -64,7 +64,13 @@ totalExpenseAmount, remarks, modelSid, - configSid + configSid, + accountName, + modelBankName, + modelBankAccount, + modelAccountName, + isBeforePayment as isBeforePaymentKey, + case isBeforePayment when 1 then '是' when 0 then '否' end as isBeforePaymentValue from base_outsourcing_application where sid = #{sid} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/externalPurchase/ExternalPurchaseVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/externalPurchase/ExternalPurchaseVo.java index 0ac1b64e8e..ade10d7f3f 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/externalPurchase/ExternalPurchaseVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/externalPurchase/ExternalPurchaseVo.java @@ -46,11 +46,11 @@ public class ExternalPurchaseVo implements Vo { @ApiModelProperty("采购单位名称") @JsonProperty("purchasingUnit") private String purchasingUnitName; - @ApiModelProperty("开户银行") - @JsonProperty("bankDeposit") + @ApiModelProperty("车款开户银行") + @JsonProperty("carPaymentAccount") private String depositBankName; - @ApiModelProperty("银行账号") - @JsonProperty("invoBankNum") + @ApiModelProperty("车款银行账号") + @JsonProperty("carPaymentBankDeposit") private String bankAccount; @ApiModelProperty("采购价格") private String purchasePrice; @@ -76,4 +76,23 @@ public class ExternalPurchaseVo implements Vo { private String configSid; private ExterVesionVo carDetailPage; + + @ApiModelProperty("车款收款账户") + @JsonProperty("carPaymentBankAccount") + private String accountName; + @ApiModelProperty("订金开户银行") + @JsonProperty("depositBankDeposit") + private String modelBankName; + @ApiModelProperty("订金银行账号") + @JsonProperty("depositBankAccount") + private String modelBankAccount; + @ApiModelProperty("订金收款账户名称") + @JsonProperty("depositAccount") + private String modelAccountName; + @ApiModelProperty("是否先付款") + @JsonProperty("firstPayKey") + private String isBeforePaymentKey; + @ApiModelProperty("是否先付款 1是，0否") + @JsonProperty("firstPay") + private String isBeforePaymentValue; } From ca62ff6502b58a7cc3fb9631fb5c9d1b2b66c309 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 6 Oct 2022 16:07:04 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E8=B4=B9?= =?UTF-8?q?=E7=94=A8=E7=94=B3=E8=AF=B7=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E3=80=81=E4=BB=98=E6=AC=BE=E7=94=B3=E8=AF=B7=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/fincostapply/AppFinCostApplyVo.java | 4 +- .../finpaymentapply/AppFinPaymentApplyVo.java | 58 ++++++++ .../finpaymentapply/FinPaymentapplyFeign.java | 4 + .../FinPaymentapplyFeignFallback.java | 5 + .../AppFinPaymentapplyDetailVo.java | 27 ++++ .../FinPaymentapplyDetails.java | 33 +++++ .../AppFinPaymentapplyVehicleVo.java | 21 +++ .../FinPaymentapplyVehicle.java | 32 ++++ .../biz/fincostapply/FinCostapplyMapper.xml | 6 +- .../biz/fincostapply/FinCostapplyService.java | 2 +- .../FinPaymentapplyMapper.java | 3 + .../finpaymentapply/FinPaymentapplyMapper.xml | 29 +++- .../finpaymentapply/FinPaymentapplyRest.java | 5 + .../FinPaymentapplyService.java | 21 +++ .../FinPaymentapplyDetailsMapper.java | 18 +++ .../FinPaymentapplyDetailsMapper.xml | 14 ++ .../FinPaymentapplyDetailsService.java | 20 +++ .../FinPaymentapplyVehicleMapper.java | 18 +++ .../FinPaymentapplyVehicleMapper.xml | 11 ++ .../FinPaymentapplyVehicleService.java | 20 +++ .../paymentapply/PaymentApplyDetailsVo.java | 28 ++++ .../paymentapply/PaymentApplyFeign.java | 56 +++++++ .../PaymentApplyFeignFallback.java | 9 ++ .../paymentapply/PaymentApplyVehicleVo.java | 22 +++ .../finance/paymentapply/PaymentApplyVo.java | 54 +++++++ .../flowable/PaymentApplyDto.java | 37 +++++ .../flowable/PaymentApplyQuery.java | 25 ++++ .../flowable/PaymentApplyTaskQuery.java | 47 ++++++ .../paymentapply/PaymentApplyRest.java | 54 +++++++ .../paymentapply/PaymentApplyService.java | 137 ++++++++++++++++++ doc/databases/fin_tables.sql | 59 +++++++- 31 files changed, 872 insertions(+), 7 deletions(-) create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/AppFinPaymentApplyVo.java create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/AppFinPaymentapplyDetailVo.java create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetails.java create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyvehicle/AppFinPaymentapplyVehicleVo.java create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyvehicle/FinPaymentapplyVehicle.java create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsMapper.java create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsMapper.xml create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleMapper.java create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleMapper.xml create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleService.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyDetailsVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyFeign.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyFeignFallback.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVehicleVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/flowable/PaymentApplyDto.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/flowable/PaymentApplyQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/flowable/PaymentApplyTaskQuery.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/paymentapply/PaymentApplyRest.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/paymentapply/PaymentApplyService.java diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/AppFinCostApplyVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/AppFinCostApplyVo.java index daf5caafc8..5ba1612606 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/AppFinCostApplyVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/AppFinCostApplyVo.java @@ -36,7 +36,9 @@ public class AppFinCostApplyVo implements Vo { //是否涉及车辆 @ApiModelProperty("是否涉及车辆:1是，0否") - private Boolean isVeh; + private String isVeh; + + private String isVehKey; //涉及车辆 private String vins; diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/AppFinPaymentApplyVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/AppFinPaymentApplyVo.java new file mode 100644 index 0000000000..51bae17d71 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/AppFinPaymentApplyVo.java @@ -0,0 +1,58 @@ +package com.yxt.anrui.fin.api.finpaymentapply; + +import com.yxt.anrui.fin.api.finpaymentapplydetails.AppFinPaymentapplyDetailVo; +import com.yxt.anrui.fin.api.finpaymentapplyvehicle.AppFinPaymentapplyVehicleVo; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/10/6 10:35 + * @Description + */ +@Data +public class AppFinPaymentApplyVo implements Vo { + private static final long serialVersionUID = -7421450588161214608L; + + @ApiModelProperty("款项名称") + private String costTitleValue; + //创建时间 + private String createTime; + //申请人 + private String name; + //款项类别 + private String costTypeValue; + //业务编号 + private String busSid; + //金额 + private String cost; + //付款单位名称 + private String payCompany; + //收款单位名称 + private String receiveCompany; + //付款备注 + private String remarks; + //是否涉及车辆 + private String isVeh; + private String isVehValue; + //付款明细List + private List paymentList = new ArrayList<>(); + @ApiModelProperty("付款明细合计") + private String paymentTotal; + + //车辆列表 + private List carList = new ArrayList<>(); + @ApiModelProperty("车辆金额合计") + private String carTotal; + + private String createBySid; + private String taskId; + private String procInstId; + + private String sid; + +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyFeign.java index 643d8746c7..d202e6f408 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyFeign.java @@ -109,5 +109,9 @@ public interface FinPaymentapplyFeign { @PostMapping(value = "/breakProcess") public ResultBean breakProcess(@Valid @RequestBody FinPayTaskQuery query); + @ApiOperation(value = "终止任务") + @GetMapping(value = "/getPaymentApply/{sid}") + ResultBean getPaymentApply(@PathVariable("sid") String sid) + } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyFeignFallback.java index 96efdf6aeb..bdd41f2f71 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyFeignFallback.java @@ -105,4 +105,9 @@ public class FinPaymentapplyFeignFallback implements FinPaymentapplyFeign { public ResultBean breakProcess(FinPayTaskQuery query) { return null; } + + @Override + public ResultBean getPaymentApply(String sid) { + return null; + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/AppFinPaymentapplyDetailVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/AppFinPaymentapplyDetailVo.java new file mode 100644 index 0000000000..f81f59648e --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/AppFinPaymentapplyDetailVo.java @@ -0,0 +1,27 @@ +package com.yxt.anrui.fin.api.finpaymentapplydetails; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/10/6 14:41 + * @Description + */ +@Data +public class AppFinPaymentapplyDetailVo implements Vo { + private static final long serialVersionUID = -5474423439043642156L; + @ApiModelProperty("厂家销售通路") + private String actualPay; + @ApiModelProperty("付款方式") + private String paymentType; + @ApiModelProperty("开户行") + private String bank; + @ApiModelProperty("收款银行账号") + private String receivingAccount; + @ApiModelProperty("付款金额") + private String payAccount; + @ApiModelProperty("备注") + private String remarks; +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetails.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetails.java new file mode 100644 index 0000000000..4d94c1c988 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetails.java @@ -0,0 +1,33 @@ +package com.yxt.anrui.fin.api.finpaymentapplydetails; + +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @Author dimengzhe + * @Date 2022/10/6 14:11 + * @Description + */ +@Data +public class FinPaymentapplyDetails extends BaseEntity { + private static final long serialVersionUID = -4576193401443241659L; + + private String applySid; + @ApiModelProperty("付款方式key") + private String paymentTypeKey; + @ApiModelProperty("付款方式") + private String paymentType; + @ApiModelProperty("厂家销售通路") + private String actualPay; + @ApiModelProperty("开户行") + private String bank; + + @ApiModelProperty("收款银行账号") + private String receivingAccount; + @ApiModelProperty("付款金额") + private BigDecimal payAccount; + +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyvehicle/AppFinPaymentapplyVehicleVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyvehicle/AppFinPaymentapplyVehicleVo.java new file mode 100644 index 0000000000..bd5f8b4c3b --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyvehicle/AppFinPaymentapplyVehicleVo.java @@ -0,0 +1,21 @@ +package com.yxt.anrui.fin.api.finpaymentapplyvehicle; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/10/6 14:56 + * @Description + */ +@Data +public class AppFinPaymentapplyVehicleVo implements Vo { + private static final long serialVersionUID = -3232965325256220009L; + @ApiModelProperty("车型") + private String modelName; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("厂家结算价") + private String money; +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyvehicle/FinPaymentapplyVehicle.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyvehicle/FinPaymentapplyVehicle.java new file mode 100644 index 0000000000..7d2dd17bcd --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyvehicle/FinPaymentapplyVehicle.java @@ -0,0 +1,32 @@ +package com.yxt.anrui.fin.api.finpaymentapplyvehicle; + +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @Author dimengzhe + * @Date 2022/10/6 14:23 + * @Description + */ +@Data +public class FinPaymentapplyVehicle extends BaseEntity { + private static final long serialVersionUID = 6931224151880251447L; + + @ApiModelProperty("付款申请") + private String applySid; + @ApiModelProperty("车型名称") + private String modelName; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("车辆sid") + private String vehiSid; + @ApiModelProperty("车型sid") + private String modelSid; + @ApiModelProperty("配置sid") + private String configSid; + @ApiModelProperty("厂家结算价") + private BigDecimal money; +} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyMapper.xml index fe210d8b5c..87bc76ce1c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyMapper.xml @@ -89,12 +89,14 @@ fc.cost, fc.useTypeValue, fc.remarks, - fc.isVeh, + fc.isVeh as isVehKey, fc.taskId, fc.procInstId, fc.sid, fc.createBySid, - case fc.isOutDoor when 1 then '是' when 0 then '否' end as isOutDoor + case fc.isOutDoor when 1 then '是' when 0 then '否' end as isOutDoor, + case fc.isVeh when 1 then '是' when 0 then '否' end as isVeh + from fin_costapply fc where fc.sid = #{sid} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java index ce3bc3ebe3..a81a2e61df 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java @@ -544,7 +544,7 @@ public class FinCostapplyService extends MybatisBaseService appDetails(String sid) { ResultBean rb = ResultBean.fireFail(); AppFinCostApplyVo appFinCostApplyVo = baseMapper.appDetails(sid); - if (appFinCostApplyVo.getIsVeh()) {//涉及车辆 + if ('1'.equals(appFinCostApplyVo.getIsVehKey())) {//涉及车辆 List vinNoList = finCostapplyVehicleService.selectByApplySid(sid); String vins = StringUtils.join(vinNoList.toArray(), "\n"); appFinCostApplyVo.setVins(vins); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.java index a03a4a3336..79a615bce9 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.java @@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.fin.api.finpaymentapply.AppFinPaymentApplyVo; import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapplyDetailsVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -76,4 +77,6 @@ public interface FinPaymentapplyMapper extends BaseMapper { List selectCodeBySid(@Param("list") List applySids); int updateStateBySid(@Param("sid") String applySid, @Param("state") int state); + + AppFinPaymentApplyVo getPaymentApply(String sid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml index 89e8c7ae5e..d9f94b3f9a 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml @@ -47,9 +47,11 @@ + select fp.costTitleValue, + DATE_FORMAT(fp.createTime, '%Y-%m-%d') as createTime, + fp.createBySid, + fp.name, + fp.costTypeValue, + fp.busSid, + fp.cost, + fp.payCompany, + fp.receiveCompany, + fp.remarks, + fp.isVeh, + case fp.isVeh when 1 then '是' when 0 then '否' end as isVehValue, + fp.paymentTotal, + fp.carTotal, + fp.sid, + fp.createBySid, + fp.taskId, + fp.procInstId + from fin_paymentapply fp + where sid = #{sid} + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyRest.java index f7ba3ae5dd..7586c9d4b7 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyRest.java @@ -126,4 +126,9 @@ public class FinPaymentapplyRest implements FinPaymentapplyFeign { public ResultBean breakProcess(FinPayTaskQuery query) { return finPaymentapplyService.breakProcess(query); } + + @Override + public ResultBean getPaymentApply(String sid) { + return finPaymentapplyService.getPaymentApply(sid); + } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java index e01baecf14..35aec2a132 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java @@ -37,7 +37,11 @@ import com.yxt.anrui.fin.api.finpaymentapply.flow.FinPayGetNodeQuery; import com.yxt.anrui.fin.api.finpaymentapply.flow.FinPayGetNodeVo; import com.yxt.anrui.fin.api.finpaymentapply.flow.FinPayTaskQuery; import com.yxt.anrui.fin.api.finpaymentapply.flow.SubmitFinPayDto; +import com.yxt.anrui.fin.api.finpaymentapplydetails.AppFinPaymentapplyDetailVo; +import com.yxt.anrui.fin.api.finpaymentapplyvehicle.AppFinPaymentapplyVehicleVo; import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordDto; +import com.yxt.anrui.fin.biz.finpaymentapplydetails.FinPaymentapplyDetailsService; +import com.yxt.anrui.fin.biz.finpaymentapplyvehicle.FinPaymentapplyVehicleService; import com.yxt.anrui.fin.biz.finpaymentrecord.FinPaymentrecordService; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; @@ -96,6 +100,11 @@ public class FinPaymentapplyService extends MybatisBaseService listPageVo(PagerQuery pq) { FinPaymentapplyQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); @@ -498,4 +507,16 @@ public class FinPaymentapplyService extends MybatisBaseService getPaymentApply(String sid) { + ResultBean rb = ResultBean.fireFail(); + AppFinPaymentApplyVo vo = baseMapper.getPaymentApply(sid); + List paymentList = finPaymentapplyDetailsService.getDetailsList(sid); + vo.setPaymentList(paymentList); + if ("1".equals(vo.getIsVeh())) {//涉及车辆 + List carList = finPaymentapplyVehicleService.getCarList(sid); + vo.setCarList(carList); + } + return rb.success().setData(vo); + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsMapper.java new file mode 100644 index 0000000000..8ad5d25168 --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsMapper.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.fin.biz.finpaymentapplydetails; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.anrui.fin.api.finpaymentapplydetails.AppFinPaymentapplyDetailVo; +import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetails; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/10/6 15:16 + * @Description + */ +@Mapper +public interface FinPaymentapplyDetailsMapper extends BaseMapper { + List getDetailsList(String sid); +} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsMapper.xml new file mode 100644 index 0000000000..3d873fe49b --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsMapper.xml @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java new file mode 100644 index 0000000000..0f487bcfa0 --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.fin.biz.finpaymentapplydetails; + +import com.yxt.anrui.fin.api.finpaymentapplydetails.AppFinPaymentapplyDetailVo; +import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetails; +import com.yxt.common.base.service.MybatisBaseService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/10/6 15:16 + * @Description + */ +@Service +public class FinPaymentapplyDetailsService extends MybatisBaseService { + public List getDetailsList(String sid) { + return baseMapper.getDetailsList(sid); + } +} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleMapper.java new file mode 100644 index 0000000000..3b0780c1e9 --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleMapper.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.fin.biz.finpaymentapplyvehicle; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.anrui.fin.api.finpaymentapplyvehicle.AppFinPaymentapplyVehicleVo; +import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicle; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/10/6 15:18 + * @Description + */ +@Mapper +public interface FinPaymentapplyVehicleMapper extends BaseMapper { + List getCarList(String sid); +} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleMapper.xml new file mode 100644 index 0000000000..eb25712a58 --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleMapper.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleService.java new file mode 100644 index 0000000000..54de3622b9 --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleService.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.fin.biz.finpaymentapplyvehicle; + +import com.yxt.anrui.fin.api.finpaymentapplyvehicle.AppFinPaymentapplyVehicleVo; +import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicle; +import com.yxt.common.base.service.MybatisBaseService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/10/6 15:18 + * @Description + */ +@Service +public class FinPaymentapplyVehicleService extends MybatisBaseService { + public List getCarList(String sid) { + return baseMapper.getCarList(sid); + } +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyDetailsVo.java new file mode 100644 index 0000000000..a7009f912e --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyDetailsVo.java @@ -0,0 +1,28 @@ +package com.yxt.anrui.terminal.api.finance.paymentapply; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/10/6 15:52 + * @Description + */ +@Data +public class PaymentApplyDetailsVo implements Vo { + private static final long serialVersionUID = -3182165897761808808L; + + @ApiModelProperty("厂家销售通路") + private String actualPay; + @ApiModelProperty("付款方式") + private String paymentType; + @ApiModelProperty("开户行") + private String bank; + @ApiModelProperty("收款银行账号") + private String receivingAccount; + @ApiModelProperty("付款金额") + private String payAccount; + @ApiModelProperty("备注") + private String remarks; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyFeign.java new file mode 100644 index 0000000000..4c30586f70 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyFeign.java @@ -0,0 +1,56 @@ +package com.yxt.anrui.terminal.api.finance.paymentapply; + +import com.yxt.anrui.terminal.api.finance.paymentapply.flowable.PaymentApplyDto; +import com.yxt.anrui.terminal.api.finance.paymentapply.flowable.PaymentApplyQuery; +import com.yxt.anrui.terminal.api.finance.paymentapply.flowable.PaymentApplyTaskQuery; +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; +import org.springframework.web.bind.annotation.*; + +/** + * @Author dimengzhe + * @Date 2022/10/6 9:57 + * @Description + */ +@Api(tags = "付款申请") +@FeignClient( + contextId = "terminal-PaymentApply", + name = "anrui-terminal", + path = "/finance/v1/paymentApply", + fallback = PaymentApplyFeignFallback.class) +public interface PaymentApplyFeign { + + @ApiOperation("办理") + @GetMapping("/getPaymentApply/{sid}") + @ResponseBody + ResultBean getPaymentApply(@PathVariable("sid") String sid); + + + @ApiOperation("办理") + @PutMapping("/agreePaymentApplyInfo") + @ResponseBody + ResultBean agreePayApplyInfo(@RequestBody PaymentApplyDto dto); + + @ApiOperation("驳回") + @PutMapping("/rejectPaymentApplyInfo") + @ResponseBody + ResultBean rejectPayApplyInfo(@RequestBody PaymentApplyTaskQuery query); + + @ApiOperation("撤回") + @PutMapping("/recallPaymentApplyInfo") + @ResponseBody + ResultBean recallPayApplyInfo(@RequestBody PaymentApplyTaskQuery query); + + @ApiOperation("终止") + @PutMapping("/stopPaymentApplyInfo") + @ResponseBody + ResultBean stopPayApplyInfo(@RequestBody PaymentApplyTaskQuery query); + + @ApiOperation("获取流程操作标题") + @GetMapping("/getFlowOperateTitle") + @ResponseBody + ResultBean getFlowOperateTitle(@SpringQueryMap PaymentApplyQuery query); +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyFeignFallback.java new file mode 100644 index 0000000000..d1c67074ec --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyFeignFallback.java @@ -0,0 +1,9 @@ +package com.yxt.anrui.terminal.api.finance.paymentapply; + +/** + * @Author dimengzhe + * @Date 2022/10/6 9:58 + * @Description + */ +public class PaymentApplyFeignFallback { +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVehicleVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVehicleVo.java new file mode 100644 index 0000000000..db2dd3fd90 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVehicleVo.java @@ -0,0 +1,22 @@ +package com.yxt.anrui.terminal.api.finance.paymentapply; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/10/6 15:53 + * @Description + */ +@Data +public class PaymentApplyVehicleVo implements Vo { + private static final long serialVersionUID = -8919822312166380804L; + + @ApiModelProperty("车型") + private String modelName; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("厂家结算价") + private String money; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVo.java new file mode 100644 index 0000000000..fa41461c7d --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVo.java @@ -0,0 +1,54 @@ +package com.yxt.anrui.terminal.api.finance.paymentapply; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/10/6 9:59 + * @Description + */ +@Data +public class PaymentApplyVo implements Vo { + private static final long serialVersionUID = 1191604961683000023L; + + @ApiModelProperty("款项名称") + private String costTitleValue; + //创建时间 + private String createTime; + //申请人 + private String name; + //款项类别 + private String costTypeValue; + //业务编号 + private String busSid; + //金额 + private String cost; + //付款单位名称 + private String payCompany; + //收款单位名称 + private String receiveCompany; + //付款备注 + private String remarks; + //是否涉及车辆 + private String isVeh; + private String isVehValue; + //付款明细List + private List paymentList = new ArrayList<>(); + @ApiModelProperty("付款明细合计") + private String paymentTotal; + + //车辆列表 + private List carList = new ArrayList<>(); + @ApiModelProperty("车辆金额合计") + private String carTotal; + + private String createBySid; + private String taskId; + private String procInstId; + +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/flowable/PaymentApplyDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/flowable/PaymentApplyDto.java new file mode 100644 index 0000000000..a79129090e --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/flowable/PaymentApplyDto.java @@ -0,0 +1,37 @@ +package com.yxt.anrui.terminal.api.finance.paymentapply.flowable; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Author dimengzhe + * @Date 2022/10/6 9:59 + * @Description + */ +@Data +public class PaymentApplyDto implements Dto { + private static final long serialVersionUID = 7798653263828204569L; + + @ApiModelProperty(value = "任务id") + @NotBlank(message = "参数错误：taskId") + private String taskId; + @ApiModelProperty(value = "流程id") + @NotBlank(message = "参数错误：procInsId") + @JsonProperty("procInsId") + private String instanceId; + @ApiModelProperty(value = "意见") + private String comment; + @ApiModelProperty(value = "业务sid") + @NotBlank(message = "参数错误：businessSid") + private String businessSid; + @ApiModelProperty(value = "用户sid") + @NotBlank(message = "参数错误：userSid") + private String userSid; + @ApiModelProperty(value = "节点id") + @NotBlank(message = "参数错误：taskDefKey") + private String taskDefKey; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/flowable/PaymentApplyQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/flowable/PaymentApplyQuery.java new file mode 100644 index 0000000000..b2ea38b523 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/flowable/PaymentApplyQuery.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.terminal.api.finance.paymentapply.flowable; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Author dimengzhe + * @Date 2022/10/6 10:00 + * @Description + */ +@Data +public class PaymentApplyQuery implements Query { + private static final long serialVersionUID = 6112966480482869923L; + + @ApiModelProperty(value = "节点key") + private String taskDefKey; + @ApiModelProperty(value = "业务sid") + private String businessSid; + @ApiModelProperty(value = "0 上一环节 1下一环节") + @NotNull(message = "参数错误：next") + private Integer next; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/flowable/PaymentApplyTaskQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/flowable/PaymentApplyTaskQuery.java new file mode 100644 index 0000000000..9679c7b9f9 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/flowable/PaymentApplyTaskQuery.java @@ -0,0 +1,47 @@ +package com.yxt.anrui.terminal.api.finance.paymentapply.flowable; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Author dimengzhe + * @Date 2022/10/6 10:00 + * @Description + */ +@Data +public class PaymentApplyTaskQuery implements Query { + + private static final long serialVersionUID = 4492173829846824226L; + /** + * 终止、驳回、撤回 + */ + @ApiModelProperty("任务Id") + @NotBlank(message = "参数错误：taskId") + private String taskId; + /** + * 终止、驳回、撤回 + */ + @ApiModelProperty("业务sid") + @NotBlank(message = "参数错误：businessSid") + private String businessSid; + /** + * 终止、驳回 + */ + @ApiModelProperty("任务意见") + private String comment; + /** + * 终止、撤回、驳回 + */ + @ApiModelProperty("用户Sid") + private String userSid; + /** + * 终止 + */ + @ApiModelProperty("流程实例Id") + @JsonProperty("procInsId") + private String instanceId; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/paymentapply/PaymentApplyRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/paymentapply/PaymentApplyRest.java new file mode 100644 index 0000000000..4eb45269ad --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/paymentapply/PaymentApplyRest.java @@ -0,0 +1,54 @@ +package com.yxt.anrui.terminal.biz.finance.paymentapply; + +import com.yxt.anrui.terminal.api.finance.paymentapply.PaymentApplyFeign; +import com.yxt.anrui.terminal.api.finance.paymentapply.PaymentApplyVo; +import com.yxt.anrui.terminal.api.finance.paymentapply.flowable.PaymentApplyDto; +import com.yxt.anrui.terminal.api.finance.paymentapply.flowable.PaymentApplyQuery; +import com.yxt.anrui.terminal.api.finance.paymentapply.flowable.PaymentApplyTaskQuery; +import com.yxt.common.core.result.ResultBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +/** + * @Author dimengzhe + * @Date 2022/10/6 10:15 + * @Description + */ +@Controller +@RequestMapping("/finance/v1/paymentApply") +public class PaymentApplyRest implements PaymentApplyFeign { + + @Autowired + private PaymentApplyService paymentApplyService; + + @Override + public ResultBean getPaymentApply(String sid) { + return paymentApplyService.getPaymentApply(sid); + } + + @Override + public ResultBean agreePayApplyInfo(PaymentApplyDto dto) { + return paymentApplyService.agreePayApplyInfo(dto); + } + + @Override + public ResultBean rejectPayApplyInfo(PaymentApplyTaskQuery query) { + return paymentApplyService.rejectPayApplyInfo(query); + } + + @Override + public ResultBean recallPayApplyInfo(PaymentApplyTaskQuery query) { + return paymentApplyService.recallPayApplyInfo(query); + } + + @Override + public ResultBean stopPayApplyInfo(PaymentApplyTaskQuery query) { + return paymentApplyService.stopPayApplyInfo(query); + } + + @Override + public ResultBean getFlowOperateTitle(PaymentApplyQuery query) { + return paymentApplyService.getFlowOperateTitle(query); + } +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/paymentapply/PaymentApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/paymentapply/PaymentApplyService.java new file mode 100644 index 0000000000..088f8ab276 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/paymentapply/PaymentApplyService.java @@ -0,0 +1,137 @@ +package com.yxt.anrui.terminal.biz.finance.paymentapply; + +import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.fin.api.fincostapply.flow.FinCostGetNodeVo; +import com.yxt.anrui.fin.api.finpaymentapply.AppFinPaymentApplyVo; +import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapplyFeign; +import com.yxt.anrui.fin.api.finpaymentapply.flow.FinPayCompleteDto; +import com.yxt.anrui.fin.api.finpaymentapply.flow.FinPayGetNodeQuery; +import com.yxt.anrui.fin.api.finpaymentapply.flow.FinPayGetNodeVo; +import com.yxt.anrui.fin.api.finpaymentapply.flow.FinPayTaskQuery; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.anrui.terminal.api.finance.paymentapply.PaymentApplyVo; +import com.yxt.anrui.terminal.api.finance.paymentapply.flowable.PaymentApplyDto; +import com.yxt.anrui.terminal.api.finance.paymentapply.flowable.PaymentApplyQuery; +import com.yxt.anrui.terminal.api.finance.paymentapply.flowable.PaymentApplyTaskQuery; +import com.yxt.common.core.result.ResultBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Collections; +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/10/6 10:16 + * @Description + */ +@Service +public class PaymentApplyService { + + @Autowired + private FinPaymentapplyFeign finPaymentapplyFeign; + @Autowired + private SysUserFeign sysUserFeign; + @Autowired + private SysStaffOrgFeign sysStaffOrgFeign; + + public ResultBean getPaymentApply(String sid) { + ResultBean rb = ResultBean.fireFail(); + PaymentApplyVo vo = new PaymentApplyVo(); + ResultBean resultBean = finPaymentapplyFeign.getPaymentApply(sid); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + BeanUtil.copyProperties(resultBean.getData(), vo); + return rb.success().setData(vo); + } + + public ResultBean agreePayApplyInfo(PaymentApplyDto dto) { + ResultBean rb = ResultBean.fireFail(); + //根据用户sid获取staffSid + ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + //根据staffSid获取用户的组织全路径 + ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); + if (!staffOrgResultBean.getSuccess()) { + return rb.setMsg(staffOrgResultBean.getMsg()); + } + //用户的组织全路径 + String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); + FinPayCompleteDto finPayCompleteDto = new FinPayCompleteDto(); + BeanUtil.copyProperties(dto, finPayCompleteDto); + finPayCompleteDto.setOrgSidPath(orgSidPath); + ResultBean resultBean = finPaymentapplyFeign.complete(finPayCompleteDto); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean rejectPayApplyInfo(PaymentApplyTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + FinPayTaskQuery finPayTaskQuery = new FinPayTaskQuery(); + BeanUtil.copyProperties(query, finPayTaskQuery); + ResultBean resultBean = finPaymentapplyFeign.taskReject(finPayTaskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean recallPayApplyInfo(PaymentApplyTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + FinPayTaskQuery finPayTaskQuery = new FinPayTaskQuery(); + BeanUtil.copyProperties(query, finPayTaskQuery); + ResultBean resultBean = finPaymentapplyFeign.revokeProcess(finPayTaskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean stopPayApplyInfo(PaymentApplyTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + FinPayTaskQuery finPayTaskQuery = new FinPayTaskQuery(); + BeanUtil.copyProperties(query, finPayTaskQuery); + ResultBean resultBean = finPaymentapplyFeign.breakProcess(finPayTaskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean getFlowOperateTitle(PaymentApplyQuery query) { + ResultBean rb = ResultBean.fireFail(); + //0 上一环节 1下一环节 + int next = query.getNext(); + FinPayGetNodeQuery getNodeQuery = new FinPayGetNodeQuery(); + BeanUtil.copyProperties(query, getNodeQuery); + String data = ""; + if (next == 0) { + ResultBean> getPreviousNodesForReject = finPaymentapplyFeign.getPreviousNodesForReject(getNodeQuery); + if (getPreviousNodesForReject.getSuccess()) { + getPreviousNodesForReject.getData().removeAll(Collections.singleton(null)); + data = getPreviousNodesForReject.getData().get(0).getName(); + } else { + return rb.setMsg(getPreviousNodesForReject.getMsg()); + } + } else if (next == 1) { + ResultBean> getNextNodesForSubmit = finPaymentapplyFeign.getNextNodesForSubmit(getNodeQuery); + if (getNextNodesForSubmit.getSuccess()) { + getNextNodesForSubmit.getData().removeAll(Collections.singleton(null)); + data = getNextNodesForSubmit.getData().get(0).getName(); + } else { + return rb.setMsg(getNextNodesForSubmit.getMsg()); + } + } else { + return rb.setMsg("参数错误：next"); + } + return rb.success().setData(data); + } +} diff --git a/doc/databases/fin_tables.sql b/doc/databases/fin_tables.sql index eb03edbee0..c9d7fb54d0 100644 --- a/doc/databases/fin_tables.sql +++ b/doc/databases/fin_tables.sql @@ -1032,4 +1032,61 @@ CREATE TABLE `fin_manufacturer_bank` PRIMARY KEY (`id`), KEY `id` (`id`) ) ENGINE = INNODB - DEFAULT CHARSET = utf8 COMMENT ='公司开户账号表'; \ No newline at end of file + DEFAULT CHARSET = utf8 COMMENT ='公司开户账号表'; + + + +DROP TABLE IF EXISTS `fin_paymentapply_details`; +CREATE TABLE `fin_paymentapply_details` +( + `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id', + `sid` varchar(64) NOT NULL COMMENT 'sid', + `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁', + `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `isEnable` int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用', + `state` int(32) DEFAULT '1' COMMENT '状态', + `isDelete` int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除', + `remarks` varchar(255) DEFAULT NULL COMMENT '备注', + `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid', + `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid', + `applySid` VARCHAR(64) DEFAULT NULL COMMENT '付款申请sid', + `paymentTypeKey` VARCHAR(64) DEFAULT NULL COMMENT '付款方式key', + `paymentType` VARCHAR(64) DEFAULT NULL COMMENT '付款方式value', + `actualPay` varchar(64) DEFAULT NULL COMMENT '厂家销售通路', + `bank` varchar(64) DEFAULT NULL COMMENT '开户行', + `receivingAccount` varchar(64) DEFAULT NULL COMMENT '收款银行账号', + `payAccount` varchar(64) DEFAULT NULL COMMENT '付款金额', + PRIMARY KEY (`id`), + KEY `id` (`id`) +) ENGINE = INNODB + DEFAULT CHARSET = utf8 COMMENT ='付款申请明细'; + +DROP TABLE IF EXISTS `fin_paymentapply_vehicle`; +CREATE TABLE `fin_paymentapply_vehicle` +( + `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id', + `sid` varchar(64) NOT NULL COMMENT 'sid', + `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁', + `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `isEnable` int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用', + `state` int(32) DEFAULT '1' COMMENT '状态', + `isDelete` int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除', + `remarks` varchar(255) DEFAULT NULL COMMENT '备注', + `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid', + `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid', + `applySid` VARCHAR(64) DEFAULT NULL COMMENT '付款申请sid', + `modelName` VARCHAR(64) DEFAULT NULL COMMENT '车型', + `vinNo` VARCHAR(64) DEFAULT NULL COMMENT '车架号', + `vehiSid` varchar(64) DEFAULT NULL COMMENT '车辆sid', + `modelSid` varchar(64) DEFAULT NULL COMMENT '车型sid', + `configSid` varchar(64) DEFAULT NULL COMMENT '配置sid', + `money` varchar(64) DEFAULT NULL COMMENT '厂家结算价', + PRIMARY KEY (`id`), + KEY `id` (`id`) +) ENGINE = INNODB + DEFAULT CHARSET = utf8 COMMENT ='付款申请车辆'; + + + From 3bd25a515da74b5c5bfcbb90b30d50b273f8e6d3 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 6 Oct 2022 17:14:29 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E8=B4=B9?= =?UTF-8?q?=E7=94=A8=E7=94=B3=E8=AF=B7=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E3=80=81=E4=BB=98=E6=AC=BE=E7=94=B3=E8=AF=B7=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java | 3 +++ .../anrui/terminal/api/finance/costapply/CostDetailsVo.java | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java index 35aec2a132..7899d6ac4b 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java @@ -226,6 +226,9 @@ public class FinPaymentapplyService extends MybatisBaseService variables = new HashMap<>(); + Map appMap = new HashMap<>(); + appMap.put("sid",businessSid); + variables.put("app",appMap); //用户的部门全路径sid bv.setOrgSidPath(orgSidPath); //业务sid diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/costapply/CostDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/costapply/CostDetailsVo.java index 654e09bc3f..3a38391f6c 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/costapply/CostDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/costapply/CostDetailsVo.java @@ -43,7 +43,9 @@ public class CostDetailsVo implements Vo { //是否涉及车辆 @JsonProperty("isVeh") - private boolean isVeh; + private String isVeh; + @JsonProperty("isVehKey") + private String isVehKey; @ApiModelProperty(value = "车架号") From 88949c836e6a0e59060f1e79b6fdd179af4774dd Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 6 Oct 2022 20:09:12 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E8=B4=B9?= =?UTF-8?q?=E7=94=A8=E7=94=B3=E8=AF=B7=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E3=80=81=E4=BB=98=E6=AC=BE=E7=94=B3=E8=AF=B7=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../paymentapply/PaymentApplyDetailsVo.java | 6 ++++++ .../paymentapply/PaymentApplyVehicleVo.java | 4 ++++ .../api/finance/paymentapply/PaymentApplyVo.java | 15 ++++++++++++++- 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyDetailsVo.java index a7009f912e..f0e99ff072 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyDetailsVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.terminal.api.finance.paymentapply; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,14 +15,19 @@ public class PaymentApplyDetailsVo implements Vo { private static final long serialVersionUID = -3182165897761808808L; @ApiModelProperty("厂家销售通路") + @JsonProperty("paymentName") private String actualPay; @ApiModelProperty("付款方式") + @JsonProperty("state") private String paymentType; @ApiModelProperty("开户行") + @JsonProperty("depositBank") private String bank; @ApiModelProperty("收款银行账号") + @JsonProperty("bankAccount") private String receivingAccount; @ApiModelProperty("付款金额") + @JsonProperty("paymentPrice") private String payAccount; @ApiModelProperty("备注") private String remarks; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVehicleVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVehicleVo.java index db2dd3fd90..76b7aa1e0c 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVehicleVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVehicleVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.terminal.api.finance.paymentapply; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,9 +15,12 @@ public class PaymentApplyVehicleVo implements Vo { private static final long serialVersionUID = -8919822312166380804L; @ApiModelProperty("车型") + @JsonProperty("model") private String modelName; @ApiModelProperty("车架号") + @JsonProperty("vin") private String vinNo; @ApiModelProperty("厂家结算价") + @JsonProperty("price") private String money; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVo.java index fa41461c7d..5b4b5c0d3d 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.terminal.api.finance.paymentapply; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -17,25 +18,36 @@ public class PaymentApplyVo implements Vo { private static final long serialVersionUID = 1191604961683000023L; @ApiModelProperty("款项名称") + @JsonProperty("paymentName") private String costTitleValue; //创建时间 + @JsonProperty("申请时间") private String createTime; //申请人 + @JsonProperty("申请人") private String name; //款项类别 + @JsonProperty("paymentType") private String costTypeValue; //业务编号 + @JsonProperty("businessId") private String busSid; //金额 + @JsonProperty("price") private String cost; //付款单位名称 + @JsonProperty("payerName") private String payCompany; //收款单位名称 + @JsonProperty("payeeName") private String receiveCompany; //付款备注 + @JsonProperty("paymentRemarks") private String remarks; //是否涉及车辆 + @JsonProperty("involveCar") private String isVeh; + @JsonProperty("involveCarKey") private String isVehValue; //付款明细List private List paymentList = new ArrayList<>(); @@ -46,9 +58,10 @@ public class PaymentApplyVo implements Vo { private List carList = new ArrayList<>(); @ApiModelProperty("车辆金额合计") private String carTotal; - + @JsonProperty("userSid") private String createBySid; private String taskId; + @JsonProperty("procInsId") private String procInstId; } From f74ae001c619477ca2ece68b72af4113cfabbd9c Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 6 Oct 2022 20:42:36 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E8=B4=B9?= =?UTF-8?q?=E7=94=A8=E7=94=B3=E8=AF=B7=E4=BB=A5=E5=8F=8A=E4=BB=98=E6=AC=BE?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E7=9A=84=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/fincostapply/FinCostapplyService.java | 82 +++++++++++++++++-- .../FinPaymentapplyService.java | 69 ++++++++++++++++ 2 files changed, 143 insertions(+), 8 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java index a81a2e61df..ffda27f5d1 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java @@ -43,6 +43,7 @@ import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo; +import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; @@ -59,6 +60,9 @@ 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 com.yxt.messagecenter.api.message.MessageFeign; +import com.yxt.messagecenter.api.message.MessageFlowVo; +import com.yxt.messagecenter.api.message.MessageFlowableQuery; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -99,6 +103,8 @@ public class FinCostapplyService extends MybatisBaseService listPageVo(PagerQuery pq) { FinCostapplyQuery query = pq.getParams(); @@ -259,9 +265,9 @@ public class FinCostapplyService extends MybatisBaseService variables = new HashMap<>(); - Map appMap = new HashMap<>(); - appMap.put("sid",businessSid); - variables.put("app",appMap); + Map appMap = new HashMap<>(); + appMap.put("sid", businessSid); + variables.put("app", appMap); //用户的部门全路径sid bv.setOrgSidPath(orgSidPath); //业务sid @@ -317,6 +323,18 @@ public class FinCostapplyService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); return voResultBean; } if (r == 2) { @@ -382,15 +400,33 @@ public class FinCostapplyService extends MybatisBaseService vaributes = new HashMap<>(); + Map appMap = new HashMap<>(); + appMap.put("sid", bv.getBusinessSid()); + vaributes.put("app", appMap); + bv.setFormVariables(vaributes); ResultBean resultBean = flowableFeign.handleProsess(bv); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); - /* //ToDo:出纳付款记录 - if ("Event_end".equals(resultBean.getData().getTaskDefKey())) { - - }*/ + if (!"Event_end".equals(resultBean.getData().getTaskDefKey())){ + //极光推送 + UpdateFlowFieldVo ufVo = resultBean.getData(); + finCostapply = fetchBySid(bv.getBusinessSid()); + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo, messageFlowVo); + ufVo.setProcDefId(finCostapply.getProcDefId()); + ufVo.setProcInsId(finCostapply.getProcInstId()); + messageFlowableQuery.setUfVo(messageFlowVo); + messageFlowableQuery.setAppMap(appMap); + messageFlowableQuery.setBusinessSid(bv.getBusinessSid()); + messageFlowableQuery.setModuleName("费用申请"); + messageFlowableQuery.setMsgContent(finCostapply.getName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + messageFlowableQuery.setMsgTitle("费用申请"); + ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); + } return rb.success().setData(resultBean.getData()); } else { return rb.setMsg("操作失败!提交的数据不一致"); @@ -443,6 +479,7 @@ public class FinCostapplyService extends MybatisBaseService vaributes = new HashMap<>(); + Map appMap = new HashMap<>(); + appMap.put("sid", query.getBusinessSid()); + vaributes.put("app", appMap); + flowTaskVo.setValues(vaributes); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); @@ -461,6 +503,30 @@ public class FinCostapplyService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); //更新业务中的流程相关的参数 updateFlowFiled(map); + //极光推送 + UpdateFlowFieldVo ufVo = resultBean.getData(); + finCostapply = fetchBySid(businessSid); + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo, messageFlowVo); + String procId = finCostapply.getProcInstId(); + ufVo.setProcInsId(procId); + ufVo.setProcDefId(finCostapply.getProcDefId()); + messageFlowableQuery.setUfVo(messageFlowVo); + messageFlowableQuery.setAppMap(appMap); + messageFlowableQuery.setBusinessSid(businessSid); + messageFlowableQuery.setModuleName("费用申请"); + ResultBean> listResultBean = flowTaskFeign.getLatestTasks(procId); + String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); + List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); + if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(finCostapply.getCreateBySid())) { + messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); + } else { + messageFlowableQuery.setMsgContent(finCostapply.getName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + } + + messageFlowableQuery.setMsgTitle("费用申请"); + ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); return rb.success(); } } @@ -544,7 +610,7 @@ public class FinCostapplyService extends MybatisBaseService appDetails(String sid) { ResultBean rb = ResultBean.fireFail(); AppFinCostApplyVo appFinCostApplyVo = baseMapper.appDetails(sid); - if ('1'.equals(appFinCostApplyVo.getIsVehKey())) {//涉及车辆 + if ("1".equals(appFinCostApplyVo.getIsVehKey())) {//涉及车辆 List vinNoList = finCostapplyVehicleService.selectByApplySid(sid); String vins = StringUtils.join(vinNoList.toArray(), "\n"); appFinCostApplyVo.setVins(vins); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java index 7899d6ac4b..9f5e2ee3c3 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java @@ -47,6 +47,7 @@ import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo; +import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; @@ -62,6 +63,9 @@ 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 com.yxt.messagecenter.api.message.MessageFeign; +import com.yxt.messagecenter.api.message.MessageFlowVo; +import com.yxt.messagecenter.api.message.MessageFlowableQuery; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -104,6 +108,8 @@ public class FinPaymentapplyService extends MybatisBaseService listPageVo(PagerQuery pq) { FinPaymentapplyQuery query = pq.getParams(); @@ -267,6 +273,18 @@ public class FinPaymentapplyService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); return voResultBean; } if (r == 2) { @@ -331,6 +349,11 @@ public class FinPaymentapplyService extends MybatisBaseService vaributes = new HashMap<>(); + Map appMap = new HashMap<>(); + appMap.put("sid", bv.getBusinessSid()); + vaributes.put("app", appMap); + bv.setFormVariables(vaributes); ResultBean resultBean = flowableFeign.handleProsess(bv); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); @@ -353,6 +376,22 @@ public class FinPaymentapplyService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); } return rb.success().setData(resultBean.getData()); } else { @@ -407,6 +446,7 @@ public class FinPaymentapplyService extends MybatisBaseService vaributes = new HashMap<>(); + Map appMap = new HashMap<>(); + appMap.put("sid", query.getBusinessSid()); + vaributes.put("app", appMap); + flowTaskVo.setValues(vaributes); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); @@ -424,6 +469,30 @@ public class FinPaymentapplyService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); //更新业务中的流程相关的参数 updateFlowFiled(map); + //极光推送 + UpdateFlowFieldVo ufVo = resultBean.getData(); + finPaymentapply = fetchBySid(businessSid); + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo, messageFlowVo); + String procId = finPaymentapply.getProcInstId(); + ufVo.setProcInsId(procId); + ufVo.setProcDefId(finPaymentapply.getProcDefId()); + messageFlowableQuery.setUfVo(messageFlowVo); + messageFlowableQuery.setAppMap(appMap); + messageFlowableQuery.setBusinessSid(businessSid); + messageFlowableQuery.setModuleName("付款申请"); + ResultBean> listResultBean = flowTaskFeign.getLatestTasks(procId); + String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); + List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); + if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(finPaymentapply.getCreateBySid())) { + messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); + } else { + messageFlowableQuery.setMsgContent(finPaymentapply.getName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + } + + messageFlowableQuery.setMsgTitle("付款申请"); + ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); return rb.success(); } } From 246b7923ddf1284cbc4656594e4d18df8334440f Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 6 Oct 2022 20:56:41 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E4=BB=98=E6=AC=BE=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyFeign.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyFeign.java index d202e6f408..3e08b2f0c4 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyFeign.java @@ -111,7 +111,7 @@ public interface FinPaymentapplyFeign { @ApiOperation(value = "终止任务") @GetMapping(value = "/getPaymentApply/{sid}") - ResultBean getPaymentApply(@PathVariable("sid") String sid) + ResultBean getPaymentApply(@PathVariable("sid") String sid); } \ No newline at end of file From 9fb108d8260fe2b06764e31225793ce615f436d7 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 7 Oct 2022 20:27:09 +0800 Subject: [PATCH 11/14] =?UTF-8?q?pc=E7=AB=AF=E4=BB=98=E6=AC=BE=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E4=BB=A5=E5=8F=8A=E6=B1=89=E5=AD=97=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E9=A6=96=E5=AD=97=E6=AF=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinPaymentapplyDetailsVo.java | 11 +++++- .../finpaymentapply/FinPaymentapplyDto.java | 11 +++++- .../FinPaymentapplyDetailDto.java | 31 ++++++++++++++++ .../FinPaymentapplyDetailVo.java | 31 ++++++++++++++++ .../FinPaymentapplyVehicleDto.java | 30 ++++++++++++++++ .../FinPaymentapplyVehicleVo.java | 30 ++++++++++++++++ .../finpaymentapply/FinPaymentapplyMapper.xml | 3 +- .../FinPaymentapplyService.java | 35 ++++++++++++++++--- .../FinPaymentapplyDetailsMapper.java | 5 +++ .../FinPaymentapplyDetailsMapper.xml | 18 ++++++++++ .../FinPaymentapplyDetailsService.java | 25 +++++++++++++ .../FinPaymentapplyVehicleMapper.java | 5 +++ .../FinPaymentapplyVehicleMapper.xml | 17 +++++++++ .../FinPaymentapplyVehicleService.java | 24 +++++++++++++ 14 files changed, 269 insertions(+), 7 deletions(-) create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetailDto.java create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetailVo.java create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyvehicle/FinPaymentapplyVehicleDto.java create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyvehicle/FinPaymentapplyVehicleVo.java diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDetailsVo.java index 506f4037ee..c3acb36dfb 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDetailsVo.java @@ -26,12 +26,16 @@ package com.yxt.anrui.fin.api.finpaymentapply; +import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailVo; +import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleVo; import com.yxt.common.core.vo.Vo; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + /** * Project: anrui-fin(财务)
* File: FinPaymentapplyVo.java
@@ -88,4 +92,9 @@ public class FinPaymentapplyDetailsVo implements Vo { @ApiModelProperty(value = "备注") private String remarks; + private List detailsList = new ArrayList<>(); + + private List vehicleList = new ArrayList<>(); + private String isVeh; + } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java index f02a8efb60..fdbcd991af 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java @@ -26,12 +26,15 @@ package com.yxt.anrui.fin.api.finpaymentapply; +import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailDto; +import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleDto; import com.yxt.common.core.dto.Dto; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * Project: anrui-fin(财务)
* File: FinPaymentapplyDto.java
@@ -83,4 +86,10 @@ public class FinPaymentapplyDto implements Dto { @ApiModelProperty(value = "业务关联:编号") private String busSid; + private List detailsList; + + private List vehicleList; + @ApiModelProperty("是否涉及车辆，1是，0否") + private String isVeh; + } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetailDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetailDto.java new file mode 100644 index 0000000000..29a90ae04e --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetailDto.java @@ -0,0 +1,31 @@ +package com.yxt.anrui.fin.api.finpaymentapplydetails; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @Author dimengzhe + * @Date 2022/10/6 21:26 + * @Description + */ +@Data +public class FinPaymentapplyDetailDto implements Dto { + private static final long serialVersionUID = -5488673242509961312L; + + @ApiModelProperty("付款方式key") + private String paymentTypeKey; + @ApiModelProperty("付款方式") + private String paymentType; + @ApiModelProperty("厂家销售通路") + private String actualPay; + @ApiModelProperty("开户行") + private String bank; + + @ApiModelProperty("收款银行账号") + private String receivingAccount; + @ApiModelProperty("付款金额") + private String payAccount; +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetailVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetailVo.java new file mode 100644 index 0000000000..9d9d85b15e --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetailVo.java @@ -0,0 +1,31 @@ +package com.yxt.anrui.fin.api.finpaymentapplydetails; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @Author dimengzhe + * @Date 2022/10/6 22:13 + * @Description + */ +@Data +public class FinPaymentapplyDetailVo implements Vo { + private static final long serialVersionUID = 2763515857490645883L; + + @ApiModelProperty("付款方式key") + private String paymentTypeKey; + @ApiModelProperty("付款方式") + private String paymentType; + @ApiModelProperty("厂家销售通路") + private String actualPay; + @ApiModelProperty("开户行") + private String bank; + + @ApiModelProperty("收款银行账号") + private String receivingAccount; + @ApiModelProperty("付款金额") + private String payAccount; +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyvehicle/FinPaymentapplyVehicleDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyvehicle/FinPaymentapplyVehicleDto.java new file mode 100644 index 0000000000..27a32b690f --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyvehicle/FinPaymentapplyVehicleDto.java @@ -0,0 +1,30 @@ +package com.yxt.anrui.fin.api.finpaymentapplyvehicle; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @Author dimengzhe + * @Date 2022/10/6 21:28 + * @Description + */ +@Data +public class FinPaymentapplyVehicleDto implements Dto { + private static final long serialVersionUID = 5067723170213631020L; + + @ApiModelProperty("车型名称") + private String modelName; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("车辆sid") + private String vehiSid; + @ApiModelProperty("车型sid") + private String modelSid; + @ApiModelProperty("配置sid") + private String configSid; + @ApiModelProperty("厂家结算价") + private String money; +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyvehicle/FinPaymentapplyVehicleVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyvehicle/FinPaymentapplyVehicleVo.java new file mode 100644 index 0000000000..fc05d7aa8b --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyvehicle/FinPaymentapplyVehicleVo.java @@ -0,0 +1,30 @@ +package com.yxt.anrui.fin.api.finpaymentapplyvehicle; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @Author dimengzhe + * @Date 2022/10/6 22:14 + * @Description + */ +@Data +public class FinPaymentapplyVehicleVo implements Vo { + private static final long serialVersionUID = 3601884852528436759L; + + @ApiModelProperty("车型名称") + private String modelName; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("车辆sid") + private String vehiSid; + @ApiModelProperty("车型sid") + private String modelSid; + @ApiModelProperty("配置sid") + private String configSid; + @ApiModelProperty("厂家结算价") + private String money; +} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml index d9f94b3f9a..361364fa15 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml @@ -73,7 +73,8 @@ fp.receiveCompanySid, fp.remarks, fp.name, - DATE_FORMAT(fp.createTime, '%Y-%m-%d') as createTime + DATE_FORMAT(fp.createTime, '%Y-%m-%d') as createTime, + fp.isVeh from fin_paymentapply fp where fp.sid = #{sid} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java index 9f5e2ee3c3..6241d85f1d 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java @@ -38,7 +38,11 @@ import com.yxt.anrui.fin.api.finpaymentapply.flow.FinPayGetNodeVo; import com.yxt.anrui.fin.api.finpaymentapply.flow.FinPayTaskQuery; import com.yxt.anrui.fin.api.finpaymentapply.flow.SubmitFinPayDto; import com.yxt.anrui.fin.api.finpaymentapplydetails.AppFinPaymentapplyDetailVo; +import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailDto; +import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailVo; import com.yxt.anrui.fin.api.finpaymentapplyvehicle.AppFinPaymentapplyVehicleVo; +import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleDto; +import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleVo; import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordDto; import com.yxt.anrui.fin.biz.finpaymentapplydetails.FinPaymentapplyDetailsService; import com.yxt.anrui.fin.biz.finpaymentapplyvehicle.FinPaymentapplyVehicleService; @@ -157,6 +161,12 @@ public class FinPaymentapplyService extends MybatisBaseService detailsList = dto.getDetailsList(); + finPaymentapplyDetailsService.saveDetailsList(detailsList, finPaymentapply.getSid()); + if ("1".equals(dto.getIsVeh())) { + List vehicleDtoList = dto.getVehicleList(); + finPaymentapplyVehicleService.saveVehicleList(vehicleDtoList, finPaymentapply.getSid()); + } dtoSid = finPaymentapply.getSid(); } else { FinPaymentapply finPaymentapply = fetchBySid(dtoSid); @@ -165,6 +175,14 @@ public class FinPaymentapplyService extends MybatisBaseService detailsList = dto.getDetailsList(); + finPaymentapplyDetailsService.saveDetailsList(detailsList, finPaymentapply.getSid()); + if ("1".equals(dto.getIsVeh())) { + List vehicleDtoList = dto.getVehicleList(); + finPaymentapplyVehicleService.saveVehicleList(vehicleDtoList, finPaymentapply.getSid()); + } else { + finPaymentapplyVehicleService.deleteVehicle(dtoSid); + } } return rb.success().setData(dtoSid); } @@ -191,6 +209,10 @@ public class FinPaymentapplyService extends MybatisBaseService detailsList = finPaymentapplyDetailsService.getDetails(sid); + List vehicleList = finPaymentapplyVehicleService.getVehicleList(sid); + vo.setDetailsList(detailsList); + vo.setVehicleList(vehicleList); return vo; } @@ -232,9 +254,9 @@ public class FinPaymentapplyService extends MybatisBaseService variables = new HashMap<>(); - Map appMap = new HashMap<>(); - appMap.put("sid",businessSid); - variables.put("app",appMap); + Map appMap = new HashMap<>(); + appMap.put("sid", businessSid); + variables.put("app", appMap); //用户的部门全路径sid bv.setOrgSidPath(orgSidPath); //业务sid @@ -376,7 +398,7 @@ public class FinPaymentapplyService extends MybatisBaseService sidsList = Arrays.asList(sids); + for (String s : sidsList) { + finPaymentapplyDetailsService.deleteByApplySid(s); + finPaymentapplyVehicleService.deleteVehicle(s); + } return rb.success().setMsg("删除成功"); } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsMapper.java index 8ad5d25168..2da35bb8f0 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsMapper.java @@ -2,6 +2,7 @@ package com.yxt.anrui.fin.biz.finpaymentapplydetails; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yxt.anrui.fin.api.finpaymentapplydetails.AppFinPaymentapplyDetailVo; +import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailVo; import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetails; import org.apache.ibatis.annotations.Mapper; @@ -15,4 +16,8 @@ import java.util.List; @Mapper public interface FinPaymentapplyDetailsMapper extends BaseMapper { List getDetailsList(String sid); + + int deleteDetail(String sid); + + List getDetails(String sid); } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsMapper.xml index 3d873fe49b..f1ed8f6755 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsMapper.xml @@ -11,4 +11,22 @@ from fin_paymentapply_details fd where fd.applySid = #{sid} + + + delete + from fin_paymentapply_details + where applySid = #{sid} + + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java index 0f487bcfa0..0b4f617272 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java @@ -1,10 +1,14 @@ package com.yxt.anrui.fin.biz.finpaymentapplydetails; +import cn.hutool.core.bean.BeanUtil; import com.yxt.anrui.fin.api.finpaymentapplydetails.AppFinPaymentapplyDetailVo; +import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailDto; +import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailVo; import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetails; import com.yxt.common.base.service.MybatisBaseService; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.List; /** @@ -17,4 +21,25 @@ public class FinPaymentapplyDetailsService extends MybatisBaseService getDetailsList(String sid) { return baseMapper.getDetailsList(sid); } + + public void saveDetailsList(List detailsList, String sid) { + //删除 + baseMapper.deleteDetail(sid); + for (FinPaymentapplyDetailDto dto : detailsList) { + FinPaymentapplyDetails finPaymentapplyDetails = new FinPaymentapplyDetails(); + BeanUtil.copyProperties(dto, finPaymentapplyDetails, "sid"); + finPaymentapplyDetails.setApplySid(sid); + finPaymentapplyDetails.setPayAccount(new BigDecimal(dto.getPayAccount())); + baseMapper.insert(finPaymentapplyDetails); + } + + } + + public void deleteByApplySid(String s) { + baseMapper.deleteDetail(s); + } + + public List getDetails(String sid) { + return baseMapper.getDetails(sid); + } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleMapper.java index 3b0780c1e9..64fe84340d 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleMapper.java @@ -3,6 +3,7 @@ package com.yxt.anrui.fin.biz.finpaymentapplyvehicle; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yxt.anrui.fin.api.finpaymentapplyvehicle.AppFinPaymentapplyVehicleVo; import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicle; +import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleVo; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -15,4 +16,8 @@ import java.util.List; @Mapper public interface FinPaymentapplyVehicleMapper extends BaseMapper { List getCarList(String sid); + + int deleteVehicle(String sid); + + List getVehicleList(String sid); } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleMapper.xml index eb25712a58..7df2da8f25 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleMapper.xml @@ -8,4 +8,21 @@ from fin_paymentapply_vehicle fv where applySid = #{sid} + + + delete + from fin_paymentapply_vehicle + where applySid = #{sid} + + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleService.java index 54de3622b9..6d1d06f36f 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleService.java @@ -1,10 +1,15 @@ package com.yxt.anrui.fin.biz.finpaymentapplyvehicle; +import cn.hutool.core.bean.BeanUtil; import com.yxt.anrui.fin.api.finpaymentapplyvehicle.AppFinPaymentapplyVehicleVo; import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicle; +import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleDto; +import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleVo; import com.yxt.common.base.service.MybatisBaseService; +import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.List; /** @@ -17,4 +22,23 @@ public class FinPaymentapplyVehicleService extends MybatisBaseService getCarList(String sid) { return baseMapper.getCarList(sid); } + + public void saveVehicleList(List vehicleDtoList, String sid) { + baseMapper.deleteVehicle(sid); + for (FinPaymentapplyVehicleDto dto : vehicleDtoList) { + FinPaymentapplyVehicle finPaymentapplyVehicle = new FinPaymentapplyVehicle(); + BeanUtil.copyProperties(dto, finPaymentapplyVehicle, "sid"); + finPaymentapplyVehicle.setMoney(new BigDecimal(dto.getMoney())); + baseMapper.insert(finPaymentapplyVehicle); + } + + } + + public void deleteVehicle(String dtoSid) { + baseMapper.deleteVehicle(dtoSid); + } + + public List getVehicleList(String sid) { + return baseMapper.getVehicleList(sid); + } } From a94cf4440e1142bd196d2361b9464905522bc49a Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 7 Oct 2022 21:14:40 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E4=BB=98=E6=AC=BE=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/finpaymentapply/FinPaymentapply.java | 7 +++++++ .../finpaymentapply/FinPaymentapplyFeign.java | 2 +- .../FinPaymentapplyDetailDto.java | 3 +++ .../FinPaymentapplyService.java | 19 +++++++++++++------ .../FinPaymentapplyDetailsService.java | 5 ++++- .../FinPaymentapplyVehicleService.java | 6 ++++-- .../paymentapply/PaymentApplyFeign.java | 2 +- .../finance/paymentapply/PaymentApplyVo.java | 8 ++++---- 8 files changed, 37 insertions(+), 15 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapply.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapply.java index bb56f47f99..dde68fc9b4 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapply.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapply.java @@ -96,4 +96,11 @@ public class FinPaymentapply extends BaseEntity { @ApiModelProperty(value = "任务id") private String taskId; + @ApiModelProperty("是否涉及车辆，1是，0否") + private String isVeh; + @ApiModelProperty("付款明细合计") + private BigDecimal paymentTotal; + @ApiModelProperty("车辆金额合计") + private BigDecimal carTotal; + } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyFeign.java index 3e08b2f0c4..8bd8bfad50 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyFeign.java @@ -109,7 +109,7 @@ public interface FinPaymentapplyFeign { @PostMapping(value = "/breakProcess") public ResultBean breakProcess(@Valid @RequestBody FinPayTaskQuery query); - @ApiOperation(value = "终止任务") + @ApiOperation(value = "移动端详情") @GetMapping(value = "/getPaymentApply/{sid}") ResultBean getPaymentApply(@PathVariable("sid") String sid); diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetailDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetailDto.java index 29a90ae04e..7d3afed62a 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetailDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetailDto.java @@ -28,4 +28,7 @@ public class FinPaymentapplyDetailDto implements Dto { private String receivingAccount; @ApiModelProperty("付款金额") private String payAccount; + + @ApiModelProperty("备注") + private String remarks; } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java index 6241d85f1d..c1dc8409bd 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java @@ -74,6 +74,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; @@ -160,13 +161,16 @@ public class FinPaymentapplyService extends MybatisBaseService detailsList = dto.getDetailsList(); - finPaymentapplyDetailsService.saveDetailsList(detailsList, finPaymentapply.getSid()); + String i = finPaymentapplyDetailsService.saveDetailsList(detailsList, finPaymentapply.getSid()); if ("1".equals(dto.getIsVeh())) { List vehicleDtoList = dto.getVehicleList(); - finPaymentapplyVehicleService.saveVehicleList(vehicleDtoList, finPaymentapply.getSid()); + String j = finPaymentapplyVehicleService.saveVehicleList(vehicleDtoList, finPaymentapply.getSid()); + finPaymentapply.setCarTotal(new BigDecimal(j)); } + finPaymentapply.setPaymentTotal(new BigDecimal(i)); + baseMapper.insert(finPaymentapply); dtoSid = finPaymentapply.getSid(); } else { FinPaymentapply finPaymentapply = fetchBySid(dtoSid); @@ -174,15 +178,18 @@ public class FinPaymentapplyService extends MybatisBaseService detailsList = dto.getDetailsList(); - finPaymentapplyDetailsService.saveDetailsList(detailsList, finPaymentapply.getSid()); + String i = finPaymentapplyDetailsService.saveDetailsList(detailsList, finPaymentapply.getSid()); if ("1".equals(dto.getIsVeh())) { List vehicleDtoList = dto.getVehicleList(); - finPaymentapplyVehicleService.saveVehicleList(vehicleDtoList, finPaymentapply.getSid()); + String j = finPaymentapplyVehicleService.saveVehicleList(vehicleDtoList, finPaymentapply.getSid()); + finPaymentapply.setCarTotal(new BigDecimal(j)); } else { finPaymentapplyVehicleService.deleteVehicle(dtoSid); } + finPaymentapply.setPaymentTotal(new BigDecimal(i)); + baseMapper.updateById(finPaymentapply); } return rb.success().setData(dtoSid); } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java index 0b4f617272..f2aac89444 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java @@ -22,16 +22,19 @@ public class FinPaymentapplyDetailsService extends MybatisBaseService detailsList, String sid) { + public String saveDetailsList(List detailsList, String sid) { //删除 baseMapper.deleteDetail(sid); + BigDecimal bigDecimal = new BigDecimal("0"); for (FinPaymentapplyDetailDto dto : detailsList) { FinPaymentapplyDetails finPaymentapplyDetails = new FinPaymentapplyDetails(); BeanUtil.copyProperties(dto, finPaymentapplyDetails, "sid"); finPaymentapplyDetails.setApplySid(sid); + bigDecimal = bigDecimal.add(new BigDecimal(dto.getPayAccount())); finPaymentapplyDetails.setPayAccount(new BigDecimal(dto.getPayAccount())); baseMapper.insert(finPaymentapplyDetails); } + return bigDecimal.toString(); } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleService.java index 6d1d06f36f..fdc41e65ac 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleService.java @@ -6,7 +6,6 @@ import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicle; import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleDto; import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleVo; import com.yxt.common.base.service.MybatisBaseService; -import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Service; import java.math.BigDecimal; @@ -23,14 +22,17 @@ public class FinPaymentapplyVehicleService extends MybatisBaseService vehicleDtoList, String sid) { + public String saveVehicleList(List vehicleDtoList, String sid) { baseMapper.deleteVehicle(sid); + BigDecimal bigDecimal = new BigDecimal("0"); for (FinPaymentapplyVehicleDto dto : vehicleDtoList) { FinPaymentapplyVehicle finPaymentapplyVehicle = new FinPaymentapplyVehicle(); BeanUtil.copyProperties(dto, finPaymentapplyVehicle, "sid"); finPaymentapplyVehicle.setMoney(new BigDecimal(dto.getMoney())); + bigDecimal = bigDecimal.add(new BigDecimal(dto.getMoney())); baseMapper.insert(finPaymentapplyVehicle); } + return bigDecimal.toString(); } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyFeign.java index 4c30586f70..7514c2c8df 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyFeign.java @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*; fallback = PaymentApplyFeignFallback.class) public interface PaymentApplyFeign { - @ApiOperation("办理") + @ApiOperation("详情") @GetMapping("/getPaymentApply/{sid}") @ResponseBody ResultBean getPaymentApply(@PathVariable("sid") String sid); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVo.java index 5b4b5c0d3d..c67c15de15 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVo.java @@ -21,10 +21,10 @@ public class PaymentApplyVo implements Vo { @JsonProperty("paymentName") private String costTitleValue; //创建时间 - @JsonProperty("申请时间") + @JsonProperty("applyDate") private String createTime; //申请人 - @JsonProperty("申请人") + @JsonProperty("applyName") private String name; //款项类别 @JsonProperty("paymentType") @@ -45,9 +45,9 @@ public class PaymentApplyVo implements Vo { @JsonProperty("paymentRemarks") private String remarks; //是否涉及车辆 - @JsonProperty("involveCar") - private String isVeh; @JsonProperty("involveCarKey") + private String isVeh; + @JsonProperty("involveCar") private String isVehValue; //付款明细List private List paymentList = new ArrayList<>(); From cbb03a74893ebb97ec6ce3cc5cc284ce09279d68 Mon Sep 17 00:00:00 2001 From: yxt_djz Date: Sat, 8 Oct 2022 09:33:40 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=91=E8=9D=B6?= =?UTF-8?q?=E9=93=B6=E8=A1=8C=E3=80=81=E9=93=B6=E8=A1=8C=E8=B4=A6=E6=88=B7?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseAccadjApplyService.java | 8 ++ .../base/biz/basevehicle/BaseVehicleRest.java | 9 +- .../fin/api/kingdee/FinKingDeeFeign.java | 10 +++ .../api/kingdee/FinKingDeeFeignFallBack.java | 12 +++ .../anrui/fin/api/kingdee/KingDeeBillId.java | 2 + .../fin/api/kingdee/appaybill/ApPayBill.java | 3 +- .../anrui/fin/api/kingdee/bank/BDBank.java | 29 +++++++ .../fin/api/kingdee/cnbankcnt/CNBankacnt.java | 33 +++++++ .../api/kingdee/stkinstock/StkInStock.java | 4 + .../fin/biz/kingdee/FinKingDeeFeignRest.java | 29 +++++++ .../kingdee/appaybill/ApPayBillService.java | 50 ++++------- .../kingdee/appaybill/data_FPAYBILLENTRY.json | 8 +- .../bank/BDBankCastToKingDeeBillFields.java | 44 ++++++++++ .../fin/biz/kingdee/bank/BDBankService.java | 72 ++++++++++++++++ .../yxt/anrui/fin/biz/kingdee/bank/data.json | 4 + .../anrui/fin/biz/kingdee/bank/data_data.json | 13 +++ .../fin/biz/kingdee/bank/data_model.json | 11 +++ .../anrui/fin/biz/kingdee/bank/remarks.txt | 59 +++++++++++++ .../kingdee/bank/webapi测试的数据.txt | 1 + .../bank/银行的参数必填备注.xlsx | Bin 0 -> 9356 bytes .../kingdee/bdmaterial/BdMaterialService.java | 4 +- .../CNBankcntCastToKingDeeBillFields.java | 44 ++++++++++ .../kingdee/cnbankcnt/CNBankcntService.java | 81 ++++++++++++++++++ .../anrui/fin/biz/kingdee/cnbankcnt/data.json | 4 + .../fin/biz/kingdee/cnbankcnt/data_data.json | 13 +++ .../fin/biz/kingdee/cnbankcnt/data_model.json | 20 +++++ .../fin/biz/kingdee/cnbankcnt/remarks.txt | 75 ++++++++++++++++ .../cnbankcnt/webapi测试的数据.txt | 1 + .../银行的参数必填备注.xlsx | Bin 0 -> 9356 bytes .../kingdee/stkinstock/STKInStockService.java | 4 +- .../timertask/feign/entity/BdMaterial.java | 80 +++++++++++++++++ 31 files changed, 683 insertions(+), 44 deletions(-) create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bank/BDBank.java create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/cnbankcnt/CNBankacnt.java create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/BDBankCastToKingDeeBillFields.java create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/BDBankService.java create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/data.json create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/data_data.json create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/data_model.json create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/remarks.txt create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/webapi测试的数据.txt create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/银行的参数必填备注.xlsx create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/CNBankcntCastToKingDeeBillFields.java create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/CNBankcntService.java create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/data.json create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/data_data.json create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/data_model.json create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/remarks.txt create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/webapi测试的数据.txt create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/银行的参数必填备注.xlsx create mode 100644 anrui-timertask/src/main/java/com/yxt/anrui/timertask/feign/entity/BdMaterial.java diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java index b9e306483d..f237230ae6 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java @@ -458,6 +458,10 @@ public class BaseAccadjApplyService extends MybatisBaseService优先考虑LNG的类型，然后再是牵引、载货等。 - + /** + * 车辆类型 + */ + sf.setCllxType("03"); /** * // 批号:FLot */ @@ -284,6 +287,10 @@ public class BaseVehicleRest implements BaseVehicleFeign { * 物料分组 */ sf.setWlfz("01"); + /** + * 物料分组 + */ + sf.setWlfzType("01"); fInStockEntry.add(sf); } stkInStock.setFInStockEntry(fInStockEntry); diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java index 7660df213b..ba709426c1 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java @@ -3,10 +3,12 @@ package com.yxt.anrui.fin.api.kingdee; import com.yxt.anrui.fin.api.kingdee.appayable.APPayable; import com.yxt.anrui.fin.api.kingdee.appaybill.ApPayBill; import com.yxt.anrui.fin.api.kingdee.arreceivable.ARReceivable; +import com.yxt.anrui.fin.api.kingdee.bank.BDBank; import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer; import com.yxt.anrui.fin.api.kingdee.bdmaterial.BdMaterial; import com.yxt.anrui.fin.api.kingdee.bdstock.BDStock; import com.yxt.anrui.fin.api.kingdee.bdsupplier.BdSupplier; +import com.yxt.anrui.fin.api.kingdee.cnbankcnt.CNBankacnt; import com.yxt.anrui.fin.api.kingdee.orgorganizations.OrgOrganizations; import com.yxt.anrui.fin.api.kingdee.purmrb.PurMrb; import com.yxt.anrui.fin.api.kingdee.push.STKInStockPushPurmrb; @@ -105,4 +107,12 @@ public interface FinKingDeeFeign { @PostMapping("/drafBDStock") @ResponseBody public ResultBean drafBDtStock(@RequestBody @Valid BDStock bDtStock) throws Exception; + @ApiOperation("暂存银行的接口") + @PostMapping("/drafBDBank") + @ResponseBody + public ResultBean drafBDBank(@RequestBody @Valid BDBank bdBank) ; + @ApiOperation("暂存银行账号的接口") + @PostMapping("/drafCNBankacnt") + @ResponseBody + public ResultBean drafCNBankacnt(@RequestBody @Valid CNBankacnt cnBankacnt); } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java index 82d9f79415..89c2b68e6f 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java @@ -3,10 +3,12 @@ package com.yxt.anrui.fin.api.kingdee; import com.yxt.anrui.fin.api.kingdee.appayable.APPayable; import com.yxt.anrui.fin.api.kingdee.appaybill.ApPayBill; import com.yxt.anrui.fin.api.kingdee.arreceivable.ARReceivable; +import com.yxt.anrui.fin.api.kingdee.bank.BDBank; import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer; import com.yxt.anrui.fin.api.kingdee.bdmaterial.BdMaterial; import com.yxt.anrui.fin.api.kingdee.bdstock.BDStock; import com.yxt.anrui.fin.api.kingdee.bdsupplier.BdSupplier; +import com.yxt.anrui.fin.api.kingdee.cnbankcnt.CNBankacnt; import com.yxt.anrui.fin.api.kingdee.orgorganizations.OrgOrganizations; import com.yxt.anrui.fin.api.kingdee.purmrb.PurMrb; import com.yxt.anrui.fin.api.kingdee.push.STKInStockPushPurmrb; @@ -98,5 +100,15 @@ implements FinKingDeeFeign{ return null; } + @Override + public ResultBean drafBDBank(BDBank bdBank) { + return null; + } + + @Override + public ResultBean drafCNBankacnt(CNBankacnt cnBankacnt) { + return null; + } + } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/KingDeeBillId.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/KingDeeBillId.java index dcab636d10..3986a5ec5c 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/KingDeeBillId.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/KingDeeBillId.java @@ -13,6 +13,8 @@ public enum KingDeeBillId { BD_CUSTOMER("BD_Customer","客户"), BD_SUPPLIER("BD_Supplier","供应商"), BD_MATERIAL("BD_MATERIAL","物料"), + BD_BANK("BD_BANK","银行"), + CN_BANKACNT("CN_BANKACNT","银行账号"), BD_STOCK("BD_STOCK","仓库"); private String ID; private String NAME; diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appaybill/ApPayBill.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appaybill/ApPayBill.java index e3c6291c4e..e51d0e318e 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appaybill/ApPayBill.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appaybill/ApPayBill.java @@ -42,7 +42,7 @@ public class ApPayBill { /** * //应付类别:F_PAEZ_AssistantKey (必填项) 默认：005 定金 */ - @JsonProperty("F_PAEZ_Assistant") + @JsonProperty("F_PAEZ_AssistantKey") @NotBlank public String F_PAEZ_AssistantKey; /** @@ -73,7 +73,6 @@ public class ApPayBill { //付款组织:FPAYORGID (必填项) /* public String FPAYORGID ;*/ @JsonProperty("FPAYBILLENTRY") - @NotBlank public List FPAYBILLENTRY=new ArrayList<>(); @Data public static class FPAYBILLENTRY{ diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bank/BDBank.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bank/BDBank.java new file mode 100644 index 0000000000..6f5af7353f --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bank/BDBank.java @@ -0,0 +1,29 @@ +package com.yxt.anrui.fin.api.kingdee.bank; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * 银行 + */ +@Data +public class BDBank { + /* 创建组织:FCreateOrgId (必填项)*/ + @NotBlank + @JsonProperty("FCreateOrgId") + public String FCreateOrgId; + /*名称:FName (必填项)*/ + @NotBlank + @JsonProperty("FName") + public String FName; + /* 使用组织:FUseOrgId (必填项)*/ + @NotBlank + @JsonProperty("FUseOrgId") + public String FUseOrgId; + /* :FNumber (必填项)*/ + @NotBlank + @JsonProperty("FNumber") + public String FNumber; +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/cnbankcnt/CNBankacnt.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/cnbankcnt/CNBankacnt.java new file mode 100644 index 0000000000..e5e8779104 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/cnbankcnt/CNBankacnt.java @@ -0,0 +1,33 @@ +package com.yxt.anrui.fin.api.kingdee.cnbankcnt; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * 银行账号 + */ +@Data +public class CNBankacnt { + /*银行账号:FNumber (必填项)*/ + @NotBlank + @JsonProperty("FNumber") + public String FNumber; + /*开户银行:FBANKID (必填项)*/ + @NotBlank + @JsonProperty("FBANKID") + public String FBANKID; + /*账户名称:FName (必填项)*/ + @NotBlank + @JsonProperty("FName") + public String FName; + /*使用组织:FUseOrgId (必填项)*/ + @NotBlank + @JsonProperty("FUseOrgId") + public String FUseOrgId; + /*创建组织:FCreateOrgId (必填项)*/ + @NotBlank + @JsonProperty("FCreateOrgId") + public String FCreateOrgId; +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stkinstock/StkInStock.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stkinstock/StkInStock.java index e3c1c26566..7b76a61b65 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stkinstock/StkInStock.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stkinstock/StkInStock.java @@ -85,11 +85,15 @@ public class StkInStock { */ @NotBlank public String wlfz; + @NotBlank + public String wlfzType; /** * 车辆类型 */ @NotBlank public String cllx; + @NotBlank + public String cllxType; /** * // 单价:FPrice */@JsonProperty("FPrice") diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java index f62f8639fd..97c1ad42b3 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java @@ -4,10 +4,12 @@ import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.appayable.APPayable; import com.yxt.anrui.fin.api.kingdee.appaybill.ApPayBill; import com.yxt.anrui.fin.api.kingdee.arreceivable.ARReceivable; +import com.yxt.anrui.fin.api.kingdee.bank.BDBank; import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer; import com.yxt.anrui.fin.api.kingdee.bdmaterial.BdMaterial; import com.yxt.anrui.fin.api.kingdee.bdstock.BDStock; import com.yxt.anrui.fin.api.kingdee.bdsupplier.BdSupplier; +import com.yxt.anrui.fin.api.kingdee.cnbankcnt.CNBankacnt; import com.yxt.anrui.fin.api.kingdee.orgorganizations.OrgOrganizations; import com.yxt.anrui.fin.api.kingdee.purmrb.PurMrb; import com.yxt.anrui.fin.api.kingdee.push.STKInStockPushPurmrb; @@ -16,10 +18,12 @@ import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock; import com.yxt.anrui.fin.api.kingdee.stktransferdirect.StkTransferDirect; import com.yxt.anrui.fin.biz.kingdee.appaybill.ApPayBillService; import com.yxt.anrui.fin.biz.kingdee.appayable.APPayableService; +import com.yxt.anrui.fin.biz.kingdee.bank.BDBankService; import com.yxt.anrui.fin.biz.kingdee.bdcustomer.BdCustomerService; import com.yxt.anrui.fin.biz.kingdee.bdmaterial.BdMaterialService; import com.yxt.anrui.fin.biz.kingdee.bdstock.BDStockService; import com.yxt.anrui.fin.biz.kingdee.bdsupplier.BdSupplierService; +import com.yxt.anrui.fin.biz.kingdee.cnbankcnt.CNBankcntService; import com.yxt.anrui.fin.biz.kingdee.orgorganizations.OrgOrganizationsService; import com.yxt.anrui.fin.biz.kingdee.purmrb.PurMrbService; import com.yxt.anrui.fin.biz.kingdee.push.PushService; @@ -106,6 +110,16 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { */ @Autowired private PushService pushService; + /** + * 银行 + */ + @Autowired + private BDBankService bdBankService; + /** + * 银行 + */ + @Autowired + private CNBankcntService cnBankcntService; @ApiOperation("入账暂存应付单的接口") @PostMapping("/draftEntryBill") @ResponseBody @@ -223,5 +237,20 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { public ResultBean drafBDtStock(@RequestBody @Valid BDStock bDtStock) throws Exception { return bDStockService.draftBDStock(bDtStock);//bdCustomerService;//bdCustomerService.getKingBillDataInfoList("",""); } + @ApiOperation("暂存银行的接口") + @PostMapping("/drafBDBank") + @ResponseBody + @Override + public ResultBean drafBDBank(BDBank bdBank) { + return bdBankService.draftBDBank(bdBank);//bdCustomerService;//bdCustomerService.getKingBillDataInfoList("",""); + } + + @ApiOperation("暂存银行账号的接口") + @PostMapping("/drafCNBankacnt") + @ResponseBody + @Override + public ResultBean drafCNBankacnt(CNBankacnt cNBankacnt) { + return cnBankcntService.draftCNBankcnt(cNBankacnt);//bdCustomerService;//bdCustomerService.getKingBillDataInfoList("",""); + } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillService.java index 5fb1aaa167..d2ee51d07c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillService.java @@ -31,56 +31,29 @@ public class ApPayBillService extends FinKingDeeService { //业务表的主表数据集合 Map map_fEntityModel_= object2Map(apPayBill);//createMapParams(stringObjectMap); //应付类别 - String F_PAEZ_AssistantType = map_fEntityModel_.get("F_PAEZ_AssistantType"); - String F_PAEZ_AssistantKey = map_fEntityModel_.get("F_PAEZ_AssistantKey"); - SysMappingInfoQuery smiq=new SysMappingInfoQuery(); - smiq.setMap_sourceKey("CWXT"); - smiq.setMap_object("付款单"); - smiq.setMap_item("应付类别"); - smiq.setDictKey(F_PAEZ_AssistantKey); - smiq.setDictTypeCode(F_PAEZ_AssistantType); - ResultBean sysMappingInfoVoResultBean = sysMappingFeign.selectMappingInfo(smiq); + ResultBean sysMappingInfoVoResultBean = getSysMappingInfoVoResultBean( "应付类别",map_fEntityModel_.get("F_PAEZ_AssistantKey"), map_fEntityModel_.get("F_PAEZ_AssistantType")); boolean success = sysMappingInfoVoResultBean.getSuccess(); if(!success){ return rb.setMsg(sysMappingInfoVoResultBean.getMsg()); } - String F_PAEZ_Assistant=sysMappingInfoVoResultBean.getData().getMap_itemKey();//TODO 根据应付类别的code,key查询金蝶系统中的应付类别的编码 映射来源“CWXT”/“财务系统” - map_fEntityModel_.put("F_PAEZ_Assistant",F_PAEZ_Assistant); + map_fEntityModel_.put("F_PAEZ_Assistant","001");//sysMappingInfoVoResultBean.getData().getMap_itemKey()); //准备 物料列表的数据 ForEntryBill List fpaybillentrYs = apPayBill.getFPAYBILLENTRY(); List> vehicleListMap = createVehicleLists(fpaybillentrYs); for(int i=0;i params=vehicleListMap.get(i); //付款用途 - String FPURPOSEIDType = params.get("FPURPOSEIDType"); - String FPURPOSEIDKey = params.get("FPURPOSEIDKey"); - smiq=new SysMappingInfoQuery(); - smiq.setMap_sourceKey("CWXT"); - smiq.setMap_object("付款单"); - smiq.setMap_item("付款用途"); - smiq.setDictKey(FPURPOSEIDKey); - smiq.setDictTypeCode(FPURPOSEIDType); - sysMappingInfoVoResultBean = sysMappingFeign.selectMappingInfo(smiq); + sysMappingInfoVoResultBean = getSysMappingInfoVoResultBean( "付款用途", params.get("FPURPOSEIDKey"), params.get("FPURPOSEIDType")); if(! sysMappingInfoVoResultBean.getSuccess()){ return rb.setMsg(sysMappingInfoVoResultBean.getMsg()); } - String FPURPOSEID=sysMappingInfoVoResultBean.getData().getMap_itemKey();//TODO 根据付款用途的code,key查询金蝶系统中的付款用途的编码 映射来源“CWXT”/“财务系统” - params.put("FPURPOSEID",FPURPOSEID); + params.put("FPURPOSEID","SFKYT08_SYS");//sysMappingInfoVoResultBean.getData().getMap_itemKey()); //结算方式 - String FSETTLETYPEIDType = params.get("FSETTLETYPEIDType"); - String FSETTLETYPEIDKey = params.get("FSETTLETYPEIDKey"); - smiq=new SysMappingInfoQuery(); - smiq.setMap_sourceKey("CWXT"); - smiq.setMap_object("付款单"); - smiq.setMap_item("结算方式"); - smiq.setDictKey(FSETTLETYPEIDKey); - smiq.setDictTypeCode(FSETTLETYPEIDType); - sysMappingInfoVoResultBean = sysMappingFeign.selectMappingInfo(smiq); + sysMappingInfoVoResultBean = getSysMappingInfoVoResultBean( "结算方式", params.get("FSETTLETYPEIDKey"), params.get("FSETTLETYPEIDType")); if(!sysMappingInfoVoResultBean.getSuccess()){ return rb.setMsg(sysMappingInfoVoResultBean.getMsg()); } - String FSETTLETYPEID=sysMappingInfoVoResultBean.getData().getMap_itemKey();//TODO 根据结算方式的code,key查询金蝶系统中的结算方式的编码 映射来源“CWXT”/“财务系统” - params.put("FSETTLETYPEID",FSETTLETYPEID); + params.put("FSETTLETYPEID","02");//sysMappingInfoVoResultBean.getData().getMap_itemKey()); } String kingDeeData = ApPayBillCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_,vehicleListMap); return accessKingDeeInterface(KingDeeBillId.AP_PAYBILL.getID(),kingDeeData, KingDeeBillUrl.DRAFT_URL.getURL()); @@ -89,4 +62,15 @@ public class ApPayBillService extends FinKingDeeService { } return rb; } + + private ResultBean getSysMappingInfoVoResultBean( String Map_item, String FPURPOSEIDKey, + String FPURPOSEIDType) { + SysMappingInfoQuery smiq =new SysMappingInfoQuery(); + smiq.setMap_sourceKey("CWXT"); + smiq.setMap_object("付款单"); + smiq.setMap_item(Map_item); + smiq.setDictKey(FPURPOSEIDKey); + smiq.setDictTypeCode(FPURPOSEIDType); + return sysMappingFeign.selectMappingInfo(smiq); + } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data_FPAYBILLENTRY.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data_FPAYBILLENTRY.json index f428a0a6cb..7c8d86c62e 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data_FPAYBILLENTRY.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data_FPAYBILLENTRY.json @@ -6,10 +6,10 @@ "FNumber": "@KD_FPURPOSEID" }, "FPAYTOTALAMOUNTFOR": @KD_FPAYTOTALAMOUNTFOR, - "FPAYAMOUNTFOR_E": @KD_FPAYAMOUNTFOR_E, - "FSETTLEPAYAMOUNTFOR": @KD_FSETTLEPAYAMOUNTFOR, - "FREALPAYAMOUNTFOR_D": @KD_FREALPAYAMOUNTFOR_D, - "FPAYAMOUNT_E": @KD_FPAYAMOUNT_E, + "FPAYAMOUNTFOR_E": @KD_FPAYTOTALAMOUNTFOR, + "FSETTLEPAYAMOUNTFOR": @KD_FPAYTOTALAMOUNTFOR, + "FREALPAYAMOUNTFOR_D": @KD_FPAYTOTALAMOUNTFOR, + "FPAYAMOUNT_E": @KD_FPAYTOTALAMOUNTFOR, "FACCOUNTID": {"FNumber":"@KD_FACCOUNTID"}, "FPOSTDATE": "@KD_FPOSTDATE", "FRuZhangType": "1", diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/BDBankCastToKingDeeBillFields.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/BDBankCastToKingDeeBillFields.java new file mode 100644 index 0000000000..672a763b99 --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/BDBankCastToKingDeeBillFields.java @@ -0,0 +1,44 @@ +package com.yxt.anrui.fin.biz.kingdee.bank; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.parser.Feature; +import com.yxt.anrui.fin.biz.kingdee.KingDeeUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.Map; + +/** + * 封装转换的类 + */ +public class BDBankCastToKingDeeBillFields { + private static Logger log=LoggerFactory.getLogger(BDBankCastToKingDeeBillFields.class); + /** + * 构造金蝶需要的数据结构 并对字段赋值 + * + * @param map_fEntityModel_ + * @return + */ + public static String getKingDeeData(Map map_fEntityModel_ ){ + /** + * 取模板 + */ + String readJsonFile = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/bank/data.json"); + String fEntityData_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/bank/data_data.json"); + String fEntityModel_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/bank/data_model.json"); + log.info("readJsonFile:{}",readJsonFile); + log.info("fEntityData_:{}",fEntityData_); + log.info("fEntityModel_:{}",fEntityModel_); + + //模板字符创转json + JSONObject jsonObj= JSONObject.parseObject(readJsonFile, Feature.OrderedField); + JSONObject jsonFEntityData_= JSONObject.parseObject(fEntityData_,Feature.OrderedField); + fEntityModel_ =KingDeeUtils.replaceTemplateParams(fEntityModel_, map_fEntityModel_); + JSONObject jsonFEntityModel_= JSONObject.parseObject(fEntityModel_,Feature.OrderedField); + + jsonFEntityData_.put("Model",JSONObject.parseObject(JSON.toJSONString(jsonFEntityModel_),Feature.OrderedField)); + jsonObj.put("data",jsonFEntityData_.toJSONString()); + return jsonObj.toJSONString(); + } +} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/BDBankService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/BDBankService.java new file mode 100644 index 0000000000..1ec3fd75f9 --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/BDBankService.java @@ -0,0 +1,72 @@ +package com.yxt.anrui.fin.biz.kingdee.bank; + +import com.yxt.anrui.fin.api.kingdee.KingDeeBillId; +import com.yxt.anrui.fin.api.kingdee.KingDeeBillUrl; +import com.yxt.anrui.fin.api.kingdee.KingDeeResult; +import com.yxt.anrui.fin.api.kingdee.bank.BDBank; +import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService; +import com.yxt.common.core.result.ResultBean; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +@Service +public class BDBankService extends FinKingDeeService { + /** + * 保存银行信息 list + * @param bDBanks + * @return + */ + public ResultBean> draftBDBankList(List bDBanks) { + List list=new ArrayList<>(); + ResultBean rb=ResultBean.fireFail(); + for(BDBank b:bDBanks) { + ResultBean> resultBean = draftBDBank(b); + if (resultBean.getSuccess()) { + list.add(resultBean.getData().get(0)); + } + } + return rb.success().setData(list); + } + /** + * 保存银行信息 + * @param bDBank + * @return + */ + public ResultBean draftBDBank(BDBank bDBank) { + //bdCustomer=BdCustomer.createBdCustomer(); + ResultBean rb=ResultBean.fireFail(); + try { + //业务表的主表数据集合 + Map map_fEntityModel_= object2Map(bDBank); + //准备 物料列表的数据 ForEntryBill + String kingDeeData = BDBankCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_); + ResultBean resultBean = accessKingDeeInterface( + KingDeeBillId.BD_BANK.getID(), kingDeeData, KingDeeBillUrl.DRAFT_URL.getURL()); + + String submitKD = getSubmitKD(resultBean.getData(),KingDeeBillId.BD_BANK.getID()); + ResultBean resultBean1 = accessKingDeeInterface(KingDeeBillId.BD_BANK.getID(), submitKD,KingDeeBillUrl.SUBMIT_URL.getURL()); + if(!resultBean1.getSuccess()){ + log.info("银行提交失败!"); + return rb.setMsg("银行提交失败!"); + } + log.info("银行提交成功!"); + + String auditKD = getAuditKD(resultBean.getData(),KingDeeBillId.BD_BANK.getID()); + ResultBean resultBean2 = accessKingDeeInterface(KingDeeBillId.BD_BANK.getID(), auditKD,KingDeeBillUrl.AUDIT_URL.getURL()); + if(!resultBean2.getSuccess()){ + log.info("银行审核失败!"); + return rb.setMsg("银行审核失败!"); + } + log.info("银行审核成功!"); + + return resultBean; + } catch (Exception e) { + e.printStackTrace(); + } + return rb; + } + +} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/data.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/data.json new file mode 100644 index 0000000000..a195252b83 --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/data.json @@ -0,0 +1,4 @@ +{ + "formId": "BD_BANK", + "data": "@KD_data" +} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/data_data.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/data_data.json new file mode 100644 index 0000000000..f8b9dc071d --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/data_data.json @@ -0,0 +1,13 @@ +{ + "Creator": "", + "NeedUpDateFields": [], + "NeedReturnFields": [], + "IsDeleteEntry": "True", + "SubSystemId": "", + "IsVerifyBaseDataField": "false", + "IsEntryBatchFill": "True", + "ValidateFlag": "True", + "NumberSearch": "True", + "InterationFlags": "", + "Model": {} +} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/data_model.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/data_model.json new file mode 100644 index 0000000000..da6b03d2ed --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/data_model.json @@ -0,0 +1,11 @@ +{ + "FBANKID": 0, + "FName": "@KD_FName", + "FNumber": "@KD_FNumber", + "FCreateOrgId": { + "FNumber": "@KD_FCreateOrgId" + }, + "FUseOrgId": { + "FNumber": "@KD_FUseOrgId" + } +} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/remarks.txt b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/remarks.txt new file mode 100644 index 0000000000..198c9d70ee --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/remarks.txt @@ -0,0 +1,59 @@ +一、请求参数说明: +1.formid：业务对象表单Id，字符串类型（必录） +2.data：Json格式数据（详情参考Json格式数据）（必录） + 2.1.Creator：创建者内码（非必录） + 2.2.NeedUpDateFields：需要更新的字段，数组类型，格式：[key1,key2,...]（非必录），注（更新单据体字段得加上单据体key） + 2.3.NeedReturnFields：需返回结果的字段集合，数组类型，格式：[key,entitykey.key,...]（非必录），注（返回单据体字段格式：entitykey.key） + 2.4.IsDeleteEntry：是否删除已存在的分录，布尔类型，默认true（非必录） + 2.5.SubSystemId：表单所在的子系统内码，字符串类型（非必录） + 2.6.IsVerifyBaseDataField：是否验证所有的基础资料有效性，布尔类，默认false（非必录） + 2.7.IsEntryBatchFill：是否批量填充分录，默认true（非必录） + 2.8.ValidateFlag：是否验证标志，布尔类型，默认true（非必录） + 2.9.NumberSearch：是否用编码搜索基础资料，布尔类型，默认true（非必录） + 2.10.InterationFlags：交互标志集合，字符串类型，分号分隔，格式："flag1;flag2;..."（非必录），例如（允许负库存标识：STK_InvCheckResult） + 2.11.Model：表单数据包，Json类型（必录） + +二、Json格式数据: +{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\",\"IsEntryBatchFill\":\"True\",\"ValidateFlag\":\"True\",\"NumberSearch\":\"True\",\"InterationFlags\":\"\",\"Model\":{\"FBANKID\":\"0\",\"FNumber\":\"\",\"FName\":\"\",\"FACNTBRANCHNUMBER\":\"\",\"FCreateOrgId\":{\"FNumber\":\"\"},\"FUseOrgId\":{\"FNumber\":\"\"},\"FACNTAREACODE\":\"\",\"FACNTAREANAME\":\"\",\"FADDRESS\":\"\",\"FDescription\":\"\"}} + +三、返回参数: +{\"Result\":{\"ResponseStatus\":{\"ErrorCode\":\"\",\"IsSuccess\":\"false\",\"Errors\":[{\"FieldName\":\"\",\"Message\":\"\",\"DIndex\":0}],\"SuccessEntitys\":[{\"Id\":\"\",\"Number\":\"\",\"DIndex\":0}],\"SuccessMessages\":[{\"FieldName\":\"\",\"Message\":\"\",\"DIndex\":0}]},\"Id\":\"\",\"NeedReturnData\":[{}]}} + +四、代码示例: +// 使用webapi引用组件Kingdee.BOS.WebApi.Client.dll +K3CloudApiClient client = new K3CloudApiClient("http://121.36.43.55/k3cloud/"); +var ret = client.ValidateLogin("61dce6601125a0","Administrator","888888",2052); +var result = JObject.Parse(ret)["LoginResultType"].Value(); +// 登陆成功 +if (result == 1) +{ + client.Draft("BD_BANK","{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\",\"IsEntryBatchFill\":\"True\",\"ValidateFlag\":\"True\",\"NumberSearch\":\"True\",\"InterationFlags\":\"\",\"Model\":{\"FBANKID\":\"0\",\"FNumber\":\"\",\"FName\":\"\",\"FACNTBRANCHNUMBER\":\"\",\"FCreateOrgId\":{\"FNumber\":\"\"},\"FUseOrgId\":{\"FNumber\":\"\"},\"FACNTAREACODE\":\"\",\"FACNTAREANAME\":\"\",\"FADDRESS\":\"\",\"FDescription\":\"\"}}"); +} + +五、字段说明: +审核人:FAuditorID +系统预设:FIsSysPreset +银行地址:FADDRESS +禁用人:FForbidderID +禁用日期:FForbidDate +审核日期:FAuditDate +银行:FBankType +联行号:FACNTBRANCHNUMBER +地区名:FACNTAREANAME +地区码:FACNTAREACODE +省:FProvince +城市:FCity +地区:FDistrict +编码:FNumber +描述:FDescription +创建组织:FCreateOrgId (必填项) +数据状态:FDocumentStatus +禁用状态:FForbidStatus +名称:FName (必填项) +使用组织:FUseOrgId (必填项) +修改日期:FModifyDate +生效日期:FStartDate +失效日期:FEndDate +创建人:FCreatorId +修改人:FModifierId +创建日期:FCreateDate \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/webapi测试的数据.txt b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/webapi测试的数据.txt new file mode 100644 index 0000000000..66751f6932 --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/webapi测试的数据.txt @@ -0,0 +1 @@ +{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\",\"IsEntryBatchFill\":\"True\",\"ValidateFlag\":\"True\",\"NumberSearch\":\"True\",\"InterationFlags\":\"\",\"Model\":{\"FBANKID\":0,\"FName\":\"mcmcmcmcm\",\"FCreateOrgId\":{\"FNumber\":\"101\"},\"FUseOrgId\":{\"FNumber\":\"101\"}}} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/银行的参数必填备注.xlsx b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/银行的参数必填备注.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..092a3f664171d82b1b8e43cfff6eacac5f6e4071 GIT binary patch literal 9356 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 literal 0 HcmV?d00001 diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java index 334951983f..7ed0dc4fec 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java @@ -69,11 +69,11 @@ public class BdMaterialService extends FinKingDeeService { private List getKeyItems() { List params=new ArrayList<>(); params.add(new KeyItem("FCategoryID","存货类别") ); - /* params.add(new KeyItem("FMaterialGroup","物料分组") ); + params.add(new KeyItem("FMaterialGroup","物料分组") ); params.add(new KeyItem("F_PAEZ_Base","车辆类型") ); params.add(new KeyItem("F_PAEZ_Base2","车辆系别") ); params.add(new KeyItem("F_PAEZ_Base3","车辆马力") ); - params.add(new KeyItem("F_PAEZ_Base4","车辆驱动") );*/ + params.add(new KeyItem("F_PAEZ_Base4","车辆驱动") ); return params; } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/CNBankcntCastToKingDeeBillFields.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/CNBankcntCastToKingDeeBillFields.java new file mode 100644 index 0000000000..eae698dc6e --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/CNBankcntCastToKingDeeBillFields.java @@ -0,0 +1,44 @@ +package com.yxt.anrui.fin.biz.kingdee.cnbankcnt; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.parser.Feature; +import com.yxt.anrui.fin.biz.kingdee.KingDeeUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.Map; + +/** + * 封装转换的类 + */ +public class CNBankcntCastToKingDeeBillFields { + private static Logger log=LoggerFactory.getLogger(CNBankcntCastToKingDeeBillFields.class); + /** + * 构造金蝶需要的数据结构 并对字段赋值 + * + * @param map_fEntityModel_ + * @return + */ + public static String getKingDeeData(Map map_fEntityModel_ ){ + /** + * 取模板 + */ + String readJsonFile = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/cnbankcnt/data.json"); + String fEntityData_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/cnbankcnt/data_data.json"); + String fEntityModel_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/cnbankcnt/data_model.json"); + log.info("readJsonFile:{}",readJsonFile); + log.info("fEntityData_:{}",fEntityData_); + log.info("fEntityModel_:{}",fEntityModel_); + + //模板字符创转json + JSONObject jsonObj= JSONObject.parseObject(readJsonFile, Feature.OrderedField); + JSONObject jsonFEntityData_= JSONObject.parseObject(fEntityData_,Feature.OrderedField); + fEntityModel_ =KingDeeUtils.replaceTemplateParams(fEntityModel_, map_fEntityModel_); + JSONObject jsonFEntityModel_= JSONObject.parseObject(fEntityModel_,Feature.OrderedField); + + jsonFEntityData_.put("Model",JSONObject.parseObject(JSON.toJSONString(jsonFEntityModel_),Feature.OrderedField)); + jsonObj.put("data",jsonFEntityData_.toJSONString()); + return jsonObj.toJSONString(); + } +} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/CNBankcntService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/CNBankcntService.java new file mode 100644 index 0000000000..a5709486c8 --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/CNBankcntService.java @@ -0,0 +1,81 @@ +package com.yxt.anrui.fin.biz.kingdee.cnbankcnt; + +import com.yxt.anrui.fin.api.kingdee.KingDeeBillId; +import com.yxt.anrui.fin.api.kingdee.KingDeeBillUrl; +import com.yxt.anrui.fin.api.kingdee.KingDeeResult; +import com.yxt.anrui.fin.api.kingdee.bank.BDBank; +import com.yxt.anrui.fin.api.kingdee.cnbankcnt.CNBankacnt; +import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService; +import com.yxt.common.core.result.ResultBean; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +@Service +public class CNBankcntService extends FinKingDeeService { + /** + * 保存银行账号信息 list + * @param cNBankacnts + * @return + */ + public ResultBean> draftCNBankcntList(List cNBankacnts) { + List list=new ArrayList<>(); + ResultBean rb=ResultBean.fireFail(); + for(CNBankacnt b:cNBankacnts) { + ResultBean> resultBean = draftCNBankcnt(b); + if (resultBean.getSuccess()) { + list.add(resultBean.getData().get(0)); + } + } + return rb.success().setData(list); + } + /** + * 保存银行账号信息 + * @param cNBankcnt + * @return + */ + public ResultBean draftCNBankcnt(CNBankacnt cNBankcnt) { + //bdCustomer=BdCustomer.createBdCustomer(); + ResultBean rb=ResultBean.fireFail(); + try { + //业务表的主表数据集合 + Map map_fEntityModel_= object2Map(cNBankcnt); + //准备 物料列表的数据 ForEntryBill + String kingDeeData = CNBankcntCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_); + ResultBean resultBean = accessKingDeeInterface( + KingDeeBillId.CN_BANKACNT.getID(), kingDeeData, KingDeeBillUrl.DRAFT_URL.getURL()); + + String submitKD = getSubmitKD(resultBean.getData(),KingDeeBillId.CN_BANKACNT.getID()); + ResultBean resultBean1 = accessKingDeeInterface(KingDeeBillId.CN_BANKACNT.getID(), submitKD,KingDeeBillUrl.SUBMIT_URL.getURL()); + if(!resultBean1.getSuccess()){ + log.info("银行账号提交失败!"); + return rb.setMsg("银行账号提交失败!"); + } + log.info("银行账号提交成功!"); + + String auditKD = getAuditKD(resultBean.getData(),KingDeeBillId.CN_BANKACNT.getID()); + ResultBean resultBean2 = accessKingDeeInterface(KingDeeBillId.CN_BANKACNT.getID(), auditKD,KingDeeBillUrl.AUDIT_URL.getURL()); + if(!resultBean2.getSuccess()){ + log.info("银行账号审核失败!"); + return rb.setMsg("银行账号审核失败!"); + } + log.info("银行账号审核成功!"); + /*String allocate = getAllocate(resultBean.getData(),cNBankcnt.getTOrgIds(),KingDeeBillId.BD_MATERIAL.getID()); + ResultBean resultBean3 =accessKingDeeInterface( + KingDeeBillId.CN_BANKACNT.getID(), allocate, + KingDeeBillUrl.ALLOCATE_URL.getURL());// allocateKingDeeBillData(KingDeeBillId.BD_MATERIAL.getID(), allocate); + if(!resultBean3.getSuccess()){ + log.info("银行账号分配失败!"); + return rb.setMsg("银行账号分配失败!"); + } + log.info("银行账号分配成功!");*/ + return resultBean; + } catch (Exception e) { + e.printStackTrace(); + } + return rb; + } + +} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/data.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/data.json new file mode 100644 index 0000000000..118860d9e9 --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/data.json @@ -0,0 +1,4 @@ +{ + "formId": "CN_BANKACNT", + "data": "@KD_data" +} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/data_data.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/data_data.json new file mode 100644 index 0000000000..f8b9dc071d --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/data_data.json @@ -0,0 +1,13 @@ +{ + "Creator": "", + "NeedUpDateFields": [], + "NeedReturnFields": [], + "IsDeleteEntry": "True", + "SubSystemId": "", + "IsVerifyBaseDataField": "false", + "IsEntryBatchFill": "True", + "ValidateFlag": "True", + "NumberSearch": "True", + "InterationFlags": "", + "Model": {} +} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/data_model.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/data_model.json new file mode 100644 index 0000000000..fcb756e1a6 --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/data_model.json @@ -0,0 +1,20 @@ +{ + "FBANKACNTID": 0, + "FCreateOrgId": { + "FNumber": "@KD_FCreateOrgId" + }, + "FNumber": "@KD_FNumber", + "FBANKID": { + "FNumber": "@KD_FBANKID" + }, + "FName": "@KD_FName", + "FUseOrgId": { + "FNumber": "@KD_FUseOrgId" + }, + "FIsCancel": false, + "FIsFundUp": false, + "FISDEFAULTBANK": false, + "FIsSupBank": false, + "FUpType": "1", + "FIsSupBBC": false +} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/remarks.txt b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/remarks.txt new file mode 100644 index 0000000000..a5024c2993 --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/remarks.txt @@ -0,0 +1,75 @@ +一、请求参数说明: +1.formid：业务对象表单Id，字符串类型（必录） +2.data：Json格式数据（详情参考Json格式数据）（必录） + 2.1.Creator：创建者内码（非必录） + 2.2.NeedUpDateFields：需要更新的字段，数组类型，格式：[key1,key2,...]（非必录），注（更新单据体字段得加上单据体key） + 2.3.NeedReturnFields：需返回结果的字段集合，数组类型，格式：[key,entitykey.key,...]（非必录），注（返回单据体字段格式：entitykey.key） + 2.4.IsDeleteEntry：是否删除已存在的分录，布尔类型，默认true（非必录） + 2.5.SubSystemId：表单所在的子系统内码，字符串类型（非必录） + 2.6.IsVerifyBaseDataField：是否验证所有的基础资料有效性，布尔类，默认false（非必录） + 2.7.IsEntryBatchFill：是否批量填充分录，默认true（非必录） + 2.8.ValidateFlag：是否验证标志，布尔类型，默认true（非必录） + 2.9.NumberSearch：是否用编码搜索基础资料，布尔类型，默认true（非必录） + 2.10.InterationFlags：交互标志集合，字符串类型，分号分隔，格式："flag1;flag2;..."（非必录），例如（允许负库存标识：STK_InvCheckResult） + 2.11.Model：表单数据包，Json类型（必录） + +二、Json格式数据: +{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\",\"IsEntryBatchFill\":\"True\",\"ValidateFlag\":\"True\",\"NumberSearch\":\"True\",\"InterationFlags\":\"\",\"Model\":{\"FBANKACNTID\":\"0\",\"FCreateOrgId\":{\"FNumber\":\"\"},\"FNumber\":\"\",\"FBANKID\":{\"FNumber\":\"\"},\"FName\":\"\",\"FInOrOut\":\"\",\"FACNTBRANCHNUMBER\":\"\",\"FBankType\":{\"FNAME\":\"\"},\"FProvince\":{\"FNAME\":\"\"},\"FCity\":{\"FNAME\":\"\"},\"FDistrict\":{\"FNAME\":\"\"},\"FUseOrgId\":{\"FNumber\":\"\"},\"FACNTAREACODE\":\"\",\"FACNTAREANAME\":\"\",\"FIsCancel\":\"false\",\"FIsFundUp\":\"false\",\"FISDEFAULTBANK\":\"false\",\"FIsSupBank\":\"false\",\"FINNERACCOUNTID\":{\"FNUMBER\":\"\"},\"FDescription\":\"\",\"FSRCBILLID\":\"0\",\"FUpType\":\"\",\"FUpAmount\":\"0\",\"FBaseAmount\":\"0\",\"FMinUpAmount\":\"0\",\"FACCOUNTTYPE\":\"\",\"FLICENSEKEY\":\"\",\"FPUBLICACNT\":{\"FNUMBER\":\"\"},\"FBankServiceLoginId\":\"\",\"FBankServiceLoginDesc\":\"\",\"FIsSupBBC\":\"false\"}} + +三、返回参数: +{\"Result\":{\"ResponseStatus\":{\"ErrorCode\":\"\",\"IsSuccess\":\"false\",\"Errors\":[{\"FieldName\":\"\",\"Message\":\"\",\"DIndex\":0}],\"SuccessEntitys\":[{\"Id\":\"\",\"Number\":\"\",\"DIndex\":0}],\"SuccessMessages\":[{\"FieldName\":\"\",\"Message\":\"\",\"DIndex\":0}]},\"Id\":\"\",\"NeedReturnData\":[{}]}} + +四、代码示例: +// 使用webapi引用组件Kingdee.BOS.WebApi.Client.dll +K3CloudApiClient client = new K3CloudApiClient("http://121.36.43.55/k3cloud/"); +var ret = client.ValidateLogin("61dce6601125a0","Administrator","888888",2052); +var result = JObject.Parse(ret)["LoginResultType"].Value(); +// 登陆成功 +if (result == 1) +{ + client.Draft("CN_BANKACNT","{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\",\"IsEntryBatchFill\":\"True\",\"ValidateFlag\":\"True\",\"NumberSearch\":\"True\",\"InterationFlags\":\"\",\"Model\":{\"FBANKACNTID\":\"0\",\"FCreateOrgId\":{\"FNumber\":\"\"},\"FNumber\":\"\",\"FBANKID\":{\"FNumber\":\"\"},\"FName\":\"\",\"FInOrOut\":\"\",\"FACNTBRANCHNUMBER\":\"\",\"FBankType\":{\"FNAME\":\"\"},\"FProvince\":{\"FNAME\":\"\"},\"FCity\":{\"FNAME\":\"\"},\"FDistrict\":{\"FNAME\":\"\"},\"FUseOrgId\":{\"FNumber\":\"\"},\"FACNTAREACODE\":\"\",\"FACNTAREANAME\":\"\",\"FIsCancel\":\"false\",\"FIsFundUp\":\"false\",\"FISDEFAULTBANK\":\"false\",\"FIsSupBank\":\"false\",\"FINNERACCOUNTID\":{\"FNUMBER\":\"\"},\"FDescription\":\"\",\"FSRCBILLID\":\"0\",\"FUpType\":\"\",\"FUpAmount\":\"0\",\"FBaseAmount\":\"0\",\"FMinUpAmount\":\"0\",\"FACCOUNTTYPE\":\"\",\"FLICENSEKEY\":\"\",\"FPUBLICACNT\":{\"FNUMBER\":\"\"},\"FBankServiceLoginId\":\"\",\"FBankServiceLoginDesc\":\"\",\"FIsSupBBC\":\"false\"}}"); +} + +五、字段说明: +资金上划:FIsFundUp +内部账户:FINNERACCOUNTID +上划方式:FUpType (必填项) +留底余额:FBaseAmount +上划定额:FUpAmount +省:FProvince +城市:FCity +地区:FDistrict +源单内码:FSRCBILLID +账户收支属性:FInOrOut (必填项) +最小上划金额:FMinUpAmount +登录配置编号:FBankServiceLoginId +对公账号:FPUBLICACNT +银行版本:FBankServiceLoginDesc +支持BBC分销门户显示:FIsSupBBC +币别:FCURRENCYID +支持网银:FIsSupBank +是否销户:FIsCancel +默认账号:FISDEFAULTBANK +授权密码:FLICENSEKEY +账号类型:FACCOUNTTYPE (必填项) +使用组织:FUseOrgId (必填项) +创建组织:FCreateOrgId (必填项) +创建人:FCreatorId +创建日期:FCreateDate +修改人:FModifierId +禁用状态:FForbidStatus +数据状态:FDocumentStatus +账户名称:FName (必填项) +备注:FDescription +银行账号:FNumber (必填项) +修改日期:FModifyDate +禁用日期:FForbidDate +审核人:FApproverId +禁用人:FForbidderID +银行:FBankType +银行地址:FBANKADDRESS +账户地区码:FACNTAREACODE +开户银行联行号:FACNTBRANCHNUMBER +账户地区名:FACNTAREANAME +审核日期:FApproveDate +开户银行:FBANKID (必填项) \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/webapi测试的数据.txt b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/webapi测试的数据.txt new file mode 100644 index 0000000000..41be67a5a5 --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/webapi测试的数据.txt @@ -0,0 +1 @@ +{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\",\"IsEntryBatchFill\":\"True\",\"ValidateFlag\":\"True\",\"NumberSearch\":\"True\",\"InterationFlags\":\"\",\"Model\":{\"FBANKACNTID\":0,\"FCreateOrgId\":{\"FNumber\":\"101\"},\"FNumber\":\"11122222\",\"FBANKID\":{\"FNumber\":\"0001\"},\"FName\":\"222211111\",\"FUseOrgId\":{\"FNumber\":\"101\"},\"FIsCancel\":false,\"FIsFundUp\":false,\"FISDEFAULTBANK\":false,\"FIsSupBank\":false,\"FUpType\":\"1\",\"FIsSupBBC\":false}} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/银行的参数必填备注.xlsx b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/银行的参数必填备注.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..092a3f664171d82b1b8e43cfff6eacac5f6e4071 GIT binary patch literal 9356 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 literal 0 HcmV?d00001 diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockService.java index 5f031d267a..004600ecc5 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockService.java @@ -98,9 +98,9 @@ public class STKInStockService extends FinKingDeeService { BdMaterial bdMaterial=new BdMaterial(); bdMaterial.setFName(f.getFMaterialId()); bdMaterial.setF_PAEZ_BaseKey(f.getCllx()); - bdMaterial.setF_PAEZ_BaseType(f.getCllx()); + bdMaterial.setF_PAEZ_BaseType(f.getCllxType()); bdMaterial.setFMaterialGroupKey(f.getWlfz()); - bdMaterial.setFMaterialGroupType(f.getWlfz()); + bdMaterial.setFMaterialGroupType(f.getWlfzType()); bdMaterial.setTOrgIds(stkInStock.getTOrgId()); List list=new ArrayList<>(); list.add(bdMaterial); diff --git a/anrui-timertask/src/main/java/com/yxt/anrui/timertask/feign/entity/BdMaterial.java b/anrui-timertask/src/main/java/com/yxt/anrui/timertask/feign/entity/BdMaterial.java new file mode 100644 index 0000000000..a870d17c98 --- /dev/null +++ b/anrui-timertask/src/main/java/com/yxt/anrui/timertask/feign/entity/BdMaterial.java @@ -0,0 +1,80 @@ +package com.yxt.anrui.timertask.feign.entity; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; + + +/** + * 物料 + */ +@Data +public class BdMaterial { + /** + * 目标组织:TOrgId + */ + @JsonProperty("TOrgIds") + private String TOrgIds; + /** + *创建组织:FCreateOrgId (必填项) + */ + // @JsonProperty("FCreateOrgId") + // private String FCreateOrgId; + /** + *使用组织:FUseOrgId (必填项) + */ + // @JsonProperty("FUseOrgId") + // private String FUseOrgId; + /** + *名称:FName (必填项) + */ + @JsonProperty("FName") + private String FName; + /** + *物料分组:FMaterialGroup (必填项) + */ + @JsonProperty("FMaterialGroup") + private String FMaterialGroup; + + /** + *车辆类型:F_PAEZ_Base (必填项) + */ + @JsonProperty("F_PAEZ_Base") + private String F_PAEZ_Base; + /** + *存货类别:FCategoryID (必填项) + */ + /* @NotBlank(message = "存货类别:FCategoryID ") + @JsonProperty("FCategoryID") + private String FCategoryID="CHLB01_SYS";*/ + private final static BdMaterial bdMaterial = new BdMaterial(); + static { + /** + *物料分组:FMaterialGroup (必填项) + */ + // bdMaterial.setFMaterialGroup("01"); + /** + *名称:FName (必填项) + */ + // bdMaterial.setFName("物料名称1911"); + /** + *使用组织:FUseOrgId (必填项) + */ + // bdMaterial.setFUseOrgId("100"); + /** + *创建组织:FCreateOrgId (必填项) + */ + // bdMaterial.setFCreateOrgId("100"); + /** + * 目标组织:TOrgId + */ + // bdMaterial.setTOrgIds("101"); + /** + * 车辆类型:F_PAEZ_Base (必填项) + */ + bdMaterial.setF_PAEZ_Base("02"); + } + public static BdMaterial createBdMaterial() { + return bdMaterial; + } + +} From 9e43e1e876d8f6c2488a318bb5959d431ab2bfb8 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Sat, 8 Oct 2022 11:48:49 +0800 Subject: [PATCH 14/14] =?UTF-8?q?pc=E7=AB=AF=E4=BB=98=E6=AC=BE=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E7=9A=84=E8=BD=A6=E8=BE=86=E9=80=89=E6=8B=A9=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basevehicle/BaseVehicleFeign.java | 4 +++ .../basevehicle/BaseVehicleFeignFallback.java | 5 ++++ .../api/basevehicle/PayBaseVehicleQuery.java | 27 ++++++++++++++++++ .../api/basevehicle/PayBaseVehicleVo.java | 28 +++++++++++++++++++ .../biz/basevehicle/BaseVehicleMapper.java | 2 ++ .../biz/basevehicle/BaseVehicleMapper.xml | 7 +++++ .../base/biz/basevehicle/BaseVehicleRest.java | 7 +++++ .../biz/basevehicle/BaseVehicleService.java | 23 +++++++++++++++ 8 files changed, 103 insertions(+) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleQuery.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleVo.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index 694e3efcaa..b0452673db 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java @@ -317,6 +317,10 @@ public interface BaseVehicleFeign { @PostMapping("/selectCostVehicleList") ResultBean> selectCostVehicleList(@RequestBody PagerQuery pagerQuery); + @ApiOperation("付款申请选择车辆分页列表") + @PostMapping("/selectPayVehicleList") + ResultBean> selectPayVehicleList(@RequestBody PagerQuery pagerQuery); + @ApiOperation("入库根据车架号更改车辆台账数据") @PostMapping("/updateVehicleEnterlibraryByVin") ResultBean updateVehicleEnterlibraryByVin(@RequestBody VehicleEnterlibrary vehicleEnterlibrary); diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java index f5ec3ad9e9..88a246625d 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java @@ -218,6 +218,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { return null; } + @Override + public ResultBean> selectPayVehicleList(PagerQuery pagerQuery) { + return null; + } + @Override public ResultBean updateVehicleEnterlibraryByVin(VehicleEnterlibrary vehicleEnterlibrary) { return null; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleQuery.java new file mode 100644 index 0000000000..3af05e9e4b --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleQuery.java @@ -0,0 +1,27 @@ +package com.yxt.anrui.base.api.basevehicle; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/10/8 11:21 + * @Description + */ +@Data +public class PayBaseVehicleQuery implements Query { + private static final long serialVersionUID = 8939482367294270164L; + + @ApiModelProperty(value = "已选择的车辆的sid") + private List sidList = new ArrayList<>(); + + @ApiModelProperty(value = "车架号") + private String vinNo; + + @ApiModelProperty(value = "用户sid") + private String userSid; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleVo.java new file mode 100644 index 0000000000..e38e522573 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleVo.java @@ -0,0 +1,28 @@ +package com.yxt.anrui.base.api.basevehicle; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/10/8 11:16 + * @Description + */ +@Data +public class PayBaseVehicleVo implements Vo { + private static final long serialVersionUID = 8935506131970564858L; + + @ApiModelProperty("车型名称") + private String modelName; + @ApiModelProperty("车型sid") + private String modelSid; + @ApiModelProperty("配置sid") + private String configSid; + @ApiModelProperty("车辆sid") + private String vehSid; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("厂家结算价") + private String costPrice; +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java index 87c4688d5d..b446255665 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java @@ -464,4 +464,6 @@ public interface BaseVehicleMapper extends BaseMapper { @Update("update base_vehicle set remarks = #{remarks} where sid = #{sid}") void updateVehRemarks(@Param("remarks") String remarks,@Param("sid") String sid); + + IPage selectPayVehicleList(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index ab5349f37c..99a94b21b5 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -1182,4 +1182,11 @@ ${ew.sqlSegment} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index cf5a313b68..ad04b87624 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java @@ -636,6 +636,13 @@ public class BaseVehicleRest implements BaseVehicleFeign { return rb.success().setData(pv); } + @Override + public ResultBean> selectPayVehicleList(PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = baseVehicleService.selectPayVehicleList(pagerQuery); + return rb.success().setData(pv); + } + @Override public ResultBean updateVehicleEnterlibraryByVin(VehicleEnterlibrary vehicleEnterlibrary) { return baseVehicleService.updateVehicleEnterlibraryByVin(vehicleEnterlibrary); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index f02b3766d3..d53fbc8303 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -2647,4 +2647,27 @@ public class BaseVehicleService extends MybatisBaseService selectPayVehicleList(PagerQuery pagerQuery) { + IPage page = PagerUtil.queryToPage(pagerQuery); + PayBaseVehicleQuery query = pagerQuery.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + //本分公司、非删除、库存状态为非在途非调入。 + if (query != null) { + if (StringUtils.isNotBlank(query.getUserSid())) { + ResultBean resultBean = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid()); + qw.eq("bv.useOrgSid", resultBean.getData()); + } + if (query.getSidList().size() > 0) { + qw.notIn("bv.vinNo", query.getSidList()); + } + if (StringUtils.isNotBlank(query.getVinNo())) { + qw.like("bv.vinNo", query.getVinNo()); + } + qw.and(wrapper -> wrapper.ne("bv.vehicleState", VehicleState.StockEnum.ING_STOCK.getCode()).or().ne("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode())); + } + IPage pagging = baseMapper.selectPayVehicleList(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } } \ No newline at end of file