feat: 审核流程配置功能-sql删除

src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java

@@ -45,6 +45,7 @@ import com.glxp.api.service.auth.CustomerService;
 import com.glxp.api.service.auth.InvWarehouseService;
 import com.glxp.api.service.auth.WarehouseUserService;
 import com.glxp.api.service.basic.IBasicBusTypeChangeService;
+import com.glxp.api.service.basic.SysApprovalFlowService;
 import com.glxp.api.service.basic.UdiProductService;
 import com.glxp.api.service.inout.IoOrderDetailBizService;
 import com.glxp.api.service.inout.IoOrderService;
@@ -113,7 +114,10 @@ public class PurOrderReceiveController extends BaseController {
     InvPreinProductController invPreinProductController;
     @Resource
     InvProductController invProductController;
+    @Resource
+    SysApprovalFlowService sysApprovalFlowService;
 
+    final String type = "ly";
 
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/thrsys/order/insertWeb")
@@ -145,6 +149,14 @@ public class PurOrderReceiveController extends BaseController {
 
         Long userId = customerService.getUserId();
         purReceiveEntity.setStatus(purReceiveEntity.getStatus());
+
+        Integer editStatus = purReceiveEntity.getStatus();
+        if (editStatus == 2){//提交审核
+            String approvalFlowId = sysApprovalFlowService.getApprovalFlowId();
+            purReceiveEntity.setApprovalFlowId(approvalFlowId);
+            sysApprovalFlowService.generateFlow(approvalFlowId,purReceiveEntity.getBillNo(),type);
+        }
+
         purReceiveEntity.setUpdateUser(userId + "");
         purReceiveEntity.setUpdateTime(new Date());
         receiveService.updateOrder(purReceiveEntity);

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

@@ -9,53 +9,5 @@ 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

@@ -9,53 +9,5 @@ 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

@@ -1,6 +1,8 @@
 package com.glxp.api.dao.basic;
 
+import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.basic.SysApprovalFlow;
+import com.glxp.api.entity.basic.SysApprovalFlowConfig;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -8,54 +10,5 @@ import java.util.List;
 
 
 @Mapper
-public interface SysApprovalFlowMapper {
+public interface SysApprovalFlowMapper extends BaseMapperPlus<SysApprovalFlowMapper, SysApprovalFlow,SysApprovalFlow> {
-    /**
-     * 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

@@ -9,53 +9,5 @@ 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/inout/PurReceiveEntity.java

@@ -111,6 +111,12 @@ public class PurReceiveEntity {
     @TableField(value = "targetDeptCode")
     private String targetDeptCode;
 
+    /**
+     * 审批表主键
+     */
+    @TableField(value = "approvalFlowId")
+    private String approvalFlowId;
+
 
     public static final String COL_ID = "id";
 

src/main/java/com/glxp/api/res/inout/ReceiveResponse.java

@@ -1,5 +1,6 @@
 package com.glxp.api.res.inout;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.util.Date;
@@ -100,4 +101,9 @@ public class ReceiveResponse {
 
     private String billTypeName;
 
+    /**
+     * 审批表主键
+     */
+    private String approvalFlowId;
+
 }

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

@@ -1,30 +1,9 @@
 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);
+import com.baomidou.mybatisplus.extension.service.IService;
-
+import com.glxp.api.entity.basic.SysApprovalFlowConfigMx;
-    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);
+public interface SysApprovalFlowConfigMxService extends IService<SysApprovalFlowConfigMx> {
 
 }

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

@@ -1,6 +1,7 @@
 package com.glxp.api.service.basic;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.glxp.api.entity.basic.SysApprovalFlowConfig;
 import com.glxp.api.entity.basic.SysApprovalFlowConfigMx;
 import com.glxp.api.req.basic.SysApprovalFlowAddDetailRequest;
@@ -8,29 +9,9 @@ import com.glxp.api.req.basic.SysApprovalFlowFilterRequest;
 
 import java.util.List;
 
-public interface SysApprovalFlowConfigService{
+public interface SysApprovalFlowConfigService extends IService<SysApprovalFlowConfig> {
 
 
-    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);

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

@@ -1,30 +1,11 @@
 package com.glxp.api.service.basic;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.glxp.api.entity.basic.SysApprovalFlowMx;
 
-import java.util.List;
 
-public interface SysApprovalFlowMxService{
+public interface SysApprovalFlowMxService extends IService<SysApprovalFlowMx> {
 
 
-    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

@@ -1,33 +1,13 @@
 package com.glxp.api.service.basic;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 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{
+public interface SysApprovalFlowService extends IService<SysApprovalFlow> {
-
-
-    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();
 

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

@@ -1,67 +1,15 @@
 package com.glxp.api.service.basic.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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 org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
-import java.util.List;
 
 @Service
-public class SysApprovalFlowConfigMxServiceImpl implements SysApprovalFlowConfigMxService{
+@Transactional(rollbackFor = Exception.class)
-
+public class SysApprovalFlowConfigMxServiceImpl  extends ServiceImpl<SysApprovalFlowConfigMxMapper, SysApprovalFlowConfigMx> 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

@@ -4,6 +4,7 @@ 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.glxp.api.dao.basic.SysApprovalFlowConfigMapper;
 import com.glxp.api.dao.basic.SysApprovalFlowConfigMxMapper;
 import com.glxp.api.entity.basic.SysApprovalFlowConfig;
@@ -23,7 +24,7 @@ import java.util.List;
 import java.util.UUID;
 
 @Service
-public class SysApprovalFlowConfigServiceImpl implements SysApprovalFlowConfigService {
+public class SysApprovalFlowConfigServiceImpl extends ServiceImpl<SysApprovalFlowConfigMapper, SysApprovalFlowConfig>  implements SysApprovalFlowConfigService {
 
     @Resource
     private SysApprovalFlowConfigMapper sysApprovalFlowConfigMapper;
@@ -32,56 +33,6 @@ public class SysApprovalFlowConfigServiceImpl implements SysApprovalFlowConfigSe
     @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) {
@@ -140,7 +91,7 @@ public class SysApprovalFlowConfigServiceImpl implements SysApprovalFlowConfigSe
 
     @Override
     public int removeDetail(String id) {
-        return sysApprovalFlowConfigMxMapper.deleteByPrimaryKey(id);
+        return sysApprovalFlowConfigMxMapper.deleteById(id);
     }
 
 

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

@@ -1,67 +1,14 @@
 package com.glxp.api.service.basic.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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 {
+public class SysApprovalFlowMxServiceImpl extends ServiceImpl<SysApprovalFlowMxMapper, SysApprovalFlowMx> 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

@@ -4,6 +4,7 @@ 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.glxp.api.dao.basic.SysApprovalFlowMapper;
 import com.glxp.api.dao.basic.SysApprovalFlowMxMapper;
 import com.glxp.api.entity.basic.SysApprovalFlow;
@@ -26,7 +27,7 @@ import java.util.stream.Collectors;
 
 @Service
 @Transactional(rollbackFor = Exception.class)
-public class SysApprovalFlowServiceImpl implements SysApprovalFlowService{
+public class SysApprovalFlowServiceImpl extends ServiceImpl<SysApprovalFlowMapper, SysApprovalFlow> implements  SysApprovalFlowService{
 
     @Resource
     private SysApprovalFlowMapper sysApprovalFlowMapper;
@@ -37,56 +38,6 @@ public class SysApprovalFlowServiceImpl implements SysApprovalFlowService{
     @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() {
@@ -116,7 +67,7 @@ public class SysApprovalFlowServiceImpl implements SysApprovalFlowService{
         generateFlowMx(type,approvalFlowId,userId,date,mxs);
 
         sysApprovalFlowMapper.insert(sysApprovalFlow);
-        sysApprovalFlowMxMapper.batchInsert(mxs);
+        sysApprovalFlowMxMapper.insertBatch(mxs);
 
     }
 
@@ -125,7 +76,7 @@ public class SysApprovalFlowServiceImpl implements SysApprovalFlowService{
         QueryWrapper<SysApprovalFlowMx> qw = new QueryWrapper<>();
         qw.eq("approvalFlowId",approvalFlowId);
         List<SysApprovalFlowMx> sysApprovalFlowMxes = sysApprovalFlowMxMapper.selectList(qw);
-        SysApprovalFlow sysApprovalFlow = sysApprovalFlowMapper.selectByPrimaryKey(approvalFlowId);
+        SysApprovalFlow sysApprovalFlow = sysApprovalFlowMapper.selectVoById(approvalFlowId);
         ArrayList<SysApprovalFlowDetailResponse> listRes = new ArrayList<>();
         SysApprovalFlowDetailResponse sysApprovalFlowDetailResponse = new SysApprovalFlowDetailResponse();
         BeanUtil.copyProperties(sysApprovalFlow,sysApprovalFlowDetailResponse);
@@ -152,7 +103,7 @@ public class SysApprovalFlowServiceImpl implements SysApprovalFlowService{
 
         Long userId = customerService.getUserId();
         String id = submitApprovalFlowRequest.getId();
-        SysApprovalFlowMx sysApprovalFlowMx = sysApprovalFlowMxMapper.selectByPrimaryKey(id);
+        SysApprovalFlowMx sysApprovalFlowMx = sysApprovalFlowMxMapper.selectVoById(id);
         if (ObjectUtil.isNull(sysApprovalFlowMx)){
             throw new JsonException("审批id有误，未找到记录！");
         }
@@ -161,7 +112,7 @@ public class SysApprovalFlowServiceImpl implements SysApprovalFlowService{
             throw new JsonException("当前账号不可对此审批节点进行审批！");
         }
         String approvalFlowId = sysApprovalFlowMx.getApprovalFlowId();
-        SysApprovalFlow sysApprovalFlow = sysApprovalFlowMapper.selectByPrimaryKey(approvalFlowId);
+        SysApprovalFlow sysApprovalFlow = sysApprovalFlowMapper.selectVoById(approvalFlowId);
 
         if (sysApprovalFlow.getStatus() != ApprovalFlowEnum.DSH.getCode()){
             throw new JsonException("该单据未处于待审核状态无法审核！");
@@ -205,7 +156,7 @@ public class SysApprovalFlowServiceImpl implements SysApprovalFlowService{
         qw.eq("approvalFlowId",approvalFlowId);
         qw.orderByAsc("approvalSort");
         List<SysApprovalFlowMx> sysApprovalFlowMxes = sysApprovalFlowMxMapper.selectList(qw);
-        SysApprovalFlow sysApprovalFlow = sysApprovalFlowMapper.selectByPrimaryKey(approvalFlowId);
+        SysApprovalFlow sysApprovalFlow = sysApprovalFlowMapper.selectVoById(approvalFlowId);
         int shz = 0;
         int tg = 0;
         int bh = 0;
@@ -231,7 +182,7 @@ public class SysApprovalFlowServiceImpl implements SysApprovalFlowService{
 
         if (status != newStatus){
             sysApprovalFlow.setStatus(newStatus);
-            sysApprovalFlowMapper.updateByPrimaryKey(sysApprovalFlow);
+            sysApprovalFlowMapper.updateById(sysApprovalFlow);
         }
 
     }

src/main/resources/mybatis/mapper/inout/ReceiveDao.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.inout.ReceiveDao">
     <select id="filterList" resultType="com.glxp.api.res.inout.ReceiveResponse">
-        select io.*,
+        select IFNULL(saf.status,0) as status,io.*,
                ( SELECT originName FROM basic_bustype_change bus WHERE bus.originAction = io.billType ) billTypeName,
                (select name from auth_dept ad where ad.code = io.deptCode)                deptName,
                (select name from auth_warehouse aw where aw.code = io.invCode)            invName,
@@ -12,6 +12,7 @@
                (select name from auth_dept ad2 where ad2.code = io.targetDeptCode)        targetDeptName,
                (select name from auth_warehouse aw2 where aw2.code = io.targetInvCode)   targetInvName
         from pur_receive as io
+        Left Join sys_approval_flow as saf ON io.approvalFlowId = saf.id
         <where>
             <if test="billType != null and billType != ''">
                 AND billType = #{billType}
@@ -47,16 +48,16 @@
                 AND date_format(createTime, '%Y-%m-%d') &lt;= date_format(#{endTime}, '%Y-%m-%d')
             </if>
             <if test="status != null">
-                AND status = #{status}
+                AND saf.status = #{status}
             </if>
             <if test="type == 1">
-                AND (status=1 or status=2 or status=4)
+                AND (saf.status is null or saf.status=1 or saf.status=3)
             </if>
             <if test="type == 2">
-                AND (status=2)
+                AND (saf.status=1)
             </if>
             <if test="type == 3">
-                AND (status=3 or status=4)
+                AND (saf.status=2 or saf.status=3)
             </if>
         </where>
 

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

@@ -834,3 +834,12 @@ INSERT IGNORE INTO sys_approval_flow_config(`id`, `type`, `typeName`, `approvalS
                                             `updateUser`, `updateTime`)
 VALUES ('4', 'cgdd', '采购订单单据', 4, NULL, NULL, NULL, NULL);
 
+CALL Pro_Temp_ColumnWork('pur_receive', 'approvalFlowId',
+                         ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT ''审批表主键(关联审批流程主表)'' ',
+                         1);
+UPDATE sys_custom_config_detail
+SET `configId` = 21, `type` = '1', `isShow` = 1, `columnName` = 'status', `columnDesc` = '单据状态', `columnType` = 'eltag',
+    `colorRule` = '', `sort` = NULL, `lableRule` = '{\"0\":\"草稿\",\"1\":\"未审核\",\"2\":\"已审核\",\"3\":\"已拒绝\"}',
+    `width` = 120, `tooltip` = NULL, `buttonRule` = '', `number` = NULL, `lineNumber` = NULL, `clickFuc` = NULL,
+    `size` = NULL, `style` = NULL, `disabled` = NULL, `checkRules` = NULL, `inputType` = NULL, `disabledFuc` = NULL,
+    `expression` = NULL, `dataFuc` = NULL, `isShowXx` = NULL WHERE `id` = 234;