Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/ScmFinanceAdjustApplyFeign.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.scm.api.scmfinanceadjustapply;
 
+import com.yxt.anrui.scm.api.scmfinanceadjustapply.app.AppDetailsVo;
 import com.yxt.anrui.scm.api.scmfinanceadjustapply.flow.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -54,8 +55,8 @@ import java.util.List;
  */
 @Api(tags = "金融贴息差异调整申请")
 @FeignClient(
-        contextId = "scm-ScmFinanceAdjustApply",
-        name = "scm",
+        contextId = "anrui-scm-ScmFinanceAdjustApply",
+        name = "anrui-scm",
         path = "v1/scmfinanceadjustapply",
         fallback = ScmFinanceAdjustApplyFeignFallback.class)
 public interface ScmFinanceAdjustApplyFeign {
@@ -135,4 +136,20 @@ public interface ScmFinanceAdjustApplyFeign {
     @ApiOperation(value = "加签")
     @PostMapping(value = "/delegate")
     public ResultBean delegate(@RequestBody AdjustDelegateQuery distributorDelegateQuery);
+
+    @ApiOperation(value = "转办")
+    @PutMapping(value = "/assignTask")
+    @ResponseBody
+    public ResultBean assignTask(@RequestBody AdjustDelegateQuery query);
+
+
+
+    //----------------------------- app ----------------------------------
+
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/getAppDetails/{sid}")
+    @ResponseBody
+    public ResultBean<AppDetailsVo> getAppDetails(@PathVariable("sid") String sid);
+
+
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/ScmFinanceAdjustApplyFeignFallback.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.scm.api.scmfinanceadjustapply;
 
+import com.yxt.anrui.scm.api.scmfinanceadjustapply.app.AppDetailsVo;
 import com.yxt.anrui.scm.api.scmfinanceadjustapply.flow.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -131,4 +132,14 @@ public class ScmFinanceAdjustApplyFeignFallback implements ScmFinanceAdjustApply
 	public ResultBean delegate(AdjustDelegateQuery distributorDelegateQuery) {
 		return null;
 	}
+
+	@Override
+	public ResultBean assignTask(AdjustDelegateQuery query) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<AppDetailsVo> getAppDetails(String sid) {
+		return null;
+	}
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/app/AppDetailsVo.java

@@ -0,0 +1,78 @@
+package com.yxt.anrui.scm.api.scmfinanceadjustapply.app;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AppDetailsVo {
+
+    private String sid;
+    /**
+     * 调整方式
+     */
+    private String adjustWay;
+    /**
+     * 申请编号
+     */
+    private String billNo;
+    /**
+     * 申请人姓名
+     */
+    private String createByName;
+    /**
+     * 申请日期
+     */
+    private String createTime;
+    /**
+     * 附件
+     */
+    private List<String> files;
+    /**
+     * 明细列表
+     */
+    private List<AppListVo> list;
+    private String procInsId;
+    /**
+     * 分公司-部门
+     */
+    private String publishInfo;
+    /**
+     * 备注
+     */
+    private String remarks;
+    /**
+     * 销售经理
+     */
+    private String salesManage;
+    /**
+     * 销售专员
+     */
+    private String staffName;
+    private String taskId;
+    /**
+     * 差额
+     */
+    private String adjustmentMoneyTotal;
+    /**
+     * 已调整金额
+     */
+    private String alreadyMoneyTotal;
+    /**
+     * 订单贴息金额
+     */
+    private String estimateRebateTotal;
+    /**
+     * 本次调整金额
+     */
+    private String nowAdjustmentMoneyTotal;
+    /**
+     * 当前差额
+     */
+    private String nowDiffAmountTotal;
+    /**
+     * 上传贴息金额
+     */
+    private String uploadMoneyTotal;
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/app/AppListVo.java

@@ -0,0 +1,64 @@
+package com.yxt.anrui.scm.api.scmfinanceadjustapply.app;
+
+import lombok.Data;
+
+@Data
+public class AppListVo {
+
+
+    /**
+     * 差额
+     */
+    private String adjustmentMoney;
+    /**
+     * 已调整金额
+     */
+    private String alreadyMoney;
+    /**
+     * 品牌
+     */
+    private String brandName;
+    /**
+     * 合同号
+     */
+    private String contractNo;
+    /**
+     * 客户
+     */
+    private String customerName;
+    /**
+     * 订单贴息金额
+     */
+    private String estimateRebate;
+    /**
+     * 本次调整金额
+     */
+    private String nowAdjustmentMoney;
+    /**
+     * 当前差额
+     */
+    private String nowDiffAmount;
+
+    /**
+     * 采购系统名称
+     */
+    private String purchaseSystemName;
+    /**
+     * 调整说明
+     */
+    private String remarks;
+    /**
+     * 上传贴息金额
+     */
+    private String uploadMoney;
+    /**
+     * 车型
+     */
+    private String vehModelName;
+    /**
+     * 车架号
+     */
+    private String vinNo;
+
+    private String salesOrderSid;
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustdetails/ScmFinanceAdjustDetailsFeign.java

@@ -25,16 +25,14 @@
  *********************************************************/
 package com.yxt.anrui.scm.api.scmfinanceadjustdetails;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * Project: scm(金融贴息) <br/>
  * File: ScmFinanceAdjustDetailsFeign.java <br/>
@@ -50,8 +48,8 @@ import java.util.List;
  */
 @Api(tags = "金融贴息差异金额调整明细表")
 @FeignClient(
-        contextId = "scm-ScmFinanceAdjustDetails",
-        name = "scm",
+        contextId = "anrui-scm-ScmFinanceAdjustDetails",
+        name = "anrui-scm",
         path = "v1/scmfinanceadjustdetails",
         fallback = ScmFinanceAdjustDetailsFeignFallback.class)
 public interface ScmFinanceAdjustDetailsFeign {

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyRest.java

@@ -29,6 +29,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.scm.api.scmfinanceadjustapply.*;
+import com.yxt.anrui.scm.api.scmfinanceadjustapply.app.AppDetailsVo;
 import com.yxt.anrui.scm.api.scmfinanceadjustapply.flow.*;
 import com.yxt.anrui.scm.biz.scmfile.ScmFileService;
 import com.yxt.anrui.scm.biz.scmfinanceadjustdetails.ScmFinanceAdjustDetailsService;
@@ -187,4 +188,14 @@ public class ScmFinanceAdjustApplyRest implements ScmFinanceAdjustApplyFeign {
 	public ResultBean delegate(AdjustDelegateQuery delegateQuery) {
 		return scmFinanceAdjustApplyService.delegate(delegateQuery);
 	}
+
+	@Override
+	public ResultBean assignTask(AdjustDelegateQuery query) {
+		return scmFinanceAdjustApplyService.assignTask(query);
+	}
+
+	@Override
+	public ResultBean<AppDetailsVo> getAppDetails(String sid) {
+		return scmFinanceAdjustApplyService.getAppDetails(sid);
+	}
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyService.java

@@ -68,6 +68,8 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.scm.api.scmfile.ScmFileDto;
 import com.yxt.anrui.scm.api.scmfile.ScmFileVo;
 import com.yxt.anrui.scm.api.scmfinanceadjustapply.*;
+import com.yxt.anrui.scm.api.scmfinanceadjustapply.app.AppDetailsVo;
+import com.yxt.anrui.scm.api.scmfinanceadjustapply.app.AppListVo;
 import com.yxt.anrui.scm.api.scmfinanceadjustapply.flow.*;
 import com.yxt.anrui.scm.api.scmfinanceadjustdetails.ScmFinanceAdjustDetails;
 import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebate;
@@ -1120,4 +1122,78 @@ public class ScmFinanceAdjustApplyService extends MybatisBaseService<ScmFinanceA
     }
 
 
+    public ResultBean<AppDetailsVo> getAppDetails(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        AppDetailsVo vo = new AppDetailsVo();
+        ScmFinanceAdjustApply apply = fetchBySid(sid);
+        BigDecimal t = BigDecimal.ZERO;//订单贴息金额合计
+        BigDecimal s = BigDecimal.ZERO;//上传贴息金额合计
+        BigDecimal c = BigDecimal.ZERO;//差额合计
+        BigDecimal y = BigDecimal.ZERO;//已调整金额合计
+        BigDecimal d = BigDecimal.ZERO;//当前差额合计
+        BigDecimal b = BigDecimal.ZERO;//本次调整金额合计
+        if (null != apply) {
+            BeanUtil.copyProperties(apply, vo);
+            vo.setCreateTime(DateUtil.formatDate(apply.getCreateTime()));
+            vo.setPublishInfo(apply.getUseOrgName() + "-" + apply.getDeptName());
+            if (StringUtils.isNotBlank(apply.getProcInstId())) {
+                vo.setProcInsId(apply.getProcInstId());
+            }
+            List<ScmFileVo> scmFileVos = scmFileService.fetchByMainSid(sid);
+            if (!scmFileVos.isEmpty() && scmFileVos.size() > 0) {
+                List<String> files = new ArrayList<>();
+                for (ScmFileVo scmFileVo : scmFileVos) {
+                    String filePath = scmFileVo.getFilePath();
+                    String urlPrefix = fileUploadComponent.getUrlPrefix();
+                    filePath = urlPrefix + filePath;
+                    files.add(filePath);
+                }
+                vo.setFiles(files);
+            }
+            List<ScmFinanceAdjustDetails> details = scmFinanceAdjustDetailsService.selByMainSid(sid);
+            if (!details.isEmpty() && details.size() > 0) {
+                List<AppListVo> list = new ArrayList<>();
+                for (ScmFinanceAdjustDetails detail : details) {
+                    AppListVo detailsListVo = new AppListVo();
+                    BeanUtil.copyProperties(detail, detailsListVo);
+                    list.add(detailsListVo);
+                    if (null != detail.getEstimateRebate()) {
+                        t = t.add(detail.getEstimateRebate());
+                    }
+                    if (null != detail.getUploadMoney()) {
+                        s = s.add(detail.getUploadMoney());
+                    }
+                    if (null != detail.getAdjustmentMoney()) {
+                        c = c.add(detail.getAdjustmentMoney());
+                    }
+                    if (null != detail.getAlreadyMoney()) {
+                        y = y.add(detail.getAlreadyMoney());
+                    }
+                    if (null != detail.getNowDiffAmount()) {
+                        d = d.add(detail.getNowDiffAmount());
+                    }
+                    if (null != detail.getNowAdjustmentMoney()) {
+                        b = b.add(detail.getNowAdjustmentMoney());
+                    }
+                }
+                vo.setList(list);
+            }
+            vo.setEstimateRebateTotal(t.toString());
+            vo.setUploadMoneyTotal(s.toString());
+            vo.setAdjustmentMoneyTotal(c.toString());
+            vo.setAlreadyMoneyTotal(y.toString());
+            vo.setNowDiffAmountTotal(d.toString());
+            vo.setNowAdjustmentMoneyTotal(b.toString());
+        }
+        return rb.success().setData(vo);
+    }
+
+    public ResultBean assignTask(AdjustDelegateQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        FlowDelegateQuery delegateQuery = new
+                FlowDelegateQuery();
+        BeanUtil.copyProperties(query, delegateQuery);
+        flowFeign.assignTask(delegateQuery);
+        return rb.success();
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java

@@ -9,6 +9,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Author dimengzhe
@@ -53,6 +54,11 @@ public interface CommonFeign {
     @GetMapping("/getOrder")
     ResultBean<CarModelVo> getOrder(@RequestParam("saleOrderSid") String saleOrderSid);
 
+    @ApiOperation(value = "销售订单页面")
+    @ResponseBody
+    @GetMapping("/getOrderListByOrderSids")
+    ResultBean<Map<String,CarModelVo>> getOrderListByOrderSids(@RequestBody List<String> orderSids);
+
     @ApiOperation(value = "金融方案详情页面")
     @ResponseBody
     @GetMapping("/getLoanSolution")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/AdjustApplyDetailsVo.java

@@ -0,0 +1,82 @@
+package com.yxt.anrui.terminal.api.supplychain.financeadjustapply;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/11/13 15:38
+ */
+@Data
+public class AdjustApplyDetailsVo implements Vo {
+    private String sid;
+    /**
+     * 调整方式
+     */
+    private String adjustWay;
+    /**
+     * 申请编号
+     */
+    private String billNo;
+    /**
+     * 申请人姓名
+     */
+    private String createByName;
+    /**
+     * 申请日期
+     */
+    private String createTime;
+    /**
+     * 附件
+     */
+    private List<String> files;
+    /**
+     * 明细列表
+     */
+    private List<AdjustApplyRecordVo> list;
+    private String procInsId;
+    /**
+     * 分公司-部门
+     */
+    private String publishInfo;
+    /**
+     * 备注
+     */
+    private String remarks;
+    /**
+     * 销售经理
+     */
+    private String salesManage;
+    /**
+     * 销售专员
+     */
+    private String staffName;
+    private String taskId;
+    /**
+     * 差额
+     */
+    private String adjustmentMoneyTotal;
+    /**
+     * 已调整金额
+     */
+    private String alreadyMoneyTotal;
+    /**
+     * 订单贴息金额
+     */
+    private String estimateRebateTotal;
+    /**
+     * 本次调整金额
+     */
+    private String nowAdjustmentMoneyTotal;
+    /**
+     * 当前差额
+     */
+    private String nowDiffAmountTotal;
+    /**
+     * 上传贴息金额
+     */
+    private String uploadMoneyTotal;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/AdjustApplyFeign.java

@@ -0,0 +1,72 @@
+package com.yxt.anrui.terminal.api.supplychain.financeadjustapply;
+
+
+import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.AppAdjustApplyDelegateQuery;
+import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.AppAdjustApplyTaskQuery;
+import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.CompleteAdjustApplyDto;
+import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.AdjustApplyFlowableQuery;
+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.*;
+
+import javax.validation.Valid;
+
+/**
+ * @description:
+ * @author: fzz
+ * @date: 2023/8/8
+ **/
+@Api(tags = "金融贴息差异调整")
+@FeignClient(
+        contextId = "terminal-financeadjustapply",
+        name = "anrui-terminal",
+        path = "/v1/financeadjustapply",
+        fallback = AdjustApplyFeignFallback.class)
+public interface AdjustApplyFeign {
+
+
+    @ApiOperation("详情")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    ResultBean<AdjustApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    //-------------------------流程-----------------------------------------
+
+    @ApiOperation("办理")
+    @PutMapping("/agreeCreditInfo")
+    @ResponseBody
+    ResultBean agreeCreditInfo(@Valid @RequestBody CompleteAdjustApplyDto dto);
+
+    @ApiOperation("驳回")
+    @PutMapping("/rejectCreditInfo")
+    @ResponseBody
+    ResultBean rejectCreditInfo(@Valid @RequestBody AppAdjustApplyTaskQuery query);
+
+    @ApiOperation("撤回")
+    @PutMapping("/recallCreditInfo")
+    @ResponseBody
+    ResultBean recallCreditInfo(@Valid @RequestBody AppAdjustApplyTaskQuery query);
+
+    @ApiOperation("终止")
+    @PutMapping("/stopCreditInfo")
+    @ResponseBody
+    ResultBean stopCreditInfo(@Valid @RequestBody AppAdjustApplyTaskQuery query);
+
+    @ApiOperation("获取流程操作标题")
+    @GetMapping("/getFlowOperateTitle")
+    @ResponseBody
+    ResultBean<String> getFlowOperateTitle(@Valid @SpringQueryMap AdjustApplyFlowableQuery query);
+
+    @ApiOperation(value = "加签")
+    @PutMapping(value = "/delegate")
+    @ResponseBody
+    public ResultBean delegate(@RequestBody AppAdjustApplyDelegateQuery delegateQuery);
+
+    @ApiOperation(value = "转办")
+    @PutMapping(value = "/assignTask")
+    @ResponseBody
+    public ResultBean assignTask(@RequestBody AppAdjustApplyDelegateQuery delegateQuery);
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/AdjustApplyFeignFallback.java

@@ -0,0 +1,57 @@
+package com.yxt.anrui.terminal.api.supplychain.financeadjustapply;
+
+import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.AppAdjustApplyDelegateQuery;
+import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.AppAdjustApplyTaskQuery;
+import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.CompleteAdjustApplyDto;
+import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.AdjustApplyFlowableQuery;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.stereotype.Component;
+
+/**
+ * @description:
+ * @author: fzz
+ * @date:
+ **/
+@Component
+public class AdjustApplyFeignFallback implements AdjustApplyFeign {
+
+    @Override
+    public ResultBean<AdjustApplyDetailsVo> fetchDetailsBySid(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean agreeCreditInfo(CompleteAdjustApplyDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean rejectCreditInfo(AppAdjustApplyTaskQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean recallCreditInfo(AppAdjustApplyTaskQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean stopCreditInfo(AppAdjustApplyTaskQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<String> getFlowOperateTitle(AdjustApplyFlowableQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean delegate(AppAdjustApplyDelegateQuery delegateQuery) {
+        return null;
+    }
+
+    @Override
+    public ResultBean assignTask(AppAdjustApplyDelegateQuery delegateQuery) {
+        return null;
+    }
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/AdjustApplyRecordVo.java

@@ -0,0 +1,72 @@
+package com.yxt.anrui.terminal.api.supplychain.financeadjustapply;
+
+import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.AppLoanHomeVisitVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/11/13 15:45
+ */
+@Data
+public class AdjustApplyRecordVo {
+    /**
+     * 差额
+     */
+    private String adjustmentMoney;
+    /**
+     * 已调整金额
+     */
+    private String alreadyMoney;
+    /**
+     * 品牌
+     */
+    private String brandName;
+    /**
+     * 合同号
+     */
+    private String contractNo;
+    /**
+     * 客户
+     */
+    private String customerName;
+    /**
+     * 订单贴息金额
+     */
+    private String estimateRebate;
+    /**
+     * 本次调整金额
+     */
+    private String nowAdjustmentMoney;
+    /**
+     * 当前差额
+     */
+    private String nowDiffAmount;
+
+    /**
+     * 采购系统名称
+     */
+    private String purchaseSystemName;
+    /**
+     * 调整说明
+     */
+    private String remarks;
+    /**
+     * 上传贴息金额
+     */
+    private String uploadMoney;
+    /**
+     * 车型
+     */
+    private String vehModelName;
+    /**
+     * 车架号
+     */
+    private String vinNo;
+
+    private String salesOrderSid;
+
+    @ApiModelProperty("销售订单页面")
+    private AppLoanHomeVisitVo orderPage;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/flow/AdjustApplyFlowableQuery.java

@@ -0,0 +1,21 @@
+package com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class AdjustApplyFlowableQuery implements Query {
+    private static final long serialVersionUID = -5879668616710833830L;
+
+    @ApiModelProperty(value = "节点key")
+    private String taskDefKey;
+    @ApiModelProperty(value = "业务sid")
+    private String businessSid;
+    @ApiModelProperty(value = "0 上一环节  1下一环节")
+    @NotNull(message = "参数错误：next")
+    private Integer next;
+
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/flow/AppAdjustApplyDelegateQuery.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/9/28 10:16
+ */
+@Data
+public class AppAdjustApplyDelegateQuery {
+    @ApiModelProperty
+    private String userSid;
+    @ApiModelProperty("流程实例id")
+    @JsonProperty("procInsId")
+    private String instanceId;
+    @ApiModelProperty("任务Id")
+    private String taskId;
+    @ApiModelProperty("审批人sid")
+    private String assignee;
+    @ApiModelProperty("填写意见")
+    private String views;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/flow/AppAdjustApplyTaskQuery.java

@@ -0,0 +1,46 @@
+package com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow;
+
+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 Administrator
+ * @description
+ * @date 2023/10/17 9:14
+ */
+@Data
+public class AppAdjustApplyTaskQuery implements Query {
+    /**
+     * 终止、驳回、撤回
+     */
+    @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;
+
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/flow/CompleteAdjustApplyDto.java

@@ -0,0 +1,35 @@
+package com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow;
+
+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 Administrator
+ * @description
+ * @date 2023/10/17 9:13
+ */
+@Data
+public class CompleteAdjustApplyDto implements Dto {
+    @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;
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java

@@ -10,6 +10,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Author dimengzhe
@@ -54,6 +55,11 @@ public class CommonRest implements CommonFeign {
         return commonService.getOrder(saleOrderSid);
     }
 
+    @Override
+    public ResultBean<Map<String, CarModelVo>> getOrderListByOrderSids(List<String> orderSids) {
+        return commonService.getOrderListByOrderSids(orderSids);
+    }
+
     @Override
     public ResultBean<CarModelVo> getLoanSolution(String orderSid) {
         return commonService.getLoanSolution(orderSid);

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java

@@ -118,6 +118,36 @@ public class CommonService {
         return rb.success().setData(carModelVo);
     }
 
+    public ResultBean<Map<String, CarModelVo>> getOrderListByOrderSids(List<String> orderSids) {
+        ResultBean<Map<String, CarModelVo>> rb = ResultBean.fireFail();
+        String appSid = "e25e13b5-f2ed-421f-bdb3-6f2eca2a3028";
+        String moduleAction = "com.anrui.android.plugin.autoservice.activity.DetailSaleOrderActivity";
+        ResultBean<AppSubVersionVo> voResultBean = appSubsetVersionFeign.getLastRiskByAppSid(appSid, moduleAction);
+        AppSubVersionVo appSubVersionVo = voResultBean.getData();
+        Map<String, CarModelVo> modelMap = new HashMap<>();
+        for (String saleOrderSid : orderSids) {
+            CarModelVo carModelVo = new CarModelVo();
+            Map<String, Object> map = new HashMap<>();
+            map.put("saleOrderSid", saleOrderSid);
+            appSubVersionVo.setJson(JSONObject.toJSONString(map));
+            BeanUtil.copyProperties(appSubVersionVo, carModelVo);
+            carModelVo.setRequestCode("1002");
+//        carModelVo.setPluginName("autoservice");
+            carModelVo.setARouterClass("com.anrui.android.plugin.autoservice.manager.ARouterManager");
+            carModelVo.setARouterMethod("DETAIL_SALE_ORDER");
+            List<String> aRouterParamType = new ArrayList<>();
+            aRouterParamType.add("STRING");
+            List<String> aRouterParamValue = new ArrayList<>();
+            aRouterParamValue.add(saleOrderSid);
+            carModelVo.setARouterParamType(aRouterParamType);
+            carModelVo.setARouterParamValue(aRouterParamValue);
+            carModelVo.setBtnName("销售订单");
+            modelMap.put(saleOrderSid,carModelVo);
+        }
+        return rb.success().setData(modelMap);
+    }
+
+
     public ResultBean<CarModelVo> getLoanSolution(String orderSid) {
         ResultBean<CarModelVo> rb = ResultBean.fireFail();
         String appSid = "e25e13b5-f2ed-421f-bdb3-6f2eca2a3028";
@@ -301,4 +331,6 @@ public class CommonService {
         carModelVo.setARouterParamValue(aRouterParamValue);
         return rb.success().setData(carModelVo);
     }
+
+
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/financeadjustapply/AdjustApplyRest.java

@@ -0,0 +1,67 @@
+package com.yxt.anrui.terminal.biz.supplychain.financeadjustapply;
+
+
+import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.AdjustApplyDetailsVo;
+import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.AdjustApplyFeign;
+import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.AdjustApplyFlowableQuery;
+import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.AppAdjustApplyDelegateQuery;
+import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.AppAdjustApplyTaskQuery;
+import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.CompleteAdjustApplyDto;
+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;
+
+/**
+ * @description:
+ * @author: fzz
+ * @date:
+ **/
+@Controller
+@RequestMapping("/v1/financeadjustapply")
+public class AdjustApplyRest implements AdjustApplyFeign {
+
+    @Autowired
+    private AdjustApplyService adjustApplyService;
+
+
+    @Override
+    public ResultBean<AdjustApplyDetailsVo> fetchDetailsBySid(String sid) {
+        return adjustApplyService.detail(sid);
+    }
+
+    @Override
+    public ResultBean agreeCreditInfo(CompleteAdjustApplyDto dto) {
+        return adjustApplyService.agreeCreditInfo(dto);
+    }
+
+    @Override
+    public ResultBean rejectCreditInfo(AppAdjustApplyTaskQuery query) {
+        return adjustApplyService.rejectCreditInfo(query);
+    }
+
+    @Override
+    public ResultBean recallCreditInfo(AppAdjustApplyTaskQuery query) {
+        return adjustApplyService.recallCreditInfo(query);
+    }
+
+    @Override
+    public ResultBean stopCreditInfo(AppAdjustApplyTaskQuery query) {
+        return adjustApplyService.stopCreditInfo(query);
+    }
+
+    @Override
+    public ResultBean<String> getFlowOperateTitle(AdjustApplyFlowableQuery query) {
+        return adjustApplyService.getFlowOperateTitle(query);
+    }
+
+    @Override
+    public ResultBean delegate(AppAdjustApplyDelegateQuery delegateQuery) {
+        return adjustApplyService.delegate(delegateQuery);
+    }
+
+    @Override
+    public ResultBean assignTask(AppAdjustApplyDelegateQuery delegateQuery) {
+        return adjustApplyService.assignTask(delegateQuery);
+    }
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/financeadjustapply/AdjustApplyService.java

@@ -0,0 +1,178 @@
+package com.yxt.anrui.terminal.biz.supplychain.financeadjustapply;
+
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.scm.api.scmfinanceadjustapply.ScmFinanceAdjustApplyFeign;
+import com.yxt.anrui.scm.api.scmfinanceadjustapply.app.AppDetailsVo;
+import com.yxt.anrui.scm.api.scmfinanceadjustapply.flow.*;
+import com.yxt.anrui.terminal.api.base.common.CarModelVo;
+import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.AppLoanHomeVisitVo;
+import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.AdjustApplyDetailsVo;
+import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.AdjustApplyRecordVo;
+import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.AdjustApplyFlowableQuery;
+import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.AppAdjustApplyDelegateQuery;
+import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.AppAdjustApplyTaskQuery;
+import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.CompleteAdjustApplyDto;
+import com.yxt.anrui.terminal.biz.base.common.CommonService;
+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;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @description:
+ * @author: fzz
+ * @date:
+ **/
+@Service
+public class AdjustApplyService {
+
+    @Autowired
+    private SysUserFeign sysUserFeign;
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private ScmFinanceAdjustApplyFeign scmFinanceAdjustApplyFeign;
+    @Autowired
+    private CommonService commonService;
+    public ResultBean<AdjustApplyDetailsVo> detail(String sid) {
+        ResultBean<AdjustApplyDetailsVo> rb = ResultBean.fireFail();
+        AdjustApplyDetailsVo vo = new AdjustApplyDetailsVo();
+        AppDetailsVo data = scmFinanceAdjustApplyFeign.getAppDetails(sid).getData();
+        if (null != data) {
+            BeanUtil.copyProperties(data, vo);
+            List<AdjustApplyRecordVo> list = vo.getList();
+            if (!list.isEmpty() && list.size() > 0) {
+                List<String> orderSids = list.stream().map(AdjustApplyRecordVo::getSalesOrderSid).collect(Collectors.toList());
+                Map<String, CarModelVo> voMap = commonService.getOrderListByOrderSids(orderSids).getData();
+                if (!voMap.isEmpty()) {
+                    for (AdjustApplyRecordVo recordVo : list) {
+                        CarModelVo carModelVo = voMap.get(recordVo.getSalesOrderSid());
+                        AppLoanHomeVisitVo appOrderVo = new AppLoanHomeVisitVo();
+                        BeanUtil.copyProperties(carModelVo,appOrderVo);
+                        recordVo.setOrderPage(appOrderVo);
+                    }
+                }
+            }
+        }
+        return rb.success().setData(vo);
+    }
+
+
+    public ResultBean agreeCreditInfo(CompleteAdjustApplyDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        //根据用户sid获取staffSid
+        ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
+        if (!userVoResultBean.getSuccess()) {
+            return rb.setMsg(userVoResultBean.getMsg());
+        }
+        //根据staffSid获取用户的组织全路径
+        ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
+        if (!staffOrgResultBean.getSuccess()) {
+            return rb.setMsg(staffOrgResultBean.getMsg());
+        }
+        //用户的组织全路径
+        String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
+        AdjustCompleteDto completeDto = new
+                AdjustCompleteDto();
+        BeanUtil.copyProperties(dto, completeDto);
+        completeDto.setOrgSidPath(orgSidPath);
+        ResultBean resultBean = scmFinanceAdjustApplyFeign.complete(completeDto);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setData(resultBean.getData());
+    }
+
+    public ResultBean rejectCreditInfo(AppAdjustApplyTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        AdjustTaskQuery taskQuery = new
+                AdjustTaskQuery();
+        BeanUtil.copyProperties(query, taskQuery);
+        ResultBean resultBean = scmFinanceAdjustApplyFeign.taskReject(taskQuery);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setData(resultBean.getData());
+    }
+
+    public ResultBean recallCreditInfo(AppAdjustApplyTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        AdjustTaskQuery taskQuery = new
+                AdjustTaskQuery();
+        BeanUtil.copyProperties(query, taskQuery);
+        ResultBean resultBean = scmFinanceAdjustApplyFeign.revokeProcess(taskQuery);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setData(resultBean.getData());
+    }
+
+    public ResultBean stopCreditInfo(AppAdjustApplyTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        AdjustTaskQuery taskQuery = new
+                AdjustTaskQuery();
+        BeanUtil.copyProperties(query, taskQuery);
+        ResultBean resultBean = scmFinanceAdjustApplyFeign.breakProcess(taskQuery);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setData(resultBean.getData());
+    }
+
+    public ResultBean<String> getFlowOperateTitle(AdjustApplyFlowableQuery query) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        //0 上一环节  1下一环节
+        int next = query.getNext();
+        AdjustGetNodeQuery getNodeQuery = new
+                AdjustGetNodeQuery();
+        BeanUtil.copyProperties(query, getNodeQuery);
+        String data = "";
+        if (next == 0) {
+            ResultBean<List<AdjustGetNodeVo>> getPreviousNodesForReject = scmFinanceAdjustApplyFeign.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<List<AdjustGetNodeVo>> getNextNodesForSubmit = scmFinanceAdjustApplyFeign.getNextNodesForSubmit(getNodeQuery);
+            if (getNextNodesForSubmit.getSuccess()) {
+                getNextNodesForSubmit.getData().removeAll(Collections.singleton(null));
+                data = getNextNodesForSubmit.getData().get(0).getName();
+            } else {
+                return rb.setMsg(getNextNodesForSubmit.getMsg());
+            }
+        } else {
+            return rb.setMsg("参数错误：next");
+        }
+        return rb.success().setData(data);
+    }
+
+    public ResultBean delegate(AppAdjustApplyDelegateQuery delegateQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        AdjustDelegateQuery delegateQuery1 = new
+                AdjustDelegateQuery();
+        BeanUtil.copyProperties(delegateQuery, delegateQuery1);
+        ResultBean delegate = scmFinanceAdjustApplyFeign.delegate(delegateQuery1);
+        return rb.success();
+    }
+
+    public ResultBean assignTask(AppAdjustApplyDelegateQuery delegateQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        AdjustDelegateQuery delegateQuery1 = new
+                AdjustDelegateQuery();
+        BeanUtil.copyProperties(delegateQuery, delegateQuery1);
+        ResultBean delegate = scmFinanceAdjustApplyFeign.assignTask(delegateQuery1);
+        return rb.success();
+    }
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java

@@ -180,6 +180,24 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
         return vo;
     }
 
+
+    public ResultBean delAll(String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        //查询该sid中是否有流程不是待提交的
+        int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
+        if (count > 0) {
+            return rb.setMsg("删除的数据中包含已提交或已办结审批的数据，删除失败");
+        }
+        delBySids(sids);
+        return rb.success();
+    }
+
+    /**
+     * 提交
+     *
+     * @param dto
+     * @return
+     */
     public ResultBean submit(SubmitOaMendApplyDto dto) {
         ResultBean rb = ResultBean.fireFail();
         ResultBean<String> stringResultBean = saveOrUpdateDto(dto);
@@ -206,17 +224,6 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
         return oaFormService.submit(submitDto);
     }
 
-    public ResultBean delAll(String[] sids) {
-        ResultBean rb = ResultBean.fireFail();
-        //查询该sid中是否有流程不是待提交的
-        int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
-        if (count > 0) {
-            return rb.setMsg("删除的数据中包含已提交或已办结审批的数据，删除失败");
-        }
-        delBySids(sids);
-        return rb.success();
-    }
-
     /**
      * 办理（同意）
      *
@@ -255,7 +262,12 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
         return oaFormService.reject(dto);
     }
 
-    public ResultBean<List<NodeVo>> getPreviousNodesForReject(NodeQuery query) {
+     /**
+     * 提交时获取下一环节
+     * @param query
+     * @return
+     */
+    public ResultBean<List<NodeVo>> getNextNodesForSubmit(NodeQuery query) {
         Map<String, Object> formVariables = query.getFormVariables();
         //添加网关
 //        formVariables.put("", "");
@@ -264,10 +276,15 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
         appMap.put("sid", query.getBusinessSid());
         formVariables.put("app", appMap);
         query.setFormVariables(formVariables);
-        return oaFormService.getPreviousNodesForReject(query);
+        return oaFormService.getNextNodesForSubmit(query);
     }
 
-    public ResultBean<List<NodeVo>> getNextNodesForSubmit(NodeQuery query) {
+    /**
+     * 驳回时获取上一环节
+     * @param query
+     * @return
+     */
+    public ResultBean<List<NodeVo>> getPreviousNodesForReject(NodeQuery query) {
         Map<String, Object> formVariables = query.getFormVariables();
         //添加网关
 //        formVariables.put("", "");
@@ -276,6 +293,11 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
         appMap.put("sid", query.getBusinessSid());
         formVariables.put("app", appMap);
         query.setFormVariables(formVariables);
-        return oaFormService.getNextNodesForSubmit(query);
+        return oaFormService.getPreviousNodesForReject(query);
     }
+
+    /**
+     * 具体申请设置网关参数的统一方法
+     */
+
 }