1

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml

@@ -596,7 +596,7 @@
 
     <select id="selRkByBillSid" resultType="java.math.BigDecimal">
         SELECT
-                SUM(subscriptionMoney)
+                IFNULL(SUM(subscriptionMoney),0)
         FROM
                 fin_selected_receivables_detailed
         WHERE contractSid = #{billSid}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java

@@ -128,6 +128,6 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper<FinU
 
     String selectDjByBusVinSid(String busVinSid);
 
-    @Select("SELECT SUM(reveivableMoney) FROM fin_uncollected_receivables_detailed WHERE contractSid = #{billSid}")
+    @Select("SELECT IFNULL(SUM(reveivableMoney),0) FROM fin_uncollected_receivables_detailed WHERE contractSid = #{billSid}")
     BigDecimal selYsByBillSid(String billSid);
 }

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlFeign.java

@@ -57,6 +57,9 @@ public interface SysProUrlFeign {
     @PostMapping("/selectAppUrlByTaskDefKey")
     ResultBean<AppUrlVo> selectAppUrlByTaskDefKey(@Valid @RequestBody AppSysProUrlQuery query);
 
+    @ApiOperation("根据流程定义sid查询环节id和环节名称")
+    @PostMapping("/selecTaskByProId")
+    ResultBean<List<TaskVo>> selecTaskByProId(@RequestParam("flowKey") String flowKey);
 
     /**
      * pc根据流程定义id，节点id，终端及类型查询流程与业务表单url

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlFeignFallBack.java

@@ -50,6 +50,11 @@ public class SysProUrlFeignFallBack implements SysProUrlFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<TaskVo>> selecTaskByProId(String flowKey) {
+        return null;
+    }
+
     @Override
     public ResultBean<List<SysProUrlVo>> selectUrlByKey(String procDefId, String taskDefKey, String type) {
         return null;

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysprourl/TaskVo.java

@@ -0,0 +1,21 @@
+package com.yxt.anrui.flowable.api.sysprourl;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author liuguohui
+ * @version 1.0
+ * @description
+ * @date 2022/03/18
+ */
+@Data
+public class TaskVo implements Vo {
+
+    @ApiModelProperty(name = "环节id")
+    private String taskDefKey;
+    @ApiModelProperty(name = "环节名称")
+    private String taskDefName;
+}

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlController.java

@@ -102,6 +102,11 @@ public class SysProUrlController implements SysProUrlFeign {
         return new ResultBean<AppUrlVo>().success().setData(appUrlVo);
     }
 
+    @Override
+    public ResultBean<List<TaskVo>> selecTaskByProId(String flowKey) {
+        return sysProUrlService.selecTaskByProId(flowKey);
+    }
+
     @Override
     public ResultBean<List<SysProUrlVo>> selectUrlByKey(String procDefId, String taskDefKey, String type) {
         return sysProUrlService.selectUrlByKey(procDefId, taskDefKey, type,null);

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.flowable.api.sysprourl.SysProUrl;
 import com.yxt.anrui.flowable.api.sysprourl.SysProUrlQuery;
 import com.yxt.anrui.flowable.api.sysprourl.SysProUrlVo;
+import com.yxt.anrui.flowable.api.sysprourl.TaskVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -90,4 +91,6 @@ public interface SysProUrlMapper extends BaseMapper<SysProUrl> {
      */
     List<SysProUrlVo> selectUrlByKey(@Param("procDefId") String procDefId, @Param("taskDefKey") String taskDefKey,
                                @Param("type") String type,@Param("terminal") String terminal);
+
+    List<TaskVo> selecTaskByProId(String flowKey);
 }

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.xml

@@ -124,6 +124,16 @@
 
     </select>
 
+    <select id="selecTaskByProId" resultType="com.yxt.anrui.flowable.api.sysprourl.TaskVo">
+        SELECT
+                taskDefKey,
+                taskName AS taskDefName
+        FROM
+                sys_pro_url
+        WHERE proc_def_id LIKE concat('%',#{flowKey},'%')
+        GROUP BY taskDefKey
+    </select>
+
     <!--<select id="selectUrlByKey">
         select url
         from sys_pro_url

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlService.java

@@ -205,4 +205,10 @@ public class SysProUrlService extends MybatisBaseService<SysProUrlMapper, SysPro
         }
         return rb.success().setData(sid);
     }
+
+    public ResultBean<List<TaskVo>> selecTaskByProId(String flowKey) {
+        ResultBean rb = ResultBean.fireFail();
+        List<TaskVo> taskVo = baseMapper.selecTaskByProId(flowKey);
+        return rb.success().setData(taskVo);
+    }
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowpower/SysFlowPower.java

@@ -0,0 +1,62 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.api.sysflowpower;
+
+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;
+
+/**
+ * Project: anrui-portal(流程权限) <br/>
+ * File: SysFlowPower.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysflowpower.SysFlowPower <br/>
+ * Description: 流程权限. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-08-27 14:31:00 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "流程权限", description = "流程权限")
+@TableName("sys_flow_power")
+public class SysFlowPower extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("流程定义id")
+    private String procInstId; // 流程定义id
+	@ApiModelProperty("流程名称")
+    private String flowName; // 流程名称
+	@ApiModelProperty("分公司sid")
+    private String useOrgSids; // 分公司sid
+	@ApiModelProperty("分公司名称")
+    private String useOrgNames; // 分公司名称
+
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowpower/SysFlowPowerDetailsVo.java

@@ -0,0 +1,68 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.api.sysflowpower;
+
+
+import com.yxt.anrui.portal.api.sysflowpowerdetail.SysFlowPowerDetailDetailsVo;
+import com.yxt.anrui.portal.api.sysflowpowerdetail.SysFlowPowerDetailDto;
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui-portal(流程权限) <br/>
+ * File: SysFlowPowerVo.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysflowpower.SysFlowPowerVo <br/>
+ * Description: 流程权限 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-08-27 14:31:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "流程权限 视图数据详情", description = "流程权限 视图数据详情")
+public class SysFlowPowerDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("流程定义id")
+    private String procInstId; // 流程定义id
+	@ApiModelProperty("流程名称")
+    private String flowName; // 流程名称
+    @ApiModelProperty("分公司sid")
+    private List<String> useOrgSids; // 分公司sid
+    @ApiModelProperty("分公司名称")
+    private List<String> useOrgNames; // 分公司名称
+    @ApiModelProperty
+    private List<SysFlowPowerDetailDetailsVo> sysFlowPowerDetailList;
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowpower/SysFlowPowerDto.java

@@ -0,0 +1,68 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.api.sysflowpower;
+
+
+import com.yxt.anrui.portal.api.sysflowpowerdetail.SysFlowPowerDetailDto;
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui-portal(流程权限) <br/>
+ * File: SysFlowPowerDto.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysflowpower.SysFlowPowerDto <br/>
+ * Description: 流程权限 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-08-27 14:31:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "流程权限 数据传输对象", description = "流程权限 数据传输对象")
+public class SysFlowPowerDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("流程定义id")
+    private String procInstId; // 流程定义id
+	@ApiModelProperty("流程名称")
+    private String flowName; // 流程名称
+	@ApiModelProperty("分公司sid")
+    private List<String> useOrgSids; // 分公司sid
+	@ApiModelProperty("分公司名称")
+    private List<String> useOrgNames; // 分公司名称
+    @ApiModelProperty
+    private List<SysFlowPowerDetailDto> sysFlowPowerDetailList;
+
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowpower/SysFlowPowerFeign.java

@@ -0,0 +1,77 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.api.sysflowpower;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui-portal(流程权限) <br/>
+ * File: SysFlowPowerFeign.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysflowpower.SysFlowPowerFeign <br/>
+ * Description: 流程权限. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-08-27 14:31:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "流程权限")
+@FeignClient(
+        contextId = "anrui-portal-SysFlowPower",
+        name = "anrui-portal",
+        path = "v1/sysflowpower")
+public interface SysFlowPowerFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<List<SysFlowPowerVo>> listPage(@RequestParam("flowKey") String flowKey);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody SysFlowPowerDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestParam("sid") String sid);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<SysFlowPowerDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowpower/SysFlowPowerVo.java

@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.api.sysflowpower;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-portal(流程权限) <br/>
+ * File: SysFlowPowerVo.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysflowpower.SysFlowPowerVo <br/>
+ * Description: 流程权限 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-08-27 14:31:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "流程权限 视图数据对象", description = "流程权限 视图数据对象")
+public class SysFlowPowerVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("流程名称")
+    private String flowName; // 流程名称
+	@ApiModelProperty("分公司名称")
+    private String useOrgNames; // 分公司名称
+
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowpowerdetail/SysFlowPowerDetail.java

@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.api.sysflowpowerdetail;
+
+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;
+
+/**
+ * Project: anrui-portal(流程权限) <br/>
+ * File: SysFlowPowerDetail.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysflowpowerdetail.SysFlowPowerDetail <br/>
+ * Description: 流程权限列表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-08-27 14:31:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "流程权限列表", description = "流程权限列表")
+@TableName("sys_flow_power_detail")
+public class SysFlowPowerDetail extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("主表sid")
+    private String mainSid; // 主表sid
+	@ApiModelProperty("环节id")
+    private String taskDefKey; // 环节id
+	@ApiModelProperty("环节名称")
+    private String taskDefName; // 环节名称
+	@ApiModelProperty("参数名称")
+    private String paramName; // 参数名称
+	@ApiModelProperty("权限范围")
+    private String powerRange; // 权限范围
+	@ApiModelProperty("逻辑关系")
+    private String logicRela; // 逻辑关系
+
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowpowerdetail/SysFlowPowerDetailDetailsVo.java

@@ -0,0 +1,67 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.api.sysflowpowerdetail;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-portal(流程权限) <br/>
+ * File: SysFlowPowerDetailVo.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysflowpowerdetail.SysFlowPowerDetailVo <br/>
+ * Description: 流程权限列表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-08-27 14:31:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "流程权限列表 视图数据详情", description = "流程权限列表 视图数据详情")
+public class SysFlowPowerDetailDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("主表sid")
+    private String mainSid; // 主表sid
+	@ApiModelProperty("环节id")
+    private String taskDefKey; // 环节id
+	@ApiModelProperty("环节名称")
+    private String taskDefName; // 环节名称
+	@ApiModelProperty("参数名称")
+    private String paramName; // 参数名称
+	@ApiModelProperty("权限范围")
+    private String powerRange; // 权限范围
+	@ApiModelProperty("逻辑关系")
+    private String logicRela; // 逻辑关系
+
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowpowerdetail/SysFlowPowerDetailDto.java

@@ -0,0 +1,67 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.api.sysflowpowerdetail;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-portal(流程权限) <br/>
+ * File: SysFlowPowerDetailDto.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysflowpowerdetail.SysFlowPowerDetailDto <br/>
+ * Description: 流程权限列表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-08-27 14:31:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "流程权限列表 数据传输对象", description = "流程权限列表 数据传输对象")
+public class SysFlowPowerDetailDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("主表sid")
+    private String mainSid; // 主表sid
+	@ApiModelProperty("环节id")
+    private String taskDefKey; // 环节id
+	@ApiModelProperty("环节名称")
+    private String taskDefName; // 环节名称
+	@ApiModelProperty("参数名称")
+    private String paramName; // 参数名称
+	@ApiModelProperty("权限范围")
+    private String powerRange; // 权限范围
+	@ApiModelProperty("逻辑关系")
+    private String logicRela; // 逻辑关系
+
+}

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowpower/SysFlowPowerMapper.java

@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.biz.sysflowpower;
+
+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.portal.api.sysflowpower.SysFlowPower;
+import com.yxt.anrui.portal.api.sysflowpower.SysFlowPowerVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-portal(流程权限) <br/>
+ * File: SysFlowPowerMapper.java <br/>
+ * Class: com.yxt.anrui.portal.biz.sysflowpower.SysFlowPowerMapper <br/>
+ * Description: 流程权限. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-08-27 14:31:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface SysFlowPowerMapper extends BaseMapper<SysFlowPower> {
+
+	List<SysFlowPowerVo> selectPageVo(String flowKey);
+
+	List<String> selById(@Param("procInstId") String procInstId,@Param("userOrgSids") List<String> userOrgSids);
+}

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowpower/SysFlowPowerMapper.xml

@@ -0,0 +1,20 @@
+<?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.portal.biz.sysflowpower.SysFlowPowerMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.portal.api.sysflowpower.SysFlowPowerVo">
+		SELECT * FROM sys_flow_power WHERE procInstId LIKE CONCAT('%', #{flowKey}, '%')
+	</select>
+
+	<select id="selById" resultType="java.lang.String">
+		SELECT SUBSTRING_INDEX(SUBSTRING_INDEX(s.useOrgSids,',',h.help_topic_id+1),',',-1) AS num
+		FROM mysql.help_topic h,sys_flow_power s
+		WHERE h.help_topic_id &lt; LENGTH(s.useOrgSids)-LENGTH(REPLACE(s.useOrgSids,',',''))+1
+		AND s.procInstId LIKE CONCAT('%', #{procInstId}, '%')
+		AND SUBSTRING_INDEX(SUBSTRING_INDEX(s.useOrgSids,',',h.help_topic_id+1),',',-1) IN
+		<foreach collection="userOrgSids" item="item" index="index" open="(" separator="," close=")">
+			#{item}
+		</foreach>
+	</select>
+</mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowpower/SysFlowPowerRest.java

@@ -0,0 +1,96 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.biz.sysflowpower;
+
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+import com.yxt.anrui.portal.api.sysflowpower.SysFlowPowerVo;
+import com.yxt.anrui.portal.api.sysflowpower.SysFlowPowerDetailsVo;
+import com.yxt.anrui.portal.api.sysflowpower.SysFlowPowerDto;
+import com.yxt.anrui.portal.api.sysflowpower.SysFlowPowerFeign;
+
+/**
+ * Project: anrui-portal(流程权限) <br/>
+ * File: SysFlowPowerFeignFallback.java <br/>
+ * Class: com.yxt.anrui.portal.biz.sysflowpower.SysFlowPowerRest <br/>
+ * Description: 流程权限. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-08-27 14:31:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "流程权限")
+@RestController("com.yxt.anrui.portal.biz.sysflowpower.SysFlowPowerRest")
+@RequestMapping("v1/sysflowpower")
+public class SysFlowPowerRest implements SysFlowPowerFeign {
+
+	@Autowired
+	private SysFlowPowerService sysFlowPowerService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<List<SysFlowPowerVo>> listPage(@RequestParam("flowKey") String flowKey){
+		ResultBean rb = ResultBean.fireFail();
+		List<SysFlowPowerVo> pv = sysFlowPowerService.listPageVo(flowKey);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody SysFlowPowerDto dto){
+		return sysFlowPowerService.saveOrUpdateDto(dto);
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @DeleteMapping("/delBySids")
+    public ResultBean delBySids(@RequestParam("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		sysFlowPowerService.delAll(sid);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<SysFlowPowerDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		SysFlowPowerDetailsVo vo = sysFlowPowerService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowpower/SysFlowPowerService.java

@@ -0,0 +1,143 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.biz.sysflowpower;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.portal.api.sysflowpowerdetail.SysFlowPowerDetailDetailsVo;
+import com.yxt.anrui.portal.api.sysflowpowerdetail.SysFlowPowerDetailDto;
+import com.yxt.anrui.portal.biz.sysflowpowerdetail.SysFlowPowerDetailService;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.ApiModelProperty;
+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.portal.api.sysflowpower.SysFlowPower;
+import com.yxt.anrui.portal.api.sysflowpower.SysFlowPowerVo;
+import com.yxt.anrui.portal.api.sysflowpower.SysFlowPowerDetailsVo;
+import com.yxt.anrui.portal.api.sysflowpower.SysFlowPowerDto;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Project: anrui-portal(流程权限) <br/>
+ * File: SysFlowPowerService.java <br/>
+ * Class: com.yxt.anrui.portal.biz.sysflowpower.SysFlowPowerService <br/>
+ * Description: 流程权限 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-08-27 14:31:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class SysFlowPowerService extends MybatisBaseService<SysFlowPowerMapper, SysFlowPower> {
+
+    @Autowired
+    private SysFlowPowerDetailService sysFlowPowerDetailService;
+
+    public List<SysFlowPowerVo> listPageVo(String flowKey) {
+        List<SysFlowPowerVo> sysFlowPowerVoList = baseMapper.selectPageVo(flowKey);
+        return sysFlowPowerVoList;
+    }
+
+    public ResultBean saveOrUpdateDto(SysFlowPowerDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String dtoSid = dto.getSid();
+        List<SysFlowPowerDetailDto> sysFlowPowerDetailList = dto.getSysFlowPowerDetailList();
+        if (StringUtils.isBlank(dtoSid)) {
+            List<String> useOrgSids = baseMapper.selById(dto.getProcInstId(),dto.getUseOrgSids());
+            if (useOrgSids.size() > 0){
+                return rb.setMsg("选择的分公司已存在");
+            }
+            String sid = this.insertByDto(dto);
+            for (SysFlowPowerDetailDto sysFlowPowerDetailDto : sysFlowPowerDetailList) {
+                sysFlowPowerDetailDto.setMainSid(sid);
+                sysFlowPowerDetailService.insertByDto(sysFlowPowerDetailDto);
+            }
+            return rb.success();
+        }
+        this.updateByDto(dto);
+        sysFlowPowerDetailService.delByMainSid(dtoSid);
+        for (SysFlowPowerDetailDto sysFlowPowerDetailDto : sysFlowPowerDetailList) {
+            sysFlowPowerDetailDto.setMainSid(dtoSid);
+            sysFlowPowerDetailService.insertByDto(sysFlowPowerDetailDto);
+        }
+        return rb.success();
+    }
+
+    public String insertByDto(SysFlowPowerDto dto) {
+        SysFlowPower entity = new SysFlowPower();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        List<String> useOrgSids = dto.getUseOrgSids();
+        List<String> useOrgNames = dto.getUseOrgNames();
+        entity.setUseOrgSids(StringUtils.join(useOrgSids, ","));
+        entity.setUseOrgNames(StringUtils.join(useOrgNames, ","));
+        baseMapper.insert(entity);
+        return entity.getSid();
+    }
+
+    public void updateByDto(SysFlowPowerDto dto) {
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        }
+        SysFlowPower entity = fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid", "useOrgSids", "useOrgNames");
+        List<String> useOrgSids = dto.getUseOrgSids();
+        List<String> useOrgNames = dto.getUseOrgNames();
+        entity.setUseOrgSids(StringUtils.join(useOrgSids, ","));
+        entity.setUseOrgNames(StringUtils.join(useOrgNames, ","));
+        baseMapper.updateById(entity);
+    }
+
+    public SysFlowPowerDetailsVo fetchDetailsVoBySid(String sid) {
+        SysFlowPower entity = fetchBySid(sid);
+        SysFlowPowerDetailsVo vo = new SysFlowPowerDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
+        vo.setUseOrgSids(Arrays.asList(entity.getUseOrgSids().split(",")));
+        vo.setUseOrgNames(Arrays.asList(entity.getUseOrgNames().split(",")));
+        List<SysFlowPowerDetailDetailsVo> sysFlowPowerDetailDetailsVos = sysFlowPowerDetailService.selByMainSid(sid);
+        vo.setSysFlowPowerDetailList(sysFlowPowerDetailDetailsVos);
+        return vo;
+    }
+
+    public void delAll(String sid) {
+        sysFlowPowerDetailService.delByMainSid(sid);
+        String[] sids = StringUtils.stripAll(sid);
+        delBySids(sids);
+    }
+}

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowpowerdetail/SysFlowPowerDetailMapper.java

@@ -0,0 +1,62 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.biz.sysflowpowerdetail;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.portal.api.sysflowpowerdetail.SysFlowPowerDetailDetailsVo;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.portal.api.sysflowpowerdetail.SysFlowPowerDetail;
+
+import java.util.List;
+
+/**
+ * Project: anrui-portal(流程权限) <br/>
+ * File: SysFlowPowerDetailMapper.java <br/>
+ * Class: com.yxt.anrui.portal.biz.sysflowpowerdetail.SysFlowPowerDetailMapper <br/>
+ * Description: 流程权限列表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-08-27 14:31:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface SysFlowPowerDetailMapper extends BaseMapper<SysFlowPowerDetail> {
+
+	@Delete("delete from sys_flow_power_detail where mainSid = #{dtoSid}")
+	void delByMainSid(String dtoSid);
+
+	@Select("select * from sys_flow_power_detail where mainSid = #{dtoSid}")
+	List<SysFlowPowerDetailDetailsVo> selByMainSid(String mainSid);
+}

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowpowerdetail/SysFlowPowerDetailMapper.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.portal.biz.sysflowpowerdetail.SysFlowPowerDetailMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+</mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowpowerdetail/SysFlowPowerDetailRest.java

@@ -0,0 +1,56 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.biz.sysflowpowerdetail;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import com.yxt.anrui.portal.api.sysflowpowerdetail.SysFlowPowerDetailDetailsVo;
+import com.yxt.anrui.portal.api.sysflowpowerdetail.SysFlowPowerDetailDto;
+
+/**
+ * Project: anrui-portal(流程权限) <br/>
+ * File: SysFlowPowerDetailFeignFallback.java <br/>
+ * Class: com.yxt.anrui.portal.biz.sysflowpowerdetail.SysFlowPowerDetailRest <br/>
+ * Description: 流程权限列表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-08-27 14:31:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "流程权限列表")
+@RestController
+@RequestMapping("v1/sysflowpowerdetail")
+public class SysFlowPowerDetailRest {
+}

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowpowerdetail/SysFlowPowerDetailService.java

@@ -0,0 +1,73 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.biz.sysflowpowerdetail;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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.portal.api.sysflowpowerdetail.SysFlowPowerDetail;
+import com.yxt.anrui.portal.api.sysflowpowerdetail.SysFlowPowerDetailDetailsVo;
+import com.yxt.anrui.portal.api.sysflowpowerdetail.SysFlowPowerDetailDto;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-portal(流程权限) <br/>
+ * File: SysFlowPowerDetailService.java <br/>
+ * Class: com.yxt.anrui.portal.biz.sysflowpowerdetail.SysFlowPowerDetailService <br/>
+ * Description: 流程权限列表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-08-27 14:31:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class SysFlowPowerDetailService extends MybatisBaseService<SysFlowPowerDetailMapper, SysFlowPowerDetail> {
+
+	public void insertByDto(SysFlowPowerDetailDto dto){
+		SysFlowPowerDetail entity = new SysFlowPowerDetail();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+
+	public void delByMainSid(String dtoSid) {
+		baseMapper.delByMainSid(dtoSid);
+	}
+
+	public List<SysFlowPowerDetailDetailsVo> selByMainSid(String mainSid) {
+		return baseMapper.selByMainSid(mainSid);
+	}
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busrepairbill/AppBusRepairBillFeign.java

@@ -0,0 +1,32 @@
+package com.yxt.anrui.terminal.api.as.busrepairbill;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * @Author
+ * @Date
+ * @Description
+ */
+@Api(tags = "站长出厂确认")
+@FeignClient(
+        contextId = "terminal-AppBusRepairBill",
+        name = "anrui-terminal",
+        path = "v1/busrepair")
+public interface AppBusRepairBillFeign {
+
+    @PostMapping("/listPageConfirm")
+    @ApiOperation("工单查询列表-站长出厂确认")
+    ResultBean<PagerVo<AppBusrepairBillVo>> listPageConfirm(@RequestBody PagerQuery<AppBusrepairBillQuery> pagerQuery);
+
+    @PostMapping("/statConfirmOut")
+    @ApiOperation("维修工单-站长出厂确认-确认出厂")
+    ResultBean statConfirmOut(@RequestParam("sid") String sid);
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busrepairbill/AppBusrepairBillQuery.java

@@ -0,0 +1,23 @@
+package com.yxt.anrui.terminal.api.as.busrepairbill;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/4/18 13:33
+ */
+@Data
+public class AppBusrepairBillQuery implements Query {
+
+    @ApiModelProperty("组织全路径sid")
+    private String orgPath;
+    @ApiModelProperty("菜单sid")
+    private String menuSid;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("查询条件")
+    private String name;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/busrepairbill/AppBusrepairBillVo.java

@@ -0,0 +1,37 @@
+package com.yxt.anrui.terminal.api.as.busrepairbill;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/4/18 13:33
+ */
+@Data
+public class AppBusrepairBillVo implements Vo {
+
+    private String sid;
+    @ApiModelProperty("维修单编号")
+    private String repairId;
+    @ApiModelProperty("维修单类型")
+    private String billType;
+    @ApiModelProperty("环节名称")
+    private String state;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("科目")
+    private String subject;
+    @ApiModelProperty("车架号/车牌号")
+    private String carCodeInfo;
+    @ApiModelProperty("进厂时间")
+    private String entryTime;
+    @ApiModelProperty("是否外出")
+    private String isGoOut2;
+    @ApiModelProperty("是否显示确认按钮")
+    private Boolean isConfirm;
+}

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

@@ -0,0 +1,28 @@
+package com.yxt.anrui.terminal.biz.as;
+
+import com.yxt.anrui.terminal.api.as.busrepairbill.AppBusRepairBillFeign;
+import com.yxt.anrui.terminal.api.as.busrepairbill.AppBusrepairBillQuery;
+import com.yxt.anrui.terminal.api.as.busrepairbill.AppBusrepairBillVo;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("v1/busrepair")
+public class AppBusrepairBillRest implements AppBusRepairBillFeign {
+
+    @Autowired
+    private AppBusrepairBillService asBusrepairBillService;
+
+    @Override
+    public ResultBean<PagerVo<AppBusrepairBillVo>> listPageConfirm(PagerQuery<AppBusrepairBillQuery> pagerQuery) {
+        return asBusrepairBillService.listPageConfirm(pagerQuery);
+    }
+
+    @Override
+    public ResultBean statConfirmOut(String sid) {
+        return asBusrepairBillService.statConfirmOut(sid);
+    }
+}

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

@@ -0,0 +1,65 @@
+package com.yxt.anrui.terminal.biz.as;
+
+import cn.hutool.core.date.DateUtil;
+import com.yxt.anrui.terminal.api.as.busrepairbill.AppBusrepairBillQuery;
+import com.yxt.anrui.terminal.api.as.busrepairbill.AppBusrepairBillVo;
+import com.yxt.anrui.terminal.fegin.asbusrepairbill.AsBusrepairBillQuery;
+import com.yxt.anrui.terminal.fegin.asbusrepairbill.AsBusrepairBillVo;
+import com.yxt.anrui.terminal.fegin.asbusrepairbill.AsbusrepairBillFegin;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class AppBusrepairBillService {
+
+    @Autowired
+    private AsbusrepairBillFegin asbusrepairBillFegin;
+
+    public ResultBean<PagerVo<AppBusrepairBillVo>> listPageConfirm(PagerQuery<AppBusrepairBillQuery> pagerQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerQuery<AsBusrepairBillQuery> pagerQuery1 = new PagerQuery<>();
+        AsBusrepairBillQuery params = new AsBusrepairBillQuery();
+        AppBusrepairBillQuery params1 = pagerQuery.getParams();
+        params.setUserSid(params1.getUserSid());
+        params.setOrgPath(params1.getOrgPath());
+        params.setMenuSid(params1.getMenuSid());
+        params.setName(params1.getName());
+        pagerQuery1.setParams(params);
+        PagerVo<AsBusrepairBillVo> data = asbusrepairBillFegin.listPageConfirm(pagerQuery1).getData();
+        PagerVo<AppBusrepairBillVo> appBusrepairBillVoPagerVo = new PagerVo<>();
+        List<AppBusrepairBillVo> records = new ArrayList<>();
+        List<AsBusrepairBillVo> records1 = data.getRecords();
+        for (AsBusrepairBillVo asBusrepairBillVo : records1) {
+            AppBusrepairBillVo appBusrepairBillVo = new AppBusrepairBillVo();
+            appBusrepairBillVo.setSid(asBusrepairBillVo.getSid());
+            appBusrepairBillVo.setRepairId(asBusrepairBillVo.getBillNo());
+            appBusrepairBillVo.setBillType(asBusrepairBillVo.getBillType());
+            appBusrepairBillVo.setState(asBusrepairBillVo.getNodeName());
+            appBusrepairBillVo.setCustomerName(asBusrepairBillVo.getCustomerName());
+            appBusrepairBillVo.setSubject(asBusrepairBillVo.getSubject());
+            appBusrepairBillVo.setCarCodeInfo(asBusrepairBillVo.getVinNo() + "/" + asBusrepairBillVo.getVehMark());
+            appBusrepairBillVo.setEntryTime(DateUtil.formatDate(asBusrepairBillVo.getEntryTime()));
+            appBusrepairBillVo.setIsGoOut2(asBusrepairBillVo.getIsGoOut());
+            if ("1".equals(asBusrepairBillVo.getIsOutFactory())){
+                appBusrepairBillVo.setIsConfirm(false);
+            }else {
+                appBusrepairBillVo.setIsConfirm(true);
+            }
+            records.add(appBusrepairBillVo);
+        }
+        appBusrepairBillVoPagerVo.setRecords(records);
+        return rb.success().setData(appBusrepairBillVoPagerVo);
+    }
+
+    public ResultBean statConfirmOut(String sid) {
+        String[] sids = StringUtils.stripAll(sid);
+        return asbusrepairBillFegin.statConfirmOut(sids);
+    }
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusrepairbill/AsBusrepairBillQuery.java

@@ -0,0 +1,66 @@
+package com.yxt.anrui.terminal.fegin.asbusrepairbill;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/4/18 13:33
+ */
+@Data
+public class AsBusrepairBillQuery implements Query {
+
+    @ApiModelProperty("使用组织sid")
+    private String orgPath;
+    private String userSid;
+    @ApiModelProperty("菜单url")
+    private String menuUrl;
+    private String menuSid;
+    private String name;
+
+    private String nodeCode;
+
+    @ApiModelProperty("科目")
+    private String subject;
+    @ApiModelProperty("分公司")
+    private String useOrgName;
+    @ApiModelProperty("制单部门")
+    private String dept;
+    @ApiModelProperty("制单人姓名")
+    private String createByName;
+    @ApiModelProperty("单据编号")
+    private String billNo;
+    private String startTime;//制单开始时间
+    private String endTime;//制单结束时间
+    @ApiModelProperty("单据类型0正常工单、1保险理赔、2协议单位")
+    private String billType;
+    @ApiModelProperty("进厂开始时间")
+    private String entryStartTime;
+    @ApiModelProperty("进厂结束时间")
+    private String entryEndTime;
+    @ApiModelProperty("预计完工开始时间")
+    private String finishStartTime;
+    @ApiModelProperty("预计完工结束时间")
+    private String finishEndTime;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("联系电话")
+    private String mobile;
+    @ApiModelProperty("客户单位")
+    private String customerOrg;
+    @ApiModelProperty("车牌号")
+    private String vehMark;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("服务顾问姓名")
+    private String waitorName;
+    @ApiModelProperty("班组名称")
+    private String groupName;
+    @ApiModelProperty("主修人（可多选）销售单")
+    private String mainRepairers;
+    @ApiModelProperty("是否需要开发票（是1，否0）")
+    private String isInvoicing;
+
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusrepairbill/AsBusrepairBillVo.java

@@ -0,0 +1,71 @@
+package com.yxt.anrui.terminal.fegin.asbusrepairbill;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/4/18 13:33
+ */
+@Data
+public class AsBusrepairBillVo implements Vo {
+
+    private String sid;
+    @ApiModelProperty("单据编号")
+    private String billNo;
+    @ApiModelProperty("当前环节")
+    private String nodeName;
+    @ApiModelProperty("分公司")
+    private String useOrgName;
+    @ApiModelProperty("制单部门")
+    private String dept;
+    @ApiModelProperty("制单人姓名")
+    private String createByName;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @ApiModelProperty("制单日期")
+    private Date createTime;
+    @ApiModelProperty("单据类型0正常工单、1保险理赔、2协议单位")
+    private String billType;
+    @ApiModelProperty("科目")
+    private String subject;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("进厂时间")
+    private Date entryTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("预计完工时间-工单")
+    private Date estimatedFinishTime;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("联系电话")
+    private String mobile;
+    @ApiModelProperty("客户单位")
+    private String customerOrg;
+    @ApiModelProperty("车牌号")
+    private String vehMark;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车型")
+    private String vehModel;
+    @ApiModelProperty("服务顾问姓名")
+    private String waitorName;
+    @ApiModelProperty("班组名称")
+    private String groupName;
+    @ApiModelProperty("主修人（可多选）销售单")
+    private String mainRepairers;
+    private String remarks; //备注
+    @ApiModelProperty("是否需要开发票（是1，否0）")
+    private String isInvoicing;
+    @ApiModelProperty("是否外出（1是，2否）")
+    private String isGoOut;
+
+    /*
+    * 工单查询列表-出厂
+    * */
+    @ApiModelProperty("是否可出厂")
+    private String isOutFactory;
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusrepairbill/AsbusrepairBillFegin.java

@@ -23,7 +23,16 @@ import org.springframework.web.bind.annotation.RequestBody;
         path = "v1/AsBusrepairBill"
 )
 public interface AsbusrepairBillFegin {
+
     @PostMapping("/appRepairs")
     @ApiOperation("app工单查询列表")
     ResultBean<PagerVo<AppBusrepairBillVo>> appRepairs(@RequestBody PagerQuery<InventorySearchQuery> pagerQuery);
+
+    @PostMapping("/listPageConfirm")
+    @ApiOperation("工单查询列表-站长出厂确认")
+    ResultBean<PagerVo<AsBusrepairBillVo>> listPageConfirm(@RequestBody PagerQuery<AsBusrepairBillQuery> pagerQuery);
+
+    @PostMapping("/statConfirmOut")
+    @ApiOperation("维修工单-站长出厂确认-确认出厂")
+    ResultBean statConfirmOut(@RequestBody String[] sids);
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillQuery.java

@@ -17,6 +17,9 @@ public class AsBusrepairBillQuery implements Query {
     private String userSid;
     @ApiModelProperty("菜单url")
     private String menuUrl;
+    private String menuSid;
+    private String name;
+
     private String nodeCode;
 
     @ApiModelProperty("科目")

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java

@@ -1002,10 +1002,11 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
     public PagerVo<AsBusrepairBillVo> listPageConfirm(PagerQuery<AsBusrepairBillQuery> pagerQuery) {
         AsBusrepairBillQuery query = pagerQuery.getParams();
         QueryWrapper<AsBusrepairBill> qw = new QueryWrapper<>();
-        if (StringUtils.isNotBlank(query.getMenuUrl())) {
+        if (StringUtils.isNotBlank(query.getMenuUrl()) || StringUtils.isNotBlank(query.getMenuSid())) {
             PrivilegeQuery privilegeQuery = new PrivilegeQuery();
             privilegeQuery.setOrgPath(query.getOrgPath());
             privilegeQuery.setMenuUrl(query.getMenuUrl());
+            privilegeQuery.setMenuSid(query.getMenuSid());
             privilegeQuery.setUserSid(query.getUserSid());
             ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
             if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
@@ -1076,7 +1077,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
             qw.eq("b.billType", query.getBillType());
         }
         if (StringUtils.isNotBlank(query.getSubject())) {
-            qw.like("b.`subject`", query.getSubject());
+            qw.like("b.subject", query.getSubject());
         }
         String entryStartTime = query.getEntryStartTime();
         String entryEndTime = query.getEntryEndTime();
@@ -1116,6 +1117,9 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
         if (StringUtils.isNotBlank(query.getIsInvoicing())) {
             qw.eq("i.isInvoicing", query.getIsInvoicing());
         }
+        if (StringUtils.isNotBlank(query.getName())){
+            qw.and(wrapper -> wrapper.like("b.billNo", query.getName()).or().like("b.billType", query.getName()).or().like("b.subject", query.getName()).or().like("b.customerName", query.getName()).or().like("v.vinNo", query.getName()).or().like("v.vehMark", query.getName()).or().like("b.nodeName", query.getName()));
+        }
         qw.eq("b.outDoorState",2);
         qw.eq("b.isOutFactory",0);
         qw.orderByDesc("b.createTime");