From ca1cb12097fc2656788d39f556f4077f0c380951 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 8 Jul 2024 14:38:47 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B3=95=E8=A7=84=E7=AC=A6=E5=90=88?= =?UTF-8?q?=E6=80=A7=E6=8E=92=E6=9F=A5=E6=B5=81=E7=A8=8B-=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E5=88=86=E6=B4=BE=E4=BF=A1=E6=81=AF=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...cessStandardComplianceCheckController.java | 62 ++++++++++++++++++- ...sStandardComplianceCheckDetailService.java | 2 + ...ndardComplianceCheckDetailServiceImpl.java | 22 ++++++- 3 files changed, 84 insertions(+), 2 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java index fbc09365..c39e0cad 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java @@ -1,5 +1,6 @@ package com.jero.modules.activiti.process.standardComplianceCheck.controller; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.aspect.annotation.Translation; @@ -11,12 +12,15 @@ import com.jero.modules.activiti.process.common.service.ActFlowCommonService; import com.jero.modules.activiti.process.fb.service.IProcessHandleService; import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; import com.jero.modules.activiti.process.standardComplianceCheck.entity.ProcessStandardComplianceCheck; +import com.jero.modules.activiti.process.standardComplianceCheck.entity.ProcessStandardComplianceCheckDetail; import com.jero.modules.activiti.process.standardComplianceCheck.entity.vo.ModelExcelVO; import com.jero.modules.activiti.process.standardComplianceCheck.entity.vo.ProcessSccVO; +import com.jero.modules.activiti.process.standardComplianceCheck.service.IProcessStandardComplianceCheckDetailService; import com.jero.modules.activiti.process.standardComplianceCheck.service.IProcessStandardComplianceCheckService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.formula.functions.T; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -29,6 +33,8 @@ import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import java.util.ArrayList; +import java.util.Arrays; +import java.util.Map; /** * 流程-测试流程(process_demo)表控制层 @@ -51,6 +57,9 @@ public class ProcessStandardComplianceCheckController extends JeroController()); + return mv; + } + + @PostMapping({"/deleteBatch"}) + @ApiOperation(value = "法规符合性排查流程-批量删除", notes = "法规符合性排查流程-批量删除") + @AutoLog(value = "法规符合性排查流程-批量删除") + public Result deleteBatch(@RequestBody Map map) { + String var1 = map.get("ids"); + if(StringUtils.isBlank(var1)){ + return Result.error("参数不识别!"); + } + this.sccService.removeByIds(Arrays.asList(var1.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 业务分派信息-分页列表查询 + * + * @param processStandardComplianceCheckDetail + * @param pageNo + * @param pageSize + * @return + */ + @AutoLog(value = "法规符合性评估库-法规符合性评估库-分页列表查询") + @ApiOperation(value = "法规符合性评估库-法规符合性评估库-分页列表查询", notes = "法规符合性评估库-法规符合性评估库-分页列表查询") + @GetMapping(value = "/detailPage") + public Result> queryPageList(ProcessStandardComplianceCheckDetail processStandardComplianceCheckDetail, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { + IPage pageList = sccDetailService.queryPage(processStandardComplianceCheckDetail, pageNo, pageSize); + return Result.OK(pageList); + } + } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/IProcessStandardComplianceCheckDetailService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/IProcessStandardComplianceCheckDetailService.java index e45749fb..2ec3b11a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/IProcessStandardComplianceCheckDetailService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/IProcessStandardComplianceCheckDetailService.java @@ -1,5 +1,6 @@ package com.jero.modules.activiti.process.standardComplianceCheck.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.activiti.process.standardComplianceCheck.entity.ProcessStandardComplianceCheckDetail; import com.baomidou.mybatisplus.extension.service.IService; @@ -10,4 +11,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IProcessStandardComplianceCheckDetailService extends IService { + IPage queryPage(ProcessStandardComplianceCheckDetail processStandardComplianceCheckDetail, Integer pageNo, Integer pageSize); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckDetailServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckDetailServiceImpl.java index 8b9d792a..29e7fd59 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckDetailServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckDetailServiceImpl.java @@ -1,9 +1,14 @@ package com.jero.modules.activiti.process.standardComplianceCheck.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +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.jero.common.exception.JeroBootException; import com.jero.modules.activiti.process.standardComplianceCheck.entity.ProcessStandardComplianceCheckDetail; -import com.jero.modules.activiti.process.standardComplianceCheck.service.IProcessStandardComplianceCheckDetailService; import com.jero.modules.activiti.process.standardComplianceCheck.mapper.ProcessStandardComplianceCheckDetailMapper; +import com.jero.modules.activiti.process.standardComplianceCheck.service.IProcessStandardComplianceCheckDetailService; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; /** @@ -15,6 +20,21 @@ import org.springframework.stereotype.Service; public class ProcessStandardComplianceCheckDetailServiceImpl extends ServiceImpl implements IProcessStandardComplianceCheckDetailService { + @Override + public IPage queryPage(ProcessStandardComplianceCheckDetail processStandardComplianceCheckDetail, Integer pageNo, Integer pageSize) { + String checkId = processStandardComplianceCheckDetail.getCheckId(); + if (StringUtils.isBlank(checkId)) { + throw new JeroBootException("checkId不能为空"); + } + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + Page page = new Page<>(pageNo, pageSize); + if (StringUtils.isNotBlank(processStandardComplianceCheckDetail.getAuthDept())) { + queryWrapper.like(ProcessStandardComplianceCheckDetail::getAuthDept, processStandardComplianceCheckDetail.getAuthDept()); + } + queryWrapper.eq(ProcessStandardComplianceCheckDetail::getCheckId, checkId); + queryWrapper.orderByDesc(ProcessStandardComplianceCheckDetail::getCreateTime); + return page(page, queryWrapper); + } }