1

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

@@ -70,6 +70,10 @@ public interface SysOrganizationFeign {
     @GetMapping("/tranfour/{sid}")
     public ResultBean<List<SysOrganizationVo>> tranfour(@PathVariable("sid") String sid);
 
+    @ApiOperation("查询当前分公司下（部门下）所有合作二级站")
+    @GetMapping("/tranFive/{sid}")
+    public ResultBean<List<SysOrganizationVo>> tranFive(@PathVariable("sid") String sid);
+
     @ApiOperation("新增保存")
     @PostMapping("/save")
     public ResultBean save(@RequestBody SysOrganizationDto dto);

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

@@ -74,6 +74,11 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<SysOrganizationVo>> tranFive(String sid) {
+        return null;
+    }
+
     @Override
     public ResultBean save(SysOrganizationDto dto) {
         return ResultBean.fireFail().setMsg("接口anrui_portal/sysorganization/save无法访问");

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

@@ -138,4 +138,6 @@ public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
     List<SysOrganizationVo> tranThree(@Param("sid") String sid,@Param("deptSid") String deptSid);
 
     List<SysOrganizationVo> tranfour(String sid);
+
+    List<SysOrganizationVo> tranFive(String sid);
 }

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

@@ -5,26 +5,26 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo">
         SELECT so.*,
-               (SELECT GROUP_CONCAT(ss.name)
+        (SELECT GROUP_CONCAT(ss.name)
-                FROM `sys_staff_org` sso
+        FROM `sys_staff_org` sso
-                         LEFT JOIN `sys_staffinfo` ss ON sso.`staffSid` = ss.`sid`
+        LEFT JOIN `sys_staffinfo` ss ON sso.`staffSid` = ss.`sid`
-                WHERE so.`sid` = sso.`orgSid`
+        WHERE so.`sid` = sso.`orgSid`
-                  AND sso.manageType = '1') zgNames,
+        AND sso.manageType = '1') zgNames,
-               (SELECT GROUP_CONCAT(ss.sid)
+        (SELECT GROUP_CONCAT(ss.sid)
-                FROM `sys_staff_org` sso
+        FROM `sys_staff_org` sso
-                         LEFT JOIN `sys_staffinfo` ss ON sso.`staffSid` = ss.`sid`
+        LEFT JOIN `sys_staffinfo` ss ON sso.`staffSid` = ss.`sid`
-                WHERE so.`sid` = sso.`orgSid`
+        WHERE so.`sid` = sso.`orgSid`
-                  AND sso.manageType = '1') zgSids,
+        AND sso.manageType = '1') zgSids,
-               (SELECT GROUP_CONCAT(ss.name)
+        (SELECT GROUP_CONCAT(ss.name)
-                FROM `sys_staff_org` sso
+        FROM `sys_staff_org` sso
-                         LEFT JOIN `sys_staffinfo` ss ON sso.`staffSid` = ss.`sid`
+        LEFT JOIN `sys_staffinfo` ss ON sso.`staffSid` = ss.`sid`
-                WHERE so.`sid` = sso.`orgSid`
+        WHERE so.`sid` = sso.`orgSid`
-                  AND sso.manageType = '2') fgNames,
+        AND sso.manageType = '2') fgNames,
-               (SELECT GROUP_CONCAT(ss.sid)
+        (SELECT GROUP_CONCAT(ss.sid)
-                FROM `sys_staff_org` sso
+        FROM `sys_staff_org` sso
-                         LEFT JOIN `sys_staffinfo` ss ON sso.`staffSid` = ss.`sid`
+        LEFT JOIN `sys_staffinfo` ss ON sso.`staffSid` = ss.`sid`
-                WHERE so.`sid` = sso.`orgSid`
+        WHERE so.`sid` = sso.`orgSid`
-                  AND sso.manageType = '2') fgSids
+        AND sso.manageType = '2') fgSids
         FROM sys_organization so
         <where>
             ${ew.sqlSegment}
@@ -108,8 +108,7 @@
 
     <select id="selectOrgCodeByPsid" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganization">
         SELECT *
-        FROM sys_organization
+        FROM sys_organization LIMIT 0,1
-        LIMIT 0,1
     </select>
 
     <select id="selectTreeList" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrgListVo">
@@ -190,8 +189,8 @@
     <select id="selectByOrgDeptSid" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrgStaffVo">
         select distinct si.name staffName, si.sid staffSid, su.sid userSid
         from sys_staff_org so
-                 left join sys_staffinfo si on so.staffSid = si.sid
+                     left join sys_staffinfo si on so.staffSid = si.sid
-                 left join sys_user su on su.staffSid = si.sid
+                     left join sys_user su on su.staffSid = si.sid
         where so.orgSid = #{orgDeptSid}
           and si.personTypeKey != '01'
     </select>
@@ -199,8 +198,8 @@
     <select id="selectByOrgDeptSid2" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrgStaffVo">
         select distinct si.name staffName, si.sid staffSid, su.sid userSid
         from sys_staff_org so
-        left join sys_staffinfo si on so.staffSid = si.sid
+                     left join sys_staffinfo si on so.staffSid = si.sid
-        left join sys_user su on su.staffSid = si.sid
+                     left join sys_user su on su.staffSid = si.sid
         where so.orgSid = #{orgDeptSid}
     </select>
 
@@ -208,7 +207,7 @@
         select *
         from sys_organization
         where psid = #{sid}
-          and name like concat('%',#{name},'%')
+          and name like concat('%', #{name}, '%')
     </select>
 
     <select id="selectOrgSidList" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo">
@@ -241,20 +240,21 @@
     </update>
 
     <select id="selectBy" resultType="com.yxt.anrui.portal.api.sysorganization.SysFinanceVo">
-        select managerSid as userSid,managerName as name from sys_organization where psid = #{useOrgSid} and name = #{name}
+        select managerSid as userSid, managerName as name
+        from sys_organization
+        where psid = #{useOrgSid}
+          and name = #{name}
     </select>
     <select id="selectByOrgCodeAndPsid" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganization">
         select *
         from sys_organization
         where psid = #{pSid}
-          and orgCode =#{orgCode}
+          and orgCode = #{orgCode}
     </select>
 
     <select id="tranOne" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo">
-        SELECT
+        SELECT *
-                *
+        FROM sys_organization
-        FROM
-                sys_organization
         WHERE (
                 orgAttributeKey = 'fwz_002'
                         OR orgAttributeKey = 'fwz_003'
@@ -263,33 +263,25 @@
     </select>
 
     <select id="tranTwo" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo">
-        SELECT
+        SELECT *
-                *
+        FROM sys_organization
-        FROM
-                sys_organization
         WHERE orgAttributeKey = 'fwz_001'
           AND (
                 psid =
-                (SELECT
+                (SELECT psid
-                         psid
+                 FROM sys_organization
-                 FROM
-                         sys_organization
                  WHERE sid = #{sid})
                         OR sid =
-                           (SELECT
+                           (SELECT psid
-                                    psid
+                            FROM sys_organization
-                            FROM
-                                    sys_organization
                             WHERE sid = #{sid})
                 )
           AND sid != #{sid}
     </select>
 
     <select id="tranThree" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo">
-        SELECT
+        SELECT *
-                *
+        FROM sys_organization
-        FROM
-                sys_organization
         WHERE orgAttributeKey = 'fwz_001'
           AND sid != #{deptSid}
           AND (psid = #{sid}
@@ -297,31 +289,30 @@
     </select>
 
     <select id="tranfour" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo">
-        SELECT
+        SELECT *
-                *
+        FROM sys_organization
-        FROM
-                sys_organization
         WHERE sid =
-              (SELECT
+              (SELECT psid
-                       psid
+               FROM sys_organization
-               FROM
-                       sys_organization
                WHERE sid = #{sid})
         UNION
-        SELECT
+        SELECT *
-                *
+        FROM sys_organization
-        FROM
-                sys_organization
         WHERE (
                 orgAttributeKey = 'fwz_002'
                         OR orgAttributeKey = 'fwz_003'
                 )
           AND psid =
-              (SELECT
+              (SELECT psid
-                       psid
+               FROM sys_organization
-               FROM
-                       sys_organization
                WHERE sid = #{sid})
           AND sid != #{sid}
     </select>
+
+    <select id="tranFive" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo">
+        SELECT *
+        FROM sys_organization
+        WHERE orgAttributeKey = 'fwz_003'
+          AND psid = #{sid}
+    </select>
 </mapper>

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

@@ -129,6 +129,11 @@ public class SysOrganizationRest implements SysOrganizationFeign {
         return new ResultBean<List<SysOrganizationVo>>().success().setData(sysOrganizationService.tranfour(sid));
     }
 
+    @Override
+    public ResultBean<List<SysOrganizationVo>> tranFive(String sid) {
+        return new ResultBean<List<SysOrganizationVo>>().success().setData(sysOrganizationService.tranFive(sid));
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResultBean update(SysOrganizationDto dto, String sid) {

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

@@ -735,4 +735,8 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
     public List<SysOrganizationVo> tranfour(String sid) {
         return baseMapper.tranfour(sid);
     }
+
+    public List<SysOrganizationVo> tranFive(String sid) {
+        return baseMapper.tranFive(sid);
+    }
 }

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

@@ -3,6 +3,8 @@ package com.yxt.anrui.terminal.api.as.busclaiminvoicebill;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * @description:
  * @author: dimengzhe
@@ -28,6 +30,8 @@ public class AppBusclaimInvoiceBillDetailVo {
     @ApiModelProperty("厂家补助费")
     private String claimSubsidyAmount;
     @ApiModelProperty("施救费")
+    private String claimRescueAmount;
+    @ApiModelProperty("施救费")
     private String claimEffortAmount;
     @ApiModelProperty("其他费用")
     private String claimOtherAmount;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/bwinvoiceapply/AppBwinvoiceapplyDetailDetailsVo.java

@@ -0,0 +1,81 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.api.as.bwinvoiceapply;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * Project: yxt-as(保外工单) <br/>
+ * File: AsBwinvoiceapplyDetailVo.java <br/>
+ * Class: com.yxt.anrui.as.api.asbwinvoiceapplydetail.AsBwinvoiceapplyDetailVo <br/>
+ * Description: 保外开票工单列表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-06-17 13:42:57 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "保外开票工单列表 视图数据详情", description = "保外开票工单列表 视图数据详情")
+public class AppBwinvoiceapplyDetailDetailsVo implements Vo {
+
+    @ApiModelProperty("维修工单号")
+    private String sourceBillNo;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("车牌号")
+    private String vehMark;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	@ApiModelProperty("结算日期")
+    private Date settleTime;
+	@ApiModelProperty("工时费")
+    private BigDecimal hourAmount;
+	@ApiModelProperty("材料费")
+    private BigDecimal goodsAmount;
+    @ApiModelProperty("施救费")
+    private BigDecimal rescueAmount;
+    @ApiModelProperty("施救费")
+    private BigDecimal claimRescueAmount;
+	@ApiModelProperty("外出费")
+    private BigDecimal outAmount;
+	@ApiModelProperty("其他费用")
+    private BigDecimal otherAmount;
+	@ApiModelProperty("费用合计")
+    private BigDecimal totalAmount;
+
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/bwinvoiceapply/AppBwinvoiceapplyDetailsVo.java

@@ -0,0 +1,67 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.api.as.bwinvoiceapply;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+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.Date;
+import java.util.List;
+
+@Data
+@ApiModel(value = "保外工单开票申请 视图数据详情", description = "保外工单开票申请 视图数据详情")
+public class AppBwinvoiceapplyDetailsVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("申请人")
+    private String createByName;
+    @ApiModelProperty("申请部门名称")
+    private String deptName;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @ApiModelProperty("申请日期")
+    private Date createTime;
+    @ApiModelProperty("开票名称")
+    private String invoiceTitle;
+    @ApiModelProperty("开票类型value")
+    private String invoiceTypeValue;
+    @ApiModelProperty("开票金额")
+    private String invoiceMoney;
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("附件")
+    private List<String> files = new ArrayList<>();
+    @ApiModelProperty("实例id")
+    private String procInsId;
+    @ApiModelProperty("任务id")
+    private String taskId;
+    @ApiModelProperty("工单列表")
+    private List<AppBwinvoiceapplyDetailDetailsVo> asBwinvoiceapplyDetailList = new ArrayList<>();
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/bwinvoiceapply/AppBwinvoiceapplyFeign.java

@@ -0,0 +1,64 @@
+package com.yxt.anrui.terminal.api.as.bwinvoiceapply;
+
+import com.yxt.anrui.terminal.api.as.bwinvoiceapply.flowable.AppDelegateQuery;
+import com.yxt.anrui.terminal.api.as.bwinvoiceapply.flowable.AppFlowDto;
+import com.yxt.anrui.terminal.api.as.bwinvoiceapply.flowable.AppFlowQuery;
+import com.yxt.anrui.terminal.api.as.bwinvoiceapply.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.*;
+
+/**
+ * @Author
+ * @Date
+ * @Description
+ */
+@FeignClient(
+        contextId = "terminal-AppBwinvoiceapply",
+        name = "anrui-terminal",
+        path = "v1/bwinvoiceapply")
+public interface AppBwinvoiceapplyFeign {
+
+    @ApiOperation("详情")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<AppBwinvoiceapplyDetailsVo> fetchDetailsBySid(@PathVariable("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/bwinvoiceapply/flowable/AppDelegateQuery.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.terminal.api.as.bwinvoiceapply.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/bwinvoiceapply/flowable/AppFlowDto.java

@@ -0,0 +1,37 @@
+package com.yxt.anrui.terminal.api.as.bwinvoiceapply.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/bwinvoiceapply/flowable/AppFlowQuery.java

@@ -0,0 +1,28 @@
+package com.yxt.anrui.terminal.api.as.bwinvoiceapply.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/bwinvoiceapply/flowable/AppFlowTaskQuery.java

@@ -0,0 +1,47 @@
+package com.yxt.anrui.terminal.api.as.bwinvoiceapply.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","com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill","com.yxt.anrui.terminal.fegin.wmsinventoryallocatebill","com.yxt.anrui.terminal.fegin.asoldpartreturnapply","com.yxt.anrui.terminal.fegin.asoldparthandleapply","com.yxt.anrui.terminal.fegin.asbwdiffapply"})
+@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.anrui.buscenter","com.yxt.anrui.scm","com.yxt.anrui.fin", "com.yxt.anrui.terminal.fegin.wmsinventorycheckbill","com.yxt.anrui.terminal.fegin.wmsinventoryprofitin","com.yxt.anrui.terminal.fegin.wmsinventoryprofitout","com.yxt.anrui.terminal.fegin.basegoodssku","com.yxt.anrui.terminal.fegin.basesupplierinfo","com.yxt.anrui.terminal.fegin.wmsInventory","com.yxt.anrui.terminal.fegin.asbusrepairbill","com.yxt.anrui.terminal.fegin.pmspurchasebill","com.yxt.anrui.terminal.fegin.pmspurchasebackbill","com.yxt.anrui.terminal.fegin.smspricestrategybill","com.yxt.anrui.terminal.fegin.astechtitleapply","com.yxt.anrui.terminal.fegin.asserviceaccommapply","com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill","com.yxt.anrui.terminal.fegin.wmsinventoryallocatebill","com.yxt.anrui.terminal.fegin.asoldpartreturnapply","com.yxt.anrui.terminal.fegin.asoldparthandleapply","com.yxt.anrui.terminal.fegin.asbwdiffapply","com.yxt.anrui.terminal.fegin.asbwinvoiceapply"})
 public class TerminalApplication {
 
     public static void main(String[] args) {

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

@@ -30,6 +30,7 @@ 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.AppBusclaimInvoiceBillDetailVo;
 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;
@@ -71,6 +72,10 @@ public class AppBusclaimInvoiceBillService {
             files.add(asBusclaimInvoiceBillFile.getUrl());
         }
         appBusclaimInvoiceBillDetailsVo.setFileList(files);
+        List<AppBusclaimInvoiceBillDetailVo> detailList = appBusclaimInvoiceBillDetailsVo.getDetailList();
+        for (AppBusclaimInvoiceBillDetailVo appBusclaimInvoiceBillDetailVo : detailList) {
+            appBusclaimInvoiceBillDetailVo.setClaimEffortAmount(appBusclaimInvoiceBillDetailVo.getClaimRescueAmount());
+        }
         return rb.success().setData(appBusclaimInvoiceBillDetailsVo);
     }
 

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/oldparthandleapply/AppBwdiffapplyRest.java → anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/bwdiffapply/AppBwdiffapplyRest.java

@@ -23,11 +23,14 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.anrui.terminal.biz.as.oldparthandleapply;
+package com.yxt.anrui.terminal.biz.as.bwdiffapply;
 
 import com.yxt.anrui.terminal.api.as.bwdiffapply.AppBwdiffapplyDetailsVo;
 import com.yxt.anrui.terminal.api.as.bwdiffapply.AppBwdiffapplyFeign;
-import com.yxt.anrui.terminal.api.as.bwdiffapply.flowable.*;
+import com.yxt.anrui.terminal.api.as.bwdiffapply.flowable.AppDelegateQuery;
+import com.yxt.anrui.terminal.api.as.bwdiffapply.flowable.AppFlowDto;
+import com.yxt.anrui.terminal.api.as.bwdiffapply.flowable.AppFlowQuery;
+import com.yxt.anrui.terminal.api.as.bwdiffapply.flowable.AppFlowTaskQuery;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/oldparthandleapply/AppBwdiffapplyService.java → anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/bwdiffapply/AppBwdiffapplyService.java

@@ -23,7 +23,7 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.anrui.terminal.biz.as.oldparthandleapply;
+package com.yxt.anrui.terminal.biz.as.bwdiffapply;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
@@ -33,8 +33,13 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.terminal.api.as.bwdiffapply.AppBwdiffapplyDetailDetailsVo;
 import com.yxt.anrui.terminal.api.as.bwdiffapply.AppBwdiffapplyDetailFile;
 import com.yxt.anrui.terminal.api.as.bwdiffapply.AppBwdiffapplyDetailsVo;
-import com.yxt.anrui.terminal.api.as.bwdiffapply.flowable.*;
+import com.yxt.anrui.terminal.api.as.bwdiffapply.flowable.AppDelegateQuery;
-import com.yxt.anrui.terminal.fegin.asbwdiffapply.*;
+import com.yxt.anrui.terminal.api.as.bwdiffapply.flowable.AppFlowDto;
+import com.yxt.anrui.terminal.api.as.bwdiffapply.flowable.AppFlowQuery;
+import com.yxt.anrui.terminal.api.as.bwdiffapply.flowable.AppFlowTaskQuery;
+import com.yxt.anrui.terminal.fegin.asbwdiffapply.AsBwdiffapplyDetailsVo;
+import com.yxt.anrui.terminal.fegin.asbwdiffapply.AsBwdiffapplyFegin;
+import com.yxt.anrui.terminal.fegin.asbwdiffapply.AsBwdiffapplyFile;
 import com.yxt.anrui.terminal.fegin.asbwdiffapply.flowable.*;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.beans.factory.annotation.Autowired;

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/bwinvoiceapply/AppBwinvoiceapplyRest.java

@@ -0,0 +1,82 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.biz.as.bwinvoiceapply;
+
+import com.yxt.anrui.terminal.api.as.bwinvoiceapply.flowable.*;
+import com.yxt.anrui.terminal.api.as.bwinvoiceapply.AppBwinvoiceapplyDetailsVo;
+import com.yxt.anrui.terminal.api.as.bwinvoiceapply.AppBwinvoiceapplyFeign;
+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/bwinvoiceapply")
+public class AppBwinvoiceapplyRest implements AppBwinvoiceapplyFeign {
+
+    @Autowired
+    private AppBwinvoiceapplyService appBwinvoiceapplyService;
+
+    @Override
+    public ResultBean<AppBwinvoiceapplyDetailsVo> fetchDetailsBySid(String sid) {
+        return appBwinvoiceapplyService.fetchDetailsBySid(sid);
+    }
+
+    @Override
+    public ResultBean agreeCreditInfo(AppFlowDto dto) {
+        return appBwinvoiceapplyService.agreeCreditInfo(dto);
+    }
+
+    @Override
+    public ResultBean rejectCreditInfo(AppFlowTaskQuery query) {
+        return appBwinvoiceapplyService.rejectCreditInfo(query);
+    }
+
+    @Override
+    public ResultBean recallCreditInfo(AppFlowTaskQuery query) {
+        return appBwinvoiceapplyService.recallCreditInfo(query);
+    }
+
+    @Override
+    public ResultBean stopCreditInfo(AppFlowTaskQuery query) {
+        return appBwinvoiceapplyService.stopCreditInfo(query);
+    }
+
+    @Override
+    public ResultBean<String> getFlowOperateTitle(AppFlowQuery query) {
+        return appBwinvoiceapplyService.getFlowOperateTitle(query);
+    }
+
+    @Override
+    public ResultBean delegate(AppDelegateQuery delegateQuery) {
+        return appBwinvoiceapplyService.delegate(delegateQuery);
+    }
+
+    @Override
+    public ResultBean assignTask(AppDelegateQuery delegateQuery) {
+        return appBwinvoiceapplyService.assignTask(delegateQuery);
+    }
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/bwinvoiceapply/AppBwinvoiceapplyService.java

@@ -0,0 +1,181 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.biz.as.bwinvoiceapply;
+
+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.bwinvoiceapply.AppBwinvoiceapplyDetailDetailsVo;
+import com.yxt.anrui.terminal.api.as.bwinvoiceapply.flowable.*;
+import com.yxt.anrui.terminal.api.as.bwinvoiceapply.AppBwinvoiceapplyDetailsVo;
+import com.yxt.anrui.terminal.fegin.asbwinvoiceapply.AsBwinvoiceapplyDetailsVo;
+import com.yxt.anrui.terminal.fegin.asbwinvoiceapply.AsBwinvoiceapplyFegin;
+import com.yxt.anrui.terminal.fegin.asbwinvoiceapply.AsBwinvoiceapplyFile;
+import com.yxt.anrui.terminal.fegin.asbwinvoiceapply.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 AppBwinvoiceapplyService {
+
+    @Resource
+    private AsBwinvoiceapplyFegin asBwinvoiceapplyFegin;
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private SysUserFeign sysUserFeign;
+
+    public ResultBean<AppBwinvoiceapplyDetailsVo> fetchDetailsBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        AsBwinvoiceapplyDetailsVo data = asBwinvoiceapplyFegin.fetchDetailsBySid(sid).getData();
+        AppBwinvoiceapplyDetailsVo appBwinvoiceapplyDetailsVo = new AppBwinvoiceapplyDetailsVo();
+        BeanUtil.copyProperties(data,appBwinvoiceapplyDetailsVo);
+        appBwinvoiceapplyDetailsVo.setProcInsId(data.getProcInstId());
+        List<AsBwinvoiceapplyFile> fileList = data.getFileList();
+        ArrayList<String> files = new ArrayList<>();
+        for (AsBwinvoiceapplyFile asBwinvoiceapplyFile : fileList) {
+            files.add(asBwinvoiceapplyFile.getUrl());
+        }
+        appBwinvoiceapplyDetailsVo.setFiles(files);
+        List<AppBwinvoiceapplyDetailDetailsVo> asBwinvoiceapplyDetailList = appBwinvoiceapplyDetailsVo.getAsBwinvoiceapplyDetailList();
+        for (AppBwinvoiceapplyDetailDetailsVo appBwinvoiceapplyDetailDetailsVo : asBwinvoiceapplyDetailList) {
+            appBwinvoiceapplyDetailDetailsVo.setRescueAmount(appBwinvoiceapplyDetailDetailsVo.getClaimRescueAmount());
+        }
+        return rb.success().setData(appBwinvoiceapplyDetailsVo);
+    }
+
+    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();
+        CompleteBwinvoiceApplyDto completeBwinvoiceApplyDto = new CompleteBwinvoiceApplyDto();
+        BeanUtil.copyProperties(dto, completeBwinvoiceApplyDto);
+        completeBwinvoiceApplyDto.setOrgSidPath(orgSidPath);
+        ResultBean resultBean = asBwinvoiceapplyFegin.complete(completeBwinvoiceApplyDto);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setData(resultBean.getData());
+    }
+
+    public ResultBean rejectCreditInfo(AppFlowTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        BwinvoiceApplyTaskQuery bwinvoiceApplyTaskQuery = new BwinvoiceApplyTaskQuery();
+        BeanUtil.copyProperties(query, bwinvoiceApplyTaskQuery);
+        ResultBean resultBean = asBwinvoiceapplyFegin.taskReject(bwinvoiceApplyTaskQuery);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setData(resultBean.getData());
+    }
+
+    public ResultBean recallCreditInfo(AppFlowTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        BwinvoiceApplyTaskQuery bwinvoiceApplyTaskQuery = new BwinvoiceApplyTaskQuery();
+        BeanUtil.copyProperties(query, bwinvoiceApplyTaskQuery);
+        ResultBean resultBean = asBwinvoiceapplyFegin.revokeProcess(bwinvoiceApplyTaskQuery);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setData(resultBean.getData());
+    }
+
+    public ResultBean stopCreditInfo(AppFlowTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        BwinvoiceApplyTaskQuery bwinvoiceApplyTaskQuery = new BwinvoiceApplyTaskQuery();
+        BeanUtil.copyProperties(query, bwinvoiceApplyTaskQuery);
+        ResultBean resultBean = asBwinvoiceapplyFegin.breakProcess(bwinvoiceApplyTaskQuery);
+        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();
+        BwinvoiceApplyNodeQuery getNodeQuery = new BwinvoiceApplyNodeQuery();
+        BeanUtil.copyProperties(query, getNodeQuery);
+        String data = "";
+        if (next == 0) {
+            ResultBean<List<BwinvoiceApplyNodeVo>> getPreviousNodesForReject = asBwinvoiceapplyFegin.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<BwinvoiceApplyNodeVo>> getNextNodesForSubmit = asBwinvoiceapplyFegin.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();
+        BwinvoiceApplyDelegateQuery delegateQuery1 = new
+                BwinvoiceApplyDelegateQuery();
+        BeanUtil.copyProperties(delegateQuery, delegateQuery1);
+        asBwinvoiceapplyFegin.delegate(delegateQuery1);
+        return rb.success();
+    }
+
+    public ResultBean assignTask(AppDelegateQuery delegateQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        BwinvoiceApplyDelegateQuery delegateQuery1 = new
+                BwinvoiceApplyDelegateQuery();
+        BeanUtil.copyProperties(delegateQuery, delegateQuery1);
+        asBwinvoiceapplyFegin.assignTask(delegateQuery1);
+        return rb.success();
+    }
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/bwdiffapply/AppOldparthandleApplyRest.java → anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/oldparthandleapply/AppOldparthandleApplyRest.java

@@ -23,7 +23,7 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.anrui.terminal.biz.as.bwdiffapply;
+package com.yxt.anrui.terminal.biz.as.oldparthandleapply;
 
 import com.yxt.anrui.terminal.api.as.oldparthandleapply.AppOldparthandleApplyDetailsVo;
 import com.yxt.anrui.terminal.api.as.oldparthandleapply.AppOldparthandleApplyFeign;

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/bwdiffapply/AppOldparthandleApplyService.java → anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/oldparthandleapply/AppOldparthandleApplyService.java

@@ -23,7 +23,7 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.anrui.terminal.biz.as.bwdiffapply;
+package com.yxt.anrui.terminal.biz.as.oldparthandleapply;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;

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

@@ -27,6 +27,8 @@ public class AsBusclaimInvoiceBillDetailVo {
     private String claimOutAmount;
     @ApiModelProperty("厂家补助费")
     private String claimSubsidyAmount;
+    @ApiModelProperty("施救费")
+    private String claimRescueAmount;
     @ApiModelProperty("其他费用")
     private String claimOtherAmount;
     @ApiModelProperty("费用是否一致")

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbwinvoiceapply/AsBwinvoiceapplyDetailDetailsVo.java

@@ -0,0 +1,87 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.fegin.asbwinvoiceapply;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * Project: yxt-as(保外工单) <br/>
+ * File: AsBwinvoiceapplyDetailVo.java <br/>
+ * Class: com.yxt.anrui.as.api.asbwinvoiceapplydetail.AsBwinvoiceapplyDetailVo <br/>
+ * Description: 保外开票工单列表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-06-17 13:42:57 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "保外开票工单列表 视图数据详情", description = "保外开票工单列表 视图数据详情")
+public class AsBwinvoiceapplyDetailDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("业务sid")
+    private String mainSid; // 业务sid
+	@ApiModelProperty("维修工单sid")
+    private String sourceBillSid; // 维修工单sid
+	@ApiModelProperty("维修工单号")
+    private String sourceBillNo; // 维修工单号
+	@ApiModelProperty("客户sid")
+    private String customerSid; // 客户sid
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+	@ApiModelProperty("车牌号")
+    private String vehMark; // 车牌号
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	@ApiModelProperty("结算日期")
+    private Date settleTime; // 结算日期
+	@ApiModelProperty("工时费")
+    private BigDecimal hourAmount; // 工时费
+	@ApiModelProperty("材料费")
+    private BigDecimal goodsAmount; // 材料费
+	@ApiModelProperty("外出费")
+    private BigDecimal outAmount; // 外出费
+	@ApiModelProperty("施救费")
+    private BigDecimal claimRescueAmount; // 施救费
+	@ApiModelProperty("其他费用")
+    private BigDecimal otherAmount; // 其他费用
+	@ApiModelProperty("费用合计")
+    private BigDecimal totalAmount; // 费用合计
+
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbwinvoiceapply/AsBwinvoiceapplyDetailsVo.java

@@ -0,0 +1,88 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.fegin.asbwinvoiceapply;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+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.Date;
+import java.util.List;
+
+@Data
+@ApiModel(value = "保外工单开票申请 视图数据详情", description = "保外工单开票申请 视图数据详情")
+public class AsBwinvoiceapplyDetailsVo implements Vo {
+
+    private String sid; // sid
+
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @ApiModelProperty("申请日期")
+    private Date createTime;
+	@ApiModelProperty("单据编号")
+    private String billNo; // 单据编号
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("申请人sid")
+    private String createBySid;
+	@ApiModelProperty("申请人")
+    private String createByName; // 申请人
+	@ApiModelProperty("申请部门sid")
+    private String deptSid; // 申请部门sid
+	@ApiModelProperty("申请部门名称")
+    private String deptName; // 申请部门名称
+	@ApiModelProperty("开票名称")
+    private String invoiceTitle; // 开票名称
+	@ApiModelProperty("开票类型key")
+    private String invoiceTypeKey; // 开票类型key
+	@ApiModelProperty("开票类型value")
+    private String invoiceTypeValue; // 开票类型value
+	@ApiModelProperty("开票金额")
+    private String invoiceMoney; // 开票金额
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("分公司名称")
+    private String useOrgName; // 分公司名称
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @ApiModelProperty("办结日期")
+    private Date finishTime; // 办结日期
+	@ApiModelProperty("实例id")
+    private String procInstId; // 实例id
+	@ApiModelProperty("流程定义id")
+    private String procDefId; // 流程定义id
+	@ApiModelProperty("任务id")
+    private String taskId; // 任务id
+	@ApiModelProperty("环节id")
+    private String nodeId; // 环节id
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+    @ApiModelProperty("附件")
+    private List<AsBwinvoiceapplyFile> fileList = new ArrayList<>();
+    @ApiModelProperty("工单列表")
+    private List<AsBwinvoiceapplyDetailDetailsVo> asBwinvoiceapplyDetailList = new ArrayList<>();
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbwinvoiceapply/AsBwinvoiceapplyFegin.java

@@ -0,0 +1,59 @@
+package com.yxt.anrui.terminal.fegin.asbwinvoiceapply;
+
+import com.yxt.anrui.terminal.fegin.asbwdiffapply.AsBwdiffapplyDetailsVo;
+import com.yxt.anrui.terminal.fegin.asbwdiffapply.flowable.*;
+import com.yxt.anrui.terminal.fegin.asbwinvoiceapply.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-AsBwinvoiceapply",
+        name = "yxt-as",
+        path = "v1/asbwinvoiceapply"
+)
+public interface AsBwinvoiceapplyFegin {
+
+    @ApiOperation("详情")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<AsBwinvoiceapplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation(value = "办理（同意）")
+    @PostMapping("/complete")
+    public ResultBean complete(@Valid @RequestBody CompleteBwinvoiceApplyDto query);
+
+    @ApiOperation(value = "获取上一个环节")
+    @GetMapping(value = "/getPreviousNodesForReject")
+    ResultBean<List<BwinvoiceApplyNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap BwinvoiceApplyNodeQuery query);
+
+    @ApiOperation(value = "获取下一个环节")
+    @GetMapping(value = "/getNextNodesForSubmit")
+    ResultBean<List<BwinvoiceApplyNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap BwinvoiceApplyNodeQuery query);
+
+    @ApiOperation(value = "驳回任务")
+    @PostMapping(value = "/reject")
+    public ResultBean taskReject(@Valid @RequestBody BwinvoiceApplyTaskQuery query);
+
+    @ApiOperation(value = "撤回流程")
+    @PostMapping(value = "/revokeProcess")
+    public ResultBean revokeProcess(@Valid @RequestBody BwinvoiceApplyTaskQuery query);
+
+    @ApiOperation(value = "终止任务")
+    @PostMapping(value = "/breakProcess")
+    public ResultBean breakProcess(@Valid @RequestBody BwinvoiceApplyTaskQuery query);
+
+    @ApiOperation(value = "加签")
+    @PostMapping(value = "/delegate")
+    @ResponseBody
+    public ResultBean delegate(@RequestBody BwinvoiceApplyDelegateQuery query);
+
+    @ApiOperation(value = "转办")
+    @PutMapping(value = "/assignTask")
+    @ResponseBody
+    public ResultBean assignTask(@RequestBody BwinvoiceApplyDelegateQuery query);
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbwinvoiceapply/AsBwinvoiceapplyFile.java

@@ -0,0 +1,51 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.fegin.asbwinvoiceapply;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(保外工单) <br/>
+ * File: AsBwinvoiceapplyVo.java <br/>
+ * Class: com.yxt.anrui.as.api.asbwinvoiceapply.AsBwinvoiceapplyVo <br/>
+ * Description: 保外工单开票申请 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-06-17 13:42:57 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "保外工单开票申请 视图数据对象", description = "保外工单开票申请 视图数据对象")
+public class AsBwinvoiceapplyFile implements Vo {
+
+    private String url;
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbwinvoiceapply/flowable/BwinvoiceApplyDelegateQuery.java

@@ -0,0 +1,23 @@
+package com.yxt.anrui.terminal.fegin.asbwinvoiceapply.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/11
+ **/
+@Data
+public class BwinvoiceApplyDelegateQuery {
+
+    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/asbwinvoiceapply/flowable/BwinvoiceApplyNodeQuery.java

@@ -0,0 +1,18 @@
+package com.yxt.anrui.terminal.fegin.asbwinvoiceapply.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/11
+ **/
+@Data
+public class BwinvoiceApplyNodeQuery {
+
+    @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/asbwinvoiceapply/flowable/BwinvoiceApplyNodeVo.java

@@ -0,0 +1,24 @@
+package com.yxt.anrui.terminal.fegin.asbwinvoiceapply.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/11
+ **/
+@Data
+public class BwinvoiceApplyNodeVo {
+
+    @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/asbwinvoiceapply/flowable/BwinvoiceApplyTaskQuery.java

@@ -0,0 +1,43 @@
+package com.yxt.anrui.terminal.fegin.asbwinvoiceapply.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/11
+ **/
+@Data
+public class BwinvoiceApplyTaskQuery {
+
+    /**
+     * 终止、驳回、撤回
+     */
+    @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/asbwinvoiceapply/flowable/CompleteBwinvoiceApplyDto.java

@@ -0,0 +1,35 @@
+package com.yxt.anrui.terminal.fegin.asbwinvoiceapply.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/11
+ **/
+@Data
+public class CompleteBwinvoiceApplyDto {
+
+    @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/api/asbusclaimbill/AsBusclaimBill.java

@@ -38,6 +38,8 @@ public class AsBusclaimBill extends BaseEntity {
     private BigDecimal claimOutAmount;
     @ApiModelProperty("索赔厂家补助")
     private BigDecimal claimSubsidyAmount;
+    @ApiModelProperty("施救费")
+    private BigDecimal claimRescueAmount;
     @ApiModelProperty("索赔其他费用")
     private BigDecimal claimOtherAmount;
     @ApiModelProperty("开票状态")

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBillExcelInfo.java

@@ -27,6 +27,8 @@ public class AsBusclaimBillExcelInfo{
     private BigDecimal claimOutAmount = new BigDecimal("0");
     @ApiModelProperty("索赔厂家补助")
     private BigDecimal claimSubsidyAmount = new BigDecimal("0");
+    @ApiModelProperty("施救费")
+    private BigDecimal claimRescueAmount = new BigDecimal("0");
     @ApiModelProperty("索赔其他费用")
     private BigDecimal claimOtherAmount = new BigDecimal("0");
     @ApiModelProperty("状态")

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBillExcelVo.java

@@ -41,6 +41,10 @@ public class AsBusclaimBillExcelVo {
     @ApiModelProperty("索赔厂家补助")
     private String claimSubsidyAmount;
 
+    @ExportEntityMap(CnName = "施救费", EnName = "claimRescueAmount")
+    @ApiModelProperty("施救费")
+    private BigDecimal claimRescueAmount;
+
     //其他费用
     @ExportEntityMap(CnName = "其他费用", EnName = "claimOtherAmount")
     @ApiModelProperty("索赔其他费用")

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBillVo.java

@@ -3,6 +3,8 @@ package com.yxt.anrui.as.api.asbusclaimbill;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * @description:
  * @author: dimengzhe
@@ -29,6 +31,8 @@ public class AsBusclaimBillVo {
     private String claimOutAmount;
     @ApiModelProperty("厂家补助")
     private String claimSubsidyAmount;
+    @ApiModelProperty("施救费")
+    private String claimRescueAmount;
     @ApiModelProperty("索赔其他费用")
     private String claimOtherAmount;
     @ApiModelProperty("单据状态")

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheck/AsBusclaimCheckVo.java

@@ -49,6 +49,9 @@ public class AsBusclaimCheckVo {
     //工单厂家补助
     private String claimSubsidyAmount1;
 
+    //工单施救费
+    private String claimRescueAmount1;
+
     //工单其他费用
     private String claimOtherAmount1;
 
@@ -67,6 +70,9 @@ public class AsBusclaimCheckVo {
     //索赔开票厂家补助
     private String claimSubsidyAmount2;
 
+    //索赔开票施救费
+    private String claimRescueAmount2;
+
     //索赔开票其他金额
     private String claimOtherAmount2;
 

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetail.java

@@ -32,6 +32,8 @@ public class AsBusclaimInvoiceBillDetail extends BaseEntity {
     private BigDecimal claimOutAmount;
     @ApiModelProperty("厂家补助费")
     private BigDecimal claimSubsidyAmount;
+    @ApiModelProperty("施救费")
+    private BigDecimal claimRescueAmount;
     @ApiModelProperty("其他费用")
     private BigDecimal claimOtherAmount;
     @ApiModelProperty("费用是否一致")

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailDto.java

@@ -29,6 +29,8 @@ public class AsBusclaimInvoiceBillDetailDto {
     private String claimOutAmount;
     @ApiModelProperty("厂家补助费")
     private String claimSubsidyAmount;
+    @ApiModelProperty("施救费")
+    private BigDecimal claimRescueAmount;
     @ApiModelProperty("其他费用")
     private String claimOtherAmount;
     @ApiModelProperty("费用是否一致")

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailVo.java

@@ -29,6 +29,8 @@ public class AsBusclaimInvoiceBillDetailVo {
     private String claimOutAmount;
     @ApiModelProperty("厂家补助费")
     private String claimSubsidyAmount;
+    @ApiModelProperty("施救费")
+    private BigDecimal claimRescueAmount;
     @ApiModelProperty("其他费用")
     private String claimOtherAmount;
     @ApiModelProperty("费用是否一致")

yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapplydetail/AsBwinvoiceapplyDetail.java

@@ -78,7 +78,7 @@ public class AsBwinvoiceapplyDetail extends BaseEntity {
 	@ApiModelProperty("外出费")
     private BigDecimal outAmount; // 外出费
 	@ApiModelProperty("施救费")
-    private BigDecimal rescueAmount; // 施救费
+    private BigDecimal claimRescueAmount; // 施救费
 	@ApiModelProperty("其他费用")
     private BigDecimal otherAmount; // 其他费用
 	@ApiModelProperty("费用合计")

yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapplydetail/AsBwinvoiceapplyDetailDetailsVo.java

@@ -79,7 +79,7 @@ public class AsBwinvoiceapplyDetailDetailsVo implements Vo {
 	@ApiModelProperty("外出费")
     private BigDecimal outAmount; // 外出费
 	@ApiModelProperty("施救费")
-    private BigDecimal rescueAmount; // 施救费
+    private BigDecimal claimRescueAmount; // 施救费
 	@ApiModelProperty("其他费用")
     private BigDecimal otherAmount; // 其他费用
 	@ApiModelProperty("费用合计")

yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapplydetail/AsBwinvoiceapplyDetailDto.java

@@ -79,7 +79,7 @@ public class AsBwinvoiceapplyDetailDto implements Dto {
 	@ApiModelProperty("外出费")
     private BigDecimal outAmount; // 外出费
 	@ApiModelProperty("施救费")
-    private BigDecimal rescueAmount; // 施救费
+    private BigDecimal claimRescueAmount; // 施救费
 	@ApiModelProperty("其他费用")
     private BigDecimal otherAmount; // 其他费用
 	@ApiModelProperty("费用合计")

yxt-as/src/main/java/com/yxt/anrui/as/api/ashosesuppapply/AsHoseSuppApply.java

@@ -0,0 +1,91 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.ashosesuppapply;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(1) <br/>
+ * File: AsHoseSuppApply.java <br/>
+ * Class: com.yxt.anrui.as.api.ashosesuppapply.AsHoseSuppApply <br/>
+ * Description: 工时提成抵顶配件费用申请. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-09-13 14:28:06 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "工时提成抵顶配件费用申请", description = "工时提成抵顶配件费用申请")
+@TableName("as_hose_supp_apply")
+public class AsHoseSuppApply extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("单据编号")
+    private String billNo; // 单据编号
+	@ApiModelProperty("申请人")
+    private String createByName; // 申请人
+	@ApiModelProperty("申请部门sid")
+    private String deptSid; // 申请部门sid
+	@ApiModelProperty("申请部门名称")
+    private String deptName; // 申请部门名称
+	@ApiModelProperty("二级站sid")
+    private String secondStatSid; // 二级站sid
+	@ApiModelProperty("二级站名称")
+    private String secondStatName; // 二级站名称
+    @ApiModelProperty("商品总额")
+    private BigDecimal costTotal;
+    @ApiModelProperty("工时提成抵顶金额")
+    private BigDecimal suppAmoutTotal;
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("分公司名称")
+    private String useOrgName; // 分公司名称
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("办结日期")
+    private Date finishTime; // 办结日期
+	@ApiModelProperty("实例id")
+    private String procInstId; // 实例id
+	@ApiModelProperty("流程定义id")
+    private String procDefId; // 流程定义id
+	@ApiModelProperty("任务id")
+    private String taskId; // 任务id
+	@ApiModelProperty("环节id")
+    private String nodeId; // 环节id
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/ashosesuppapply/AsHoseSuppApplyDetailsVo.java

@@ -0,0 +1,106 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.ashosesuppapply;
+
+
+import com.yxt.anrui.as.api.ashosesuppgoodsdetail.AsHoseSuppGoodsDetailDetailsVo;
+import com.yxt.anrui.as.api.ashosesuppsitemdetail.AsHoseSuppSitemDetailDetailsVo;
+import com.yxt.common.core.vo.Vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(1) <br/>
+ * File: AsHoseSuppApplyVo.java <br/>
+ * Class: com.yxt.anrui.as.api.ashosesuppapply.AsHoseSuppApplyVo <br/>
+ * Description: 工时提成抵顶配件费用申请 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-09-13 14:28:06 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "工时提成抵顶配件费用申请 视图数据详情", description = "工时提成抵顶配件费用申请 视图数据详情")
+public class AsHoseSuppApplyDetailsVo implements Vo {
+
+    private String sid; // sid
+
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @ApiModelProperty("申请日期")
+    private Date createTime;
+    @ApiModelProperty("单据编号")
+    private String billNo; // 单据编号
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("申请人sid")
+    private String createBySid;
+	@ApiModelProperty("申请人")
+    private String createByName; // 申请人
+	@ApiModelProperty("申请部门sid")
+    private String deptSid; // 申请部门sid
+	@ApiModelProperty("申请部门名称")
+    private String deptName; // 申请部门名称
+	@ApiModelProperty("二级站sid")
+    private String secondStatSid; // 二级站sid
+	@ApiModelProperty("二级站名称")
+    private String secondStatName; // 二级站名称
+    @ApiModelProperty("商品总额")
+    private BigDecimal costTotal;
+    @ApiModelProperty("工时提成抵顶金额")
+    private BigDecimal suppAmoutTotal;
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("分公司名称")
+    private String useOrgName; // 分公司名称
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @ApiModelProperty("办结日期")
+    private Date finishTime;
+	@ApiModelProperty("实例id")
+    private String procInstId; // 实例id
+	@ApiModelProperty("流程定义id")
+    private String procDefId; // 流程定义id
+	@ApiModelProperty("任务id")
+    private String taskId; // 任务id
+	@ApiModelProperty("环节id")
+    private String nodeId; // 环节id
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+    @ApiModelProperty
+    private List<AsHoseSuppGoodsDetailDetailsVo> asHoseSuppGoodsDetailList;
+    @ApiModelProperty
+    private List<AsHoseSuppSitemDetailDetailsVo> asHoseSuppSitemDetailList;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/ashosesuppapply/AsHoseSuppApplyDto.java

@@ -0,0 +1,105 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.ashosesuppapply;
+
+
+import com.yxt.anrui.as.api.ashosesuppgoodsdetail.AsHoseSuppGoodsDetailDetailsVo;
+import com.yxt.anrui.as.api.ashosesuppgoodsdetail.AsHoseSuppGoodsDetailDto;
+import com.yxt.anrui.as.api.ashosesuppsitemdetail.AsHoseSuppSitemDetailDetailsVo;
+import com.yxt.anrui.as.api.ashosesuppsitemdetail.AsHoseSuppSitemDetailDto;
+import com.yxt.common.core.dto.Dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(1) <br/>
+ * File: AsHoseSuppApplyDto.java <br/>
+ * Class: com.yxt.anrui.as.api.ashosesuppapply.AsHoseSuppApplyDto <br/>
+ * Description: 工时提成抵顶配件费用申请 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-09-13 14:28:06 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "工时提成抵顶配件费用申请 数据传输对象", description = "工时提成抵顶配件费用申请 数据传输对象")
+public class AsHoseSuppApplyDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("单据编号")
+    private String billNo; // 单据编号
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("申请人sid")
+    private String createBySid;
+	@ApiModelProperty("申请人")
+    private String createByName; // 申请人
+	@ApiModelProperty("申请部门sid")
+    private String deptSid; // 申请部门sid
+	@ApiModelProperty("申请部门名称")
+    private String deptName; // 申请部门名称
+	@ApiModelProperty("二级站sid")
+    private String secondStatSid; // 二级站sid
+	@ApiModelProperty("二级站名称")
+    private String secondStatName; // 二级站名称
+    @ApiModelProperty("商品总额")
+    private BigDecimal costTotal;
+    @ApiModelProperty("工时提成抵顶金额")
+    private BigDecimal suppAmoutTotal;
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("分公司名称")
+    private String useOrgName; // 分公司名称
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	@ApiModelProperty("办结日期")
+    private Date finishTime;
+	@ApiModelProperty("实例id")
+    private String procInstId; // 实例id
+	@ApiModelProperty("流程定义id")
+    private String procDefId; // 流程定义id
+	@ApiModelProperty("任务id")
+    private String taskId; // 任务id
+	@ApiModelProperty("环节id")
+    private String nodeId; // 环节id
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+    @ApiModelProperty
+    private List<AsHoseSuppGoodsDetailDto> asHoseSuppGoodsDetailList;
+    @ApiModelProperty
+    private List<AsHoseSuppSitemDetailDto> asHoseSuppSitemDetailList;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/ashosesuppapply/AsHoseSuppApplyQuery.java

@@ -0,0 +1,74 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.ashosesuppapply;
+
+
+import com.yxt.common.core.query.Query;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(1) <br/>
+ * File: AsHoseSuppApplyQuery.java <br/>
+ * Class: com.yxt.anrui.as.api.ashosesuppapply.AsHoseSuppApplyQuery <br/>
+ * Description: 工时提成抵顶配件费用申请 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-09-13 14:28:06 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "工时提成抵顶配件费用申请 查询条件", description = "工时提成抵顶配件费用申请 查询条件")
+public class AsHoseSuppApplyQuery implements Query {
+
+    @ApiModelProperty("分公司名称")
+    private String useOrgName;
+    @ApiModelProperty("申请部门名称")
+    private String deptName;
+    @ApiModelProperty("申请人")
+    private String createByName;
+    @ApiModelProperty("单据编号")
+    private String billNo;
+    @ApiModelProperty("申请日期")
+    private String createTimeStart;
+    private String createTimeEnd;
+    @ApiModelProperty("办结日期")
+    private String finishTimeStart;
+    private String finishTimeEnd;
+    @ApiModelProperty("二级站名称")
+    private String secondStatName;
+
+    private String orgPath;
+    private String userSid;
+    private String menuUrl;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/ashosesuppapply/AsHoseSuppApplyVo.java

@@ -0,0 +1,84 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.ashosesuppapply;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(1) <br/>
+ * File: AsHoseSuppApplyVo.java <br/>
+ * Class: com.yxt.anrui.as.api.ashosesuppapply.AsHoseSuppApplyVo <br/>
+ * Description: 工时提成抵顶配件费用申请 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-09-13 14:28:06 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "工时提成抵顶配件费用申请 视图数据对象", description = "工时提成抵顶配件费用申请 视图数据对象")
+public class AsHoseSuppApplyVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("流程状态")
+    private String nodeState;
+	@ApiModelProperty("单据编号")
+    private String billNo;
+    @ApiModelProperty("分公司名称")
+    private String useOrgName;
+    @ApiModelProperty("申请部门名称")
+    private String deptName;
+	@ApiModelProperty("申请人")
+    private String createByName;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @ApiModelProperty("申请日期")
+    private Date createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @ApiModelProperty("办结日期")
+    private Date finishTime;
+    @ApiModelProperty("二级站名称")
+    private String secondStatName;
+    @ApiModelProperty("商品总额")
+    private BigDecimal costTotal;
+    @ApiModelProperty("工时提成抵顶金额")
+    private BigDecimal suppAmoutTotal;
+    @ApiModelProperty("实例id")
+    private String procInstId;
+    @ApiModelProperty("流程定义id")
+    private String procDefId;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/ashosesuppapply/flowable/CompleteHoseSuppApplyDto.java

@@ -0,0 +1,35 @@
+package com.yxt.anrui.as.api.ashosesuppapply.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/11
+ **/
+@Data
+public class CompleteHoseSuppApplyDto {
+
+    @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/api/ashosesuppapply/flowable/HoseSuppApplyDelegateQuery.java

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

yxt-as/src/main/java/com/yxt/anrui/as/api/ashosesuppapply/flowable/HoseSuppApplyNodeQuery.java

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

yxt-as/src/main/java/com/yxt/anrui/as/api/ashosesuppapply/flowable/HoseSuppApplyNodeVo.java

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

yxt-as/src/main/java/com/yxt/anrui/as/api/ashosesuppapply/flowable/HoseSuppApplyTaskQuery.java

@@ -0,0 +1,43 @@
+package com.yxt.anrui.as.api.ashosesuppapply.flowable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/11
+ **/
+@Data
+public class HoseSuppApplyTaskQuery {
+
+    /**
+     * 终止、驳回、撤回
+     */
+    @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;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/ashosesuppapply/flowable/SubmitHoseSuppApplyDto.java

@@ -0,0 +1,20 @@
+package com.yxt.anrui.as.api.ashosesuppapply.flowable;
+
+import com.yxt.anrui.as.api.asbwinvoiceapply.AsBwinvoiceapplyDto;
+import com.yxt.anrui.as.api.ashosesuppapply.AsHoseSuppApplyDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/11
+ **/
+@Data
+public class SubmitHoseSuppApplyDto extends AsHoseSuppApplyDto {
+
+    @ApiModelProperty("流程实例id")
+    private String instanceId;
+    @ApiModelProperty("任务id")
+    private String taskId;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/ashosesuppgoodsdetail/AsHoseSuppGoodsDetail.java

@@ -0,0 +1,90 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.ashosesuppgoodsdetail;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: yxt-as(1) <br/>
+ * File: AsHoseSuppGoodsDetail.java <br/>
+ * Class: com.yxt.anrui.as.api.ashosesuppgoodsdetail.AsHoseSuppGoodsDetail <br/>
+ * Description: 工时提成抵顶配件费用商品明细. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-09-13 14:28:06 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "工时提成抵顶配件费用商品明细", description = "工时提成抵顶配件费用商品明细")
+@TableName("as_hose_supp_goods_detail")
+public class AsHoseSuppGoodsDetail extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("主表sid")
+    private String billSid; // 主表sid
+	@ApiModelProperty("商品ID")
+    private String goodsID; // 商品ID
+	@ApiModelProperty("商品spuSid")
+    private String goodsSpuSid; // 商品spuSid
+	@ApiModelProperty("商品spu名称")
+    private String goodsSpuName; // 商品spu名称
+	@ApiModelProperty("商品skuSid")
+    private String goodsSkuSid; // 商品skuSid
+	@ApiModelProperty("商品sku名称")
+    private String goodsSkuTitle; // 商品sku名称
+	@ApiModelProperty("图号")
+    private String goodsSkuCode; // 图号
+	@ApiModelProperty("规格型号")
+    private String goodsSkuOwnSpec; // 规格型号
+	@ApiModelProperty("厂家sid")
+    private String manufacturerSid; // 厂家sid
+	@ApiModelProperty("厂家名称")
+    private String manufacturerName; // 厂家名称
+	@ApiModelProperty("入库单价")
+    private BigDecimal cost; // 入库单价
+	@ApiModelProperty("单位")
+    private String unit; // 单位
+	@ApiModelProperty("仓库sid")
+    private String warehouseSid; // 仓库sid
+	@ApiModelProperty("仓库名称")
+    private String warehouseName; // 仓库名称
+	@ApiModelProperty("库位sid")
+    private String warehouseRackSid; // 库位sid
+	@ApiModelProperty("库位编码")
+    private String warehouseRackCode; // 库位编码
+	@ApiModelProperty("库存数量")
+    private BigDecimal count; // 库存数量
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/ashosesuppgoodsdetail/AsHoseSuppGoodsDetailDetailsVo.java

@@ -0,0 +1,91 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.ashosesuppgoodsdetail;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: yxt-as(1) <br/>
+ * File: AsHoseSuppGoodsDetailVo.java <br/>
+ * Class: com.yxt.anrui.as.api.ashosesuppgoodsdetail.AsHoseSuppGoodsDetailVo <br/>
+ * Description: 工时提成抵顶配件费用商品明细 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-09-13 14:28:06 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "工时提成抵顶配件费用商品明细 视图数据详情", description = "工时提成抵顶配件费用商品明细 视图数据详情")
+public class AsHoseSuppGoodsDetailDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("主表sid")
+    private String billSid; // 主表sid
+	@ApiModelProperty("商品ID")
+    private String goodsID; // 商品ID
+	@ApiModelProperty("商品spuSid")
+    private String goodsSpuSid; // 商品spuSid
+	@ApiModelProperty("商品spu名称")
+    private String goodsSpuName; // 商品spu名称
+	@ApiModelProperty("商品skuSid")
+    private String goodsSkuSid; // 商品skuSid
+	@ApiModelProperty("商品sku名称")
+    private String goodsSkuTitle; // 商品sku名称
+	@ApiModelProperty("图号")
+    private String goodsSkuCode; // 图号
+	@ApiModelProperty("规格型号")
+    private String goodsSkuOwnSpec; // 规格型号
+	@ApiModelProperty("厂家sid")
+    private String manufacturerSid; // 厂家sid
+	@ApiModelProperty("厂家名称")
+    private String manufacturerName; // 厂家名称
+	@ApiModelProperty("入库单价")
+    private BigDecimal cost; // 入库单价
+	@ApiModelProperty("单位")
+    private String unit; // 单位
+	@ApiModelProperty("仓库sid")
+    private String warehouseSid; // 仓库sid
+	@ApiModelProperty("仓库名称")
+    private String warehouseName; // 仓库名称
+	@ApiModelProperty("库位sid")
+    private String warehouseRackSid; // 库位sid
+	@ApiModelProperty("库位编码")
+    private String warehouseRackCode; // 库位编码
+	@ApiModelProperty("库存数量")
+    private BigDecimal count; // 库存数量
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/ashosesuppgoodsdetail/AsHoseSuppGoodsDetailDto.java

@@ -0,0 +1,91 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.ashosesuppgoodsdetail;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: yxt-as(1) <br/>
+ * File: AsHoseSuppGoodsDetailDto.java <br/>
+ * Class: com.yxt.anrui.as.api.ashosesuppgoodsdetail.AsHoseSuppGoodsDetailDto <br/>
+ * Description: 工时提成抵顶配件费用商品明细 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-09-13 14:28:06 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "工时提成抵顶配件费用商品明细 数据传输对象", description = "工时提成抵顶配件费用商品明细 数据传输对象")
+public class AsHoseSuppGoodsDetailDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("主表sid")
+    private String billSid; // 主表sid
+	@ApiModelProperty("商品ID")
+    private String goodsID; // 商品ID
+	@ApiModelProperty("商品spuSid")
+    private String goodsSpuSid; // 商品spuSid
+	@ApiModelProperty("商品spu名称")
+    private String goodsSpuName; // 商品spu名称
+	@ApiModelProperty("商品skuSid")
+    private String goodsSkuSid; // 商品skuSid
+	@ApiModelProperty("商品sku名称")
+    private String goodsSkuTitle; // 商品sku名称
+	@ApiModelProperty("图号")
+    private String goodsSkuCode; // 图号
+	@ApiModelProperty("规格型号")
+    private String goodsSkuOwnSpec; // 规格型号
+	@ApiModelProperty("厂家sid")
+    private String manufacturerSid; // 厂家sid
+	@ApiModelProperty("厂家名称")
+    private String manufacturerName; // 厂家名称
+	@ApiModelProperty("入库单价")
+    private BigDecimal cost; // 入库单价
+	@ApiModelProperty("单位")
+    private String unit; // 单位
+	@ApiModelProperty("仓库sid")
+    private String warehouseSid; // 仓库sid
+	@ApiModelProperty("仓库名称")
+    private String warehouseName; // 仓库名称
+	@ApiModelProperty("库位sid")
+    private String warehouseRackSid; // 库位sid
+	@ApiModelProperty("库位编码")
+    private String warehouseRackCode; // 库位编码
+	@ApiModelProperty("库存数量")
+    private BigDecimal count; // 库存数量
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/ashosesuppsitemdetail/AsHoseSuppSitemDetail.java

@@ -0,0 +1,76 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.ashosesuppsitemdetail;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: yxt-as(1) <br/>
+ * File: AsHoseSuppSitemDetail.java <br/>
+ * Class: com.yxt.anrui.as.api.ashosesuppsitemdetail.AsHoseSuppSitemDetail <br/>
+ * Description: 工时提成抵顶配件费用维修项目明细. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-09-13 14:28:06 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "工时提成抵顶配件费用维修项目明细", description = "工时提成抵顶配件费用维修项目明细")
+@TableName("as_hose_supp_sitem_detail")
+public class AsHoseSuppSitemDetail extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("主表sid")
+    private String billSid; // 主表sid
+	@ApiModelProperty("维修单编号")
+    private String repairId; // 维修单编号
+	@ApiModelProperty("维修单类型")
+    private String billType; // 维修单类型
+	@ApiModelProperty("科目")
+    private String subject; // 科目
+	@ApiModelProperty("维修项目")
+    private String sitem; // 维修项目
+	@ApiModelProperty("工种")
+    private String serviceType; // 工种
+	@ApiModelProperty("工时数量")
+    private BigDecimal hours; // 工时数量
+	@ApiModelProperty("销售价")
+    private BigDecimal salePrice; // 销售价
+	@ApiModelProperty("工时提成")
+    private BigDecimal examineHourPrice; // 工时提成
+	@ApiModelProperty("抵顶金额")
+    private BigDecimal suppAmout; // 抵顶金额
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/ashosesuppsitemdetail/AsHoseSuppSitemDetailDetailsVo.java

@@ -0,0 +1,77 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.ashosesuppsitemdetail;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: yxt-as(1) <br/>
+ * File: AsHoseSuppSitemDetailVo.java <br/>
+ * Class: com.yxt.anrui.as.api.ashosesuppsitemdetail.AsHoseSuppSitemDetailVo <br/>
+ * Description: 工时提成抵顶配件费用维修项目明细 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-09-13 14:28:06 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "工时提成抵顶配件费用维修项目明细 视图数据详情", description = "工时提成抵顶配件费用维修项目明细 视图数据详情")
+public class AsHoseSuppSitemDetailDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("主表sid")
+    private String billSid; // 主表sid
+	@ApiModelProperty("维修单编号")
+    private String repairId; // 维修单编号
+	@ApiModelProperty("维修单类型")
+    private String billType; // 维修单类型
+	@ApiModelProperty("科目")
+    private String subject; // 科目
+	@ApiModelProperty("维修项目")
+    private String sitem; // 维修项目
+	@ApiModelProperty("工种")
+    private String serviceType; // 工种
+	@ApiModelProperty("工时数量")
+    private BigDecimal hours; // 工时数量
+	@ApiModelProperty("销售价")
+    private BigDecimal salePrice; // 销售价
+	@ApiModelProperty("工时提成")
+    private BigDecimal examineHourPrice; // 工时提成
+	@ApiModelProperty("抵顶金额")
+    private BigDecimal suppAmout; // 抵顶金额
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/ashosesuppsitemdetail/AsHoseSuppSitemDetailDto.java

@@ -0,0 +1,77 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.ashosesuppsitemdetail;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: yxt-as(1) <br/>
+ * File: AsHoseSuppSitemDetailDto.java <br/>
+ * Class: com.yxt.anrui.as.api.ashosesuppsitemdetail.AsHoseSuppSitemDetailDto <br/>
+ * Description: 工时提成抵顶配件费用维修项目明细 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-09-13 14:28:06 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "工时提成抵顶配件费用维修项目明细 数据传输对象", description = "工时提成抵顶配件费用维修项目明细 数据传输对象")
+public class AsHoseSuppSitemDetailDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("主表sid")
+    private String billSid; // 主表sid
+	@ApiModelProperty("维修单编号")
+    private String repairId; // 维修单编号
+	@ApiModelProperty("维修单类型")
+    private String billType; // 维修单类型
+	@ApiModelProperty("科目")
+    private String subject; // 科目
+	@ApiModelProperty("维修项目")
+    private String sitem; // 维修项目
+	@ApiModelProperty("工种")
+    private String serviceType; // 工种
+	@ApiModelProperty("工时数量")
+    private BigDecimal hours; // 工时数量
+	@ApiModelProperty("销售价")
+    private BigDecimal salePrice; // 销售价
+	@ApiModelProperty("工时提成")
+    private BigDecimal examineHourPrice; // 工时提成
+	@ApiModelProperty("抵顶金额")
+    private BigDecimal suppAmout; // 抵顶金额
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsBusrepairServiceItemNewQuery.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.as.api.asserviceitem;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/7/18 17:21
+ */
+@Data
+public class AsBusrepairServiceItemNewQuery implements Query {
+
+    private String useOrgSid; // 部门sid
+
+    @ApiModelProperty("多条件查询")
+    private String name;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemNewVo.java

@@ -0,0 +1,71 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asserviceitem;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: yxt-as(售后服务) <br/>
+ * File: AsServicePackageVo.java <br/>
+ * Class: com.yxt.anrui.as.api.asservicepackage.AsServicePackageVo <br/>
+ * Description: 服务套餐 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-07 11:21:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "服务项目 视图数据对象", description = "服务项目 视图数据对象")
+public class AsServiceItemNewVo implements Vo {
+
+    @ApiModelProperty("维修单编号")
+    private String repairId; // 维修单编号
+    @ApiModelProperty("维修单类型")
+    private String billType; // 维修单类型
+    @ApiModelProperty("科目")
+    private String subject; // 科目
+    @ApiModelProperty("维修项目")
+    private String sitem; // 维修项目
+    @ApiModelProperty("工种")
+    private String serviceType; // 工种
+    @ApiModelProperty("工时数量")
+    private BigDecimal hours; // 工时数量
+    @ApiModelProperty("销售价")
+    private BigDecimal salePrice; // 销售价
+    @ApiModelProperty("工时提成")
+    private BigDecimal examineHourPrice; // 工时提成
+    @ApiModelProperty("抵顶金额")
+    private BigDecimal suppAmout; // 抵顶金额
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillRest.java

@@ -77,7 +77,7 @@ public class AsBusclaimBillRest {
         if (!fileName.matches("^.+\\.(?i)(xls)$") && !fileName.matches("^.+\\.(?i)(xlsx)$")) {
             return ResultBean.fireFail().setMsg("上传文件不正确");
         }
-        int[] resultCell = new int[]{0, 1, 2, 3, 4, 5, 6, 7};
+        int[] resultCell = new int[]{0, 1, 2, 3, 4, 5, 6, 7, 8};
         List<AsBusclaimBillExcelInfo> resultList = new ArrayList<>();
         boolean isExcel2003 = true;
         if (fileName.matches("^.+\\.(?i)(xlsx)$")) {
@@ -175,10 +175,14 @@ public class AsBusclaimBillRest {
                                     asBusclaimBillExcelInfo.setClaimSubsidyAmount(new BigDecimal(temp));
                                     break;
                                 case 6:
+                                    //施救费
+                                    asBusclaimBillExcelInfo.setClaimRescueAmount(new BigDecimal(temp));
+                                    break;
+                                case 7:
                                     //其他费用
                                     asBusclaimBillExcelInfo.setClaimOtherAmount(new BigDecimal(temp));
                                     break;
-                                case 7:
+                                case 8:
                                     //状态
                                     asBusclaimBillExcelInfo.setState(temp);
                                     break;
@@ -212,9 +216,12 @@ public class AsBusclaimBillRest {
                                 word = "索赔厂家补助";
                                 break;
                             case 6:
-                                word = "索赔其他费用";
+                                word = "施救费";
                                 break;
                             case 7:
+                                word = "索赔其他费用";
+                                break;
+                            case 8:
                                 word = "状态";
                                 break;
                             default:

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheck/AsBusclaimCheckMapper.xml

@@ -13,12 +13,14 @@
         IFNULL(abb.goodsAmount,0) AS goodsAmount1,
         IFNULL(abb.outAmount,0) AS claimOutAmount1,
         IFNULL(abb.subsidyAmount,0) AS claimSubsidyAmount1,
+        IFNULL(abb.claimRescueAmount,0) AS claimRescueAmount1,
         IFNULL(abb.otherAmount,0) AS claimOtherAmount1,
         (COALESCE(abb.hourAmount, 0) + COALESCE(abb.goodsAmount, 0) + COALESCE(abb.outAmount, 0) + COALESCE(abb.subsidyAmount, 0) + COALESCE(abb.otherAmount, 0)) AS all1,
         SUM(aibd.`claimHourAmount`) AS claimHourAmount2,
         SUM(aibd.`claimGoodsAmount`) AS claimGoodsAmount2,
         SUM(aibd.`claimOutAmount`) AS claimOutAmount2,
         SUM(aibd.`claimSubsidyAmount`) AS claimSubsidyAmount2,
+        SUM(aibd.`claimRescueAmount`) AS claimRescueAmount2,
         SUM(aibd.`claimOtherAmount`) AS claimOtherAmount2,
         SUM(COALESCE(aibd.`claimHourAmount`, 0) + COALESCE(aibd.`claimGoodsAmount`, 0) + COALESCE(aibd.`claimOutAmount`, 0) + COALESCE(aibd.`claimSubsidyAmount`, 0) + COALESCE(aibd.`claimOtherAmount`, 0)) AS all2,
         SUM(COALESCE(aibd.`claimHourAmount`, 0) + COALESCE(aibd.`claimGoodsAmount`, 0) + COALESCE(aibd.`claimOutAmount`, 0) + COALESCE(aibd.`claimSubsidyAmount`, 0) + COALESCE(aibd.`claimOtherAmount`, 0)) - (COALESCE(abb.hourAmount, 0) + COALESCE(abb.goodsAmount, 0) + COALESCE(abb.outAmount, 0) + COALESCE(abb.subsidyAmount, 0) + COALESCE(abb.otherAmount, 0)) AS all3

yxt-as/src/main/java/com/yxt/anrui/as/biz/ashosesuppapply/AsHoseSuppApplyMapper.java

@@ -0,0 +1,64 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.ashosesuppapply;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.as.api.ashosesuppapply.AsHoseSuppApply;
+import com.yxt.anrui.as.api.ashosesuppapply.AsHoseSuppApplyVo;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Project: yxt-as(1) <br/>
+ * File: AsHoseSuppApplyMapper.java <br/>
+ * Class: com.yxt.anrui.as.biz.ashosesuppapply.AsHoseSuppApplyMapper <br/>
+ * Description: 工时提成抵顶配件费用申请. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-09-13 14:28:06 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface AsHoseSuppApplyMapper extends BaseMapper<AsHoseSuppApply> {
+
+	IPage<AsHoseSuppApplyVo> selectPageVo(IPage<AsHoseSuppApply> page, @Param(Constants.WRAPPER) Wrapper<AsHoseSuppApply> qw);
+
+	int selectBySid(String join);
+
+	int updateFlowFiled(Map<String, Object> beanToMap);
+
+	String selectNum(String billNo);
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/ashosesuppapply/AsHoseSuppApplyMapper.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.as.biz.ashosesuppapply.AsHoseSuppApplyMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.as.api.ashosesuppapply.AsHoseSuppApplyVo">
+		SELECT
+		aa.*
+		FROM
+		as_hose_supp_apply aa
+		LEFT JOIN anrui_portal.sys_organization AS s
+		ON aa.deptSid = s.sid
+		<where> ${ew.sqlSegment} </where>
+	</select>
+
+	<select id="selectBySid" resultType="int">
+		SELECT COUNT(*)
+		FROM as_hose_supp_apply
+		WHERE nodeState != '待提交'
+		  and find_in_set(sid, #{list})
+	</select>
+
+	<update id="updateFlowFiled">
+		UPDATE as_hose_supp_apply
+		SET nodeState=#{nodeState}, nodeId=#{taskDefKey}
+		<if test="nodeState == '已办结' or nodeState == '终止'">
+			, finishTime = NOW()
+		</if>
+		<if test="procDefId != null and procDefId != ''">
+			, procDefId=#{procDefId}
+		</if>
+		<if test="procInsId != null and procInsId != ''">
+			, procInstId=#{procInsId}
+		</if>
+		<if test="taskId != null and taskId != ''">
+			, taskId=#{taskId}
+		</if>
+		WHERE sid=#{sid}
+	</update>
+
+	<select id="selectNum" resultType="java.lang.String">
+		select RIGHT (billNo, 4)
+		from as_hose_supp_apply
+		where billNo LIKE concat(#{billNo}, '%')
+		order by billNo desc
+				limit 1
+	</select>
+</mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/ashosesuppapply/AsHoseSuppApplyRest.java

@@ -0,0 +1,138 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.ashosesuppapply;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.as.api.asbwinvoiceapply.flowable.*;
+import com.yxt.anrui.as.api.ashosesuppapply.flowable.*;
+import com.yxt.anrui.as.feign.flowable.flow.BusinessVariables;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.*;
+
+import com.yxt.anrui.as.api.ashosesuppapply.AsHoseSuppApplyQuery;
+import com.yxt.anrui.as.api.ashosesuppapply.AsHoseSuppApplyVo;
+import com.yxt.anrui.as.api.ashosesuppapply.AsHoseSuppApplyDetailsVo;
+import com.yxt.anrui.as.api.ashosesuppapply.AsHoseSuppApplyDto;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@Api(tags = "工时提成抵顶配件费用申请")
+@RestController
+@RequestMapping("v1/ashosesuppapply")
+public class AsHoseSuppApplyRest {
+
+	@Autowired
+	private AsHoseSuppApplyService asHoseSuppApplyService;
+
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<AsHoseSuppApplyVo>> listPage(@RequestBody PagerQuery<AsHoseSuppApplyQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<AsHoseSuppApplyVo> pv = asHoseSuppApplyService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody AsHoseSuppApplyDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		asHoseSuppApplyService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@ApiOperation("根据sid批量删除")
+    @DeleteMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		return asHoseSuppApplyService.delAll(sids);
+	}
+
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<AsHoseSuppApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		AsHoseSuppApplyDetailsVo vo = asHoseSuppApplyService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+
+	@ApiOperation("提交")
+	@PostMapping("/submitApply")
+	public ResultBean submitApply(@Valid @RequestBody SubmitHoseSuppApplyDto dto) {
+		return asHoseSuppApplyService.submitApply(dto);
+	}
+
+	@ApiOperation(value = "办理（同意）")
+	@PostMapping("/complete")
+	public ResultBean complete(@Valid @RequestBody CompleteHoseSuppApplyDto query) {
+		BusinessVariables bv = new BusinessVariables();
+		BeanUtil.copyProperties(query, bv);
+		bv.setModelId("");
+		return asHoseSuppApplyService.complete(bv);
+	}
+
+	@ApiOperation(value = "获取上一个环节")
+	@GetMapping(value = "/getPreviousNodesForReject")
+	ResultBean<List<HoseSuppApplyNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap HoseSuppApplyNodeQuery query) {
+		return asHoseSuppApplyService.getPreviousNodesForReject(query);
+	}
+
+	@ApiOperation(value = "获取下一个环节")
+	@GetMapping(value = "/getNextNodesForSubmit")
+	ResultBean<List<HoseSuppApplyNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap HoseSuppApplyNodeQuery query) {
+		return asHoseSuppApplyService.getNextNodesForSubmit(query);
+	}
+
+	@ApiOperation(value = "驳回任务")
+	@PostMapping(value = "/reject")
+	public ResultBean taskReject(@Valid @RequestBody HoseSuppApplyTaskQuery query) {
+		return asHoseSuppApplyService.taskReject(query);
+	}
+
+	@ApiOperation(value = "撤回流程")
+	@PostMapping(value = "/revokeProcess")
+	public ResultBean revokeProcess(@Valid @RequestBody HoseSuppApplyTaskQuery query) {
+		return asHoseSuppApplyService.revokeProcess(query);
+	}
+
+	@ApiOperation(value = "终止任务")
+	@PostMapping(value = "/breakProcess")
+	public ResultBean breakProcess(@Valid @RequestBody HoseSuppApplyTaskQuery query) {
+		return asHoseSuppApplyService.breakProcess(query);
+	}
+
+	@ApiOperation(value = "加签")
+	@PostMapping(value = "/delegate")
+	@ResponseBody
+	public ResultBean delegate(@RequestBody HoseSuppApplyDelegateQuery query) {
+		return asHoseSuppApplyService.delegate(query);
+	}
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/ashosesuppapply/AsHoseSuppApplyService.java

@@ -0,0 +1,589 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.ashosesuppapply;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import com.yxt.anrui.as.api.asbwdiffapply.AsBwdiffapply;
+import com.yxt.anrui.as.api.asbwdiffapply.flowable.*;
+import com.yxt.anrui.as.api.asbwinvoiceapply.AsBwinvoiceapply;
+import com.yxt.anrui.as.api.asbwinvoiceapply.AsBwinvoiceapplyQuery;
+import com.yxt.anrui.as.api.asbwinvoiceapply.AsBwinvoiceapplyVo;
+import com.yxt.anrui.as.api.ashosesuppapply.flowable.*;
+import com.yxt.anrui.as.api.ashosesuppgoodsdetail.AsHoseSuppGoodsDetailDetailsVo;
+import com.yxt.anrui.as.api.ashosesuppgoodsdetail.AsHoseSuppGoodsDetailDto;
+import com.yxt.anrui.as.api.ashosesuppsitemdetail.AsHoseSuppSitemDetailDetailsVo;
+import com.yxt.anrui.as.api.ashosesuppsitemdetail.AsHoseSuppSitemDetailDto;
+import com.yxt.anrui.as.biz.ashosesuppgoodsdetail.AsHoseSuppGoodsDetailService;
+import com.yxt.anrui.as.biz.ashosesuppsitemdetail.AsHoseSuppSitemDetailService;
+import com.yxt.anrui.as.feign.base.billno.Rule;
+import com.yxt.anrui.as.feign.flowable.flow.BusinessVariables;
+import com.yxt.anrui.as.feign.flowable.flow.FlowableFeign;
+import com.yxt.anrui.as.feign.flowable.flow.ProcDefEnum;
+import com.yxt.anrui.as.feign.flowable.flow.UpdateFlowFieldVo;
+import com.yxt.anrui.as.feign.flowable.flow2.FlowDelegateQuery;
+import com.yxt.anrui.as.feign.flowable.flow2.FlowFeign;
+import com.yxt.anrui.as.feign.flowable.flowtask.FlowTaskFeign;
+import com.yxt.anrui.as.feign.flowable.flowtask.FlowTaskVo;
+import com.yxt.anrui.as.feign.flowable.flowtask.LatestTaskVo;
+import com.yxt.anrui.as.feign.message.MessageFeign;
+import com.yxt.anrui.as.feign.message.MessageFlowVo;
+import com.yxt.anrui.as.feign.message.MessageFlowableQuery;
+import com.yxt.anrui.as.feign.portal.privilege.PrivilegeQuery;
+import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.as.feign.portal.sysuser.SysUserFeign;
+import com.yxt.common.base.config.component.FileUploadComponent;
+import com.yxt.common.core.result.ResultBean;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.as.api.ashosesuppapply.AsHoseSuppApply;
+import com.yxt.anrui.as.api.ashosesuppapply.AsHoseSuppApplyQuery;
+import com.yxt.anrui.as.api.ashosesuppapply.AsHoseSuppApplyVo;
+import com.yxt.anrui.as.api.ashosesuppapply.AsHoseSuppApplyDetailsVo;
+import com.yxt.anrui.as.api.ashosesuppapply.AsHoseSuppApplyDto;
+
+import org.apache.tomcat.util.threads.ThreadPoolExecutor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.stream.Collectors;
+
+/**
+ * Project: yxt-as(1) <br/>
+ * File: AsHoseSuppApplyService.java <br/>
+ * Class: com.yxt.anrui.as.biz.ashosesuppapply.AsHoseSuppApplyService <br/>
+ * Description: 工时提成抵顶配件费用申请 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-09-13 14:28:06 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class AsHoseSuppApplyService extends MybatisBaseService<AsHoseSuppApplyMapper, AsHoseSuppApply> {
+
+	@Autowired
+	private SysOrganizationFeign sysOrganizationFeign;
+	@Autowired
+	private SysStaffOrgFeign sysStaffOrgFeign;
+	@Autowired
+	private SysUserFeign sysUserFeign;
+	@Autowired
+	private FlowableFeign flowableFeign;
+	@Autowired
+	private FlowTaskFeign flowTaskFeign;
+	@Autowired
+	private FlowFeign flowFeign;
+	@Autowired
+	private MessageFeign messageFeign;
+	@Autowired
+	private FileUploadComponent fileUploadComponent;
+	@Autowired
+	private AsHoseSuppGoodsDetailService asHoseSuppGoodsDetailService;
+	@Autowired
+	private AsHoseSuppSitemDetailService asHoseSuppSitemDetailService;
+
+	public PagerVo<AsHoseSuppApplyVo> listPageVo(PagerQuery<AsHoseSuppApplyQuery> pq) {
+		AsHoseSuppApplyQuery query = pq.getParams();
+		QueryWrapper<AsHoseSuppApply> qw = new QueryWrapper<>();
+		//========================================数据授权开始
+		if (StringUtils.isNotBlank(query.getMenuUrl())) {
+			PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+			privilegeQuery.setOrgPath(query.getOrgPath());
+			privilegeQuery.setMenuUrl(query.getMenuUrl());
+			privilegeQuery.setUserSid(query.getUserSid());
+			ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+			if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+				//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+				String orgSidPath = query.getOrgPath();
+				orgSidPath = orgSidPath + "/";
+				int i1 = orgSidPath.indexOf("/");
+				int i2 = orgSidPath.indexOf("/", i1 + 1);
+				int i3 = orgSidPath.indexOf("/", i2 + 1);
+				int i4 = orgSidPath.indexOf("/", i3 + 1);
+				String orgLevelKey = defaultIdReltBean.getData();
+				if ("1".equals(orgLevelKey)) {
+					orgSidPath = orgSidPath.substring(0, i1);
+					qw.like("s.orgSidPath", orgSidPath);
+				} else if ("2".equals(orgLevelKey)) {
+					orgSidPath = orgSidPath.substring(0, i2);
+					qw.like("s.orgSidPath", orgSidPath);
+				} else if ("3".equals(orgLevelKey)) {
+					orgSidPath = orgSidPath.substring(0, i3);
+					qw.like("s.orgSidPath", orgSidPath);
+				} else if ("4".equals(orgLevelKey)) {
+					orgSidPath = orgSidPath.substring(0, i4);
+					qw.like("s.orgSidPath", orgSidPath);
+				} else if ("5".equals(orgLevelKey)) {
+					qw.eq("aa.createBySid", query.getUserSid());
+				} else {
+					PagerVo<AsHoseSuppApplyVo> p = new PagerVo<>();
+					return p;
+				}
+			} else {
+				PagerVo<AsHoseSuppApplyVo> p = new PagerVo<>();
+				return p;
+			}
+		}
+		if (StringUtils.isNotBlank(query.getUseOrgName())) {
+			qw.like("aa.useOrgName", query.getUseOrgName());
+		}
+		if (StringUtils.isNotBlank(query.getDeptName())) {
+			qw.like("aa.deptName", query.getDeptName());
+		}
+		if (StringUtils.isNotBlank(query.getCreateByName())) {
+			qw.like("aa.createByName", query.getCreateByName());
+		}
+		if (StringUtils.isNotBlank(query.getBillNo())) {
+			qw.like("aa.billNo", query.getBillNo());
+		}
+		if (StringUtils.isNotBlank(query.getSecondStatName())){
+			qw.like("aa.secondStatName",query.getSecondStatName());
+		}
+		String createTimeStart = query.getCreateTimeStart();
+		String createTimeEnd = query.getCreateTimeEnd();
+		qw.apply(StringUtils.isNotEmpty(createTimeStart), "date_format (aa.createTime,'%Y-%m-%d') >= date_format('" + createTimeStart + "','%Y-%m-%d')").
+				apply(StringUtils.isNotEmpty(createTimeEnd), "date_format (aa.createTime,'%Y-%m-%d') <= date_format('" + createTimeEnd + "','%Y-%m-%d')"
+				);
+		String finishTimeStart = query.getFinishTimeStart();
+		String finishTimeEnd = query.getFinishTimeEnd();
+		qw.apply(StringUtils.isNotEmpty(finishTimeStart), "date_format (aa.finishTime,'%Y-%m-%d') >= date_format('" + finishTimeStart + "','%Y-%m-%d')").
+				apply(StringUtils.isNotEmpty(finishTimeEnd), "date_format (aa.finishTime,'%Y-%m-%d') <= date_format('" + finishTimeEnd + "','%Y-%m-%d')"
+				);
+		qw.groupBy("aa.sid");
+		IPage<AsHoseSuppApply> page = PagerUtil.queryToPage(pq);
+		IPage<AsHoseSuppApplyVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<AsHoseSuppApplyVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public String saveOrUpdateDto(AsHoseSuppApplyDto dto){
+        String dtoSid = dto.getSid();
+		List<AsHoseSuppGoodsDetailDto> asHoseSuppGoodsDetailList = dto.getAsHoseSuppGoodsDetailList();
+		List<AsHoseSuppSitemDetailDto> asHoseSuppSitemDetailList = dto.getAsHoseSuppSitemDetailList();
+		String deptSid = dto.getDeptSid();
+		SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(deptSid).getData();
+		String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(deptVo.getOrgSidPath()).getData();
+		SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
+		dto.setUseOrgSid(useOrgSid);
+		dto.setUseOrgName(organizationVo.getName());
+		if (StringUtils.isBlank(dtoSid)) {
+			//生成单据编号
+			String billNo = "";
+			String date = DateUtil.format(DateUtil.date(), "yyyyMM");
+			billNo = "GSTCDDPJFY" + organizationVo.getOrgCode() + date;
+			String i = baseMapper.selectNum(billNo);
+			if (StringUtils.isNotBlank(i)) {
+				billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue());
+			} else {
+				billNo = Rule.getBillNo(billNo, 0);
+			}
+			dto.setBillNo(billNo);
+			String sid = this.insertByDto(dto);
+			for (AsHoseSuppGoodsDetailDto asHoseSuppGoodsDetailDto : asHoseSuppGoodsDetailList) {
+				asHoseSuppGoodsDetailDto.setBillSid(sid);
+				asHoseSuppGoodsDetailService.insertByDto(asHoseSuppGoodsDetailDto);
+			}
+			for (AsHoseSuppSitemDetailDto asHoseSuppSitemDetailDto : asHoseSuppSitemDetailList) {
+				asHoseSuppSitemDetailDto.setBillSid(sid);
+				asHoseSuppSitemDetailService.insertByDto(asHoseSuppSitemDetailDto);
+			}
+			return sid;
+        } 
+		this.updateByDto(dto);
+		asHoseSuppGoodsDetailService.delByBillSid(dtoSid);
+		for (AsHoseSuppGoodsDetailDto asHoseSuppGoodsDetailDto : asHoseSuppGoodsDetailList) {
+			asHoseSuppGoodsDetailDto.setBillSid(dtoSid);
+			asHoseSuppGoodsDetailService.insertByDto(asHoseSuppGoodsDetailDto);
+		}
+		asHoseSuppSitemDetailService.delByBillSid(dtoSid);
+		for (AsHoseSuppSitemDetailDto asHoseSuppSitemDetailDto : asHoseSuppSitemDetailList) {
+			asHoseSuppSitemDetailDto.setBillSid(dtoSid);
+			asHoseSuppSitemDetailService.insertByDto(asHoseSuppSitemDetailDto);
+		}
+		return dtoSid;
+	}
+	
+	public String insertByDto(AsHoseSuppApplyDto dto){
+		AsHoseSuppApply entity = new AsHoseSuppApply();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		entity.setNodeState("待提交");
+		baseMapper.insert(entity);
+		return entity.getSid();
+	}
+	
+	public void updateByDto(AsHoseSuppApplyDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		AsHoseSuppApply entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public AsHoseSuppApplyDetailsVo fetchDetailsVoBySid(String sid){
+		AsHoseSuppApply entity = fetchBySid(sid);
+		AsHoseSuppApplyDetailsVo vo = new AsHoseSuppApplyDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		List<AsHoseSuppGoodsDetailDetailsVo> asHoseSuppGoodsDetailDetailsVos = asHoseSuppGoodsDetailService.selByBillSid(sid);
+		vo.setAsHoseSuppGoodsDetailList(asHoseSuppGoodsDetailDetailsVos);
+		List<AsHoseSuppSitemDetailDetailsVo> asHoseSuppSitemDetailDetailsVos = asHoseSuppSitemDetailService.selByBillSid(sid);
+		vo.setAsHoseSuppSitemDetailList(asHoseSuppSitemDetailDetailsVos);
+		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);
+		for (String sid : sids) {
+			asHoseSuppGoodsDetailService.delByBillSid(sid);
+			asHoseSuppSitemDetailService.delByBillSid(sid);
+		}
+		return rb.success();
+	}
+
+	public ResultBean submitApply(SubmitHoseSuppApplyDto dto) {
+		ResultBean rb = ResultBean.fireFail();
+		AsHoseSuppApply asHoseSuppApply = fetchBySid(dto.getSid());
+		int r = submitBusinessData(dto, asHoseSuppApply);
+		if (r == 3) {
+			return rb.setMsg("该申请不存在");
+		}
+		if (r == 0) {
+			return rb.setMsg("操作失败!提交的数据不一致");
+		}
+		String businessSid = saveOrUpdateDto(dto);
+		asHoseSuppApply = fetchBySid(businessSid);
+		//创建BusinessVariables实体对象
+		BusinessVariables bv = new BusinessVariables();
+		//流程中的参数赋值、若有网关，则赋值网关中判断的字段。
+		Map<String, Object> variables = new HashMap<>();
+		Map<String, Object> appMap = new HashMap<>();
+		appMap.put("sid", businessSid);
+		variables.put("app", appMap);
+		//用户的部门全路径sid
+		SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(asHoseSuppApply.getDeptSid()).getData();
+		if (sysOrganization != null) {
+			bv.setOrgSidPath(sysOrganization.getOrgSidPath());
+		}
+		bv.setBusinessSid(businessSid);
+		bv.setUserSid(dto.getCreateBySid());
+		bv.setFormVariables(variables);
+		if (r == 1) {
+			//ToDo:流程定义id
+			bv.setModelId(ProcDefEnum.ASHOSESUPPAPPLY.getProDefId());
+			ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
+			if (!voResultBean.getSuccess()) {
+				return rb.setMsg(voResultBean.getMsg());
+			}
+			UpdateFlowFieldVo ufVo = voResultBean.getData();
+			updateFlowFiled(BeanUtil.beanToMap(ufVo));
+			asHoseSuppApply = fetchBySid(businessSid);
+			//==================================添加线程
+			try {
+				ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+						.setNameFormat("demo-pool-%d").build();
+				ExecutorService pool = new ThreadPoolExecutor(2, 100,
+						0L, TimeUnit.MILLISECONDS,
+						new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+				AsHoseSuppApply finalAsHoseSuppApply = asHoseSuppApply;
+				Future future1 = pool.submit(() -> {
+					//极光推送
+					MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+					MessageFlowVo messageFlowVo = new MessageFlowVo();
+					BeanUtil.copyProperties(ufVo, messageFlowVo);
+					messageFlowableQuery.setUfVo(messageFlowVo);
+					messageFlowableQuery.setAppMap(appMap);
+					messageFlowableQuery.setBusinessSid(businessSid);
+					messageFlowableQuery.setModuleName("工时提成抵顶配件费用申请");
+					messageFlowableQuery.setMsgContent(finalAsHoseSuppApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+					messageFlowableQuery.setMsgTitle("工时提成抵顶配件费用申请");
+					ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+				});
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+			//==================================添加线程
+			return voResultBean;
+		}
+		if (r == 2) {
+			// ToDo:驳回到发起人后再次提交
+			if (StringUtils.isBlank(dto.getInstanceId())) {
+				return rb.setMsg("参数错误：instanceId");
+			}
+			bv.setTaskId(asHoseSuppApply.getTaskId());
+			bv.setTaskDefKey(asHoseSuppApply.getNodeId());
+			bv.setComment("重新提交");
+			bv.setInstanceId(dto.getInstanceId());
+			return complete(bv);
+		}
+		return rb;
+	}
+
+	private int updateFlowFiled(Map<String, Object> beanToMap) {
+		return baseMapper.updateFlowFiled(beanToMap);
+	}
+
+
+	private int submitBusinessData(SubmitHoseSuppApplyDto dto, AsHoseSuppApply asHoseSuppApply) {
+		int r = 0;
+		if (StringUtils.isBlank(dto.getSid())) {
+			r = 1;
+		} else {
+			if (asHoseSuppApply != null) {
+				String businessTaskId = asHoseSuppApply.getTaskId();
+				if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) {
+					//新提交
+					r = 1;
+				} else if (StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) {
+					//二次提交//只有数据一致的时候才能进行下一步
+					r = 2;
+				}
+			} else {
+				r = 3;
+			}
+		}
+		return r;
+	}
+
+	public ResultBean complete(BusinessVariables bv) {
+		ResultBean rb = ResultBean.fireFail();
+		String businessSid = bv.getBusinessSid();
+		AsHoseSuppApply asHoseSuppApply = fetchBySid(businessSid);
+		Map<String, Object> variables = new HashMap<>();
+		Map<String, Object> appMap = new HashMap<>();
+		appMap.put("sid", businessSid);
+		variables.put("app", appMap);
+		bv.setFormVariables(variables);
+		SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(asHoseSuppApply.getDeptSid()).getData();
+		if (sysOrganization != null) {
+			bv.setOrgSidPath(sysOrganization.getOrgSidPath());
+		}
+		bv.setModelId(asHoseSuppApply.getProcDefId());
+		if (bv.getTaskId().equals(asHoseSuppApply.getTaskId())) {
+			ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
+			if (!resultBean.getSuccess()) {
+				return rb.setMsg(resultBean.getMsg());
+			}
+			UpdateFlowFieldVo ufVo = resultBean.getData();
+			updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+			if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
+
+			} else {
+				//极光推送
+				asHoseSuppApply = fetchBySid(businessSid);
+				MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+				MessageFlowVo messageFlowVo = new MessageFlowVo();
+				BeanUtil.copyProperties(ufVo, messageFlowVo);
+				messageFlowVo.setProcDefId(asHoseSuppApply.getProcDefId());
+				messageFlowVo.setProcInsId(asHoseSuppApply.getProcInstId());
+				messageFlowableQuery.setUfVo(messageFlowVo);
+				messageFlowableQuery.setAppMap(appMap);
+				messageFlowableQuery.setBusinessSid(businessSid);
+				messageFlowableQuery.setModuleName("工时提成抵顶配件费用申请");
+				messageFlowableQuery.setMsgContent(asHoseSuppApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+				messageFlowableQuery.setMsgTitle("工时提成抵顶配件费用申请");
+				ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+			}
+			return rb.success().setData(resultBean.getData());
+		} else {
+			return rb.setMsg("操作失败!提交的数据不一致");
+		}
+	}
+
+	public ResultBean<List<HoseSuppApplyNodeVo>> getPreviousNodesForReject(HoseSuppApplyNodeQuery query) {
+		ResultBean<List<HoseSuppApplyNodeVo>> rb = ResultBean.fireFail();
+		BusinessVariables bv = new BusinessVariables();
+		BeanUtil.copyProperties(query, bv);
+		AsHoseSuppApply asHoseSuppApply = fetchBySid(query.getBusinessSid());
+		bv.setModelId(asHoseSuppApply.getProcDefId());
+		ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
+		//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo
+		List<HoseSuppApplyNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), HoseSuppApplyNodeVo.class)).collect(Collectors.toList());
+		return rb.success().setData(voList);
+	}
+
+	public ResultBean<List<HoseSuppApplyNodeVo>> getNextNodesForSubmit(HoseSuppApplyNodeQuery query) {
+		ResultBean<List<HoseSuppApplyNodeVo>> rb = ResultBean.fireFail();
+		BusinessVariables bv = new BusinessVariables();
+		BeanUtil.copyProperties(query, bv);
+		AsHoseSuppApply asHoseSuppApply = fetchBySid(query.getBusinessSid());
+		bv.setModelId(asHoseSuppApply.getProcDefId());
+		ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
+		//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo
+		List<HoseSuppApplyNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), HoseSuppApplyNodeVo.class)).collect(Collectors.toList());
+		return rb.success().setData(voList);
+	}
+
+	public ResultBean taskReject(HoseSuppApplyTaskQuery query) {
+		ResultBean rb = ResultBean.fireFail();
+		String businessSid = query.getBusinessSid();
+		AsHoseSuppApply asHoseSuppApply = fetchBySid(businessSid);
+		if (asHoseSuppApply == null) {
+			return rb.setMsg("该申请不存在");
+		}
+		String businessTaskId = asHoseSuppApply.getTaskId();
+		if (StringUtils.isNotBlank(businessTaskId)) {
+			if (businessTaskId.equals(query.getTaskId())) {
+				if (StringUtils.isBlank(query.getComment())) {
+					return rb.setMsg("请填写意见");
+				}
+				if (StringUtils.isBlank(query.getUserSid())) {
+					return rb.setMsg("参数错误：userSid");
+				}
+				FlowTaskVo flowTaskVo = new FlowTaskVo();
+				BeanUtil.copyProperties(query, flowTaskVo);
+				Map<String, Object> variables = new HashMap<>();
+				Map<String, Object> appMap = new HashMap<>();
+				appMap.put("sid", businessSid);
+				variables.put("app", appMap);
+				ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
+				if (!resultBean.getSuccess()) {
+					return rb.setMsg(resultBean.getMsg());
+				}
+				UpdateFlowFieldVo ufVo = resultBean.getData();
+				Map<String, Object> map = BeanUtil.beanToMap(ufVo);
+				//更新业务中的流程相关的参数
+				updateFlowFiled(map);
+				//极光推送
+				asHoseSuppApply = fetchBySid(businessSid);
+				MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+				MessageFlowVo messageFlowVo = new MessageFlowVo();
+				BeanUtil.copyProperties(ufVo, messageFlowVo);
+				String procId = asHoseSuppApply.getProcInstId();
+				messageFlowVo.setProcInsId(procId);
+				messageFlowVo.setProcDefId(asHoseSuppApply.getProcDefId());
+				messageFlowableQuery.setUfVo(messageFlowVo);
+				messageFlowableQuery.setAppMap(appMap);
+				messageFlowableQuery.setBusinessSid(businessSid);
+				messageFlowableQuery.setModuleName("工时提成抵顶配件费用申请");
+				ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
+				String nextName = listResultBean.getData().get(0).getName_();
+				String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
+				if ("发起申请".equals(nextName)) {
+					messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
+				} else {
+					messageFlowableQuery.setMsgContent(asHoseSuppApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+				}
+
+				messageFlowableQuery.setMsgTitle("工时提成抵顶配件费用申请");
+				ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+				return rb.success();
+			}
+		}
+		return rb.setMsg("操作失败!提交的数据不一致!");
+	}
+
+	public ResultBean revokeProcess(HoseSuppApplyTaskQuery query) {
+		ResultBean rb = ResultBean.fireFail();
+		if (StringUtils.isBlank(query.getUserSid())) {
+			return rb.setMsg("参数错误：userSid");
+		}
+		AsHoseSuppApply asHoseSuppApply = fetchBySid(query.getBusinessSid());
+		String businessTaskId = asHoseSuppApply.getTaskId();
+		if (StringUtils.isNotBlank(businessTaskId)) {
+			if (businessTaskId.equals(query.getTaskId())) {
+				FlowTaskVo flowTaskVo = new FlowTaskVo();
+				BeanUtil.copyProperties(query, flowTaskVo);
+				ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.revokeProcess(flowTaskVo);
+				if (!resultBean.getSuccess()) {
+					return rb.setMsg(resultBean.getMsg());
+				}
+				updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+				return rb.success().setData(resultBean.getData());
+			}
+		}
+		return rb.setMsg("操作失败，提交的数据不一致!");
+	}
+
+	public ResultBean breakProcess(HoseSuppApplyTaskQuery query) {
+		ResultBean rb = ResultBean.fireFail();
+		if (StringUtils.isBlank(query.getInstanceId())) {
+			return rb.setMsg("参数错误：instanceId");
+		}
+		if (StringUtils.isBlank(query.getUserSid())) {
+			return rb.setMsg("参数错误：userSid");
+		}
+		if (StringUtils.isBlank(query.getComment())) {
+			return rb.setMsg("请填写意见");
+		}
+		AsHoseSuppApply asHoseSuppApply = fetchBySid(query.getBusinessSid());
+		String businessTaskId = asHoseSuppApply.getTaskId();
+		if (StringUtils.isNotBlank(businessTaskId)) {
+			if (query.getUserSid().equals(asHoseSuppApply.getCreateBySid())) {
+				FlowTaskVo flowTaskVo = new FlowTaskVo();
+				BeanUtil.copyProperties(query, flowTaskVo);
+				ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
+				if (!resultBean.getSuccess()) {
+					return rb.setMsg(resultBean.getMsg());
+				}
+				Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
+				updateFlowFiled(map);
+				return rb.success().setData(resultBean.getData());
+			} else {
+				if (businessTaskId.equals(query.getTaskId())) {
+					FlowTaskVo flowTaskVo = new FlowTaskVo();
+					BeanUtil.copyProperties(query, flowTaskVo);
+					ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
+					if (!resultBean.getSuccess()) {
+						return rb.setMsg(resultBean.getMsg());
+					}
+					Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
+					updateFlowFiled(map);
+					return rb.success().setData(resultBean.getData());
+				}
+			}
+		}
+		return rb.setMsg("操作失败!提交的数据不一致!");
+	}
+
+	public ResultBean delegate(HoseSuppApplyDelegateQuery query) {
+		ResultBean rb = ResultBean.fireFail();
+		FlowDelegateQuery delegateQuery = new FlowDelegateQuery();
+		BeanUtil.copyProperties(query, delegateQuery);
+		flowFeign.delegate(delegateQuery);
+		return rb.success();
+	}
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/ashosesuppgoodsdetail/AsHoseSuppGoodsDetailMapper.java

@@ -0,0 +1,45 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.ashosesuppgoodsdetail;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.as.api.ashosesuppgoodsdetail.AsHoseSuppGoodsDetailDetailsVo;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import com.yxt.anrui.as.api.ashosesuppgoodsdetail.AsHoseSuppGoodsDetail;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface AsHoseSuppGoodsDetailMapper extends BaseMapper<AsHoseSuppGoodsDetail> {
+
+    @Delete("delete from as_hose_supp_goods_detail where billSid = #{dtoSid}")
+    void delByBillSid(String dtoSid);
+
+    @Select("select * from as_hose_supp_goods_detail where billSid = #{billSid}")
+    List<AsHoseSuppGoodsDetailDetailsVo> selByBillSid(String billSid);
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/ashosesuppgoodsdetail/AsHoseSuppGoodsDetailMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.as.biz.ashosesuppgoodsdetail.AsHoseSuppGoodsDetailMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+</mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/ashosesuppgoodsdetail/AsHoseSuppGoodsDetailRest.java

@@ -0,0 +1,36 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.ashosesuppgoodsdetail;
+
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+
+@Api(tags = "工时提成抵顶配件费用商品明细")
+@RestController
+@RequestMapping("v1/ashosesuppgoodsdetail")
+public class AsHoseSuppGoodsDetailRest {
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/ashosesuppgoodsdetail/AsHoseSuppGoodsDetailService.java

@@ -0,0 +1,54 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.ashosesuppgoodsdetail;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.anrui.as.api.ashosesuppgoodsdetail.AsHoseSuppGoodsDetail;
+import com.yxt.anrui.as.api.ashosesuppgoodsdetail.AsHoseSuppGoodsDetailDetailsVo;
+import com.yxt.anrui.as.api.ashosesuppgoodsdetail.AsHoseSuppGoodsDetailDto;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class AsHoseSuppGoodsDetailService extends MybatisBaseService<AsHoseSuppGoodsDetailMapper, AsHoseSuppGoodsDetail> {
+
+	public void insertByDto(AsHoseSuppGoodsDetailDto dto){
+		AsHoseSuppGoodsDetail entity = new AsHoseSuppGoodsDetail();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+
+	public void delByBillSid(String dtoSid) {
+		baseMapper.delByBillSid(dtoSid);
+	}
+
+	public List<AsHoseSuppGoodsDetailDetailsVo> selByBillSid(String billSid) {
+		return baseMapper.selByBillSid(billSid);
+	}
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/ashosesuppsitemdetail/AsHoseSuppSitemDetailMapper.java

@@ -0,0 +1,45 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.ashosesuppsitemdetail;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.as.api.ashosesuppsitemdetail.AsHoseSuppSitemDetailDetailsVo;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import com.yxt.anrui.as.api.ashosesuppsitemdetail.AsHoseSuppSitemDetail;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface AsHoseSuppSitemDetailMapper extends BaseMapper<AsHoseSuppSitemDetail> {
+
+	@Delete("delete from as_hose_supp_sitem_detail where billSid = #{dtoSid}")
+	void delByBillSid(String dtoSid);
+
+	@Select("select * from as_hose_supp_sitem_detail where billSid = #{billSid}")
+	List<AsHoseSuppSitemDetailDetailsVo> selByBillSid(String billSid);
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/ashosesuppsitemdetail/AsHoseSuppSitemDetailMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.as.biz.ashosesuppsitemdetail.AsHoseSuppSitemDetailMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+</mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/ashosesuppsitemdetail/AsHoseSuppSitemDetailRest.java

@@ -0,0 +1,36 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.ashosesuppsitemdetail;
+
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+
+@Api(tags = "工时提成抵顶配件费用维修项目明细")
+@RestController
+@RequestMapping("v1/ashosesuppsitemdetail")
+public class AsHoseSuppSitemDetailRest {
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/ashosesuppsitemdetail/AsHoseSuppSitemDetailService.java

@@ -0,0 +1,54 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.ashosesuppsitemdetail;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.anrui.as.api.ashosesuppsitemdetail.AsHoseSuppSitemDetail;
+import com.yxt.anrui.as.api.ashosesuppsitemdetail.AsHoseSuppSitemDetailDetailsVo;
+import com.yxt.anrui.as.api.ashosesuppsitemdetail.AsHoseSuppSitemDetailDto;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class AsHoseSuppSitemDetailService extends MybatisBaseService<AsHoseSuppSitemDetailMapper, AsHoseSuppSitemDetail> {
+	
+	public void insertByDto(AsHoseSuppSitemDetailDto dto){
+		AsHoseSuppSitemDetail entity = new AsHoseSuppSitemDetail();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void delByBillSid(String dtoSid) {
+		baseMapper.delByBillSid(dtoSid);
+	}
+
+	public List<AsHoseSuppSitemDetailDetailsVo> selByBillSid(String billSid) {
+		return baseMapper.selByBillSid(billSid);
+	}
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.as.api.asserviceitem.AsServiceItem;
+import com.yxt.anrui.as.api.asserviceitem.AsServiceItemNewVo;
 import com.yxt.anrui.as.api.asserviceitem.AsServiceItemVo;
 import com.yxt.anrui.as.api.asserviceitem.ServiceTypeVo;
 import com.yxt.anrui.as.api.asservicepackage.AsServicePackageVo;
@@ -30,4 +31,6 @@ public interface AsServiceItemMapper extends BaseMapper<AsServiceItem> {
     AsServiceItem checkForUpdate(@Param("sitemName") String sitemName, @Param("useOrgSid") String useOrgSid, @Param("sid") String sid, @Param("subjectSid") String subjectSid);
 
     int updateIsEnable(@Param("list") List<String> list, @Param("s") String s);
+
+    IPage<AsServiceItemNewVo> getServiceItemListPageNew(IPage<AsServiceItem> page,@Param(Constants.WRAPPER) QueryWrapper<AsServiceItem> qw);
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemMapper.xml

@@ -33,7 +33,7 @@
                serviceTypeName AS serviceType
         FROM as_service_type
         WHERE useOrgSid = #{useOrgSid}
-            and isDelete = 0
+          and isDelete = 0
     </select>
     <select id="checkForInsert" resultType="com.yxt.anrui.as.api.asserviceitem.AsServiceItem">
         select *
@@ -52,4 +52,25 @@
           and subjectSid = #{subjectSid}
           and sid !=#{sid}
     </select>
+
+    <select id="getServiceItemListPageNew" resultType="com.yxt.anrui.as.api.asserviceitem.AsServiceItemNewVo">
+        SELECT
+        ab.billNo AS repairId,
+        ab.billType AS billType,
+        bs.subject,
+        bs.serviceItem AS sitem,
+        bs.serviceType,
+        bs.hours,
+        bs.price AS salePrice,
+        ai.examineHourPrice
+        FROM
+        as_busrepair_bill_sitem bs
+        LEFT JOIN as_busrepair_bill ab
+        ON bs.billSid = ab.sid
+        LEFT JOIN as_service_item ai
+        ON bs.serviceItemSid = ai.sid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 </mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemRest.java

@@ -42,6 +42,13 @@ public class AsServiceItemRest {
         return rb.success().setData(pv);
     }
 
+    @ApiOperation("选择本部门维修工单最后环节维修项目")
+    @PostMapping("/getServiceItemListPageNew")
+    public ResultBean<PagerVo<AsServiceItemNewVo>> getServiceItemListPageNew(@RequestBody PagerQuery<AsBusrepairServiceItemNewQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<AsServiceItemNewVo> pv = asServiceItemService.getServiceItemListPageNew(pq);
+        return rb.success().setData(pv);
+    }
 
     @ApiOperation("禁用")
     @PostMapping("/disableState")

yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemService.java

@@ -276,4 +276,18 @@ public class AsServiceItemService extends MybatisBaseService<AsServiceItemMapper
         PagerVo<AsServiceItemVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
+
+    public PagerVo<AsServiceItemNewVo> getServiceItemListPageNew(PagerQuery<AsBusrepairServiceItemNewQuery> pq) {
+        AsBusrepairServiceItemNewQuery query = pq.getParams();
+        QueryWrapper<AsServiceItem> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.and(wrapper -> wrapper.like("ab.billNo", query.getName()).or().like("bs.serviceItem", query.getName()));
+        }
+        qw.eq("ab.nodeCode", 6);
+        qw.eq("ab.deptSid",query.getUseOrgSid());
+        IPage<AsServiceItem> page = PagerUtil.queryToPage(pq);
+        IPage<AsServiceItemNewVo> pagging = baseMapper.getServiceItemListPageNew(page, qw);
+        PagerVo<AsServiceItemNewVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
 }

yxt-as/src/main/java/com/yxt/anrui/as/feign/flowable/flow/ProcDefEnum.java

@@ -17,6 +17,7 @@ public enum ProcDefEnum {
     ASBWINVOICEAPPLY("工单开票申请", "process_j8zlnkl1:1:12097504"),
     ASTECHTITLEAPPLY("维修技师职称备案申请", ""),
     BILLSETTLEAPPLY("结算申请", "process_g3r02po8:1:10975004"),
+    ASHOSESUPPAPPLY("工时提成抵顶配件费用申请", ""),
     ;