1

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussolutionschange/BusSolutionsChangeRest.java

@@ -25,7 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.biz.bussolutionschange;
 
-
 import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.buscenter.api.bussolutionschange.*;
 import com.yxt.anrui.buscenter.api.bussolutionschange.app.*;
@@ -47,7 +46,7 @@ import java.util.List;
  * @since 1.0
  */
 @Api(tags = "金融方案变更")
-@RestController("com.yxt.anrui.buscenter.biz.bussolutionschange.BusSolutionsChangeRest")
+@RestController
 @RequestMapping("v1/bussolutionschange")
 public class BusSolutionsChangeRest implements BusSolutionsChangeFeign {
 

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java

@@ -62,9 +62,9 @@ public interface SysOrganizationFeign {
     @GetMapping("/tranTwo/{sid}")
     public ResultBean<List<SysOrganizationVo>> tranTwo(@PathVariable("sid") String sid);
 
-    @ApiOperation("调出一级站-本集团内调入所有一级站，不包含自身")
+    @ApiOperation("调出一级站-调入选择分公司内所有一级站，不包含自身")
-    @GetMapping("/tranThree/{sid}")
+    @GetMapping("/tranThree/{sid}/{deptSid}")
-    public ResultBean<List<SysOrganizationVo>> tranThree(@PathVariable("sid") String sid);
+    public ResultBean<List<SysOrganizationVo>> tranThree(@PathVariable("sid") String sid, @PathVariable("deptSid") String deptSid);
 
     @ApiOperation("调出二级站-调入上级一级站及站下所有二级站，不包含自身")
     @GetMapping("/tranfour/{sid}")

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java

@@ -65,7 +65,7 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign {
     }
 
     @Override
-    public ResultBean<List<SysOrganizationVo>> tranThree(String sid) {
+    public ResultBean<List<SysOrganizationVo>> tranThree(String sid, String deptSid) {
         return null;
     }
 

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java

@@ -135,7 +135,7 @@ public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
 
     List<SysOrganizationVo> tranTwo(String sid);
 
-    List<SysOrganizationVo> tranThree(String sid);
+    List<SysOrganizationVo> tranThree(@Param("sid") String sid,@Param("deptSid") String deptSid);
 
     List<SysOrganizationVo> tranfour(String sid);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml

@@ -291,7 +291,9 @@
         FROM
                 sys_organization
         WHERE orgAttributeKey = 'fwz_001'
-          AND sid != #{sid}
+          AND sid != #{deptSid}
+          AND (psid = #{sid}
+           OR sid = #{sid})
     </select>
 
     <select id="tranfour" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo">

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java

@@ -120,8 +120,8 @@ public class SysOrganizationRest implements SysOrganizationFeign {
     }
 
     @Override
-    public ResultBean<List<SysOrganizationVo>> tranThree(String sid) {
+    public ResultBean<List<SysOrganizationVo>> tranThree(String sid,String deptSid) {
-        return new ResultBean<List<SysOrganizationVo>>().success().setData(sysOrganizationService.tranThree(sid));
+        return new ResultBean<List<SysOrganizationVo>>().success().setData(sysOrganizationService.tranThree(sid,deptSid));
     }
 
     @Override

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java

@@ -728,8 +728,8 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         return baseMapper.tranTwo(sid);
     }
 
-    public List<SysOrganizationVo> tranThree(String sid) {
+    public List<SysOrganizationVo> tranThree(String sid,String deptSid) {
-        return baseMapper.tranThree(sid);
+        return baseMapper.tranThree(sid,deptSid);
     }
 
     public List<SysOrganizationVo> tranfour(String sid) {

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVehDto.java

@@ -108,7 +108,7 @@ public class ScmVehRebateVehDto implements Dto {
     private String calculationModeKey; // 计算方式key
 	@ApiModelProperty("计算方式Value")
     private String calculationModeValue; // 计算方式Value
-    @ApiModelProperty("调整状态(1已调整0未调整)")
+    @ApiModelProperty("调整状态(0未调整1待核对2核对中3已调整)")
     private Integer adjustmentState;
 	@ApiModelProperty("使用组织sid")
     private String useOrgSid; // 使用组织sid

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java

@@ -159,6 +159,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
                 apply(StringUtils.isNotBlank(createEndTime), "date_format (svc.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
                 );
         qw.groupBy("svc.sid");
+        qw.orderByDesc("svc.createTime");
         IPage<ScmVehrebateCheckapply> page = PagerUtil.queryToPage(pq);
         IPage<ScmVehrebateCheckapplyVo> pagging = baseMapper.selectPageVo(page, qw);
         List<ScmVehrebateCheckapplyVo> records = pagging.getRecords();

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busclaiminvoicebill/AppBusclaimInvoiceBillDetailVo.java

@@ -0,0 +1,35 @@
+package com.yxt.anrui.terminal.api.as.busclaiminvoicebill;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@Data
+public class AppBusclaimInvoiceBillDetailVo {
+
+    @ApiModelProperty("索赔单号")
+    private String claimBillNo;
+    @ApiModelProperty("维修工单号")
+    private String repairBillNo;
+    @ApiModelProperty("车牌号")
+    private String vehMark;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("索赔工时费")
+    private String claimHourAmount;
+    @ApiModelProperty("索赔材料费")
+    private String claimGoodsAmount;
+    @ApiModelProperty("外出费")
+    private String claimOutAmount;
+    @ApiModelProperty("厂家补助费")
+    private String claimSubsidyAmount;
+    @ApiModelProperty("施救费")
+    private String claimEffortAmount;
+    @ApiModelProperty("其他费用")
+    private String claimOtherAmount;
+    private String remarks;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busclaiminvoicebill/AppBusclaimInvoiceBillDetailsVo.java

@@ -0,0 +1,39 @@
+package com.yxt.anrui.terminal.api.as.busclaiminvoicebill;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@Data
+public class AppBusclaimInvoiceBillDetailsVo {
+
+    private String sid;
+    private String createByName;
+    @ApiModelProperty("申请部门名称")
+    private String createDeptName;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date createTime;
+    @ApiModelProperty("开票名称")
+    private String invoiceName;
+    @ApiModelProperty("开票类型value")
+    private String invoiceValue;
+    @ApiModelProperty("开票金额")
+    private String invoiceMoney;
+    private List<String> fileList = new ArrayList<>();
+    private String remarks;
+    private List<AppBusclaimInvoiceBillDetailVo> detailList = new ArrayList<>();
+
+    @ApiModelProperty("实例id")
+    private String procInsId;
+    @ApiModelProperty("任务iD")
+    private String taskId;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busclaiminvoicebill/AppBusclaimInvoiceBillFeign.java

@@ -0,0 +1,59 @@
+package com.yxt.anrui.terminal.api.as.busclaiminvoicebill;
+
+import com.yxt.anrui.terminal.api.as.busclaiminvoicebill.flowable.AppDelegateQuery;
+import com.yxt.anrui.terminal.api.as.busclaiminvoicebill.flowable.AppFlowDto;
+import com.yxt.anrui.terminal.api.as.busclaiminvoicebill.flowable.AppFlowQuery;
+import com.yxt.anrui.terminal.api.as.busclaiminvoicebill.flowable.AppFlowTaskQuery;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.*;
+
+@FeignClient(
+        contextId = "terminal-AppBusclaimInvoiceBill",
+        name = "anrui-terminal",
+        path = "v1/busclaimInvoicebill")
+public interface AppBusclaimInvoiceBillFeign {
+
+    @ApiOperation("详情")
+    @GetMapping("/details")
+    public ResultBean<AppBusclaimInvoiceBillDetailsVo> fetchDetailsBySid(@RequestParam("sid") String sid);
+
+    /**********************************************流程********************************************/
+
+    @ApiOperation("办理")
+    @PutMapping("/agreeCreditInfo")
+    @ResponseBody
+    ResultBean agreeCreditInfo(@RequestBody AppFlowDto dto);
+
+    @ApiOperation("驳回")
+    @PutMapping("/rejectCreditInfo")
+    @ResponseBody
+    ResultBean rejectCreditInfo(@RequestBody AppFlowTaskQuery query);
+
+    @ApiOperation("撤回")
+    @PutMapping("/recallCreditInfo")
+    @ResponseBody
+    ResultBean recallCreditInfo(@RequestBody AppFlowTaskQuery query);
+
+    @ApiOperation("终止")
+    @PutMapping("/stopCreditInfo")
+    @ResponseBody
+    ResultBean stopCreditInfo(@RequestBody AppFlowTaskQuery query);
+
+    @ApiOperation("获取流程操作标题")
+    @GetMapping("/getFlowOperateTitle")
+    @ResponseBody
+    ResultBean<String> getFlowOperateTitle(@SpringQueryMap AppFlowQuery query);
+
+    @ApiOperation(value = "加签")
+    @PutMapping(value = "/delegate")
+    @ResponseBody
+    public ResultBean delegate(@RequestBody AppDelegateQuery delegateQuery);
+
+    @ApiOperation(value = "转办")
+    @PutMapping(value = "/assignTask")
+    @ResponseBody
+    public ResultBean assignTask(@RequestBody AppDelegateQuery delegateQuery);
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busclaiminvoicebill/flowable/AppDelegateQuery.java

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

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busclaiminvoicebill/flowable/AppFlowDto.java

@@ -0,0 +1,37 @@
+package com.yxt.anrui.terminal.api.as.busclaiminvoicebill.flowable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/8/9 14:09
+ * @Description
+ */
+@Data
+public class AppFlowDto implements Dto {
+    private static final long serialVersionUID = 3626473483180150495L;
+
+    @ApiModelProperty(value = "任务id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    @ApiModelProperty(value = "流程id")
+    @NotBlank(message = "参数错误：procInsId")
+    @JsonProperty("procInsId")
+    private String instanceId;
+    @ApiModelProperty(value = "意见")
+    private String comment;
+    @ApiModelProperty(value = "业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+    @ApiModelProperty(value = "用户sid")
+    @NotBlank(message = "参数错误：userSid")
+    private String userSid;
+    @ApiModelProperty(value = "节点id")
+    @NotBlank(message = "参数错误：taskDefKey")
+    private String taskDefKey;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busclaiminvoicebill/flowable/AppFlowQuery.java

@@ -0,0 +1,28 @@
+package com.yxt.anrui.terminal.api.as.busclaiminvoicebill.flowable;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/8/9 14:15
+ * @Description
+ */
+@Data
+public class AppFlowQuery implements Query {
+    private static final long serialVersionUID = 5514095179438249641L;
+
+    @ApiModelProperty(value = "节点key")
+    private String taskDefKey;
+    @ApiModelProperty(value = "业务sid")
+    private String businessSid;
+    @ApiModelProperty(value = "0 上一环节  1下一环节")
+    @NotNull(message = "参数错误：next")
+    private Integer next;
+
+    @ApiModelProperty("组织机构全路径")
+    private String orgPath;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busclaiminvoicebill/flowable/AppFlowTaskQuery.java

@@ -0,0 +1,47 @@
+package com.yxt.anrui.terminal.api.as.busclaiminvoicebill.flowable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/8/9 14:11
+ * @Description
+ */
+@Data
+public class AppFlowTaskQuery implements Query {
+    private static final long serialVersionUID = -7082170710942810289L;
+
+    /**
+     * 终止、驳回、撤回
+     */
+    @ApiModelProperty("任务Id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    /**
+     * 终止、驳回、撤回
+     */
+    @ApiModelProperty("业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+    /**
+     * 终止、驳回
+     */
+    @ApiModelProperty("任务意见")
+    private String comment;
+    /**
+     * 终止、撤回、驳回
+     */
+    @ApiModelProperty("用户Sid")
+    private String userSid;
+    /**
+     * 终止
+     */
+    @ApiModelProperty("流程实例Id")
+    @JsonProperty("procInsId")
+    private String instanceId;
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java

@@ -15,7 +15,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
         "com.yxt.anrui.terminal",
         "com.yxt.common.base.config"
 },exclude = {DataSourceAutoConfiguration.class})
-@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.anrui.buscenter","com.yxt.anrui.scm","com.yxt.anrui.fin", "com.yxt.anrui.terminal.fegin.wmsinventorycheckbill","com.yxt.anrui.terminal.fegin.wmsinventoryprofitin","com.yxt.anrui.terminal.fegin.wmsinventoryprofitout","com.yxt.anrui.terminal.fegin.basegoodssku","com.yxt.anrui.terminal.fegin.basesupplierinfo","com.yxt.anrui.terminal.fegin.wmsInventory","com.yxt.anrui.terminal.fegin.asbusrepairbill","com.yxt.anrui.terminal.fegin.pmspurchasebill","com.yxt.anrui.terminal.fegin.pmspurchasebackbill","com.yxt.anrui.terminal.fegin.smspricestrategybill","com.yxt.anrui.terminal.fegin.astechtitleapply","com.yxt.anrui.terminal.fegin.asserviceaccommapply"})
+@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.anrui.buscenter","com.yxt.anrui.scm","com.yxt.anrui.fin", "com.yxt.anrui.terminal.fegin.wmsinventorycheckbill","com.yxt.anrui.terminal.fegin.wmsinventoryprofitin","com.yxt.anrui.terminal.fegin.wmsinventoryprofitout","com.yxt.anrui.terminal.fegin.basegoodssku","com.yxt.anrui.terminal.fegin.basesupplierinfo","com.yxt.anrui.terminal.fegin.wmsInventory","com.yxt.anrui.terminal.fegin.asbusrepairbill","com.yxt.anrui.terminal.fegin.pmspurchasebill","com.yxt.anrui.terminal.fegin.pmspurchasebackbill","com.yxt.anrui.terminal.fegin.smspricestrategybill","com.yxt.anrui.terminal.fegin.astechtitleapply","com.yxt.anrui.terminal.fegin.asserviceaccommapply","com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill"})
 public class TerminalApplication {
 
     public static void main(String[] args) {

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/busclaiminvoicebill/AppBusclaimInvoiceBillRest.java

@@ -0,0 +1,85 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.biz.as.busclaiminvoicebill;
+
+import com.yxt.anrui.terminal.api.as.busclaiminvoicebill.AppBusclaimInvoiceBillDetailsVo;
+import com.yxt.anrui.terminal.api.as.busclaiminvoicebill.AppBusclaimInvoiceBillFeign;
+import com.yxt.anrui.terminal.api.as.busclaiminvoicebill.flowable.AppDelegateQuery;
+import com.yxt.anrui.terminal.api.as.busclaiminvoicebill.flowable.AppFlowDto;
+import com.yxt.anrui.terminal.api.as.busclaiminvoicebill.flowable.AppFlowQuery;
+import com.yxt.anrui.terminal.api.as.busclaiminvoicebill.flowable.AppFlowTaskQuery;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("v1/busclaimInvoicebill")
+public class AppBusclaimInvoiceBillRest implements AppBusclaimInvoiceBillFeign {
+
+    @Autowired
+    private AppBusclaimInvoiceBillService appBusclaimInvoiceBillService;
+
+    @Override
+    public ResultBean<AppBusclaimInvoiceBillDetailsVo> fetchDetailsBySid(String sid) {
+        return appBusclaimInvoiceBillService.fetchDetailsBySid(sid);
+    }
+
+    @Override
+    public ResultBean agreeCreditInfo(AppFlowDto dto) {
+        return appBusclaimInvoiceBillService.agreeCreditInfo(dto);
+    }
+
+    @Override
+    public ResultBean rejectCreditInfo(AppFlowTaskQuery query) {
+        return appBusclaimInvoiceBillService.rejectCreditInfo(query);
+    }
+
+    @Override
+    public ResultBean recallCreditInfo(AppFlowTaskQuery query) {
+        return appBusclaimInvoiceBillService.recallCreditInfo(query);
+    }
+
+    @Override
+    public ResultBean stopCreditInfo(AppFlowTaskQuery query) {
+        return appBusclaimInvoiceBillService.stopCreditInfo(query);
+    }
+
+    @Override
+    public ResultBean<String> getFlowOperateTitle(AppFlowQuery query) {
+        return appBusclaimInvoiceBillService.getFlowOperateTitle(query);
+    }
+
+    @Override
+    public ResultBean delegate(AppDelegateQuery delegateQuery) {
+        return appBusclaimInvoiceBillService.delegate(delegateQuery);
+    }
+
+    @Override
+    public ResultBean assignTask(AppDelegateQuery delegateQuery) {
+        return appBusclaimInvoiceBillService.assignTask(delegateQuery);
+    }
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/busclaiminvoicebill/AppBusclaimInvoiceBillService.java

@@ -0,0 +1,180 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.biz.as.busclaiminvoicebill;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.terminal.api.as.busclaiminvoicebill.AppBusclaimInvoiceBillDetailsVo;
+import com.yxt.anrui.terminal.api.as.busclaiminvoicebill.flowable.AppDelegateQuery;
+import com.yxt.anrui.terminal.api.as.busclaiminvoicebill.flowable.AppFlowDto;
+import com.yxt.anrui.terminal.api.as.busclaiminvoicebill.flowable.AppFlowQuery;
+import com.yxt.anrui.terminal.api.as.busclaiminvoicebill.flowable.AppFlowTaskQuery;
+import com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill.AsBusclaimInvoiceBillDetailsVo;
+import com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill.AsBusclaimInvoiceBillFegin;
+import com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill.AsBusclaimInvoiceBillFile;
+import com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill.flowable.*;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+@Service
+public class AppBusclaimInvoiceBillService {
+
+    @Resource
+    private AsBusclaimInvoiceBillFegin asBusclaimInvoiceBillFegin;
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private SysUserFeign sysUserFeign;
+
+    public ResultBean<AppBusclaimInvoiceBillDetailsVo> fetchDetailsBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        AsBusclaimInvoiceBillDetailsVo data = asBusclaimInvoiceBillFegin.details(sid).getData();
+        AppBusclaimInvoiceBillDetailsVo appBusclaimInvoiceBillDetailsVo = new AppBusclaimInvoiceBillDetailsVo();
+        BeanUtil.copyProperties(data,appBusclaimInvoiceBillDetailsVo);
+        appBusclaimInvoiceBillDetailsVo.setProcInsId(data.getProcInstId());
+        appBusclaimInvoiceBillDetailsVo.setCreateDeptName(data.getDeptName());
+        List<AsBusclaimInvoiceBillFile> fileList = data.getFileList();
+        ArrayList<String> files = new ArrayList<>();
+        for (AsBusclaimInvoiceBillFile asBusclaimInvoiceBillFile : fileList) {
+            files.add(asBusclaimInvoiceBillFile.getUrl());
+        }
+        appBusclaimInvoiceBillDetailsVo.setFileList(files);
+        return rb.success().setData(appBusclaimInvoiceBillDetailsVo);
+    }
+
+    public ResultBean agreeCreditInfo(AppFlowDto 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();
+        CompleteBusclaimInvoiceBillDto completeBusclaimInvoiceBillDto = new CompleteBusclaimInvoiceBillDto();
+        BeanUtil.copyProperties(dto, completeBusclaimInvoiceBillDto);
+        completeBusclaimInvoiceBillDto.setOrgSidPath(orgSidPath);
+        ResultBean resultBean = asBusclaimInvoiceBillFegin.complete(completeBusclaimInvoiceBillDto);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setData(resultBean.getData());
+    }
+
+    public ResultBean rejectCreditInfo(AppFlowTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        BusclaimInvoiceTaskQuery busclaimInvoiceTaskQuery = new BusclaimInvoiceTaskQuery();
+        BeanUtil.copyProperties(query, busclaimInvoiceTaskQuery);
+        ResultBean resultBean = asBusclaimInvoiceBillFegin.taskReject(busclaimInvoiceTaskQuery);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setData(resultBean.getData());
+    }
+
+    public ResultBean recallCreditInfo(AppFlowTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        BusclaimInvoiceTaskQuery busclaimInvoiceTaskQuery = new BusclaimInvoiceTaskQuery();
+        BeanUtil.copyProperties(query, busclaimInvoiceTaskQuery);
+        ResultBean resultBean = asBusclaimInvoiceBillFegin.revokeProcess(busclaimInvoiceTaskQuery);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setData(resultBean.getData());
+    }
+
+    public ResultBean stopCreditInfo(AppFlowTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        BusclaimInvoiceTaskQuery busclaimInvoiceTaskQuery = new BusclaimInvoiceTaskQuery();
+        BeanUtil.copyProperties(query, busclaimInvoiceTaskQuery);
+        ResultBean resultBean = asBusclaimInvoiceBillFegin.breakProcess(busclaimInvoiceTaskQuery);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setData(resultBean.getData());
+    }
+
+    public ResultBean<String> getFlowOperateTitle(AppFlowQuery query) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        //0 上一环节  1下一环节
+        int next = query.getNext();
+        BusclaimInvoiceNodeQuery getNodeQuery = new BusclaimInvoiceNodeQuery();
+        BeanUtil.copyProperties(query, getNodeQuery);
+        String data = "";
+        if (next == 0) {
+            ResultBean<List<BusclaimInvoiceNodeVo>> getPreviousNodesForReject = asBusclaimInvoiceBillFegin.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<BusclaimInvoiceNodeVo>> getNextNodesForSubmit = asBusclaimInvoiceBillFegin.getNextNodesForSubmit(getNodeQuery);
+            if (getNextNodesForSubmit.getSuccess()) {
+                getNextNodesForSubmit.getData().removeAll(Collections.singleton(null));
+                data = getNextNodesForSubmit.getData().get(0).getName();
+            } else {
+                return rb.setMsg(getNextNodesForSubmit.getMsg());
+            }
+        } else {
+            return rb.setMsg("参数错误：next");
+        }
+        return rb.success().setData(data);
+    }
+
+    public ResultBean delegate(AppDelegateQuery delegateQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        BusclaimInvoiceDelegateQuery delegateQuery1 = new
+                BusclaimInvoiceDelegateQuery();
+        BeanUtil.copyProperties(delegateQuery, delegateQuery1);
+        asBusclaimInvoiceBillFegin.delegate(delegateQuery1);
+        return rb.success();
+    }
+
+    public ResultBean assignTask(AppDelegateQuery delegateQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        BusclaimInvoiceDelegateQuery delegateQuery1 = new
+                BusclaimInvoiceDelegateQuery();
+        BeanUtil.copyProperties(delegateQuery, delegateQuery1);
+        asBusclaimInvoiceBillFegin.assignTask(delegateQuery1);
+        return rb.success();
+    }
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaiminvoicebill/AsBusclaimInvoiceBillDetailVo.java

@@ -0,0 +1,36 @@
+package com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@Data
+public class AsBusclaimInvoiceBillDetailVo {
+
+    @ApiModelProperty("索赔单号")
+    private String claimBillNo;
+    @ApiModelProperty("维修工单号")
+    private String repairBillNo;
+    @ApiModelProperty("车牌号")
+    private String vehMark;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("索赔工时费")
+    private String claimHourAmount;
+    @ApiModelProperty("索赔材料费")
+    private String claimGoodsAmount;
+    @ApiModelProperty("外出费")
+    private String claimOutAmount;
+    @ApiModelProperty("厂家补助费")
+    private String claimSubsidyAmount;
+    @ApiModelProperty("其他费用")
+    private String claimOtherAmount;
+    @ApiModelProperty("费用是否一致")
+    private Boolean isUnanimous;
+
+    private String remarks;
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaiminvoicebill/AsBusclaimInvoiceBillDetailsVo.java

@@ -0,0 +1,61 @@
+package com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@Data
+public class AsBusclaimInvoiceBillDetailsVo {
+
+    private String sid;
+    private String createBySid;
+    private String createByName;
+
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date createTime;
+
+    private String billNo;
+    @ApiModelProperty("实例id")
+    private String procInstId;
+    @ApiModelProperty("流程定义id")
+    private String procDefId;
+    @ApiModelProperty("任务iD")
+    private String taskId;
+    @ApiModelProperty("环节iD")
+    private String taskDefKey;
+    @ApiModelProperty("流程状态")
+    private String nodeState;
+
+    @ApiModelProperty("申请部门sid")
+    private String deptSid;
+    @ApiModelProperty("申请部门名称")
+    private String deptName;
+    @ApiModelProperty("开票sid")
+    private String invoiceSid;
+    @ApiModelProperty("开票名称")
+    private String invoiceName;
+    @ApiModelProperty("开票类型key")
+    private String invoiceKey;
+    @ApiModelProperty("开票类型value")
+    private String invoiceValue;
+    @ApiModelProperty("开票金额")
+    private String invoiceMoney;
+
+    private String createOrgSid;
+    private String useOrgSid;
+    private String useOrgName;
+
+    private List<AsBusclaimInvoiceBillFile> fileList = new ArrayList<>();
+    private String remarks;
+
+    private List<AsBusclaimInvoiceBillDetailVo> detailList = new ArrayList<>();
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaiminvoicebill/AsBusclaimInvoiceBillFegin.java

@@ -0,0 +1,59 @@
+package com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill;
+
+import com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill.flowable.*;
+import com.yxt.anrui.terminal.fegin.astechtitleapply.AsTechTitleApplyDetailsVo;
+import com.yxt.anrui.terminal.fegin.astechtitleapply.flowable.*;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@FeignClient(
+        contextId = "yxt-as-AsBusclaimInvoiceBill",
+        name = "yxt-as",
+        path = "v1/AsBusclaimInvoiceBill"
+)
+public interface AsBusclaimInvoiceBillFegin {
+
+    @GetMapping("/details")
+    @ApiOperation("详情")
+    ResultBean<AsBusclaimInvoiceBillDetailsVo> details(@RequestParam("sid") String sid);
+
+    @ApiOperation(value = "办理（同意）")
+    @PostMapping("/complete")
+    public ResultBean complete(@Valid @RequestBody CompleteBusclaimInvoiceBillDto query);
+
+    @ApiOperation(value = "获取上一个环节")
+    @GetMapping(value = "/getPreviousNodesForReject")
+    ResultBean<List<BusclaimInvoiceNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap BusclaimInvoiceNodeQuery query);
+
+    @ApiOperation(value = "获取下一个环节")
+    @GetMapping(value = "/getNextNodesForSubmit")
+    ResultBean<List<BusclaimInvoiceNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap BusclaimInvoiceNodeQuery query);
+
+    @ApiOperation(value = "驳回任务")
+    @PostMapping(value = "/reject")
+    public ResultBean taskReject(@Valid @RequestBody BusclaimInvoiceTaskQuery query);
+
+    @ApiOperation(value = "撤回流程")
+    @PostMapping(value = "/revokeProcess")
+    public ResultBean revokeProcess(@Valid @RequestBody BusclaimInvoiceTaskQuery query);
+
+    @ApiOperation(value = "终止任务")
+    @PostMapping(value = "/breakProcess")
+    public ResultBean breakProcess(@Valid @RequestBody BusclaimInvoiceTaskQuery query);
+
+    @ApiOperation(value = "加签")
+    @PostMapping(value = "/delegate")
+    @ResponseBody
+    public ResultBean delegate(@RequestBody BusclaimInvoiceDelegateQuery query);
+
+    @ApiOperation(value = "转办")
+    @PutMapping(value = "/assignTask")
+    @ResponseBody
+    public ResultBean assignTask(@RequestBody BusclaimInvoiceDelegateQuery query);
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaiminvoicebill/AsBusclaimInvoiceBillFile.java

@@ -0,0 +1,35 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+@Data
+public class AsBusclaimInvoiceBillFile implements Vo {
+
+    private String url;
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaiminvoicebill/flowable/BusclaimInvoiceDelegateQuery.java

@@ -0,0 +1,23 @@
+package com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/10
+ **/
+@Data
+public class BusclaimInvoiceDelegateQuery {
+
+    private String userSid;
+    @ApiModelProperty("流程实例id")
+    private String instanceId;
+    @ApiModelProperty("任务Id")
+    private String taskId;
+    @ApiModelProperty("审批人sid")
+    private String assignee;
+    @ApiModelProperty("填写意见")
+    private String views;
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaiminvoicebill/flowable/BusclaimInvoiceNodeQuery.java

@@ -0,0 +1,18 @@
+package com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/10
+ **/
+@Data
+public class BusclaimInvoiceNodeQuery {
+
+    @ApiModelProperty(value = "环节定义id")
+    private String taskDefKey;
+    @ApiModelProperty(value = "业务sid")
+    private String businessSid;
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaiminvoicebill/flowable/BusclaimInvoiceNodeVo.java

@@ -0,0 +1,24 @@
+package com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/10
+ **/
+@Data
+public class BusclaimInvoiceNodeVo {
+
+    @ApiModelProperty(value = "节点名称")
+    private String name;
+    @ApiModelProperty(value = "节点id")
+    private String id;
+    @ApiModelProperty(value = "审批组")
+    private List<String> candidateGroups;
+    @ApiModelProperty(value = "是否是最后环节")
+    private String endTask;
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaiminvoicebill/flowable/BusclaimInvoiceTaskQuery.java

@@ -0,0 +1,43 @@
+package com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/10
+ **/
+@Data
+public class BusclaimInvoiceTaskQuery {
+
+    /**
+     * 终止、驳回、撤回
+     */
+    @ApiModelProperty("任务Id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    /**
+     * 终止、驳回、撤回
+     */
+    @ApiModelProperty("业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+    /**
+     * 终止、驳回
+     */
+    @ApiModelProperty("任务意见")
+    private String comment;
+    /**
+     * 终止、撤回、驳回
+     */
+    @ApiModelProperty("用户Sid")
+    private String userSid;
+    /**
+     * 终止
+     */
+    @ApiModelProperty("流程实例Id")
+    private String instanceId;
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusclaiminvoicebill/flowable/CompleteBusclaimInvoiceBillDto.java

@@ -0,0 +1,35 @@
+package com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/10
+ **/
+@Data
+public class CompleteBusclaimInvoiceBillDto {
+
+    @ApiModelProperty(value = "用户sid")
+    @NotBlank(message = "参数错误：userSid")
+    private String userSid;
+    @ApiModelProperty(value = "用户全路径sid")
+    private String orgSidPath;
+    @ApiModelProperty(value = "节点id")
+    @NotBlank(message = "参数错误：taskDefKey")
+    private String taskDefKey;
+    @ApiModelProperty(value = "任务id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    @ApiModelProperty(value = "流程id")
+    @NotBlank(message = "参数错误：instanceId")
+    private String instanceId;
+    @ApiModelProperty(value = "意见")
+    private String comment;
+    @ApiModelProperty(value = "业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillRest.java

@@ -1,7 +1,6 @@
 package com.yxt.anrui.as.biz.asbusclaiminvoicebill;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillVo;
 import com.yxt.anrui.as.api.asbusclaiminvoicebill.*;
 import com.yxt.anrui.as.api.asbusclaiminvoicebill.flowable.*;
 import com.yxt.anrui.as.feign.flowable.flow.BusinessVariables;