From 45b7fad953cafc013ef44a1fb60e9bfd81d09a89 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Thu, 14 Mar 2024 14:47:25 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=A1=E6=A0=B8=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8A=9F=E8=83=BD-sql=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchase/PurOrderReceiveController.java | 12 ++++ .../basic/SysApprovalFlowConfigMapper.java | 48 -------------- .../basic/SysApprovalFlowConfigMxMapper.java | 48 -------------- .../api/dao/basic/SysApprovalFlowMapper.java | 53 +-------------- .../dao/basic/SysApprovalFlowMxMapper.java | 48 -------------- .../api/entity/inout/PurReceiveEntity.java | 6 ++ .../glxp/api/res/inout/ReceiveResponse.java | 6 ++ .../basic/SysApprovalFlowConfigMxService.java | 27 +------- .../basic/SysApprovalFlowConfigService.java | 23 +------ .../basic/SysApprovalFlowMxService.java | 23 +------ .../service/basic/SysApprovalFlowService.java | 24 +------ .../SysApprovalFlowConfigMxServiceImpl.java | 60 ++--------------- .../SysApprovalFlowConfigServiceImpl.java | 55 +--------------- .../impl/SysApprovalFlowMxServiceImpl.java | 57 +--------------- .../impl/SysApprovalFlowServiceImpl.java | 65 +++---------------- .../mybatis/mapper/inout/ReceiveDao.xml | 11 ++-- src/main/resources/schemas/schema_v2.4.sql | 9 +++ 17 files changed, 68 insertions(+), 507 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java b/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java index 96f14afcd..d621105d1 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java +++ b/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); diff --git a/src/main/java/com/glxp/api/dao/basic/SysApprovalFlowConfigMapper.java b/src/main/java/com/glxp/api/dao/basic/SysApprovalFlowConfigMapper.java index 5b056f7f9..583ee18a3 100644 --- a/src/main/java/com/glxp/api/dao/basic/SysApprovalFlowConfigMapper.java +++ b/src/main/java/com/glxp/api/dao/basic/SysApprovalFlowConfigMapper.java @@ -9,53 +9,5 @@ import java.util.List; @Mapper public interface SysApprovalFlowConfigMapper extends BaseMapperPlus { - /** - * 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 list); - - int batchInsert(@Param("list") List list); } diff --git a/src/main/java/com/glxp/api/dao/basic/SysApprovalFlowConfigMxMapper.java b/src/main/java/com/glxp/api/dao/basic/SysApprovalFlowConfigMxMapper.java index 969367e9f..96636c6e6 100644 --- a/src/main/java/com/glxp/api/dao/basic/SysApprovalFlowConfigMxMapper.java +++ b/src/main/java/com/glxp/api/dao/basic/SysApprovalFlowConfigMxMapper.java @@ -9,53 +9,5 @@ import java.util.List; @Mapper public interface SysApprovalFlowConfigMxMapper extends BaseMapperPlus { - /** - * 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 list); - - int batchInsert(@Param("list") List list); } diff --git a/src/main/java/com/glxp/api/dao/basic/SysApprovalFlowMapper.java b/src/main/java/com/glxp/api/dao/basic/SysApprovalFlowMapper.java index 79fbcb7e7..68509d298 100644 --- a/src/main/java/com/glxp/api/dao/basic/SysApprovalFlowMapper.java +++ b/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 { - /** - * 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 list); - - int batchInsert(@Param("list") List list); +public interface SysApprovalFlowMapper extends BaseMapperPlus { } diff --git a/src/main/java/com/glxp/api/dao/basic/SysApprovalFlowMxMapper.java b/src/main/java/com/glxp/api/dao/basic/SysApprovalFlowMxMapper.java index a683bfc92..c289d23fb 100644 --- a/src/main/java/com/glxp/api/dao/basic/SysApprovalFlowMxMapper.java +++ b/src/main/java/com/glxp/api/dao/basic/SysApprovalFlowMxMapper.java @@ -9,53 +9,5 @@ import java.util.List; @Mapper public interface SysApprovalFlowMxMapper extends BaseMapperPlus { - /** - * 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 list); - - int batchInsert(@Param("list") List list); } diff --git a/src/main/java/com/glxp/api/entity/inout/PurReceiveEntity.java b/src/main/java/com/glxp/api/entity/inout/PurReceiveEntity.java index da0f3e179..29626356a 100644 --- a/src/main/java/com/glxp/api/entity/inout/PurReceiveEntity.java +++ b/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"; diff --git a/src/main/java/com/glxp/api/res/inout/ReceiveResponse.java b/src/main/java/com/glxp/api/res/inout/ReceiveResponse.java index 5fdfa3bbd..32af8f727 100644 --- a/src/main/java/com/glxp/api/res/inout/ReceiveResponse.java +++ b/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; + } diff --git a/src/main/java/com/glxp/api/service/basic/SysApprovalFlowConfigMxService.java b/src/main/java/com/glxp/api/service/basic/SysApprovalFlowConfigMxService.java index d3881e476..3cd06eb76 100644 --- a/src/main/java/com/glxp/api/service/basic/SysApprovalFlowConfigMxService.java +++ b/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); - - int insertSelective(SysApprovalFlowConfigMx record); - - SysApprovalFlowConfigMx selectByPrimaryKey(String id); - - int updateByPrimaryKeySelective(SysApprovalFlowConfigMx record); - - int updateByPrimaryKey(SysApprovalFlowConfigMx record); - - int updateBatch(List list); +import com.baomidou.mybatisplus.extension.service.IService; +import com.glxp.api.entity.basic.SysApprovalFlowConfigMx; - int batchInsert(List list); +public interface SysApprovalFlowConfigMxService extends IService { } diff --git a/src/main/java/com/glxp/api/service/basic/SysApprovalFlowConfigService.java b/src/main/java/com/glxp/api/service/basic/SysApprovalFlowConfigService.java index 7cabeecb4..8523ab265 100644 --- a/src/main/java/com/glxp/api/service/basic/SysApprovalFlowConfigService.java +++ b/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 { - 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 list); - - int batchInsert(List list); - IPage filterList(SysApprovalFlowFilterRequest sysApprovalFlowFilterRequest); List getDetailList(String type); diff --git a/src/main/java/com/glxp/api/service/basic/SysApprovalFlowMxService.java b/src/main/java/com/glxp/api/service/basic/SysApprovalFlowMxService.java index 153ff5f05..4caf0ebd5 100644 --- a/src/main/java/com/glxp/api/service/basic/SysApprovalFlowMxService.java +++ b/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 { - 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 list); - - int batchInsert(List list); } diff --git a/src/main/java/com/glxp/api/service/basic/SysApprovalFlowService.java b/src/main/java/com/glxp/api/service/basic/SysApprovalFlowService.java index 8d7fb7cdd..fab9d2132 100644 --- a/src/main/java/com/glxp/api/service/basic/SysApprovalFlowService.java +++ b/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{ - - - 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 list); - - int batchInsert(List list); +public interface SysApprovalFlowService extends IService { String getApprovalFlowId(); diff --git a/src/main/java/com/glxp/api/service/basic/impl/SysApprovalFlowConfigMxServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/SysApprovalFlowConfigMxServiceImpl.java index 3f2ab4560..207a8996b 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/SysApprovalFlowConfigMxServiceImpl.java +++ b/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{ - - @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 list) { - return sysApprovalFlowConfigMxMapper.updateBatch(list); - } - - @Override - public int batchInsert(List list) { - return sysApprovalFlowConfigMxMapper.batchInsert(list); - } +@Transactional(rollbackFor = Exception.class) +public class SysApprovalFlowConfigMxServiceImpl extends ServiceImpl implements SysApprovalFlowConfigMxService{ } diff --git a/src/main/java/com/glxp/api/service/basic/impl/SysApprovalFlowConfigServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/SysApprovalFlowConfigServiceImpl.java index dc565b177..8c4aeeb4a 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/SysApprovalFlowConfigServiceImpl.java +++ b/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 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 list) { - return sysApprovalFlowConfigMapper.updateBatch(list); - } - - @Override - public int batchInsert(List list) { - return sysApprovalFlowConfigMapper.batchInsert(list); - } - @Override public IPage 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); } diff --git a/src/main/java/com/glxp/api/service/basic/impl/SysApprovalFlowMxServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/SysApprovalFlowMxServiceImpl.java index b3ab7dd08..99863ce1f 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/SysApprovalFlowMxServiceImpl.java +++ b/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 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 list) { - return sysApprovalFlowMxMapper.updateBatch(list); - } - - @Override - public int batchInsert(List list) { - return sysApprovalFlowMxMapper.batchInsert(list); - } } diff --git a/src/main/java/com/glxp/api/service/basic/impl/SysApprovalFlowServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/SysApprovalFlowServiceImpl.java index cfb3dcd7c..ebb61c28b 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/SysApprovalFlowServiceImpl.java +++ b/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 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 list) { - return sysApprovalFlowMapper.updateBatch(list); - } - - @Override - public int batchInsert(List 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 qw = new QueryWrapper<>(); qw.eq("approvalFlowId",approvalFlowId); List sysApprovalFlowMxes = sysApprovalFlowMxMapper.selectList(qw); - SysApprovalFlow sysApprovalFlow = sysApprovalFlowMapper.selectByPrimaryKey(approvalFlowId); + SysApprovalFlow sysApprovalFlow = sysApprovalFlowMapper.selectVoById(approvalFlowId); ArrayList 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 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); } } diff --git a/src/main/resources/mybatis/mapper/inout/ReceiveDao.xml b/src/main/resources/mybatis/mapper/inout/ReceiveDao.xml index 12156a300..0080ce870 100644 --- a/src/main/resources/mybatis/mapper/inout/ReceiveDao.xml +++ b/src/main/resources/mybatis/mapper/inout/ReceiveDao.xml @@ -2,7 +2,7 @@