diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java index 514810b4..e052c43a 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java @@ -4,6 +4,7 @@ package com.ydw.bat.wkflow.business_main.datas.controller; import com.tmsps.fk.common.base.action.BaseAction; import com.ydw.bat.wkflow.business_main.datas.entity.BusMes; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.SarBussionessStandState; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.ydw.bat.wkflow.util.http.ResponseMessage; import io.swagger.annotations.Api; @@ -94,5 +95,11 @@ public class BusProcessNewController extends BaseAction { public ResponseMessage updateBusProcessNew(@RequestParam("id") String id, @RequestParam("mags") String mags) { return iBusProcessNewService.updateBusProcessNew(id,mags); } + + @ApiOperation(value = "复审流程查询 已经发起任务的流程") + @PostMapping("/getSarBussionStandPageNo") + public List getSarBussionStandPageNo(@RequestBody List rows) { + return iBusProcessNewService.getSarBussionStandPageNo(rows); + } } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/SarBussionessStandState.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/SarBussionessStandState.java new file mode 100644 index 00000000..baa9de99 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/SarBussionessStandState.java @@ -0,0 +1,47 @@ +package com.ydw.bat.wkflow.business_main.datas.entity; + +import lombok.Data; +@Data +public class SarBussionessStandState { + + private static final long serialVersionUID = 1L; + + private String id; + + private String standId; + + private String standName; + + private String standCode; + + private String reviewTime; + + private String issueTime; + + private Integer reviewResults; + + private String reviewProcessNum; + + private String creationTime; + + private String modifyTime; + + private Integer validFlag; + + private Integer param1; + + private String param2; + + private String putTime; + + private String FSRQBUSS; + + private String QCDW; + + private String QCRBUSS; + + private String standSort; + + private String menuId; + +} diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java index 6dfc484c..a3a7ab95 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java @@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.business_main.datas.service; import com.ydw.bat.wkflow.business_main.datas.entity.BusMes; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.baomidou.mybatisplus.extension.service.IService; +import com.ydw.bat.wkflow.business_main.datas.entity.SarBussionessStandState; import com.ydw.bat.wkflow.util.http.ResponseMessage; import org.activiti.engine.task.Task; import org.apache.ibatis.annotations.Param; @@ -50,4 +51,6 @@ public interface IBusProcessNewService extends IService { ResponseMessage questionsAndAnswers(String askId, String answerer); ResponseMessage updateBusProcessNew(String id, String mags); + + List getSarBussionStandPageNo(List rows); } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java index bdb5c8f4..10f4e33f 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; import com.ydw.bat.wkflow.business_main.datas.entity.BusMes; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.SarBussionessStandState; import com.ydw.bat.wkflow.business_main.datas.mapper.BusProcessNewMapper; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.ydw.bat.wkflow.business_oa.webService.service.impl.WebServiceOAServiceImpl; @@ -17,6 +18,7 @@ import com.ydw.bat.wkflow.util.http.ResponseMessage; import com.ydw.bat.wkflow.util.http.Result; import org.activiti.engine.TaskService; import org.activiti.engine.task.Task; +import org.activiti.engine.task.TaskQuery; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -191,4 +193,48 @@ public class BusProcessNewServiceImpl extends ServiceImpl getSarBussionStandPageNo(List rows) { + List row = new ArrayList<>(); + Set objects = new HashSet<>(); + if(!rows.isEmpty()){ + for (SarBussionessStandState data: rows){ + QueryWrapper objectQueryWrapper = new QueryWrapper<>(); + objectQueryWrapper.isNotNull("PRC_NAME"); + objectQueryWrapper.isNotNull("TASK_ID"); + objectQueryWrapper.isNotNull("MESG"); + objectQueryWrapper.isNotNull("USER_ID"); + objectQueryWrapper.like("MESG",data.getStandId()); + List busProcessNews = baseMapper.selectList(objectQueryWrapper); + if(!busProcessNews.isEmpty()){ + for (BusProcessNew busProcessNew : busProcessNews){ + if(busProcessNew.getPrcName().contains("企标复审")){ + JSONObject jsonObject = JSON.parseObject(busProcessNew.getMesg()); + if (jsonObject != null) { + String standId = jsonObject.getString("standId"); + if (StringUtils.isNotBlank(standId)) { + if (data.getStandId().equals(standId)) { + //如果相等 则判断task表示否有待办任务 + List list = taskService.createTaskQuery().taskId(busProcessNew.getTaskId()).list(); + if (!list.isEmpty()) { + objects.add(data); + } + } + } + } + }else { + objects.add(data); + } + } + } + } + } + if(!objects.isEmpty()) { + for (SarBussionessStandState data:objects) { + row.add(data); + } + } + return row; + } }