diff --git a/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/controller/LawsTaskTransferController.java b/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/controller/LawsTaskTransferController.java index e516d233..5e9e3e73 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/controller/LawsTaskTransferController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/controller/LawsTaskTransferController.java @@ -6,7 +6,7 @@ import com.jero.common.api.vo.ResultCommon; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.util.MessageUtils; import com.jero.modules.laws.tasktransfer.entity.LawsBaseDB; -import com.jero.modules.laws.tasktransfer.entity.LawsProcessDb; +import com.jero.modules.laws.tasktransfer.entity.LawsProcessDB; import com.jero.modules.laws.tasktransfer.service.ILawsTaskTransferService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -56,8 +56,20 @@ public class LawsTaskTransferController { @AutoLog(value = "任务转交-基础库信息转交") @ApiOperation(value="任务转交-基础库信息转交", notes="任务转交-基础库信息转交") @PostMapping(value = "/baseDBTransfer") - public Result baseDBTransfer(@RequestBody List lawsBaseDBList) { - lawsTaskTransferService.baseDBTransfer(lawsBaseDBList); + public Result baseDBTransfer(@RequestBody LawsBaseDB lawsBaseDB) { + lawsTaskTransferService.baseDBTransfer(lawsBaseDB); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); + } + + /** + * 任务转交-基础库信息转交(批量) + * @return + */ + @AutoLog(value = "任务转交-基础库信息转交(批量)") + @ApiOperation(value="任务转交-基础库信息转交(批量)", notes="任务转交-基础库信息转交(批量)") + @PostMapping(value = "/baseDBTransferBatch") + public Result baseDBTransferBatch(@RequestBody List lawsBaseDBList) { + lawsTaskTransferService.baseDBTransferBatch(lawsBaseDBList); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } @@ -68,9 +80,9 @@ public class LawsTaskTransferController { @AutoLog(value = "任务转交-流程信息分页查询") @ApiOperation(value="任务转交-流程信息分页查询", notes="任务转交-流程信息分页查询") @GetMapping(value = "/queryProcessDB") - public Result> queryProcessDB(LawsProcessDb lawsProcessDb, - @ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @ApiParam("每页条数") @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + public Result> queryProcessDB(LawsProcessDB lawsProcessDb, + @ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @ApiParam("每页条数") @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { return Result.OK(lawsTaskTransferService.queryProcessDB(lawsProcessDb, pageNo, pageSize)); } @@ -81,8 +93,20 @@ public class LawsTaskTransferController { @AutoLog(value = "任务转交-流程信息转交") @ApiOperation(value="任务转交-流程信息转交", notes="任务转交-流程信息转交") @PostMapping(value = "/processDBTransfer") - public Result> processDBTransfer(@RequestBody List lawsProcessDbList) { - lawsTaskTransferService.processDBTransfer(lawsProcessDbList); + public Result> processDBTransfer(@RequestBody LawsProcessDB lawsProcessDB) { + lawsTaskTransferService.processDBTransfer(lawsProcessDB); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); + } + + /** + * 任务转交-流程信息转交(批量) + * @return + */ + @AutoLog(value = "任务转交-流程信息转交(批量)") + @ApiOperation(value="任务转交-流程信息转交(批量)", notes="任务转交-流程信息转交(批量)") + @PostMapping(value = "/processDBTransferBatch") + public Result> processDBTransferBatch(@RequestBody List lawsProcessDBList) { + lawsTaskTransferService.processDBTransferBatch(lawsProcessDBList); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/entity/LawsProcessDb.java b/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/entity/LawsProcessDB.java similarity index 97% rename from laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/entity/LawsProcessDb.java rename to laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/entity/LawsProcessDB.java index a9b72c7f..a998cb3c 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/entity/LawsProcessDb.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/entity/LawsProcessDB.java @@ -12,7 +12,7 @@ import lombok.Data; * @Version: 1.0 **/ @Data -public class LawsProcessDb { +public class LawsProcessDB { /**主键ID*/ @ApiModelProperty(value = "主键ID") private java.lang.String id; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/mapper/LawsTaskTransferMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/mapper/LawsTaskTransferMapper.java index 07e09a03..84ab8091 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/mapper/LawsTaskTransferMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/mapper/LawsTaskTransferMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.jero.modules.laws.tasktransfer.entity.LawsBaseDB; -import com.jero.modules.laws.tasktransfer.entity.LawsProcessDb; +import com.jero.modules.laws.tasktransfer.entity.LawsProcessDB; import org.apache.ibatis.annotations.Param; /** @@ -29,5 +29,5 @@ public interface LawsTaskTransferMapper { * @param objectPage * @return */ - IPage queryProcessDB(@Param(Constants.WRAPPER) QueryWrapper queryWrapper, IPage objectPage); + IPage queryProcessDB(@Param(Constants.WRAPPER) QueryWrapper queryWrapper, IPage objectPage); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/mapper/xml/LawsTaskTransferMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/mapper/xml/LawsTaskTransferMapper.xml index 6597678e..e3fe7655 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/mapper/xml/LawsTaskTransferMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/mapper/xml/LawsTaskTransferMapper.xml @@ -84,7 +84,7 @@ ${ew.customSqlSegment} - SELECT pa.id, task_id, task_id, diff --git a/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/service/ILawsTaskTransferService.java b/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/service/ILawsTaskTransferService.java index 19237422..478302bb 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/service/ILawsTaskTransferService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/service/ILawsTaskTransferService.java @@ -2,7 +2,7 @@ package com.jero.modules.laws.tasktransfer.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.laws.tasktransfer.entity.LawsBaseDB; -import com.jero.modules.laws.tasktransfer.entity.LawsProcessDb; +import com.jero.modules.laws.tasktransfer.entity.LawsProcessDB; import java.util.List; @@ -25,9 +25,15 @@ public interface ILawsTaskTransferService { /** * 任务转交-基础库信息转交 + * @param lawsBaseDB + */ + void baseDBTransfer(LawsBaseDB lawsBaseDB); + + /** + * 任务转交-基础库信息转交(批量) * @param lawsBaseDBList */ - void baseDBTransfer(List lawsBaseDBList); + void baseDBTransferBatch(List lawsBaseDBList); /** * 任务转交-流程信息分页查询 @@ -36,11 +42,17 @@ public interface ILawsTaskTransferService { * @param pageSize * @return */ - IPage queryProcessDB(LawsProcessDb lawsProcessDb, Integer pageNo, Integer pageSize); + IPage queryProcessDB(LawsProcessDB lawsProcessDb, Integer pageNo, Integer pageSize); /** * 任务转交-流程信息转交 - * @param lawsProcessDbList + * @param lawsProcessDB */ - void processDBTransfer(List lawsProcessDbList); + void processDBTransfer(LawsProcessDB lawsProcessDB); + + /** + * 任务转交-流程信息转交(批量) + * @param lawsProcessDBList + */ + void processDBTransferBatch(List lawsProcessDBList); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/service/impl/LawsTaskTransferServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/service/impl/LawsTaskTransferServiceImpl.java index 89a56d63..12cefd6c 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/service/impl/LawsTaskTransferServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/service/impl/LawsTaskTransferServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.common.system.vo.LoginUser; import com.jero.modules.activiti.process.fb.service.IProcessHandleService; import com.jero.modules.compare.entity.SarFileCompareInfo; import com.jero.modules.compare.service.ISarFileCompareInfoService; @@ -13,7 +14,7 @@ import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan; import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService; import com.jero.modules.laws.tasktransfer.common.LawsTaskTransferCommon; import com.jero.modules.laws.tasktransfer.entity.LawsBaseDB; -import com.jero.modules.laws.tasktransfer.entity.LawsProcessDb; +import com.jero.modules.laws.tasktransfer.entity.LawsProcessDB; import com.jero.modules.laws.tasktransfer.mapper.LawsTaskTransferMapper; import com.jero.modules.laws.tasktransfer.service.ILawsTaskTransferService; import com.jero.modules.split.entity.SarFileSplitInfoEO; @@ -21,9 +22,11 @@ import com.jero.modules.split.service.ISarFileSplitInfoService; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; @@ -70,23 +73,40 @@ public class LawsTaskTransferServiceImpl implements ILawsTaskTransferService { queryWrapper.eq(StringUtils.isNotBlank(lawsBaseDB.getType()), "t.type", lawsBaseDB.getType()); queryWrapper.like(StringUtils.isNotBlank(lawsBaseDB.getStandardNo()), "t.standard_no", lawsBaseDB.getStandardNo()); queryWrapper.orderByDesc("t.create_time"); + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String roleIds = loginUser.getRoleIds(); + if (!roleIds.contains("admin")){ + queryWrapper.eq("t.user", loginUser.getId()); + } return lawsTaskTransferMapper.queryBaseDB(queryWrapper, new Page<>(pageNo, pageSize)); } @Override - public IPage queryProcessDB(LawsProcessDb lawsProcessDb, Integer pageNo, Integer pageSize) { - QueryWrapper queryWrapper = new QueryWrapper<>(); + public IPage queryProcessDB(LawsProcessDB lawsProcessDb, Integer pageNo, Integer pageSize) { + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.like(StringUtils.isNotBlank(lawsProcessDb.getUser()), "u.realname", lawsProcessDb.getUser()); queryWrapper.like(StringUtils.isNotBlank(lawsProcessDb.getPrcNum()), "prc_num", lawsProcessDb.getPrcNum()); queryWrapper.eq(!Objects.isNull(lawsProcessDb.getPrcType()), "prc_type", lawsProcessDb.getPrcType()); queryWrapper.like(StringUtils.isNotBlank(lawsProcessDb.getTaskName()), "task_name", lawsProcessDb.getTaskName()); + queryWrapper.like(StringUtils.isNotBlank(lawsProcessDb.getPrcName()), "pa.prc_name", lawsProcessDb.getPrcName()); queryWrapper.orderByDesc("par.create_time"); + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String roleIds = loginUser.getRoleIds(); + if (!roleIds.contains("admin")){ + queryWrapper.eq("par.user_id", loginUser.getId()); + } return lawsTaskTransferMapper.queryProcessDB(queryWrapper, new Page<>(pageNo, pageSize)); } @Override - public void processDBTransfer(List lawsProcessDbList) { - for (LawsProcessDb lawsProcessDb : lawsProcessDbList) { + public void processDBTransfer(LawsProcessDB lawsProcessDB) { + List lawsProcessDBList = new ArrayList<>(); + processDBTransferBatch(lawsProcessDBList); + } + + @Override + public void processDBTransferBatch(List lawsProcessDBList) { + for (LawsProcessDB lawsProcessDb : lawsProcessDBList) { String taskId = lawsProcessDb.getTaskId(); String toUserId = lawsProcessDb.getTransferUser(); processHandleService.transfer(taskId, toUserId); @@ -94,7 +114,14 @@ public class LawsTaskTransferServiceImpl implements ILawsTaskTransferService { } @Override - public void baseDBTransfer(List lawsBaseDBList) { + public void baseDBTransfer(LawsBaseDB lawsBaseDB) { + List lawsBaseDBList = new ArrayList<>(); + lawsBaseDBList.add(lawsBaseDB); + baseDBTransferBatch(lawsBaseDBList); + } + + @Override + public void baseDBTransferBatch(List lawsBaseDBList) { // 企标计划 standardPlan(lawsBaseDBList); // 标准拆分