feat: 根据企标Id查询复审列表接口

laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/entity/ProcessEsRecheck.java

@@ -4,15 +4,15 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * 企业标准
  * @TableName process_es_recheck
@@ -151,6 +151,14 @@ public class ProcessEsRecheck implements Serializable {
     @ApiModelProperty(value = "联络人")
     private String standardizationUser;
 
+    /**
+     * 流程编号
+     */
+    @ApiModelProperty(value = "流程编号")
+    @TableField(exist = false)
+    private String prcNum;
+
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }

laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardRecheckPlanController.java

@@ -4,8 +4,10 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.aspect.annotation.DictPoint;
 import com.jero.common.aspect.annotation.Translation;
 import com.jero.common.system.base.controller.JeroController;
+import com.jero.modules.activiti.process.esRecheck.entity.ProcessEsRecheck;
 import com.jero.modules.laws.enterprise.entity.EnterpriseStandardRecheckPlan;
 import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO;
 import com.jero.modules.laws.enterprise.service.EnterpriseStandardRecheckPlanService;
@@ -17,6 +19,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 
 /**
@@ -64,4 +67,19 @@ public class EnterpriseStandardRecheckPlanController extends JeroController<Ente
 	public Result<?> getDataById(@PathVariable("id") @ApiParam("复审计划主键ID") String id) {
 		return Result.OK(recheckPlanService.getDataById(id));
 	}
+
+	/**
+	 * 根据Id查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "企标复审计划-根据企标Id查询复审列表")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value="企标复审计划-根据企标Id查询复审列表", notes="企标复审计划-根据企标Id查询复审列表")
+	@GetMapping(value = "/getListByStandardId")
+	@Translation
+	@DictPoint
+	public Result<List<ProcessEsRecheck>> getListByStandardId(@RequestParam("standardId") @ApiParam("企标id") String id) {
+		return Result.OK(recheckPlanService.getListByStandardId(id));
+	}
 }

laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardRecheckPlanService.java

@@ -1,12 +1,14 @@
 package com.jero.modules.laws.enterprise.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jero.modules.laws.enterprise.entity.EnterpriseStandardRecheckPlan;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.modules.activiti.process.esRecheck.entity.ProcessEsRecheck;
+import com.jero.modules.laws.enterprise.entity.EnterpriseStandardRecheckPlan;
 import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO;
-import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardDeclareVo;
 import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardRecheckPlanVo;
 
+import java.util.List;
+
 /**
 * @author ThinkBook
 * @description 针对表【laws_enterprise_standard_recheck_plan】的数据库操作Service
@@ -24,4 +26,6 @@ public interface EnterpriseStandardRecheckPlanService extends IService<Enterpris
     IPage<EnterpriseStandardRecheckPlanVo> queryPageList(ESQueryCommonDTO esRecheckPlan, Integer pageNo, Integer pageSize);
 
     EnterpriseStandardRecheckPlanVo getDataById(String id);
+
+    List<ProcessEsRecheck> getListByStandardId(String id);
 }

laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardRecheckPlanServiceImpl.java

@@ -1,25 +1,27 @@
 package com.jero.modules.laws.enterprise.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.common.system.api.ISysBaseAPI;
+import com.jero.modules.activiti.entity.ProcessAll;
-import com.jero.common.system.vo.DictModel;
+import com.jero.modules.activiti.process.esRecheck.entity.ProcessEsRecheck;
+import com.jero.modules.activiti.process.esRecheck.service.ProcessEsRecheckService;
+import com.jero.modules.activiti.service.ProcessAllService;
 import com.jero.modules.laws.enterprise.entity.EnterpriseStandardRecheckPlan;
 import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO;
-import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardDeclareVo;
 import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardRecheckPlanVo;
-import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardReviewMeetingVo;
-import com.jero.modules.laws.enterprise.service.EnterpriseStandardRecheckPlanService;
 import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardRecheckPlanMapper;
+import com.jero.modules.laws.enterprise.service.EnterpriseStandardRecheckPlanService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
-import java.util.stream.Collectors;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * @author ThinkBook
@@ -35,6 +37,12 @@ public class EnterpriseStandardRecheckPlanServiceImpl extends ServiceImpl<Enterp
     @Resource
     private EnterpriseStandardRecheckPlanMapper esRecheckPlanMapper;
 
+    @Resource
+    private ProcessEsRecheckService esRecheckService;
+
+    @Resource
+    private ProcessAllService processAllService;
+
     @Override
     public IPage<EnterpriseStandardRecheckPlanVo> queryPageList(ESQueryCommonDTO esRecheckPlan, Integer pageNo, Integer pageSize) {
         IPage<EnterpriseStandardRecheckPlanVo> page = new Page<>(pageNo, pageSize);
@@ -52,6 +60,33 @@ public class EnterpriseStandardRecheckPlanServiceImpl extends ServiceImpl<Enterp
         }
         return null;
     }
+
+    @Override
+    public List<ProcessEsRecheck> getListByStandardId(String id) {
+        LambdaQueryWrapper<EnterpriseStandardRecheckPlan> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(EnterpriseStandardRecheckPlan::getStandardId, id);
+        EnterpriseStandardRecheckPlan plan = this.getOne(queryWrapper);
+        if (plan == null) {
+            return Collections.emptyList();
+        }
+        LambdaQueryWrapper<ProcessEsRecheck> esRecheckLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        esRecheckLambdaQueryWrapper.eq(ProcessEsRecheck::getRecheckPlanId, plan.getId());
+        List<ProcessEsRecheck> list = esRecheckService.list(esRecheckLambdaQueryWrapper);
+        if (list.isEmpty()) {
+            return list;
+        }
+        LambdaQueryWrapper<ProcessAll> processAllLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        list.forEach(esRecheck -> {
+            // 根据流程id查找流程总表获取其流程实例Id
+            processAllLambdaQueryWrapper.clear();
+            processAllLambdaQueryWrapper.eq(ProcessAll::getProcessInstanceId, esRecheck.getProcessInstanceId());
+            ProcessAll one = processAllService.getOne(processAllLambdaQueryWrapper);
+            if (one != null) {
+                esRecheck.setProcessInstanceId(one.getPrcNum());
+            }
+        });
+        return list;
+    }
 }