Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo

src/main/java/com/glxp/api/controller/auth/AuthUserController.java

@@ -135,6 +135,14 @@ public class AuthUserController extends BaseController {
         return ResultVOUtils.success(authAdmin);
     }
 
+    //查询用户名信息
+    @AuthRuleAnnotation("")
+    @GetMapping("/admin/auth/companyUser/list")
+    public BaseResponse companyUser(FilterInvLinkDataRequest filterInvLinkDataRequest) {
+        List<AuthAdmin> hospitalUserList =authAdminService.companyUserList(filterInvLinkDataRequest);
+        return ResultVOUtils.success(hospitalUserList);
+    }
+
     //修改用户信息
     @AuthRuleAnnotation("")
     @PostMapping("/admin/auth/admin/updateUser")

src/main/java/com/glxp/api/controller/basic/SysApprovalFlowConfigController.java

@@ -0,0 +1,74 @@
+package com.glxp.api.controller.basic;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.glxp.api.common.enums.ResultEnum;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.entity.basic.SysApprovalFlowConfig;
+import com.glxp.api.entity.basic.SysApprovalFlowConfigMx;
+import com.glxp.api.req.basic.SysApprovalFlowAddDetailRequest;
+import com.glxp.api.req.basic.SysApprovalFlowDetailRequest;
+import com.glxp.api.req.basic.SysApprovalFlowFilterRequest;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.service.basic.SysApprovalFlowConfigService;
+import io.swagger.annotations.ApiOperation;
+import jodd.util.StringUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * 审批配置页面相关接口
+ */
+@Slf4j
+@RestController
+public class SysApprovalFlowConfigController {
+
+    @Resource
+    SysApprovalFlowConfigService sysApprovalFlowConfigService;
+
+    @ApiOperation(value = "获取配置列表")
+    @GetMapping("/udiwms/sysApprovalFlowConfig/filter")
+    public BaseResponse filterSysApprovalFlowConfig(SysApprovalFlowFilterRequest sysApprovalFlowFilterRequest,
+                                                    BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        IPage<SysApprovalFlowConfig> page = sysApprovalFlowConfigService.filterList(sysApprovalFlowFilterRequest);
+        PageSimpleResponse<SysApprovalFlowConfig> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(page.getTotal());
+        pageSimpleResponse.setList(page.getRecords());
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+    @ApiOperation(value = "获取配置详情")
+    @GetMapping("/udiwms/sysApprovalFlowConfig/detail")
+    public BaseResponse getDetailList(SysApprovalFlowDetailRequest sysApprovalFlowDetailRequest) {
+        String type = sysApprovalFlowDetailRequest.getType();
+        if (StringUtil.isEmpty(type)) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+        }
+        List<SysApprovalFlowConfigMx> list = sysApprovalFlowConfigService.getDetailList(type);
+        return ResultVOUtils.success(list);
+    }
+
+    @ApiOperation(value = "新增配置详情")
+    @PostMapping("/udiwms/sysApprovalFlowConfig/addConfigDetail")
+    public BaseResponse addConfigDetail(@RequestBody @Valid SysApprovalFlowAddDetailRequest sysApprovalFlowAddDetailRequest) {
+        int i = sysApprovalFlowConfigService.addConfigDetail(sysApprovalFlowAddDetailRequest);
+        return ResultVOUtils.success();
+    }
+
+    @ApiOperation(value = "删除配置详情")
+    @DeleteMapping("/udiwms/sysApprovalFlowConfig/removeDetail/{id}")
+    public BaseResponse removeDetail(@PathVariable String id) {
+        int i = sysApprovalFlowConfigService.removeDetail(id);
+        return ResultVOUtils.successMsg("移除成功");
+    }
+
+
+}

src/main/java/com/glxp/api/controller/basic/SysApprovalFlowController.java

@@ -0,0 +1,37 @@
+package com.glxp.api.controller.basic;
+
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.req.basic.SubmitApprovalFlowRequest;
+import com.glxp.api.res.basic.SysApprovalFlowDetailResponse;
+import com.glxp.api.service.basic.SysApprovalFlowService;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.List;
+
+@Slf4j
+@RestController
+public class SysApprovalFlowController {
+
+    @Resource
+    private SysApprovalFlowService sysApprovalFlowService;
+
+    @ApiOperation(value = "获取流程审批过程")
+    @GetMapping("/udiwms/sysApprovalFlow/approvalFlowDetailList/{approvalFlowId}")
+    public BaseResponse getDetailList(@PathVariable String approvalFlowId) {
+        List<SysApprovalFlowDetailResponse> list = sysApprovalFlowService.getDetailList(approvalFlowId);
+        return ResultVOUtils.success(list);
+    }
+
+    @ApiOperation(value = "提交节点审批")
+    @PostMapping("/udiwms/sysApprovalFlow/submitApprovalFlow")
+    public BaseResponse submitApprovalFlow(@RequestBody @Valid SubmitApprovalFlowRequest submitApprovalFlowRequest) {
+        sysApprovalFlowService.submitApprovalFlow(submitApprovalFlowRequest);
+        return ResultVOUtils.success();
+    }
+
+}

src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java

@@ -3,6 +3,7 @@ package com.glxp.api.dao.auth;
 import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.req.auth.FilterAuthUserRequest;
+import com.glxp.api.req.auth.FilterInvLinkDataRequest;
 import com.glxp.api.req.auth.UpdateUserRequset;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -85,4 +86,5 @@ public interface AuthAdminDao extends BaseMapperPlus<AuthAdminDao, AuthAdmin, Au
     List<AuthAdmin> selectUnallocatedList(FilterAuthUserRequest filterAuthUserRequest);
 
 
+    List<AuthAdmin> companyUserList(@Param("param")FilterInvLinkDataRequest filterInvLinkDataRequest);
 }

src/main/java/com/glxp/api/dao/basic/SysApprovalFlowConfigMapper.java

@@ -0,0 +1,61 @@
+package com.glxp.api.dao.basic;
+
+import com.glxp.api.dao.BaseMapperPlus;
+import com.glxp.api.entity.basic.SysApprovalFlowConfig;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface SysApprovalFlowConfigMapper extends BaseMapperPlus<SysApprovalFlowConfigMapper,SysApprovalFlowConfig,SysApprovalFlowConfig> {
+    /**
+     * delete by primary key
+     * @param id primaryKey
+     * @return deleteCount
+     */
+    int deleteByPrimaryKey(String id);
+
+    /**
+     * insert record to table
+     * @param record the record
+     * @return insert count
+     */
+    int insert(SysApprovalFlowConfig record);
+
+    boolean insertOrUpdate(SysApprovalFlowConfig record);
+
+    int insertOrUpdateSelective(SysApprovalFlowConfig record);
+
+    /**
+     * insert record to table selective
+     * @param record the record
+     * @return insert count
+     */
+    int insertSelective(SysApprovalFlowConfig record);
+
+    /**
+     * select by primary key
+     * @param id primary key
+     * @return object by primary key
+     */
+    SysApprovalFlowConfig selectByPrimaryKey(String id);
+
+    /**
+     * update record selective
+     * @param record the updated record
+     * @return update count
+     */
+    int updateByPrimaryKeySelective(SysApprovalFlowConfig record);
+
+    /**
+     * update record
+     * @param record the updated record
+     * @return update count
+     */
+    int updateByPrimaryKey(SysApprovalFlowConfig record);
+
+    int updateBatch(List<SysApprovalFlowConfig> list);
+
+    int batchInsert(@Param("list") List<SysApprovalFlowConfig> list);
+}

src/main/java/com/glxp/api/dao/basic/SysApprovalFlowConfigMxMapper.java

@@ -0,0 +1,61 @@
+package com.glxp.api.dao.basic;
+
+import com.glxp.api.dao.BaseMapperPlus;
+import com.glxp.api.entity.basic.SysApprovalFlowConfigMx;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface SysApprovalFlowConfigMxMapper extends BaseMapperPlus<SysApprovalFlowConfigMxMapper,SysApprovalFlowConfigMx,SysApprovalFlowConfigMx> {
+    /**
+     * delete by primary key
+     * @param id primaryKey
+     * @return deleteCount
+     */
+    int deleteByPrimaryKey(String id);
+
+    /**
+     * insert record to table
+     * @param record the record
+     * @return insert count
+     */
+    int insert(SysApprovalFlowConfigMx record);
+
+    boolean insertOrUpdate(SysApprovalFlowConfigMx record);
+
+    int insertOrUpdateSelective(SysApprovalFlowConfigMx record);
+
+    /**
+     * insert record to table selective
+     * @param record the record
+     * @return insert count
+     */
+    int insertSelective(SysApprovalFlowConfigMx record);
+
+    /**
+     * select by primary key
+     * @param id primary key
+     * @return object by primary key
+     */
+    SysApprovalFlowConfigMx selectByPrimaryKey(String id);
+
+    /**
+     * update record selective
+     * @param record the updated record
+     * @return update count
+     */
+    int updateByPrimaryKeySelective(SysApprovalFlowConfigMx record);
+
+    /**
+     * update record
+     * @param record the updated record
+     * @return update count
+     */
+    int updateByPrimaryKey(SysApprovalFlowConfigMx record);
+
+    int updateBatch(List<SysApprovalFlowConfigMx> list);
+
+    int batchInsert(@Param("list") List<SysApprovalFlowConfigMx> list);
+}

src/main/java/com/glxp/api/dao/basic/SysApprovalFlowMapper.java

@@ -0,0 +1,61 @@
+package com.glxp.api.dao.basic;
+
+import com.glxp.api.entity.basic.SysApprovalFlow;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+@Mapper
+public interface SysApprovalFlowMapper {
+    /**
+     * delete by primary key
+     * @param id primaryKey
+     * @return deleteCount
+     */
+    int deleteByPrimaryKey(String id);
+
+    /**
+     * insert record to table
+     * @param record the record
+     * @return insert count
+     */
+    int insert(SysApprovalFlow record);
+
+    int insertOrUpdate(SysApprovalFlow record);
+
+    int insertOrUpdateSelective(SysApprovalFlow record);
+
+    /**
+     * insert record to table selective
+     * @param record the record
+     * @return insert count
+     */
+    int insertSelective(SysApprovalFlow record);
+
+    /**
+     * select by primary key
+     * @param id primary key
+     * @return object by primary key
+     */
+    SysApprovalFlow selectByPrimaryKey(String id);
+
+    /**
+     * update record selective
+     * @param record the updated record
+     * @return update count
+     */
+    int updateByPrimaryKeySelective(SysApprovalFlow record);
+
+    /**
+     * update record
+     * @param record the updated record
+     * @return update count
+     */
+    int updateByPrimaryKey(SysApprovalFlow record);
+
+    int updateBatch(List<SysApprovalFlow> list);
+
+    int batchInsert(@Param("list") List<SysApprovalFlow> list);
+}

src/main/java/com/glxp/api/dao/basic/SysApprovalFlowMxMapper.java

@@ -0,0 +1,61 @@
+package com.glxp.api.dao.basic;
+
+import com.glxp.api.dao.BaseMapperPlus;
+import com.glxp.api.entity.basic.SysApprovalFlowMx;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface SysApprovalFlowMxMapper extends BaseMapperPlus<SysApprovalFlowMxMapper,SysApprovalFlowMx,SysApprovalFlowMx> {
+    /**
+     * delete by primary key
+     * @param id primaryKey
+     * @return deleteCount
+     */
+    int deleteByPrimaryKey(String id);
+
+    /**
+     * insert record to table
+     * @param record the record
+     * @return insert count
+     */
+    int insert(SysApprovalFlowMx record);
+
+    boolean insertOrUpdate(SysApprovalFlowMx record);
+
+    int insertOrUpdateSelective(SysApprovalFlowMx record);
+
+    /**
+     * insert record to table selective
+     * @param record the record
+     * @return insert count
+     */
+    int insertSelective(SysApprovalFlowMx record);
+
+    /**
+     * select by primary key
+     * @param id primary key
+     * @return object by primary key
+     */
+    SysApprovalFlowMx selectByPrimaryKey(String id);
+
+    /**
+     * update record selective
+     * @param record the updated record
+     * @return update count
+     */
+    int updateByPrimaryKeySelective(SysApprovalFlowMx record);
+
+    /**
+     * update record
+     * @param record the updated record
+     * @return update count
+     */
+    int updateByPrimaryKey(SysApprovalFlowMx record);
+
+    int updateBatch(List<SysApprovalFlowMx> list);
+
+    int batchInsert(@Param("list") List<SysApprovalFlowMx> list);
+}

src/main/java/com/glxp/api/entity/basic/SysApprovalFlow.java

@@ -0,0 +1,74 @@
+package com.glxp.api.entity.basic;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+    * 审批主表
+    */
+@Data
+@TableName(value = "sys_approval_flow")
+public class SysApprovalFlow {
+    /**
+    * 主键，可作为审批编号
+    */
+    @TableField(value = "id")
+    private String id;
+
+    /**
+    * 标题（王五的请假申请）
+    */
+    @TableField(value = "title")
+    private String title;
+
+    /**
+    * 审批类型（字典表设置code用作区分类型）
+    */
+    @TableField(value = "type")
+    private String type;
+
+    /**
+    * 审核状态（1：待审核；2：通过；3：驳回；4：撤销）
+    */
+    @TableField(value = "status")
+    private Integer status;
+
+    /**
+    * 申请人主键
+    */
+    @TableField(value = "userId")
+    private String userId;
+    /**
+    * 申请人名称
+    */
+    @TableField(value = "userName")
+    private String userName;
+
+    /**
+    * 创建人
+    */
+    @TableField(value = "createUser")
+    private String createUser;
+
+    /**
+    * 创建时间
+    */
+    @TableField(value = "createTime")
+    private Date createTime;
+
+    /**
+    * 更新人
+    */
+    @TableField(value = "updateUser")
+    private String updateUser;
+
+    /**
+    * 更新时间
+    */
+    @TableField(value = "updateTime")
+    private Date updateTime;
+
+}

src/main/java/com/glxp/api/entity/basic/SysApprovalFlowConfig.java

@@ -0,0 +1,63 @@
+package com.glxp.api.entity.basic;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+    * 审批配置表
+    */
+@Data
+@TableName(value = "sys_approval_flow_config")
+public class SysApprovalFlowConfig {
+    /**
+    * 审核配置表主键
+    */
+    @TableField(value = "id")
+    private  String id;
+
+    /**
+    * 审批类型（字典表设置code用作区分类型）
+    */
+    @TableField(value = "type")
+    private  String type;
+
+    /**
+    * 审批单据名称
+    */
+    @TableField(value = "typeName")
+    private  String typeName;
+
+    /**
+    * 排序
+    */
+    @TableField(value = "approvalSort")
+    private  Integer approvalSort;
+
+    /**
+    * 创建人
+    */
+    @TableField(value = "createUser")
+    private  String createUser;
+
+    /**
+    * 创建时间
+    */
+    @TableField(value = "createTime")
+    private  Date createTime;
+
+    /**
+    * 更新人
+    */
+    @TableField(value = "updateUser")
+    private  String updateUser;
+
+    /**
+    * 更新时间
+    */
+    @TableField(value = "updateTime")
+    private  Date updateTime;
+
+}

src/main/java/com/glxp/api/entity/basic/SysApprovalFlowConfigMx.java

@@ -0,0 +1,68 @@
+package com.glxp.api.entity.basic;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+    * 审批配置表
+    */
+@Data
+@TableName(value = "sys_approval_flow_config_mx")
+public class SysApprovalFlowConfigMx {
+    /**
+    * 审核配置表主键
+    */
+    @TableField(value = "id")
+    private  String id;
+
+    /**
+    * 审批类型（字典表设置code用作区分类型）
+    */
+    @TableField(value = "type")
+    private  String type;
+
+    /**
+    * 审批人主键
+    */
+    @TableField(value = "approvalUserId")
+    private  String approvalUserId;
+    /**
+    * 审批人名称
+    */
+    @TableField(value = "approvalUserName")
+    private  String approvalUserName;
+
+    /**
+    * 排序
+    */
+    @TableField(value = "approvalSort")
+    private  Integer approvalSort;
+
+    /**
+    * 创建人
+    */
+    @TableField(value = "createUser")
+    private  String createUser;
+
+    /**
+    * 创建时间
+    */
+    @TableField(value = "createTime")
+    private  Date createTime;
+
+    /**
+    * 更新人
+    */
+    @TableField(value = "updateUser")
+    private  String updateUser;
+
+    /**
+    * 更新时间
+    */
+    @TableField(value = "updateTime")
+    private  Date updateTime;
+
+}

src/main/java/com/glxp/api/entity/basic/SysApprovalFlowMx.java

@@ -0,0 +1,87 @@
+package com.glxp.api.entity.basic;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+    * 审批明细表
+    */
+@Data
+@TableName(value = "sys_approval_flow_mx")
+public class SysApprovalFlowMx {
+    /**
+    * 明细表主键
+    */
+    @TableField(value = "id")
+    private  String id;
+
+    /**
+    * 审批表主键
+    */
+    @TableField(value = "approvalFlowId")
+    private  String approvalFlowId;
+
+    /**
+    * 审批人主键
+    */
+    @TableField(value = "approvalUserId")
+    private  String approvalUserId;
+
+    /**
+     * 审批人名称
+     */
+    @TableField(value = "approvalUserName")
+    private  String approvalUserName;
+
+    /**
+    * 审批时间
+    */
+    @TableField(value = "approvalTime")
+    private  Date approvalTime;
+
+    /**
+    * 审批意见
+    */
+    @TableField(value = "approvalOpinion")
+    private  String approvalOpinion;
+
+    /**
+    * 审核状态（1：审核中；2：等待我审核；3：通过；4：驳回）
+    */
+    @TableField(value = "approvalStatus")
+    private  Integer approvalStatus;
+
+    /**
+    * 排序
+    */
+    @TableField(value = "approvalSort")
+    private  Integer approvalSort;
+
+    /**
+    * 创建人
+    */
+    @TableField(value = "createUser")
+    private  String createUser;
+
+    /**
+    * 创建时间
+    */
+    @TableField(value = "createTime")
+    private  Date createTime;
+
+    /**
+    * 更新人
+    */
+    @TableField(value = "updateUser")
+    private  String updateUser;
+
+    /**
+    * 更新时间
+    */
+    @TableField(value = "updateTime")
+    private  Date updateTime;
+
+}

src/main/java/com/glxp/api/enums/ApprovalFlowEnum.java

@@ -0,0 +1,23 @@
+package com.glxp.api.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+
+@Getter
+@AllArgsConstructor
+public enum ApprovalFlowEnum {
+
+    DSH(1, "待审核"),
+    TG(2, "通过"),
+    BH(3, "驳回"),
+    CX(4, "撤销")
+    ;
+
+
+    @EnumValue
+    private final Integer code;
+
+    private final String name;
+}

src/main/java/com/glxp/api/enums/ApprovalStatusEnum.java

@@ -0,0 +1,22 @@
+package com.glxp.api.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum ApprovalStatusEnum {
+
+    SHZ(1, "审核中"),
+    DWSH(2, "等待我审核"),
+    TG(3, "通过"),
+    BH(4, "驳回")
+    ;
+
+
+    @EnumValue
+    private final Integer code;
+
+    private final String name;
+}

src/main/java/com/glxp/api/req/basic/SubmitApprovalFlowRequest.java

@@ -0,0 +1,34 @@
+package com.glxp.api.req.basic;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+@Data
+public class SubmitApprovalFlowRequest {
+
+    /**
+     * 明细表主键
+     */
+    @TableField(value = "id")
+    @NotEmpty(message = "审批明细id不可以为空！")
+    private  String id;
+
+
+    /**
+     * 审批意见
+     */
+    @TableField(value = "approvalOpinion")
+    @NotEmpty(message = "审批意见不可以为空！")
+    private  String approvalOpinion;
+
+    /**
+     * 审核状态（1：审核中；2：等待我审核；3：通过；4：驳回）
+     */
+    @TableField(value = "approvalStatus")
+    @NotNull(message = "审核状态不可以为空！")
+    private  Integer approvalStatus;
+
+}

src/main/java/com/glxp/api/req/basic/SysApprovalFlowAddDetailRequest.java

@@ -0,0 +1,39 @@
+package com.glxp.api.req.basic;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+@Data
+public class SysApprovalFlowAddDetailRequest {
+
+    /**
+     * 审批类型（字典表设置code用作区分类型）
+     */
+    @TableField(value = "type")
+    @NotEmpty(message = "审批类型不可以为空！")
+    private  String type;
+
+    /**
+     * 审批人主键
+     */
+    @TableField(value = "approvalUserId")
+    @NotEmpty(message = "审批人主键不可以为空！")
+    private  String approvalUserId;
+    /**
+     * 审批人名称
+     */
+    @TableField(value = "approvalUserName")
+    @NotEmpty(message = "审批人名称不可以为空！")
+    private  String approvalUserName;
+
+    /**
+     * 排序
+     */
+    @TableField(value = "approvalSort")
+    @NotNull(message = "排序不可以为空！")
+    private  Integer approvalSort;
+
+}

src/main/java/com/glxp/api/req/basic/SysApprovalFlowDetailRequest.java

@@ -0,0 +1,14 @@
+package com.glxp.api.req.basic;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+@Data
+public class SysApprovalFlowDetailRequest extends ListPageRequest {
+    /**
+     * 审批类型（字典表设置code用作区分类型）
+     */
+    @TableField(value = "type")
+    private  String type;
+}

src/main/java/com/glxp/api/req/basic/SysApprovalFlowFilterRequest.java

@@ -0,0 +1,22 @@
+package com.glxp.api.req.basic;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+@Data
+public class SysApprovalFlowFilterRequest extends ListPageRequest {
+
+    /**
+     * 审批类型（字典表设置code用作区分类型）
+     */
+    @TableField(value = "type")
+    private  String type;
+
+    /**
+     * 审批单据名称
+     */
+    @TableField(value = "typeName")
+    private  String typeName;
+
+}

src/main/java/com/glxp/api/res/basic/SysApprovalFlowDetailResponse.java

@@ -0,0 +1,100 @@
+package com.glxp.api.res.basic;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SysApprovalFlowDetailResponse {
+
+    /**
+     * 明细表主键
+     */
+    @TableField(value = "id")
+    private  String id;
+
+    /**
+     * 审批表主键
+     */
+    @TableField(value = "approvalFlowId")
+    private  String approvalFlowId;
+
+    /**
+     * 审批人主键
+     */
+    @TableField(value = "approvalUserId")
+    private  String approvalUserId;
+
+    /**
+     * 审批人名称
+     */
+    @TableField(value = "approvalUserName")
+    private  String approvalUserName;
+
+    /**
+     * 审批时间
+     */
+    @TableField(value = "approvalTime")
+    private Date approvalTime;
+
+    /**
+     * 审批意见
+     */
+    @TableField(value = "approvalOpinion")
+    private  String approvalOpinion;
+
+    /**
+     * 审核状态（1：审核中；2：等待我审核；3：通过；4：驳回）
+     */
+    @TableField(value = "approvalStatus")
+    private  Integer approvalStatus;
+
+    /**
+     * 排序
+     */
+    @TableField(value = "approvalSort")
+    private  Integer approvalSort;
+
+    /**
+     * 节点类型 1 申请人 ； 2 审批人
+     */
+    private  Integer nodeType;
+
+
+    /**
+     * 标题（王五的请假申请）
+     */
+    @TableField(value = "title")
+    private String title;
+
+    /**
+     * 审批类型（字典表设置code用作区分类型）
+     */
+    @TableField(value = "type")
+    private String type;
+
+    /**
+     * 审核状态（1：待审核；2：通过；3：驳回；4：撤销）
+     */
+    @TableField(value = "status")
+    private Integer status;
+
+    /**
+     * 申请人主键
+     */
+    @TableField(value = "userId")
+    private String userId;
+    /**
+     * 申请人名称
+     */
+    @TableField(value = "userName")
+    private String userName;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime")
+    private Date createTime;
+
+}

src/main/java/com/glxp/api/service/auth/AuthAdminService.java

@@ -4,6 +4,7 @@ package com.glxp.api.service.auth;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.req.auth.FilterAuthUserRequest;
+import com.glxp.api.req.auth.FilterInvLinkDataRequest;
 import com.glxp.api.req.auth.FilterNoSelectUserRequest;
 import com.glxp.api.req.auth.UpdateUserRequset;
 
@@ -45,4 +46,6 @@ public interface AuthAdminService extends IService<AuthAdmin> {
 
 
     void insertUserAuth(Long userId, List<Long> roleIds);
+
+    List<AuthAdmin> companyUserList(FilterInvLinkDataRequest filterInvLinkDataRequest);
 }

src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java

@@ -9,10 +9,7 @@ import com.glxp.api.dao.auth.SysUserRoleMapper;
 import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.auth.SysUserRole;
 import com.glxp.api.exception.JsonException;
-import com.glxp.api.req.auth.FilterAuthUserRequest;
-import com.glxp.api.req.auth.FilterNoSelectUserRequest;
-import com.glxp.api.req.auth.FilterUserRoleRequest;
-import com.glxp.api.req.auth.UpdateUserRequset;
+import com.glxp.api.req.auth.*;
 import com.glxp.api.service.auth.AuthAdminService;
 import com.glxp.api.common.enums.ResultEnum;
 import org.springframework.stereotype.Service;
@@ -186,6 +183,11 @@ public class AuthAdminServiceImpl extends ServiceImpl<AuthAdminDao, AuthAdmin> i
             insertUserRole(userId, roleIds);
     }
 
+    @Override
+    public List<AuthAdmin> companyUserList(FilterInvLinkDataRequest filterInvLinkDataRequest) {
+        return authAdminDao.companyUserList(filterInvLinkDataRequest);
+    }
+
 
     public void insertUserRole(Long userId, List<Long> roleIds) {
         if (ArrayUtil.isNotEmpty(roleIds)) {

src/main/java/com/glxp/api/service/basic/SysApprovalFlowConfigMxService.java

@@ -0,0 +1,30 @@
+package com.glxp.api.service.basic;
+
+import com.glxp.api.entity.basic.SysApprovalFlowConfigMx;
+
+import java.util.List;
+
+public interface SysApprovalFlowConfigMxService {
+
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(SysApprovalFlowConfigMx record);
+
+    boolean insertOrUpdate(SysApprovalFlowConfigMx record);
+
+    int insertOrUpdateSelective(SysApprovalFlowConfigMx record);
+
+    int insertSelective(SysApprovalFlowConfigMx record);
+
+    SysApprovalFlowConfigMx selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(SysApprovalFlowConfigMx record);
+
+    int updateByPrimaryKey(SysApprovalFlowConfigMx record);
+
+    int updateBatch(List<SysApprovalFlowConfigMx> list);
+
+    int batchInsert(List<SysApprovalFlowConfigMx> list);
+
+}

src/main/java/com/glxp/api/service/basic/SysApprovalFlowConfigService.java

@@ -0,0 +1,42 @@
+package com.glxp.api.service.basic;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.glxp.api.entity.basic.SysApprovalFlowConfig;
+import com.glxp.api.entity.basic.SysApprovalFlowConfigMx;
+import com.glxp.api.req.basic.SysApprovalFlowAddDetailRequest;
+import com.glxp.api.req.basic.SysApprovalFlowFilterRequest;
+
+import java.util.List;
+
+public interface SysApprovalFlowConfigService{
+
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(SysApprovalFlowConfig record);
+
+    boolean insertOrUpdate(SysApprovalFlowConfig record);
+
+    int insertOrUpdateSelective(SysApprovalFlowConfig record);
+
+    int insertSelective(SysApprovalFlowConfig record);
+
+    SysApprovalFlowConfig selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(SysApprovalFlowConfig record);
+
+    int updateByPrimaryKey(SysApprovalFlowConfig record);
+
+    int updateBatch(List<SysApprovalFlowConfig> list);
+
+    int batchInsert(List<SysApprovalFlowConfig> list);
+
+    IPage<SysApprovalFlowConfig> filterList(SysApprovalFlowFilterRequest sysApprovalFlowFilterRequest);
+
+    List<SysApprovalFlowConfigMx> getDetailList(String type);
+
+    int addConfigDetail(SysApprovalFlowAddDetailRequest sysApprovalFlowAddDetailRequest);
+
+    int removeDetail(String id);
+
+}

src/main/java/com/glxp/api/service/basic/SysApprovalFlowMxService.java

@@ -0,0 +1,30 @@
+package com.glxp.api.service.basic;
+
+import com.glxp.api.entity.basic.SysApprovalFlowMx;
+
+import java.util.List;
+
+public interface SysApprovalFlowMxService{
+
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(SysApprovalFlowMx record);
+
+    boolean insertOrUpdate(SysApprovalFlowMx record);
+
+    int insertOrUpdateSelective(SysApprovalFlowMx record);
+
+    int insertSelective(SysApprovalFlowMx record);
+
+    SysApprovalFlowMx selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(SysApprovalFlowMx record);
+
+    int updateByPrimaryKey(SysApprovalFlowMx record);
+
+    int updateBatch(List<SysApprovalFlowMx> list);
+
+    int batchInsert(List<SysApprovalFlowMx> list);
+
+}

src/main/java/com/glxp/api/service/basic/SysApprovalFlowService.java

@@ -0,0 +1,39 @@
+package com.glxp.api.service.basic;
+
+import com.glxp.api.entity.basic.SysApprovalFlow;
+import com.glxp.api.req.basic.SubmitApprovalFlowRequest;
+import com.glxp.api.res.basic.SysApprovalFlowDetailResponse;
+
+import java.util.List;
+
+public interface SysApprovalFlowService{
+
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(SysApprovalFlow record);
+
+    int insertOrUpdate(SysApprovalFlow record);
+
+    int insertOrUpdateSelective(SysApprovalFlow record);
+
+    int insertSelective(SysApprovalFlow record);
+
+    SysApprovalFlow selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(SysApprovalFlow record);
+
+    int updateByPrimaryKey(SysApprovalFlow record);
+
+    int updateBatch(List<SysApprovalFlow> list);
+
+    int batchInsert(List<SysApprovalFlow> list);
+
+    String getApprovalFlowId();
+
+    void generateFlow(String approvalFlowId, String billNo, String type);
+
+    List<SysApprovalFlowDetailResponse> getDetailList(String approvalFlowId);
+
+    void submitApprovalFlow(SubmitApprovalFlowRequest submitApprovalFlowRequest);
+}

src/main/java/com/glxp/api/service/basic/impl/SysApprovalFlowConfigMxServiceImpl.java

@@ -0,0 +1,67 @@
+package com.glxp.api.service.basic.impl;
+
+import com.glxp.api.dao.basic.SysApprovalFlowConfigMxMapper;
+import com.glxp.api.entity.basic.SysApprovalFlowConfigMx;
+import com.glxp.api.service.basic.SysApprovalFlowConfigMxService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class SysApprovalFlowConfigMxServiceImpl implements SysApprovalFlowConfigMxService{
+
+    @Resource
+    private SysApprovalFlowConfigMxMapper sysApprovalFlowConfigMxMapper;
+
+    @Override
+    public int deleteByPrimaryKey(String id) {
+        return sysApprovalFlowConfigMxMapper.deleteByPrimaryKey(id);
+    }
+
+    @Override
+    public int insert(SysApprovalFlowConfigMx record) {
+        return sysApprovalFlowConfigMxMapper.insert(record);
+    }
+
+    @Override
+    public boolean insertOrUpdate(SysApprovalFlowConfigMx record) {
+        return sysApprovalFlowConfigMxMapper.insertOrUpdate(record);
+    }
+
+    @Override
+    public int insertOrUpdateSelective(SysApprovalFlowConfigMx record) {
+        return sysApprovalFlowConfigMxMapper.insertOrUpdateSelective(record);
+    }
+
+    @Override
+    public int insertSelective(SysApprovalFlowConfigMx record) {
+        return sysApprovalFlowConfigMxMapper.insertSelective(record);
+    }
+
+    @Override
+    public SysApprovalFlowConfigMx selectByPrimaryKey(String id) {
+        return sysApprovalFlowConfigMxMapper.selectByPrimaryKey(id);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(SysApprovalFlowConfigMx record) {
+        return sysApprovalFlowConfigMxMapper.updateByPrimaryKeySelective(record);
+    }
+
+    @Override
+    public int updateByPrimaryKey(SysApprovalFlowConfigMx record) {
+        return sysApprovalFlowConfigMxMapper.updateByPrimaryKey(record);
+    }
+
+    @Override
+    public int updateBatch(List<SysApprovalFlowConfigMx> list) {
+        return sysApprovalFlowConfigMxMapper.updateBatch(list);
+    }
+
+    @Override
+    public int batchInsert(List<SysApprovalFlowConfigMx> list) {
+        return sysApprovalFlowConfigMxMapper.batchInsert(list);
+    }
+
+}

src/main/java/com/glxp/api/service/basic/impl/SysApprovalFlowConfigServiceImpl.java

@@ -0,0 +1,147 @@
+package com.glxp.api.service.basic.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.glxp.api.dao.basic.SysApprovalFlowConfigMapper;
+import com.glxp.api.dao.basic.SysApprovalFlowConfigMxMapper;
+import com.glxp.api.entity.basic.SysApprovalFlowConfig;
+import com.glxp.api.entity.basic.SysApprovalFlowConfigMx;
+import com.glxp.api.exception.JsonException;
+import com.glxp.api.req.basic.SysApprovalFlowAddDetailRequest;
+import com.glxp.api.req.basic.SysApprovalFlowFilterRequest;
+import com.glxp.api.service.auth.CustomerService;
+import com.glxp.api.service.basic.SysApprovalFlowConfigService;
+import jodd.util.StringUtil;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+@Service
+public class SysApprovalFlowConfigServiceImpl implements SysApprovalFlowConfigService {
+
+    @Resource
+    private SysApprovalFlowConfigMapper sysApprovalFlowConfigMapper;
+    @Resource
+    private SysApprovalFlowConfigMxMapper sysApprovalFlowConfigMxMapper;
+    @Resource
+    CustomerService customerService;
+
+    @Override
+    public int deleteByPrimaryKey(String id) {
+        return sysApprovalFlowConfigMapper.deleteByPrimaryKey(id);
+    }
+
+    @Override
+    public int insert(SysApprovalFlowConfig record) {
+        return sysApprovalFlowConfigMapper.insert(record);
+    }
+
+    @Override
+    public boolean insertOrUpdate(SysApprovalFlowConfig record) {
+        return sysApprovalFlowConfigMapper.insertOrUpdate(record);
+    }
+
+    @Override
+    public int insertOrUpdateSelective(SysApprovalFlowConfig record) {
+        return sysApprovalFlowConfigMapper.insertOrUpdateSelective(record);
+    }
+
+    @Override
+    public int insertSelective(SysApprovalFlowConfig record) {
+        return sysApprovalFlowConfigMapper.insertSelective(record);
+    }
+
+    @Override
+    public SysApprovalFlowConfig selectByPrimaryKey(String id) {
+        return sysApprovalFlowConfigMapper.selectByPrimaryKey(id);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(SysApprovalFlowConfig record) {
+        return sysApprovalFlowConfigMapper.updateByPrimaryKeySelective(record);
+    }
+
+    @Override
+    public int updateByPrimaryKey(SysApprovalFlowConfig record) {
+        return sysApprovalFlowConfigMapper.updateByPrimaryKey(record);
+    }
+
+    @Override
+    public int updateBatch(List<SysApprovalFlowConfig> list) {
+        return sysApprovalFlowConfigMapper.updateBatch(list);
+    }
+
+    @Override
+    public int batchInsert(List<SysApprovalFlowConfig> list) {
+        return sysApprovalFlowConfigMapper.batchInsert(list);
+    }
+
+    @Override
+    public IPage<SysApprovalFlowConfig> filterList(SysApprovalFlowFilterRequest sysApprovalFlowFilterRequest) {
+        if (sysApprovalFlowFilterRequest == null) {
+            return new Page<>();
+        }
+        IPage<SysApprovalFlowConfig> page = new Page<>();
+        page.setSize(sysApprovalFlowFilterRequest.getLimit());
+        page.setCurrent(sysApprovalFlowFilterRequest.getPage());
+        QueryWrapper<SysApprovalFlowConfig> qw = new QueryWrapper<>();
+        qw.orderByAsc("approvalSort");
+        String type = sysApprovalFlowFilterRequest.getType();
+        String typeName = sysApprovalFlowFilterRequest.getTypeName();
+        if (StringUtil.isNotEmpty(type)){
+            qw.like("type",type);
+        }
+        if (StringUtil.isNotEmpty(typeName)){
+            qw.like("typeName",typeName);
+        }
+        IPage<SysApprovalFlowConfig> sysApprovalFlowConfigIPage = sysApprovalFlowConfigMapper.selectPage(page, qw);
+        return sysApprovalFlowConfigIPage;
+    }
+
+    @Override
+    public List<SysApprovalFlowConfigMx> getDetailList(String type) {
+        QueryWrapper<SysApprovalFlowConfigMx> qw = new QueryWrapper<>();
+        qw.orderByAsc("approvalSort");
+        qw.eq("type",type);
+        return sysApprovalFlowConfigMxMapper.selectList(qw);
+    }
+
+    @Override
+    public int addConfigDetail(SysApprovalFlowAddDetailRequest sysApprovalFlowAddDetailRequest) {
+        SysApprovalFlowConfigMx sysApprovalFlowConfigMx = new SysApprovalFlowConfigMx();
+        BeanUtils.copyProperties(sysApprovalFlowAddDetailRequest,sysApprovalFlowConfigMx);
+        Integer approvalSort = sysApprovalFlowConfigMx.getApprovalSort();
+        String type = sysApprovalFlowConfigMx.getType();
+
+        QueryWrapper<SysApprovalFlowConfigMx> qw = new QueryWrapper<>();
+        qw.eq("approvalSort",approvalSort);
+        qw.eq("type",type);
+        List<SysApprovalFlowConfigMx> sysApprovalFlowConfigMxes = sysApprovalFlowConfigMxMapper.selectList(qw);
+        if (CollUtil.isNotEmpty(sysApprovalFlowConfigMxes)){
+            throw new JsonException("该单据的审核节点排序号重复！");
+        }
+
+        Date date = new Date();
+        Long userId = customerService.getUserId();
+        sysApprovalFlowConfigMx.setCreateTime(date);
+        sysApprovalFlowConfigMx.setUpdateUser(userId + "");
+        sysApprovalFlowConfigMx.setCreateUser(userId + "");
+        sysApprovalFlowConfigMx.setUpdateTime(date);
+        sysApprovalFlowConfigMx.setId(UUID.randomUUID().toString().replace("-", ""));
+
+        return sysApprovalFlowConfigMxMapper.insert(sysApprovalFlowConfigMx);
+    }
+
+    @Override
+    public int removeDetail(String id) {
+        return sysApprovalFlowConfigMxMapper.deleteByPrimaryKey(id);
+    }
+
+
+}

src/main/java/com/glxp/api/service/basic/impl/SysApprovalFlowMxServiceImpl.java

@@ -0,0 +1,67 @@
+package com.glxp.api.service.basic.impl;
+
+import com.glxp.api.dao.basic.SysApprovalFlowMxMapper;
+import com.glxp.api.entity.basic.SysApprovalFlowMx;
+import com.glxp.api.service.basic.SysApprovalFlowMxService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class SysApprovalFlowMxServiceImpl implements SysApprovalFlowMxService {
+
+    @Resource
+    private SysApprovalFlowMxMapper sysApprovalFlowMxMapper;
+
+    @Override
+    public int deleteByPrimaryKey(String id) {
+        return sysApprovalFlowMxMapper.deleteByPrimaryKey(id);
+    }
+
+    @Override
+    public int insert(SysApprovalFlowMx record) {
+        return sysApprovalFlowMxMapper.insert(record);
+    }
+
+    @Override
+    public boolean insertOrUpdate(SysApprovalFlowMx record) {
+        return sysApprovalFlowMxMapper.insertOrUpdate(record);
+    }
+
+    @Override
+    public int insertOrUpdateSelective(SysApprovalFlowMx record) {
+        return sysApprovalFlowMxMapper.insertOrUpdateSelective(record);
+    }
+
+    @Override
+    public int insertSelective(SysApprovalFlowMx record) {
+        return sysApprovalFlowMxMapper.insertSelective(record);
+    }
+
+    @Override
+    public SysApprovalFlowMx selectByPrimaryKey(String id) {
+        return sysApprovalFlowMxMapper.selectByPrimaryKey(id);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(SysApprovalFlowMx record) {
+        return sysApprovalFlowMxMapper.updateByPrimaryKeySelective(record);
+    }
+
+    @Override
+    public int updateByPrimaryKey(SysApprovalFlowMx record) {
+        return sysApprovalFlowMxMapper.updateByPrimaryKey(record);
+    }
+
+    @Override
+    public int updateBatch(List<SysApprovalFlowMx> list) {
+        return sysApprovalFlowMxMapper.updateBatch(list);
+    }
+
+    @Override
+    public int batchInsert(List<SysApprovalFlowMx> list) {
+        return sysApprovalFlowMxMapper.batchInsert(list);
+    }
+
+}

src/main/java/com/glxp/api/service/basic/impl/SysApprovalFlowServiceImpl.java

@@ -0,0 +1,269 @@
+package com.glxp.api.service.basic.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.glxp.api.dao.basic.SysApprovalFlowMapper;
+import com.glxp.api.dao.basic.SysApprovalFlowMxMapper;
+import com.glxp.api.entity.basic.SysApprovalFlow;
+import com.glxp.api.entity.basic.SysApprovalFlowConfigMx;
+import com.glxp.api.entity.basic.SysApprovalFlowMx;
+import com.glxp.api.enums.ApprovalFlowEnum;
+import com.glxp.api.enums.ApprovalStatusEnum;
+import com.glxp.api.exception.JsonException;
+import com.glxp.api.req.basic.SubmitApprovalFlowRequest;
+import com.glxp.api.res.basic.SysApprovalFlowDetailResponse;
+import com.glxp.api.service.auth.CustomerService;
+import com.glxp.api.service.basic.SysApprovalFlowConfigService;
+import com.glxp.api.service.basic.SysApprovalFlowService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class SysApprovalFlowServiceImpl implements SysApprovalFlowService{
+
+    @Resource
+    private SysApprovalFlowMapper sysApprovalFlowMapper;
+    @Resource
+    private SysApprovalFlowMxMapper sysApprovalFlowMxMapper;
+    @Resource
+    private SysApprovalFlowConfigService sysApprovalFlowConfigService;
+    @Resource
+    CustomerService customerService;
+
+    @Override
+    public int deleteByPrimaryKey(String id) {
+        return sysApprovalFlowMapper.deleteByPrimaryKey(id);
+    }
+
+    @Override
+    public int insert(SysApprovalFlow record) {
+        return sysApprovalFlowMapper.insert(record);
+    }
+
+    @Override
+    public int insertOrUpdate(SysApprovalFlow record) {
+        return sysApprovalFlowMapper.insertOrUpdate(record);
+    }
+
+    @Override
+    public int insertOrUpdateSelective(SysApprovalFlow record) {
+        return sysApprovalFlowMapper.insertOrUpdateSelective(record);
+    }
+
+    @Override
+    public int insertSelective(SysApprovalFlow record) {
+        return sysApprovalFlowMapper.insertSelective(record);
+    }
+
+    @Override
+    public SysApprovalFlow selectByPrimaryKey(String id) {
+        return sysApprovalFlowMapper.selectByPrimaryKey(id);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(SysApprovalFlow record) {
+        return sysApprovalFlowMapper.updateByPrimaryKeySelective(record);
+    }
+
+    @Override
+    public int updateByPrimaryKey(SysApprovalFlow record) {
+        return sysApprovalFlowMapper.updateByPrimaryKey(record);
+    }
+
+    @Override
+    public int updateBatch(List<SysApprovalFlow> list) {
+        return sysApprovalFlowMapper.updateBatch(list);
+    }
+
+    @Override
+    public int batchInsert(List<SysApprovalFlow> list) {
+        return sysApprovalFlowMapper.batchInsert(list);
+    }
+
+
+    @Override
+    public String getApprovalFlowId() {
+        return UUID.randomUUID().toString().replace("-", "");
+    }
+
+    @Override
+    public void generateFlow(String approvalFlowId, String title, String type) {
+        SysApprovalFlow sysApprovalFlow = new SysApprovalFlow();
+        sysApprovalFlow.setId(approvalFlowId);
+        sysApprovalFlow.setTitle(title);
+        sysApprovalFlow.setType(type);
+        sysApprovalFlow.setStatus(ApprovalFlowEnum.DSH.getCode());
+
+        Long userId = customerService.getUserId();
+        String userName = customerService.getUserName();
+        Date date = new Date();
+
+        sysApprovalFlow.setUserId(userId + "");
+        sysApprovalFlow.setUserName(userName);
+        sysApprovalFlow.setCreateUser(userId + "");
+        sysApprovalFlow.setCreateTime(date);
+        sysApprovalFlow.setUpdateUser(userId + "");
+        sysApprovalFlow.setUpdateTime(date);
+
+        ArrayList<SysApprovalFlowMx> mxs = new ArrayList<>();
+        generateFlowMx(type,approvalFlowId,userId,date,mxs);
+
+        sysApprovalFlowMapper.insert(sysApprovalFlow);
+        sysApprovalFlowMxMapper.batchInsert(mxs);
+
+    }
+
+    @Override
+    public List<SysApprovalFlowDetailResponse> getDetailList(String approvalFlowId) {
+        QueryWrapper<SysApprovalFlowMx> qw = new QueryWrapper<>();
+        qw.eq("approvalFlowId",approvalFlowId);
+        List<SysApprovalFlowMx> sysApprovalFlowMxes = sysApprovalFlowMxMapper.selectList(qw);
+        SysApprovalFlow sysApprovalFlow = sysApprovalFlowMapper.selectByPrimaryKey(approvalFlowId);
+        ArrayList<SysApprovalFlowDetailResponse> listRes = new ArrayList<>();
+        SysApprovalFlowDetailResponse sysApprovalFlowDetailResponse = new SysApprovalFlowDetailResponse();
+        BeanUtil.copyProperties(sysApprovalFlow,sysApprovalFlowDetailResponse);
+        sysApprovalFlowDetailResponse.setApprovalSort(-1);
+        sysApprovalFlowDetailResponse.setApprovalStatus(ApprovalStatusEnum.TG.getCode());
+        sysApprovalFlowDetailResponse.setNodeType(1);
+        listRes.add(sysApprovalFlowDetailResponse);
+
+        if (CollectionUtil.isNotEmpty(sysApprovalFlowMxes)){
+            sysApprovalFlowMxes.forEach( item -> {
+                SysApprovalFlowDetailResponse sysApprovalFlowDetailResponsei = new SysApprovalFlowDetailResponse();
+                BeanUtil.copyProperties(item,sysApprovalFlowDetailResponsei);
+                sysApprovalFlowDetailResponsei.setNodeType(2);
+                listRes.add(sysApprovalFlowDetailResponsei);
+            });
+        }
+
+        List<SysApprovalFlowDetailResponse> collect = listRes.stream().sorted(Comparator.comparing(SysApprovalFlowDetailResponse::getApprovalSort)).collect(Collectors.toList());
+        return collect;
+    }
+
+    @Override
+    public void submitApprovalFlow(SubmitApprovalFlowRequest submitApprovalFlowRequest) {
+
+        Long userId = customerService.getUserId();
+        String id = submitApprovalFlowRequest.getId();
+        SysApprovalFlowMx sysApprovalFlowMx = sysApprovalFlowMxMapper.selectByPrimaryKey(id);
+        if (ObjectUtil.isNull(sysApprovalFlowMx)){
+            throw new JsonException("审批id有误，未找到记录！");
+        }
+        String approvalUserId = sysApprovalFlowMx.getApprovalUserId();
+        if (!approvalUserId.equals(String.valueOf(userId))){
+            throw new JsonException("当前账号不可对此审批节点进行审批！");
+        }
+        String approvalFlowId = sysApprovalFlowMx.getApprovalFlowId();
+        SysApprovalFlow sysApprovalFlow = sysApprovalFlowMapper.selectByPrimaryKey(approvalFlowId);
+
+        if (sysApprovalFlow.getStatus() != ApprovalFlowEnum.DSH.getCode()){
+            throw new JsonException("该单据未处于待审核状态无法审核！");
+        }
+        Integer approvalSort = sysApprovalFlowMx.getApprovalSort();
+        Integer approvalStatus = sysApprovalFlowMx.getApprovalStatus();
+        if (approvalStatus != ApprovalStatusEnum.DWSH.getCode()){
+            throw new JsonException("审批节点未处于待审核状态无法审核！");
+        }
+
+        QueryWrapper<SysApprovalFlowMx> qw = new QueryWrapper<>();
+        qw.eq("approvalFlowId",approvalFlowId);
+        qw.orderByAsc("approvalSort");
+        List<SysApprovalFlowMx> sysApprovalFlowMxes = sysApprovalFlowMxMapper.selectList(qw);
+
+        for (int i = 0; i < sysApprovalFlowMxes.size(); i++) {
+            SysApprovalFlowMx sysApprovalFlowMx1 = sysApprovalFlowMxes.get(i);
+            String id1 = sysApprovalFlowMx1.getId();
+            Integer approvalSort1 = sysApprovalFlowMx1.getApprovalSort();
+            Integer approvalStatus1 = sysApprovalFlowMx1.getApprovalStatus();
+            if (!id1.equals(id) && approvalStatus1 == ApprovalStatusEnum.DWSH.getCode() && approvalSort1 <= approvalSort){
+                throw new JsonException("请先完成前面节点审批！");
+            }
+        }
+
+        Date date = new Date();
+        sysApprovalFlowMx.setApprovalTime(date);
+        sysApprovalFlowMx.setApprovalOpinion(submitApprovalFlowRequest.getApprovalOpinion());
+        sysApprovalFlowMx.setApprovalStatus(submitApprovalFlowRequest.getApprovalStatus());
+        sysApprovalFlowMx.setUpdateTime(date);
+        sysApprovalFlowMx.setUpdateUser(approvalUserId);
+        sysApprovalFlowMxMapper.updateById(sysApprovalFlowMx);
+
+        //进行单据状态更新
+        updateDocumentStatus(approvalFlowId);
+    }
+
+    private void updateDocumentStatus(String approvalFlowId) {
+        //子状态有一个驳回 为 驳回；全部审核通过 为通过 ；其他为 审核中
+        QueryWrapper<SysApprovalFlowMx> qw = new QueryWrapper<>();
+        qw.eq("approvalFlowId",approvalFlowId);
+        qw.orderByAsc("approvalSort");
+        List<SysApprovalFlowMx> sysApprovalFlowMxes = sysApprovalFlowMxMapper.selectList(qw);
+        SysApprovalFlow sysApprovalFlow = sysApprovalFlowMapper.selectByPrimaryKey(approvalFlowId);
+        int shz = 0;
+        int tg = 0;
+        int bh = 0;
+        for (SysApprovalFlowMx sysApprovalFlowMx : sysApprovalFlowMxes) {
+            Integer approvalStatus = sysApprovalFlowMx.getApprovalStatus();
+            if (approvalStatus.equals(ApprovalStatusEnum.SHZ.getCode())){
+                shz++;
+            }else if (approvalStatus.equals(ApprovalStatusEnum.TG.getCode())){
+                tg++;
+            }else if (approvalStatus.equals(ApprovalStatusEnum.BH.getCode())){
+                bh++;
+            }
+        }
+        Integer status = sysApprovalFlow.getStatus();
+        Integer newStatus;
+        if (bh>0){
+            newStatus = ApprovalFlowEnum.BH.getCode();
+        }else if (tg == sysApprovalFlowMxes.size()){
+            newStatus = ApprovalFlowEnum.TG.getCode();
+        }else {
+            newStatus = ApprovalFlowEnum.DSH.getCode();
+        }
+
+        if (status != newStatus){
+            sysApprovalFlow.setStatus(newStatus);
+            sysApprovalFlowMapper.updateByPrimaryKey(sysApprovalFlow);
+        }
+
+    }
+
+    /**
+     * 生成明细列表
+     * @param type
+     * @param approvalFlowId
+     * @param userId
+     * @param date
+     * @param mxs
+     */
+    private void generateFlowMx(String type,String approvalFlowId, Long userId, Date date, ArrayList<SysApprovalFlowMx> mxs) {
+        List<SysApprovalFlowConfigMx> list = sysApprovalFlowConfigService.getDetailList(type);
+        if (CollectionUtil.isNotEmpty(list)){
+            list.forEach( item -> {
+                SysApprovalFlowMx sysApprovalFlowMx = new SysApprovalFlowMx();
+                sysApprovalFlowMx.setId(UUID.randomUUID().toString().replace("-", ""));
+                sysApprovalFlowMx.setApprovalFlowId(approvalFlowId);
+                sysApprovalFlowMx.setApprovalUserId(item.getApprovalUserId());
+                sysApprovalFlowMx.setApprovalUserName(item.getApprovalUserName());
+                sysApprovalFlowMx.setApprovalStatus(ApprovalStatusEnum.DWSH.getCode());
+                sysApprovalFlowMx.setApprovalSort(item.getApprovalSort());
+
+                sysApprovalFlowMx.setCreateUser(userId + "");
+                sysApprovalFlowMx.setCreateTime(date);
+                sysApprovalFlowMx.setUpdateUser(userId + "");
+                sysApprovalFlowMx.setUpdateTime(date);
+
+                mxs.add(sysApprovalFlowMx);
+            });
+        }
+    }
+
+}

src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml

@@ -247,4 +247,22 @@
             </if>
         </where>
     </select>
+
+
+    <select id="companyUserList" parameterType="com.glxp.api.req.auth.FilterInvLinkDataRequest"
+            resultType="com.glxp.api.entity.auth.AuthAdmin">
+        select u.*
+        from auth_user u
+        <where>
+            <if test="param.userName != null and param.userName != ''">
+                (
+                u.userName  like concat('%', #{param.userName}, '%')
+                or u.id  like concat('%', #{param.userName}, '%')
+                or u.employeeName  like concat('%', #{param.userName}, '%')
+                )
+            </if>
+        </where>
+        order by u.createTime desc
+    </select>
+
 </mapper>

src/main/resources/mybatis/mapper/basic/SysApprovalFlowConfigMapper.xml

@@ -0,0 +1,297 @@
+<?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.glxp.api.dao.basic.SysApprovalFlowConfigMapper">
+  <resultMap id="BaseResultMap" type="com.glxp.api.entity.basic.SysApprovalFlowConfig">
+    <!--@mbg.generated-->
+    <!--@Table sys_approval_flow_config-->
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="type" jdbcType="VARCHAR" property="type" />
+    <result column="typeName" jdbcType="VARCHAR" property="typeName" />
+    <result column="approvalSort" jdbcType="INTEGER" property="approvalSort" />
+    <result column="createUser" jdbcType="VARCHAR" property="createUser" />
+    <result column="createTime" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="updateUser" jdbcType="VARCHAR" property="updateUser" />
+    <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, `type`, typeName, approvalSort, `createUser`, createTime, updateUser, updateTime
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <!--@mbg.generated-->
+    select
+    <include refid="Base_Column_List" />
+    from sys_approval_flow_config
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--@mbg.generated-->
+    delete from sys_approval_flow_config
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.glxp.api.entity.basic.SysApprovalFlowConfig">
+    <!--@mbg.generated-->
+    insert into sys_approval_flow_config (id, `type`, typeName,
+      approvalSort, `createUser`, createTime,
+      updateUser, updateTime)
+    values (#{id,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{typeName,jdbcType=VARCHAR},
+      #{approvalSort,jdbcType=INTEGER}, #{createUser,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
+      #{updateUser,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.glxp.api.entity.basic.SysApprovalFlowConfig">
+    <!--@mbg.generated-->
+    insert into sys_approval_flow_config
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="type != null">
+        `type`,
+      </if>
+      <if test="typeName != null">
+        typeName,
+      </if>
+      <if test="approvalSort != null">
+        approvalSort,
+      </if>
+      <if test="createUser != null">
+        `createUser`,
+      </if>
+      <if test="createTime != null">
+        createTime,
+      </if>
+      <if test="updateUser != null">
+        updateUser,
+      </if>
+      <if test="updateTime != null">
+        updateTime,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null">
+        #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="typeName != null">
+        #{typeName,jdbcType=VARCHAR},
+      </if>
+      <if test="approvalSort != null">
+        #{approvalSort,jdbcType=INTEGER},
+      </if>
+      <if test="createUser != null">
+        #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null">
+        #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.glxp.api.entity.basic.SysApprovalFlowConfig">
+    <!--@mbg.generated-->
+    update sys_approval_flow_config
+    <set>
+      <if test="type != null">
+        `type` = #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="typeName != null">
+        typeName = #{typeName,jdbcType=VARCHAR},
+      </if>
+      <if test="approvalSort != null">
+        approvalSort = #{approvalSort,jdbcType=INTEGER},
+      </if>
+      <if test="createUser != null">
+        `createUser` = #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        createTime = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null">
+        updateUser = #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        updateTime = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.glxp.api.entity.basic.SysApprovalFlowConfig">
+    <!--@mbg.generated-->
+    update sys_approval_flow_config
+    set `type` = #{type,jdbcType=VARCHAR},
+      typeName = #{typeName,jdbcType=VARCHAR},
+      approvalSort = #{approvalSort,jdbcType=INTEGER},
+      `createUser` = #{createUser,jdbcType=VARCHAR},
+      createTime = #{createTime,jdbcType=TIMESTAMP},
+      updateUser = #{updateUser,jdbcType=VARCHAR},
+      updateTime = #{updateTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateBatch" parameterType="java.util.List">
+    <!--@mbg.generated-->
+    update sys_approval_flow_config
+    <trim prefix="set" suffixOverrides=",">
+      <trim prefix="`type` = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.type,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="typeName = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.typeName,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="approvalSort = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.approvalSort,jdbcType=INTEGER}
+        </foreach>
+      </trim>
+      <trim prefix="`createUser` = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.createUser,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="createTime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+        </foreach>
+      </trim>
+      <trim prefix="updateUser = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.updateUser,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="updateTime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+        </foreach>
+      </trim>
+    </trim>
+    where id in
+    <foreach close=")" collection="list" item="item" open="(" separator=", ">
+      #{item.id,jdbcType=VARCHAR}
+    </foreach>
+  </update>
+  <insert id="batchInsert" parameterType="map">
+    <!--@mbg.generated-->
+    insert into sys_approval_flow_config
+    (id, `type`, typeName, approvalSort, `createUser`, createTime, updateUser,
+      updateTime)
+    values
+    <foreach collection="list" item="item" separator=",">
+      (#{item.id,jdbcType=VARCHAR}, #{item.type,jdbcType=VARCHAR}, #{item.typeName,jdbcType=VARCHAR},
+        #{item.approvalSort,jdbcType=INTEGER}, #{item.createUser,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP},
+        #{item.updateUser,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP})
+    </foreach>
+  </insert>
+  <insert id="insertOrUpdate" parameterType="com.glxp.api.entity.basic.SysApprovalFlowConfig">
+    <!--@mbg.generated-->
+    insert into sys_approval_flow_config
+    (id, `type`, typeName, approvalSort, `createUser`, createTime, updateUser,
+      updateTime)
+    values
+    (#{id,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{typeName,jdbcType=VARCHAR},
+      #{approvalSort,jdbcType=INTEGER}, #{createUser,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
+      #{updateUser,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP})
+    on duplicate key update
+    id = #{id,jdbcType=VARCHAR},
+    `type` = #{type,jdbcType=VARCHAR},
+    typeName = #{typeName,jdbcType=VARCHAR},
+    approvalSort = #{approvalSort,jdbcType=INTEGER},
+    `createUser` = #{createUser,jdbcType=VARCHAR},
+    createTime = #{createTime,jdbcType=TIMESTAMP},
+    updateUser = #{updateUser,jdbcType=VARCHAR},
+    updateTime = #{updateTime,jdbcType=TIMESTAMP}
+  </insert>
+  <insert id="insertOrUpdateSelective" parameterType="com.glxp.api.entity.basic.SysApprovalFlowConfig">
+    <!--@mbg.generated-->
+    insert into sys_approval_flow_config
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="type != null">
+        `type`,
+      </if>
+      <if test="typeName != null">
+        typeName,
+      </if>
+      <if test="approvalSort != null">
+        approvalSort,
+      </if>
+      <if test="createUser != null">
+        `createUser`,
+      </if>
+      <if test="createTime != null">
+        createTime,
+      </if>
+      <if test="updateUser != null">
+        updateUser,
+      </if>
+      <if test="updateTime != null">
+        updateTime,
+      </if>
+    </trim>
+    values
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null">
+        #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="typeName != null">
+        #{typeName,jdbcType=VARCHAR},
+      </if>
+      <if test="approvalSort != null">
+        #{approvalSort,jdbcType=INTEGER},
+      </if>
+      <if test="createUser != null">
+        #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null">
+        #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+    on duplicate key update
+    <trim suffixOverrides=",">
+      <if test="id != null">
+        id = #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null">
+        `type` = #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="typeName != null">
+        typeName = #{typeName,jdbcType=VARCHAR},
+      </if>
+      <if test="approvalSort != null">
+        approvalSort = #{approvalSort,jdbcType=INTEGER},
+      </if>
+      <if test="createUser != null">
+        `createUser` = #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        createTime = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null">
+        updateUser = #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        updateTime = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+</mapper>

src/main/resources/mybatis/mapper/basic/SysApprovalFlowConfigMxMapper.xml

@@ -0,0 +1,323 @@
+<?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.glxp.api.dao.basic.SysApprovalFlowConfigMxMapper">
+  <resultMap id="BaseResultMap" type="com.glxp.api.entity.basic.SysApprovalFlowConfigMx">
+    <!--@mbg.generated-->
+    <!--@Table sys_approval_flow_config_mx-->
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="type" jdbcType="VARCHAR" property="type" />
+    <result column="approvalUserId" jdbcType="VARCHAR" property="approvalUserId" />
+    <result column="approvalUserName" jdbcType="VARCHAR" property="approvalUserName" />
+    <result column="approvalSort" jdbcType="INTEGER" property="approvalSort" />
+    <result column="createUser" jdbcType="VARCHAR" property="createUser" />
+    <result column="createTime" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="updateUser" jdbcType="VARCHAR" property="updateUser" />
+    <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, `type`, approvalUserId,approvalUserName, approvalSort, `createUser`, createTime, updateUser, updateTime
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <!--@mbg.generated-->
+    select
+    <include refid="Base_Column_List" />
+    from sys_approval_flow_config_mx
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--@mbg.generated-->
+    delete from sys_approval_flow_config_mx
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.glxp.api.entity.basic.SysApprovalFlowConfigMx">
+    <!--@mbg.generated-->
+    insert into sys_approval_flow_config_mx (id, `type`, approvalUserId,approvalUserName,
+      approvalSort, `createUser`, createTime,
+      updateUser, updateTime)
+    values (#{id,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{approvalUserId,jdbcType=VARCHAR}, #{approvalUserName,jdbcType=VARCHAR},
+      #{approvalSort,jdbcType=INTEGER}, #{createUser,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
+      #{updateUser,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.glxp.api.entity.basic.SysApprovalFlowConfigMx">
+    <!--@mbg.generated-->
+    insert into sys_approval_flow_config_mx
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="type != null">
+        `type`,
+      </if>
+      <if test="approvalUserId != null">
+        approvalUserId,
+      </if>
+      <if test="approvalUserName != null">
+        approvalUserName,
+      </if>
+      <if test="approvalSort != null">
+        approvalSort,
+      </if>
+      <if test="createUser != null">
+        `createUser`,
+      </if>
+      <if test="createTime != null">
+        createTime,
+      </if>
+      <if test="updateUser != null">
+        updateUser,
+      </if>
+      <if test="updateTime != null">
+        updateTime,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null">
+        #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="approvalUserId != null">
+        #{approvalUserId,jdbcType=VARCHAR},
+      </if>
+      <if test="approvalUserName != null">
+        #{approvalUserName,jdbcType=VARCHAR},
+      </if>
+      <if test="approvalSort != null">
+        #{approvalSort,jdbcType=INTEGER},
+      </if>
+      <if test="createUser != null">
+        #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null">
+        #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.glxp.api.entity.basic.SysApprovalFlowConfigMx">
+    <!--@mbg.generated-->
+    update sys_approval_flow_config_mx
+    <set>
+      <if test="type != null">
+        `type` = #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="approvalUserId != null">
+        approvalUserId = #{approvalUserId,jdbcType=VARCHAR},
+      </if>
+      <if test="approvalUserName != null">
+        approvalUserName = #{approvalUserName,jdbcType=VARCHAR},
+      </if>
+      <if test="approvalSort != null">
+        approvalSort = #{approvalSort,jdbcType=INTEGER},
+      </if>
+      <if test="createUser != null">
+        `createUser` = #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        createTime = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null">
+        updateUser = #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        updateTime = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.glxp.api.entity.basic.SysApprovalFlowConfigMx">
+    <!--@mbg.generated-->
+    update sys_approval_flow_config_mx
+    set `type` = #{type,jdbcType=VARCHAR},
+      approvalUserId = #{approvalUserId,jdbcType=VARCHAR},
+    approvalUserName = #{approvalUserName,jdbcType=VARCHAR},
+      approvalSort = #{approvalSort,jdbcType=INTEGER},
+      `createUser` = #{createUser,jdbcType=VARCHAR},
+      createTime = #{createTime,jdbcType=TIMESTAMP},
+      updateUser = #{updateUser,jdbcType=VARCHAR},
+      updateTime = #{updateTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateBatch" parameterType="java.util.List">
+    <!--@mbg.generated-->
+    update sys_approval_flow_config_mx
+    <trim prefix="set" suffixOverrides=",">
+      <trim prefix="`type` = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.type,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="approvalUserId = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.approvalUserId,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="approvalUserName = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.approvalUserName,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="approvalSort = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.approvalSort,jdbcType=INTEGER}
+        </foreach>
+      </trim>
+      <trim prefix="`createUser` = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.createUser,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="createTime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+        </foreach>
+      </trim>
+      <trim prefix="updateUser = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.updateUser,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="updateTime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+        </foreach>
+      </trim>
+    </trim>
+    where id in
+    <foreach close=")" collection="list" item="item" open="(" separator=", ">
+      #{item.id,jdbcType=VARCHAR}
+    </foreach>
+  </update>
+  <insert id="batchInsert" parameterType="map">
+    <!--@mbg.generated-->
+    insert into sys_approval_flow_config_mx
+    (id, `type`, approvalUserId,  approvalUserName, approvalSort, `createUser`, createTime, updateUser,
+      updateTime)
+    values
+    <foreach collection="list" item="item" separator=",">
+      (#{item.id,jdbcType=VARCHAR}, #{item.type,jdbcType=VARCHAR}, #{item.approvalUserId,jdbcType=VARCHAR},
+        #{item.approvalSort,jdbcType=INTEGER}, #{item.createUser,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP},
+        #{item.updateUser,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP})
+    </foreach>
+  </insert>
+  <insert id="insertOrUpdate" parameterType="com.glxp.api.entity.basic.SysApprovalFlowConfigMx">
+    <!--@mbg.generated-->
+    insert into sys_approval_flow_config_mx
+    (id, `type`, approvalUserId,approvalUserName, approvalSort, `createUser`, createTime, updateUser,
+      updateTime)
+    values
+    (#{id,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{approvalUserId,jdbcType=VARCHAR},#{approvalUserName,jdbcType=VARCHAR},
+      #{approvalSort,jdbcType=INTEGER}, #{createUser,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
+      #{updateUser,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP})
+    on duplicate key update
+    id = #{id,jdbcType=VARCHAR},
+    `type` = #{type,jdbcType=VARCHAR},
+    approvalUserId = #{approvalUserId,jdbcType=VARCHAR},
+    approvalUserName = #{approvalUserName,jdbcType=VARCHAR},
+    approvalSort = #{approvalSort,jdbcType=INTEGER},
+    `createUser` = #{createUser,jdbcType=VARCHAR},
+    createTime = #{createTime,jdbcType=TIMESTAMP},
+    updateUser = #{updateUser,jdbcType=VARCHAR},
+    updateTime = #{updateTime,jdbcType=TIMESTAMP}
+  </insert>
+  <insert id="insertOrUpdateSelective" parameterType="com.glxp.api.entity.basic.SysApprovalFlowConfigMx">
+    <!--@mbg.generated-->
+    insert into sys_approval_flow_config_mx
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="type != null">
+        `type`,
+      </if>
+      <if test="approvalUserId != null">
+        approvalUserId,
+      </if>
+      <if test="approvalUserName != null">
+        approvalUserName,
+      </if>
+      <if test="approvalSort != null">
+        approvalSort,
+      </if>
+      <if test="createUser != null">
+        `createUser`,
+      </if>
+      <if test="createTime != null">
+        createTime,
+      </if>
+      <if test="updateUser != null">
+        updateUser,
+      </if>
+      <if test="updateTime != null">
+        updateTime,
+      </if>
+    </trim>
+    values
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null">
+        #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="approvalUserId != null">
+        #{approvalUserId,jdbcType=VARCHAR},
+      </if>
+      <if test="approvalUserName != null">
+        #{approvalUserName,jdbcType=VARCHAR},
+      </if>
+      <if test="approvalSort != null">
+        #{approvalSort,jdbcType=INTEGER},
+      </if>
+      <if test="createUser != null">
+        #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null">
+        #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+    on duplicate key update
+    <trim suffixOverrides=",">
+      <if test="id != null">
+        id = #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null">
+        `type` = #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="approvalUserId != null">
+        approvalUserId = #{approvalUserId,jdbcType=VARCHAR},
+      </if>
+      <if test="approvalUserName != null">
+        approvalUserName = #{approvalUserName,jdbcType=VARCHAR},
+      </if>
+      <if test="approvalSort != null">
+        approvalSort = #{approvalSort,jdbcType=INTEGER},
+      </if>
+      <if test="createUser != null">
+        `createUser` = #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        createTime = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null">
+        updateUser = #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        updateTime = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+</mapper>

src/main/resources/mybatis/mapper/basic/SysApprovalFlowMapper.xml

@@ -0,0 +1,352 @@
+<?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.glxp.udims.business.dao.basic.SysApprovalFlowMapper">
+  <resultMap id="BaseResultMap" type="com.glxp.udims.business.entity.basic.SysApprovalFlow">
+    <!--@mbg.generated-->
+    <!--@Table sys_approval_flow-->
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="title" jdbcType="VARCHAR" property="title" />
+    <result column="type" jdbcType="VARCHAR" property="type" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="userId" jdbcType="VARCHAR" property="userId" />
+    <result column="userName" jdbcType="VARCHAR" property="userName" />
+    <result column="createUser" jdbcType="VARCHAR" property="createUser" />
+    <result column="createTime" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="updateUser" jdbcType="VARCHAR" property="updateUser" />
+    <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, title, `type`, `status`, userId, userName, `createUser`, createTime, updateUser, updateTime
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <!--@mbg.generated-->
+    select
+    <include refid="Base_Column_List" />
+    from sys_approval_flow
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--@mbg.generated-->
+    delete from sys_approval_flow
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.glxp.udims.business.entity.basic.SysApprovalFlow">
+    <!--@mbg.generated-->
+    insert into sys_approval_flow (id, title, `type`,
+      `status`, userId, userName, `createUser`,
+      createTime, updateUser, updateTime
+      )
+    values (#{id,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR},
+      #{status,jdbcType=INTEGER}, #{userId,jdbcType=VARCHAR},#{userName,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR},
+      #{createTime,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.glxp.udims.business.entity.basic.SysApprovalFlow">
+    <!--@mbg.generated-->
+    insert into sys_approval_flow
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="title != null">
+        title,
+      </if>
+      <if test="type != null">
+        `type`,
+      </if>
+      <if test="status != null">
+        `status`,
+      </if>
+      <if test="userId != null">
+        userId,
+      </if>
+      <if test="userName != null">
+        userName,
+      </if>
+      <if test="createUser != null">
+        `createUser`,
+      </if>
+      <if test="createTime != null">
+        createTime,
+      </if>
+      <if test="updateUser != null">
+        updateUser,
+      </if>
+      <if test="updateTime != null">
+        updateTime,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="title != null">
+        #{title,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null">
+        #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="userId != null">
+        #{userId,jdbcType=VARCHAR},
+      </if>
+      <if test="userName != null">
+        #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null">
+        #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null">
+        #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.glxp.udims.business.entity.basic.SysApprovalFlow">
+    <!--@mbg.generated-->
+    update sys_approval_flow
+    <set>
+      <if test="title != null">
+        title = #{title,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null">
+        `type` = #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        `status` = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="userId != null">
+        userId = #{userId,jdbcType=VARCHAR},
+      </if>
+      <if test="userName != null">
+        userName = #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null">
+        `createUser` = #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        createTime = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null">
+        updateUser = #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        updateTime = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.glxp.udims.business.entity.basic.SysApprovalFlow">
+    <!--@mbg.generated-->
+    update sys_approval_flow
+    set title = #{title,jdbcType=VARCHAR},
+      `type` = #{type,jdbcType=VARCHAR},
+      `status` = #{status,jdbcType=INTEGER},
+      userId = #{userId,jdbcType=VARCHAR},
+    userName = #{userName,jdbcType=VARCHAR},
+      `createUser` = #{createUser,jdbcType=VARCHAR},
+      createTime = #{createTime,jdbcType=TIMESTAMP},
+      updateUser = #{updateUser,jdbcType=VARCHAR},
+      updateTime = #{updateTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateBatch" parameterType="java.util.List">
+    <!--@mbg.generated-->
+    update sys_approval_flow
+    <trim prefix="set" suffixOverrides=",">
+      <trim prefix="title = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.title,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="`type` = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.type,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="`status` = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.status,jdbcType=INTEGER}
+        </foreach>
+      </trim>
+      <trim prefix="userId = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.userId,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="userName = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.userName,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="`createUser` = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.createUser,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="createTime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+        </foreach>
+      </trim>
+      <trim prefix="updateUser = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.updateUser,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="updateTime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+        </foreach>
+      </trim>
+    </trim>
+    where id in
+    <foreach close=")" collection="list" item="item" open="(" separator=", ">
+      #{item.id,jdbcType=VARCHAR}
+    </foreach>
+  </update>
+  <insert id="batchInsert" parameterType="map">
+    <!--@mbg.generated-->
+    insert into sys_approval_flow
+    (id, title, `type`, `status`, userId, userName, `createUser`, createTime, updateUser, updateTime
+      )
+    values
+    <foreach collection="list" item="item" separator=",">
+      (#{item.id,jdbcType=VARCHAR}, #{item.title,jdbcType=VARCHAR}, #{item.type,jdbcType=VARCHAR},
+        #{item.status,jdbcType=INTEGER}, #{item.userId,jdbcType=VARCHAR},#{item.userName,jdbcType=VARCHAR}, #{item.createUser,jdbcType=VARCHAR},
+        #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateUser,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}
+        )
+    </foreach>
+  </insert>
+  <insert id="insertOrUpdate" parameterType="com.glxp.udims.business.entity.basic.SysApprovalFlow">
+    <!--@mbg.generated-->
+    insert into sys_approval_flow
+    (id, title, `type`, `status`, userId, userName, `createUser`, createTime, updateUser, updateTime
+      )
+    values
+    (#{id,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER},
+      #{userId,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
+      #{updateUser,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP})
+    on duplicate key update
+    id = #{id,jdbcType=VARCHAR},
+    title = #{title,jdbcType=VARCHAR},
+    `type` = #{type,jdbcType=VARCHAR},
+    `status` = #{status,jdbcType=INTEGER},
+    userId = #{userId,jdbcType=VARCHAR},
+    userName = #{userName,jdbcType=VARCHAR},
+    `createUser` = #{createUser,jdbcType=VARCHAR},
+    createTime = #{createTime,jdbcType=TIMESTAMP},
+    updateUser = #{updateUser,jdbcType=VARCHAR},
+    updateTime = #{updateTime,jdbcType=TIMESTAMP}
+  </insert>
+  <insert id="insertOrUpdateSelective" parameterType="com.glxp.udims.business.entity.basic.SysApprovalFlow">
+    <!--@mbg.generated-->
+    insert into sys_approval_flow
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="title != null">
+        title,
+      </if>
+      <if test="type != null">
+        `type`,
+      </if>
+      <if test="status != null">
+        `status`,
+      </if>
+      <if test="userId != null">
+        userId,
+      </if>
+      <if test="userName != null">
+        userName,
+      </if>
+      <if test="createUser != null">
+        `createUser`,
+      </if>
+      <if test="createTime != null">
+        createTime,
+      </if>
+      <if test="updateUser != null">
+        updateUser,
+      </if>
+      <if test="updateTime != null">
+        updateTime,
+      </if>
+    </trim>
+    values
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="title != null">
+        #{title,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null">
+        #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="userId != null">
+        #{userId,jdbcType=VARCHAR},
+      </if>
+      <if test="userName != null">
+        #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null">
+        #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null">
+        #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+    on duplicate key update
+    <trim suffixOverrides=",">
+      <if test="id != null">
+        id = #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="title != null">
+        title = #{title,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null">
+        `type` = #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        `status` = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="userId != null">
+        userId = #{userId,jdbcType=VARCHAR},
+      </if>
+      <if test="userName != null">
+        userName = #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null">
+        `createUser` = #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        createTime = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null">
+        updateUser = #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        updateTime = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+</mapper>

src/main/resources/mybatis/mapper/basic/SysApprovalFlowMxMapper.xml

@@ -0,0 +1,407 @@
+<?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.glxp.udims.business.dao.basic.SysApprovalFlowMxMapper">
+  <resultMap id="BaseResultMap" type="com.glxp.udims.business.entity.basic.SysApprovalFlowMx">
+    <!--@mbg.generated-->
+    <!--@Table sys_approval_flow_mx-->
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="approvalFlowId" jdbcType="VARCHAR" property="approvalFlowId" />
+    <result column="approvalUserId" jdbcType="VARCHAR" property="approvalUserId" />
+    <result column="approvalUserName" jdbcType="VARCHAR" property="approvalUserName" />
+    <result column="approvalTime" jdbcType="TIMESTAMP" property="approvalTime" />
+    <result column="approvalOpinion" jdbcType="VARCHAR" property="approvalOpinion" />
+    <result column="approvalStatus" jdbcType="INTEGER" property="approvalStatus" />
+    <result column="approvalSort" jdbcType="INTEGER" property="approvalSort" />
+    <result column="createUser" jdbcType="VARCHAR" property="createUser" />
+    <result column="createTime" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="updateUser" jdbcType="VARCHAR" property="updateUser" />
+    <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, approvalFlowId, approvalUserId, approvalUserName, approvalTime, approvalOpinion, approvalStatus,
+    approvalSort, `createUser`, createTime, updateUser, updateTime
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <!--@mbg.generated-->
+    select
+    <include refid="Base_Column_List" />
+    from sys_approval_flow_mx
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--@mbg.generated-->
+    delete from sys_approval_flow_mx
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.glxp.udims.business.entity.basic.SysApprovalFlowMx">
+    <!--@mbg.generated-->
+    insert into sys_approval_flow_mx (id, approvalFlowId, approvalUserId,approvalUserName,
+      approvalTime, approvalOpinion, approvalStatus,
+      approvalSort, `createUser`, createTime,
+      updateUser, updateTime)
+    values (#{id,jdbcType=VARCHAR}, #{approvalFlowId,jdbcType=VARCHAR}, #{approvalUserId,jdbcType=VARCHAR}, #{approvalUserName,jdbcType=VARCHAR},
+      #{approvalTime,jdbcType=TIMESTAMP}, #{approvalOpinion,jdbcType=VARCHAR}, #{approvalStatus,jdbcType=INTEGER},
+      #{approvalSort,jdbcType=INTEGER}, #{createUser,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
+      #{updateUser,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.glxp.udims.business.entity.basic.SysApprovalFlowMx">
+    <!--@mbg.generated-->
+    insert into sys_approval_flow_mx
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="approvalFlowId != null">
+        approvalFlowId,
+      </if>
+      <if test="approvalUserId != null">
+        approvalUserId,
+      </if>
+      <if test="approvalUserName != null">
+        approvalUserName,
+      </if>
+      <if test="approvalTime != null">
+        approvalTime,
+      </if>
+      <if test="approvalOpinion != null">
+        approvalOpinion,
+      </if>
+      <if test="approvalStatus != null">
+        approvalStatus,
+      </if>
+      <if test="approvalSort != null">
+        approvalSort,
+      </if>
+      <if test="createUser != null">
+        `createUser`,
+      </if>
+      <if test="createTime != null">
+        createTime,
+      </if>
+      <if test="updateUser != null">
+        updateUser,
+      </if>
+      <if test="updateTime != null">
+        updateTime,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="approvalFlowId != null">
+        #{approvalFlowId,jdbcType=VARCHAR},
+      </if>
+      <if test="approvalUserId != null">
+        #{approvalUserId,jdbcType=VARCHAR},
+      </if>
+      <if test="approvalUserName != null">
+        #{approvalUserName,jdbcType=VARCHAR},
+      </if>
+      <if test="approvalTime != null">
+        #{approvalTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="approvalOpinion != null">
+        #{approvalOpinion,jdbcType=VARCHAR},
+      </if>
+      <if test="approvalStatus != null">
+        #{approvalStatus,jdbcType=INTEGER},
+      </if>
+      <if test="approvalSort != null">
+        #{approvalSort,jdbcType=INTEGER},
+      </if>
+      <if test="createUser != null">
+        #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null">
+        #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.glxp.udims.business.entity.basic.SysApprovalFlowMx">
+    <!--@mbg.generated-->
+    update sys_approval_flow_mx
+    <set>
+      <if test="approvalFlowId != null">
+        approvalFlowId = #{approvalFlowId,jdbcType=VARCHAR},
+      </if>
+      <if test="approvalUserId != null">
+        approvalUserId = #{approvalUserId,jdbcType=VARCHAR},
+      </if>
+      <if test="approvalUserName != null">
+        approvalUserName = #{approvalUserName,jdbcType=VARCHAR},
+      </if>
+      <if test="approvalTime != null">
+        approvalTime = #{approvalTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="approvalOpinion != null">
+        approvalOpinion = #{approvalOpinion,jdbcType=VARCHAR},
+      </if>
+      <if test="approvalStatus != null">
+        approvalStatus = #{approvalStatus,jdbcType=INTEGER},
+      </if>
+      <if test="approvalSort != null">
+        approvalSort = #{approvalSort,jdbcType=INTEGER},
+      </if>
+      <if test="createUser != null">
+        `createUser` = #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        createTime = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null">
+        updateUser = #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        updateTime = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.glxp.udims.business.entity.basic.SysApprovalFlowMx">
+    <!--@mbg.generated-->
+    update sys_approval_flow_mx
+    set approvalFlowId = #{approvalFlowId,jdbcType=VARCHAR},
+      approvalUserId = #{approvalUserId,jdbcType=VARCHAR},
+    approvalUserName = #{approvalUserName,jdbcType=VARCHAR},
+      approvalTime = #{approvalTime,jdbcType=TIMESTAMP},
+      approvalOpinion = #{approvalOpinion,jdbcType=VARCHAR},
+      approvalStatus = #{approvalStatus,jdbcType=INTEGER},
+      approvalSort = #{approvalSort,jdbcType=INTEGER},
+      `createUser` = #{createUser,jdbcType=VARCHAR},
+      createTime = #{createTime,jdbcType=TIMESTAMP},
+      updateUser = #{updateUser,jdbcType=VARCHAR},
+      updateTime = #{updateTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateBatch" parameterType="java.util.List">
+    <!--@mbg.generated-->
+    update sys_approval_flow_mx
+    <trim prefix="set" suffixOverrides=",">
+      <trim prefix="approvalFlowId = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.approvalFlowId,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="approvalUserId = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.approvalUserId,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="approvalUserName = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.approvalUserName,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="approvalTime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.approvalTime,jdbcType=TIMESTAMP}
+        </foreach>
+      </trim>
+      <trim prefix="approvalOpinion = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.approvalOpinion,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="approvalStatus = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.approvalStatus,jdbcType=INTEGER}
+        </foreach>
+      </trim>
+      <trim prefix="approvalSort = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.approvalSort,jdbcType=INTEGER}
+        </foreach>
+      </trim>
+      <trim prefix="`createUser` = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.createUser,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="createTime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+        </foreach>
+      </trim>
+      <trim prefix="updateUser = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.updateUser,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="updateTime = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+        </foreach>
+      </trim>
+    </trim>
+    where id in
+    <foreach close=")" collection="list" item="item" open="(" separator=", ">
+      #{item.id,jdbcType=VARCHAR}
+    </foreach>
+  </update>
+  <insert id="batchInsert" parameterType="map">
+    <!--@mbg.generated-->
+    insert into sys_approval_flow_mx
+    (id, approvalFlowId, approvalUserId,  approvalUserName, approvalTime, approvalOpinion, approvalStatus,
+      approvalSort, `createUser`, createTime, updateUser, updateTime)
+    values
+    <foreach collection="list" item="item" separator=",">
+      (#{item.id,jdbcType=VARCHAR}, #{item.approvalFlowId,jdbcType=VARCHAR}, #{item.approvalUserId,jdbcType=VARCHAR},#{item.approvalUserName,jdbcType=VARCHAR},
+        #{item.approvalTime,jdbcType=TIMESTAMP}, #{item.approvalOpinion,jdbcType=VARCHAR},
+        #{item.approvalStatus,jdbcType=INTEGER}, #{item.approvalSort,jdbcType=INTEGER},
+        #{item.createUser,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateUser,jdbcType=VARCHAR},
+        #{item.updateTime,jdbcType=TIMESTAMP})
+    </foreach>
+  </insert>
+  <insert id="insertOrUpdate" parameterType="com.glxp.udims.business.entity.basic.SysApprovalFlowMx">
+    <!--@mbg.generated-->
+    insert into sys_approval_flow_mx
+    (id, approvalFlowId, approvalUserId,approvalUserName, approvalTime, approvalOpinion, approvalStatus,
+      approvalSort, `createUser`, createTime, updateUser, updateTime)
+    values
+    (#{id,jdbcType=VARCHAR}, #{approvalFlowId,jdbcType=VARCHAR}, #{approvalUserId,jdbcType=VARCHAR}, #{approvalUserName,jdbcType=VARCHAR},
+      #{approvalTime,jdbcType=TIMESTAMP}, #{approvalOpinion,jdbcType=VARCHAR}, #{approvalStatus,jdbcType=INTEGER},
+      #{approvalSort,jdbcType=INTEGER}, #{createUser,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
+      #{updateUser,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP})
+    on duplicate key update
+    id = #{id,jdbcType=VARCHAR},
+    approvalFlowId = #{approvalFlowId,jdbcType=VARCHAR},
+    approvalUserId = #{approvalUserId,jdbcType=VARCHAR},
+    approvalUserName = #{approvalUserName,jdbcType=VARCHAR},
+    approvalTime = #{approvalTime,jdbcType=TIMESTAMP},
+    approvalOpinion = #{approvalOpinion,jdbcType=VARCHAR},
+    approvalStatus = #{approvalStatus,jdbcType=INTEGER},
+    approvalSort = #{approvalSort,jdbcType=INTEGER},
+    `createUser` = #{createUser,jdbcType=VARCHAR},
+    createTime = #{createTime,jdbcType=TIMESTAMP},
+    updateUser = #{updateUser,jdbcType=VARCHAR},
+    updateTime = #{updateTime,jdbcType=TIMESTAMP}
+  </insert>
+  <insert id="insertOrUpdateSelective" parameterType="com.glxp.udims.business.entity.basic.SysApprovalFlowMx">
+    <!--@mbg.generated-->
+    insert into sys_approval_flow_mx
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="approvalFlowId != null">
+        approvalFlowId,
+      </if>
+      <if test="approvalUserId != null">
+        approvalUserId,
+      </if>
+      <if test="approvalUserName != null">
+        approvalUserName,
+      </if>
+      <if test="approvalTime != null">
+        approvalTime,
+      </if>
+      <if test="approvalOpinion != null">
+        approvalOpinion,
+      </if>
+      <if test="approvalStatus != null">
+        approvalStatus,
+      </if>
+      <if test="approvalSort != null">
+        approvalSort,
+      </if>
+      <if test="createUser != null">
+        `createUser`,
+      </if>
+      <if test="createTime != null">
+        createTime,
+      </if>
+      <if test="updateUser != null">
+        updateUser,
+      </if>
+      <if test="updateTime != null">
+        updateTime,
+      </if>
+    </trim>
+    values
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="approvalFlowId != null">
+        #{approvalFlowId,jdbcType=VARCHAR},
+      </if>
+      <if test="approvalUserId != null">
+        #{approvalUserId,jdbcType=VARCHAR},
+      </if>
+      <if test="approvalUserName != null">
+        #{approvalUserName,jdbcType=VARCHAR},
+      </if>
+      <if test="approvalTime != null">
+        #{approvalTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="approvalOpinion != null">
+        #{approvalOpinion,jdbcType=VARCHAR},
+      </if>
+      <if test="approvalStatus != null">
+        #{approvalStatus,jdbcType=INTEGER},
+      </if>
+      <if test="approvalSort != null">
+        #{approvalSort,jdbcType=INTEGER},
+      </if>
+      <if test="createUser != null">
+        #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null">
+        #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+    on duplicate key update
+    <trim suffixOverrides=",">
+      <if test="id != null">
+        id = #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="approvalFlowId != null">
+        approvalFlowId = #{approvalFlowId,jdbcType=VARCHAR},
+      </if>
+      <if test="approvalUserId != null">
+        approvalUserId = #{approvalUserId,jdbcType=VARCHAR},
+      </if>
+      <if test="approvalUserName != null">
+        approvalUserName = #{approvalUserName,jdbcType=VARCHAR},
+      </if>
+      <if test="approvalTime != null">
+        approvalTime = #{approvalTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="approvalOpinion != null">
+        approvalOpinion = #{approvalOpinion,jdbcType=VARCHAR},
+      </if>
+      <if test="approvalStatus != null">
+        approvalStatus = #{approvalStatus,jdbcType=INTEGER},
+      </if>
+      <if test="approvalSort != null">
+        approvalSort = #{approvalSort,jdbcType=INTEGER},
+      </if>
+      <if test="createUser != null">
+        `createUser` = #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        createTime = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null">
+        updateUser = #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        updateTime = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+</mapper>

src/main/resources/schemas/schema_v2.4.sql

@@ -730,3 +730,96 @@ VALUES (200322, 0, '收费出库是否过滤一对多', 'fee_out_filter_cp', '0'
 
 
 CALL Pro_Temp_ColumnWork('io_order', 'fromPatientCode',' varchar(30)  NULL DEFAULT NULL COMMENT ''往来患者code'' AFTER `sickerAdNum`', 1);
+
+
+
+CREATE TABLE if not exists `sys_approval_flow`
+(
+    `id`         varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs  NOT NULL COMMENT '主键，可作为审批编号',
+    `title`      varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs  NULL DEFAULT NULL COMMENT '标题（王五的请假申请）',
+    `type`       varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs  NULL DEFAULT NULL COMMENT '审批类型（字典表设置code用作区分类型）',
+    `status`     int(0)                                                        NULL DEFAULT NULL COMMENT '审核状态（1：待审核；2：通过；3：驳回；4：撤销）',
+    `userId`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '申请人主键',
+    `userName`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '申请人名称',
+    `createUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '创建人',
+    `createTime` datetime(0)                                                   NULL DEFAULT NULL COMMENT '创建时间',
+    `updateUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '更新人',
+    `updateTime` datetime(0)                                                   NULL DEFAULT NULL COMMENT '更新时间',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 20
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_0900_as_cs COMMENT = '审批主表'
+  ROW_FORMAT = Dynamic;
+
+CREATE TABLE if not exists `sys_approval_flow_mx`
+(
+    `id`              varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs  NOT NULL COMMENT '明细表主键',
+    `approvalFlowId`  varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs  NOT NULL COMMENT '审批表主键',
+    `approvalUserId`  varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '审批人主键',
+    `approvalUserName`  varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '审批人名称',
+    `approvalTime`    datetime(0)                                                   NULL DEFAULT NULL COMMENT '审批时间',
+    `approvalOpinion` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '审批意见',
+    `approvalStatus`  int(0)                                                        NULL DEFAULT NULL COMMENT '审核状态（1：审核中；2：等待我审核；3：通过；4：驳回）',
+    `approvalSort`    int(0)                                                        NULL DEFAULT NULL COMMENT '排序',
+    `createUser`      varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '创建人',
+    `createTime`      datetime(0)                                                   NULL DEFAULT NULL COMMENT '创建时间',
+    `updateUser`      varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '更新人',
+    `updateTime`      datetime(0)                                                   NULL DEFAULT NULL COMMENT '更新时间',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 20
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_0900_as_cs COMMENT = '审批明细表'
+  ROW_FORMAT = Dynamic;
+
+CREATE TABLE if not exists `sys_approval_flow_config`
+(
+    `id`             varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs  NOT NULL COMMENT '审核配置表主键',
+    `type`           varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs  NULL DEFAULT NULL COMMENT '审批单据名称',
+    `typeName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '审批人主键',
+    `approvalSort`   int(0)                                                        NULL DEFAULT NULL COMMENT '排序',
+    `createUser`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '创建人',
+    `createTime`     datetime(0)                                                   NULL DEFAULT NULL COMMENT '创建时间',
+    `updateUser`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '更新人',
+    `updateTime`     datetime(0)                                                   NULL DEFAULT NULL COMMENT '更新时间',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 20
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_0900_as_cs COMMENT = '审批配置表'
+  ROW_FORMAT = Dynamic;
+
+
+
+CREATE TABLE if not exists `sys_approval_flow_config_mx`
+(
+    `id`             varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs  NOT NULL COMMENT '审核配置表主键',
+    `type`           varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs  NULL DEFAULT NULL COMMENT '审批类型（字典表设置code用作区分类型）',
+    `approvalUserId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '审批人主键',
+    `approvalUserName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '审批人名称',
+    `approvalSort`   int(0)                                                        NULL DEFAULT NULL COMMENT '排序',
+    `createUser`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '创建人',
+    `createTime`     datetime(0)                                                   NULL DEFAULT NULL COMMENT '创建时间',
+    `updateUser`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '更新人',
+    `updateTime`     datetime(0)                                                   NULL DEFAULT NULL COMMENT '更新时间',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 20
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_0900_as_cs COMMENT = '审批配置明细表'
+  ROW_FORMAT = Dynamic;
+
+
+INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
+VALUES (2090, '审批配置', 1643, 7, 'basic/approval/SysApprovalFlowConfig', 'basic/approval/SysApprovalFlowConfig', NULL, 1, 0, 'C', '0', '0', NULL, NULL, '超级用户', '2024-03-14 09:57:58', NULL, NULL, NULL);
+
+INSERT IGNORE INTO sys_approval_flow_config(`id`, `type`, `typeName`, `approvalSort`, `createUser`, `createTime`, `updateUser`, `updateTime`)
+VALUES ('1', 'ly', '领用单据', 1, NULL, NULL, NULL, NULL);
+INSERT IGNORE INTO sys_approval_flow_config(`id`, `type`, `typeName`, `approvalSort`, `createUser`, `createTime`, `updateUser`, `updateTime`)
+VALUES ('2', 'sg', '申购单据', 2, NULL, NULL, NULL, NULL);
+INSERT IGNORE INTO sys_approval_flow_config(`id`, `type`, `typeName`, `approvalSort`, `createUser`, `createTime`, `updateUser`, `updateTime`)
+VALUES ('3', 'cgjh', '采购计划单据', 3, NULL, NULL, NULL, NULL);
+INSERT IGNORE INTO sys_approval_flow_config(`id`, `type`, `typeName`, `approvalSort`, `createUser`, `createTime`, `updateUser`, `updateTime`)
+VALUES ('4', 'cgdd', '采购订单单据', 4, NULL, NULL, NULL, NULL);
+