初步事件查询

src/main/java/cn/cslg/pas/common/model/cronModel/Client.java

@@ -0,0 +1,48 @@
+package cn.cslg.pas.common.model.cronModel;
+
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * <p>
+ * 委托方表
+ * </p>
+ *
+ * @author 王岩
+ * @since 2022-02-17
+ */
+@Data
+public class Client {
+    private Integer id;
+    /**
+     * 客户名称
+     */
+
+    private String name;
+
+
+    /**
+     * 客户负责人
+     */
+    private Integer personnelId;
+
+    /**
+     * 1是开启,0是关闭
+     */
+    private Integer status;
+
+    /**
+     * 租户Id
+     */
+    private Integer tenantId;
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+    private String personnelName;
+
+}

src/main/java/cn/cslg/pas/common/model/cronModel/Personnel.java

@@ -0,0 +1,90 @@
+package cn.cslg.pas.common.model.cronModel;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @author 沈永艺
+ * @date 2022-8-2
+ * @description 人员
+ */
+
+@Data
+@Accessors(chain = true)
+
+public class Personnel  {
+    /**
+     * 人员账号
+     */
+     private  Integer id;
+    private String personnelUserName;
+
+    /**
+     * 人员密码
+     */
+
+    private String personnelPassword;
+
+    /**
+     * 人员名称
+     */
+
+    private String personnelName;
+
+    /**
+     * 人员性别(1男0女)
+     */
+
+    private Integer personnelUserSex;
+
+    /**
+     * 人员联系电话
+     */
+
+    private String personnelPhone;
+
+    /**
+     * 人员邮箱
+     */
+
+    private String personnelEmail;
+
+    /**
+     * 人员QQ号
+     */
+
+    private String personnelQQ;
+
+    /**
+     * 人员微信号
+     */
+
+    private String personnelWechat;
+
+    /**
+     * 人员钉钉号
+     */
+
+    private String personnelDing;
+
+    /**
+     * 人员描述
+     */
+
+    private String personnelDescription;
+
+    /**
+     * 人员账号状态(1启用0停用)
+     */
+
+    private Integer personnelStatus;
+
+    /**
+     * 租户ID
+     */
+
+    private Integer tenantId;
+}

src/main/java/cn/cslg/pas/common/model/cronModel/SystemFile.java

@@ -0,0 +1,38 @@
+package cn.cslg.pas.common.model.cronModel;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 系统文件实体类
+ *
+ * @Author xiexiang
+ * @Date 2023/6/1
+ */
+@Data
+
+public class SystemFile  {
+
+
+    private String guid;
+
+
+
+
+
+    /**
+     * 文件名称
+     */
+    private String fileName;
+
+    /**
+     * 原始名称
+     */
+
+    private String originalName;
+
+     private String type;
+
+}

src/main/java/cn/cslg/pas/common/vo/business/EventCountVO.java

@@ -0,0 +1,19 @@
+package cn.cslg.pas.common.vo.business;
+
+import cn.cslg.pas.common.model.cronModel.SystemFile;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 统计事件专题库或报告vo类
+ */
+@Data
+public class EventCountVO {
+ private  Integer eventId;
+ private Integer projectCount;
+ private Integer projectType;
+}

src/main/java/cn/cslg/pas/common/vo/business/EventVO.java

@@ -1,10 +1,12 @@
 package cn.cslg.pas.common.vo.business;
 
+import cn.cslg.pas.common.model.cronModel.SystemFile;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.joda.time.DateTime;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -31,17 +33,20 @@ public class EventVO {
     @Schema(description = "场景id")
     private Integer scenarioId;
     @Schema(description = "场景名称")
-    private Integer scenarioName;
+    private String scenarioName;
     @Schema(description = "发生时间")
-   private Date eventDate;
+    private Date eventDate;
     @Schema(description = "创建时间")
     private Date createTime;
     @Schema(description = "创建人")
     private String createName;
     @Schema(description = "创建人Id")
-    private String createId;
+    private Integer createId;
     @Schema(description = "报告数量")
     private Integer reportProjectNum;
     @Schema(description = "专题库数量")
     private Integer patentProjectNum;
+
+    @Schema(description = "专题库数量")
+    private List<SystemFile> systemFileList;
 }

src/main/java/cn/cslg/pas/controller/EventController.java

@@ -6,6 +6,7 @@ import cn.cslg.pas.common.model.cronModel.GroupVO;
 import cn.cslg.pas.common.model.request.StringGroupRequest;
 import cn.cslg.pas.common.model.request.StringRequest;
 import cn.cslg.pas.common.utils.Response;
+import cn.cslg.pas.common.vo.business.EventVO;
 import cn.cslg.pas.exception.XiaoShiException;
 import cn.cslg.pas.factorys.businessFactory.Business;
 import cn.cslg.pas.factorys.businessFactory.BusinessFactory;
@@ -34,10 +35,10 @@ public class EventController {
 
     @Operation(summary = "查询事件")
     @PostMapping("/queryEvent")
-    public Response queryEvent(StringRequest stringRequest) throws Exception {
+    public Response queryEvent(@RequestBody StringRequest stringRequest) throws Exception {
         Business business = businessFactory.getClass("eventService");
-        business.queryMessage(stringRequest);
-        return null;
+     List<EventVO> eventVOS =  (List<EventVO>)business.queryMessage(stringRequest);
+        return Response.success(eventVOS);
     }
 
 

src/main/java/cn/cslg/pas/domain/business/AssoProjectEvent.java

@@ -0,0 +1,36 @@
+package cn.cslg.pas.domain.business;
+
+import cn.cslg.pas.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import org.joda.time.DateTime;
+
+/**
+ * <p>
+ * 事件项目关联表
+ * </p>
+ *
+ * @author 李仁杰
+ * @since 2022-10-20
+ */
+@Data
+@TableName("asso_project_event")
+/*数据库中的表对应的类
+ */
+public class AssoProjectEvent extends BaseEntity<AssoProjectEvent> {
+    @TableField(value = "project_id")
+    private Integer projectId;
+    @TableField(value = "project_type")
+    private Integer projectType;
+    @TableField(value = "matter_id")
+    private Integer matterId;
+    @TableField(value = "event_id")
+    private Integer eventId;
+    @TableField(value = "file_guid")
+    private String fileGuid;
+    @TableField(value = "create_id")
+    private Integer createId;
+    @TableField(value = "create_time")
+    private DateTime createTime;
+}

src/main/java/cn/cslg/pas/mapper/AssoProjectEventMapper.java

@@ -0,0 +1,19 @@
+package cn.cslg.pas.mapper;
+
+import cn.cslg.pas.common.vo.business.EventCountVO;
+import cn.cslg.pas.domain.business.AssoProjectEvent;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * 任务可见栏位表
+ *
+ * @author chenyu
+ * @date 2023/10/20
+ */
+@Repository
+public interface AssoProjectEventMapper extends BaseMapper<AssoProjectEvent> {
+    public List<EventCountVO> getEventProjectCount(List<Integer> eventIds);
+}

src/main/java/cn/cslg/pas/service/business/AssoProjectEventService.java

@@ -0,0 +1,12 @@
+package cn.cslg.pas.service.business;
+
+
+import cn.cslg.pas.domain.business.AssoProjectEvent;
+import cn.cslg.pas.mapper.AssoProjectEventMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service
+public class AssoProjectEventService extends ServiceImpl<AssoProjectEventMapper, AssoProjectEvent> {
+
+}

src/main/java/cn/cslg/pas/service/business/EventService.java

@@ -1,24 +1,28 @@
 package cn.cslg.pas.service.business;
 
 import cn.cslg.pas.common.dto.business.EventDTO;
-import cn.cslg.pas.common.model.cronModel.GroupConfig;
-import cn.cslg.pas.common.model.cronModel.GroupVO;
+import cn.cslg.pas.common.model.cronModel.*;
 import cn.cslg.pas.common.model.request.*;
 
 import cn.cslg.pas.common.utils.parseQueryToTree.expressManager;
 import cn.cslg.pas.common.utils.parseQueryToTree.operateNode;
 import cn.cslg.pas.common.utils.parseQueryToTree.treeNode;
+import cn.cslg.pas.common.vo.business.EventCountVO;
 import cn.cslg.pas.common.vo.business.EventVO;
 import cn.cslg.pas.domain.business.AssoEventFile;
 import cn.cslg.pas.domain.business.Event;
+import cn.cslg.pas.domain.business.SystemDict;
 import cn.cslg.pas.exception.XiaoShiException;
 import cn.cslg.pas.factorys.businessFactory.Business;
 import cn.cslg.pas.factorys.reGroupFactory.QueryGroupFactory;
 import cn.cslg.pas.factorys.reGroupFactory.QueryGroupImp;
+import cn.cslg.pas.mapper.AssoProjectEventMapper;
 import cn.cslg.pas.mapper.EventMapper;
 import cn.cslg.pas.service.common.FileManagerService;
+import cn.cslg.pas.service.permissions.PermissionService;
 import cn.cslg.pas.service.query.FormatQueryService;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
@@ -28,7 +32,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -50,6 +56,15 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
     @Autowired
     private QueryGroupFactory queryGroupFactory;
 
+    @Autowired
+    private PermissionService permissionService;
+
+    @Autowired
+    private SystemDictService systemDictService;
+
+    @Autowired
+    private AssoProjectEventMapper assoProjectEventMapper;
+
     public String getEvent(String sql) {
         eventMapper.getEvent(sql);
         return "";
@@ -89,16 +104,16 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
         //根据sql查询事件信息
         List<EventVO> eventVOS = eventMapper.getEvent(sql);
 
-         //装载事件信息
+        //装载事件信息
         this.loadEvent(eventVOS);
-        return "";
+        return eventVOS;
     }
 
     @Override
     public Integer addMessage(Object object, List<MultipartFile> files) {
         EventDTO eventDTO = (EventDTO) object;
         //检查事件格式
-        if(eventDTO.getScenarioId()==null){
+        if (eventDTO.getScenarioId() == null) {
             throw new XiaoShiException("参数错误");
         }
 
@@ -109,7 +124,7 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
         queryWrapper.eq(Event::getName, name);
         List<Event> events = this.list(queryWrapper);
         if (events != null && events.size() != 0) {
-           throw new XiaoShiException("参数错误");
+            throw new XiaoShiException("参数错误");
         }
 
         //事件入库
@@ -191,11 +206,14 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
 
     /**
      * 查询事件分组信息
+     *
      * @param groupRequest
      * @return
      * @throws Exception
      */
     public GroupVO getGroup(GroupRequest groupRequest) throws Exception {
+        String sql ="";
+
         //合成检索式
         StringGroupRequest stringGroupRequest = null;
         if (groupRequest instanceof MapGroupRequest) {
@@ -204,13 +222,12 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
             stringGroupRequest = (StringGroupRequest) groupRequest;
         }
         String condition = stringGroupRequest.getSearchQuery();
-
-        //将检索式转换为二叉树
-        treeNode tree = expressManager.getInstance().Parse(condition, false);
-
-        //格式化检索式
-        String sql = formatQueryService.ToString((operateNode) tree);
-
+           if(condition!=null) {
+               //将检索式转换为二叉树
+               treeNode tree = expressManager.getInstance().Parse(condition, false);
+               //格式化检索式
+               sql = formatQueryService.ToString((operateNode) tree);
+           }
         //格式化 分组
         String json = CommonService.readJsonFile("event_group.json");
         List<GroupConfig> groupConfigs = JSON.parseArray(json, GroupConfig.class);
@@ -244,15 +261,145 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
         return groupVO;
     }
 
+    /**
+     * 装载事件返回类
+     *
+     * @param eventVOs
+     */
+    private void loadEvent(List<EventVO> eventVOs) throws IOException {
+        List<Integer> createIds = new ArrayList<>();
+        List<Integer> clientIds = new ArrayList<>();
+        List<Integer> ids = new ArrayList<>();
+        List<EventCountVO> eventCountVOS = new ArrayList<>();
+
+        //获得所有文件的guid
+        eventVOs.forEach(
+                item -> {
+                    if (item.getClientId() != null) {
+                        clientIds.add(item.getClientId());
+                    }
+
+                    if (item.getCreateId() != null) {
+                        createIds.add(item.getCreateId());
+                    }
+                    if (item.getId() != null) {
+                        ids.add(item.getId());
+                    }
+                }
+        );
+
+        List<Personnel> personnels = new ArrayList<>();
+        List<Client> clients = new ArrayList<>();
+        List<String> guids = new ArrayList<>();
+        List<SystemFile> systemFiles = new ArrayList<>();
+        List<AssoEventFile> assoEventFiles = new ArrayList<>();
 
-    private  void loadEvent(List<EventVO> eventVO){
-       //查询创建人名称
+        if (ids.size() != 0) {
+            //根据事件id获得事件文件关联表
+            LambdaQueryWrapper<AssoEventFile> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.in(AssoEventFile::getEventId, ids);
+            assoEventFiles = assoEventFileService.list(queryWrapper);
+            guids = assoEventFiles.stream().map(AssoEventFile::getFileGuid).collect(Collectors.toList());
+
+
+            //根据事件id分组查询事件关联专题库或报告数量
+            eventCountVOS = assoProjectEventMapper.getEventProjectCount(ids);
+        }
+
+        //查询创建人名称
+        if (createIds.size() != 0) {
+            String res = permissionService.getPersonnelByIdsFromPCS(createIds);
+            JSONObject jsonObject = JSONObject.parseObject(res);
+            personnels = JSONObject.parseArray(jsonObject.getString("data"), Personnel.class);
+        }
 
         //查询客户名称
+        if (clientIds.size() != 0) {
+            String res = permissionService.getClientByIdsFromPCS(clientIds);
+            JSONObject jsonObject = JSONObject.parseObject(res);
+            clients = JSONObject.parseArray(jsonObject.getString("data"), Client.class);
+        }
+
+        //查询文件
+        if (guids.size() != 0) {
+            String res = fileManagerService.getSystemFileFromFMS(guids);
+            JSONObject jsonObject = JSONObject.parseObject(res);
+            systemFiles = JSONObject.parseArray(jsonObject.getString("data"), SystemFile.class);
+        }
+
+        //查询关联报告或专题库
 
         //查询应用场景
+        List<SystemDict> systemDictList = systemDictService.getSystemDictListByType(Arrays.asList("INVESTIGATION_TYPE"));
+
+        //查询专题库数量
+
+        //装载信息
+        for (EventVO eventVO : eventVOs) {
+            //装载人员信息
+            Personnel personnel = personnels.stream().filter(item -> item.getId().equals(eventVO.getCreateId())).findFirst().orElse(null);
+            if (personnel != null) {
+                eventVO.setName(personnel.getPersonnelName());
+            }
+
+            //装载客户信息
+            Client client = clients.stream().filter(item -> item.getId().equals(eventVO.getClientId())).findFirst().orElse(null);
+            if (client != null) {
+                eventVO.setClientName(client.getName());
+            }
+
+            //装载场景
+            SystemDict systemDict = systemDictList.stream().filter(item -> item.getValue().equals(eventVO.getScenarioId().toString())).findFirst().orElse(null);
+            if (systemDict != null) {
+                eventVO.setScenarioName(systemDict.getLabel());
+            }
+
+            //装载文件信息
+            List<AssoEventFile> assoEventFileTemp = assoEventFiles.stream().filter(item -> item.getEventId().equals(eventVO.getId())).collect(Collectors.toList());
+            if (assoEventFileTemp.size() != 0) {
+                List<String> guidTemp = assoEventFileTemp.stream().map(AssoEventFile::getFileGuid).collect(Collectors.toList());
+                if (guidTemp.size() != 0) {
+                    List<SystemFile> systemFileTemp = systemFiles.stream().filter(item -> guidTemp.contains(item.getGuid())).collect(Collectors.toList());
+                    if (systemFileTemp.size() != 0) {
+                        eventVO.setSystemFileList(systemFileTemp);
+                    }
+                }
+            }
+
+
+            //装载专题库或报告数量
+            if (eventCountVOS.size() != 0) {
+                //专题库数量
+                EventCountVO eventCountVO1 = eventCountVOS.stream().filter(item ->
+                    item.getEventId().equals(eventVO.getId())&&item.getProjectType().equals(1)).findFirst().orElse(null);
+
+                //报告数量
+                EventCountVO eventCountVO2 = eventCountVOS.stream().filter(item ->
+                        item.getEventId().equals(eventVO.getId())&&item.getProjectType().equals(2)).findFirst().orElse(null);
+
+                //设置专题库数量
+                if(eventCountVO1!=null){
+                    eventVO.setPatentProjectNum(eventCountVO1.getProjectCount());
+                }
+                else {
+                    eventVO.setPatentProjectNum(0);
+                }
+
+                //设置报告数量
+                if(eventCountVO2!=null){
+                    eventVO.setReportProjectNum(eventCountVO2.getProjectCount());
+                }
+                else {
+                    eventVO.setReportProjectNum(0);
+                }
+
+            }
+            else {
+                eventVO.setReportProjectNum(0);
+                eventVO.setPatentProjectNum(0);
+            }
+        }
 
-        //装载文件信息
 
     }
 

src/main/java/cn/cslg/pas/service/common/FileManagerService.java

@@ -107,7 +107,7 @@ public class FileManagerService {
      *
      * @param fileIds 文件ids
      */
-    public String getSystemFileFromFMS(List<Integer> fileIds) throws IOException {
+    public String getSystemFileFromFMS(List<String> fileIds) throws IOException {
         String param = new Gson().toJson(fileIds);
         RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), param);
         OkHttpClient okHttpClient = new OkHttpClient.Builder()

src/main/java/cn/cslg/pas/service/permissions/PermissionService.java

@@ -1,17 +1,32 @@
 package cn.cslg.pas.service.permissions;
 
+import com.google.gson.Gson;
+import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
+import okhttp3.RequestBody;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
+import java.util.concurrent.TimeUnit;
 
+/**
+ * 获取权限系统数据接口
+ */
 @Service
 public class PermissionService {
     @Value("${authorUrl}")
     private String PCSUrl;
+
+    /**
+     * 根据名称模糊查询人员接口
+     * @param personName
+     * @return
+     * @throws IOException
+     */
     public String getPersonIdByNamePCS(String personName) throws IOException {
         OkHttpClient okHttpClient = new OkHttpClient();
         Request request = new Request.Builder()
@@ -20,6 +35,13 @@ public class PermissionService {
                 .build();
         return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
     }
+
+    /**
+     * 获得所有人员排序接口
+     * @param orderType
+     * @return
+     * @throws IOException
+     */
     public String getPersonIdOrders(Integer orderType) throws IOException {
         OkHttpClient okHttpClient = new OkHttpClient();
         Request request = new Request.Builder()
@@ -28,4 +50,47 @@ public class PermissionService {
                 .build();
         return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
     }
+
+    /**
+     * 根据人员ids查询人员列表
+     *
+     * @param ids 人员ids
+     * @return 返回装载着人员列表数据的data的String
+     */
+    public String getPersonnelByIdsFromPCS(List<Integer> ids) throws IOException {
+        String param = new Gson().toJson(ids);
+        RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), param);
+        OkHttpClient okHttpClient = new OkHttpClient.Builder()
+                .connectTimeout(60, TimeUnit.SECONDS)
+                .writeTimeout(60, TimeUnit.SECONDS)
+                .readTimeout(60, TimeUnit.SECONDS)
+                .build();
+        Request request = new Request.Builder()
+                .url(PCSUrl + "/permission/api/system/getPersonnelByIds")
+                .post(requestBody)
+                .build();
+        return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
+    }
+
+
+    /**
+     * 根据客户ids查询客户列表
+     *
+     * @param ids 客户ids
+     * @return 返回装载着客户列表数据的data的String
+     */
+    public String getClientByIdsFromPCS(List<Integer> ids) throws IOException {
+        String param = new Gson().toJson(ids);
+        RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), param);
+        OkHttpClient okHttpClient = new OkHttpClient.Builder()
+                .connectTimeout(60, TimeUnit.SECONDS)
+                .writeTimeout(60, TimeUnit.SECONDS)
+                .readTimeout(60, TimeUnit.SECONDS)
+                .build();
+        Request request = new Request.Builder()
+                .url(PCSUrl + "/permission/api/system/getClintByIds")
+                .post(requestBody)
+                .build();
+        return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
+    }
 }

src/main/resources/jsons/event_sql.json

@@ -1,11 +1,37 @@
-[{"field":"name","sqlField":"name","sqlClass":"getComSql"
-
-},
-{"field":"id","sqlField":"id","sqlClass":"getComSql"
-
-},
-{"field":"createName","sqlField":"create_id","sqlClass":"getCreateNameSql"
-
+[
+  {
+    "field": "name",
+    "sqlField": "name",
+    "sqlClass": "getComSql"
+  },
+  {
+    "field": "id",
+    "sqlField": "id",
+    "sqlClass": "getComSql"
+  },
+  {
+    "field": "createName",
+    "sqlField": "create_id",
+    "sqlClass": "getCreateNameSql"
+  },
+  {
+    "field": "createTime",
+    "sqlField": "create_time",
+    "sqlClass": "getComSql"
+  },
+  {
+    "field": "eventDate",
+    "sqlField": "eventDate_time",
+    "sqlClass": "getComSql"
+  },
+  {
+    "field": "description",
+    "sqlField": "description",
+    "sqlClass": "getComSql"
+  },
+  {
+  "field": "scenarioId",
+  "sqlField": "scenario_id",
+  "sqlClass": "getComSql"
 }
-
 ]

src/main/resources/mapper/AssoProjectEvent.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="cn.cslg.pas.mapper.AssoProjectEventMapper">
+    <select id="getEventProjectCount" resultType="cn.cslg.pas.common.vo.business.EventCountVO">
+        select event_id as eventId,project_type as projectType,count(*) as projectCount from
+        pas_prod2.asso_project_event
+        <where>
+            event_id in
+            <foreach collection="eventIds" index="index" item="item" open="(" separator=" or " close=")">
+               #{item}
+            </foreach>
+            group by event_id,project_type
+
+        </where>
+
+
+    </select>
+</mapper>

src/main/resources/mapper/Event.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="cn.cslg.pas.mapper.EventMapper">
   <select id="getEvent"  resultType="cn.cslg.pas.common.vo.business.EventVO">
-   select id,name,description,client_id as clientId,scenario_id as scenarioId,event_date as eventDate from event
+   select id,name,description,client_id as clientId,scenario_id as scenarioId,event_date as eventDate,create_id as createId from event
        <where>
        ${sql}
     </where>

src/test/java/cn/cslg/pas/service/EventServiceTests.java

@@ -1,6 +1,7 @@
 package cn.cslg.pas.service;
 
 import cn.cslg.pas.common.model.request.*;
+import cn.cslg.pas.common.utils.Response;
 import cn.cslg.pas.controller.EventController;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.http.entity.ContentType;
@@ -41,8 +42,8 @@ public class EventServiceTests {
         queryRequest.setOrderDTOList(dtos);
         queryRequest.setCurrent(Long.parseLong("1"));
         queryRequest.setSize(Long.parseLong("10"));
-        eventController.queryEvent(queryRequest);
-    }
+       Response response = eventController.queryEvent(queryRequest);
+       System.out.println(response); }
 
     @Test
     void add() throws Exception {