合并分支 'dev_20230216' 到 'master'

复审查询企标查看合并请求 laws-foton-slrs/foton-wkflow-rest!31
2023-04-23 18:24:30 +08:00
parent 8718252bb7 4803113b5b
commit fe655314ce
4 changed files with 103 additions and 0 deletions
@@ -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<BusProcessNew> updateBusProcessNew(@RequestParam("id") String id, @RequestParam("mags") String mags) {
        return iBusProcessNewService.updateBusProcessNew(id,mags);
    }
+
+    @ApiOperation(value = "复审流程查询 已经发起任务的流程")
+    @PostMapping("/getSarBussionStandPageNo")
+    public  List<SarBussionessStandState> getSarBussionStandPageNo(@RequestBody List<SarBussionessStandState> rows) {
+        return iBusProcessNewService.getSarBussionStandPageNo(rows);
+    }
 }

@@ -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;
+
+}
@@ -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<BusProcessNew> {
    ResponseMessage<BusProcessNew> questionsAndAnswers(String askId, String answerer);

    ResponseMessage<BusProcessNew> updateBusProcessNew(String id, String mags);
+
+    List<SarBussionessStandState> getSarBussionStandPageNo(List<SarBussionessStandState> rows);
 }
@@ -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<BusProcessNewMapper, B
        baseMapper.updateByIdinfo(id,mags);
        return Result.success();
    }
+
+    @Override
+    public List<SarBussionessStandState> getSarBussionStandPageNo(List<SarBussionessStandState> rows) {
+      List<SarBussionessStandState> row = new ArrayList<>();
+        Set<SarBussionessStandState> objects = new HashSet<>();
+        if(!rows.isEmpty()){
+            for (SarBussionessStandState data: rows){
+                QueryWrapper<BusProcessNew> objectQueryWrapper = new QueryWrapper<>();
+                objectQueryWrapper.isNotNull("PRC_NAME");
+                objectQueryWrapper.isNotNull("TASK_ID");
+                objectQueryWrapper.isNotNull("MESG");
+                objectQueryWrapper.isNotNull("USER_ID");
+                objectQueryWrapper.like("MESG",data.getStandId());
+                List<BusProcessNew> 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<Task> 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;
+    }
 }