Merge remote-tracking branch 'origin/master'

src/main/java/cn/cslg/pas/common/dto/business/ProjectOpenAuditTaskDTO.java

@@ -0,0 +1,48 @@
+package cn.cslg.pas.common.dto.business;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+/**
+ * 项目开卷审核任务DTO
+ * @Author xiexiang
+ * @Date 2023/11/21
+ */
+@Data
+public class ProjectOpenAuditTaskDTO {
+    /**
+     * 任务名称
+     */
+    @TableField(value = "name")
+    private String name;
+
+    /**
+     * 专题库/报告id
+     */
+    @TableField(value = "project_id")
+    private Integer projectId;
+
+    /**
+     * 0标引任务
+     * 1项目开卷审核任务
+     * 2检索条件任务
+     * 3对比任务
+     * 4协同任务
+     * 5任务审核任务
+     */
+    @TableField(value = "type")
+    private Integer type;
+
+    /**
+     * 内部人员：人员id
+     * 外部人员：人员的邮箱
+     */
+    @TableField(value = "handle")
+    private String handle;
+
+    /**
+     * 0内部人员1外部人员
+     */
+    @TableField(value = "handle_type")
+    private Integer handleType;
+}

src/main/java/cn/cslg/pas/common/dto/business/TaskAuditResultDTO.java

@@ -0,0 +1,31 @@
+package cn.cslg.pas.common.dto.business;
+
+import lombok.Data;
+
+/**
+ * 任务审核结果DTO
+ * @Author xiexiang
+ * @Date 2023/11/22
+ */
+@Data
+public class TaskAuditResultDTO {
+    /**
+     * 审核结果
+     */
+    private String auditResult;
+
+    /**
+     * 描述/说明
+     */
+    private String description;
+
+    /**
+     * 下一个审核人
+     */
+    private String nextAuditor;
+
+    /**
+     * 是否内部人员
+     */
+    private Boolean ifInner;
+}

src/main/java/cn/cslg/pas/common/dto/business/TaskAuditTaskDTO.java

@@ -0,0 +1,60 @@
+package cn.cslg.pas.common.dto.business;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+/**
+ * 任务的审核任务DTO
+ * @Author xiexiang
+ * @Date 2023/11/21
+ */
+@Data
+public class TaskAuditTaskDTO {
+    /**
+     * 任务名称
+     */
+    @TableField(value = "name")
+    private String name;
+
+    /**
+     * 专题库/报告id
+     */
+    @TableField(value = "project_id")
+    private Integer projectId;
+
+    /**
+     * 0标引任务
+     * 1项目开卷审核任务
+     * 2检索条件任务
+     * 3对比任务
+     * 4协同任务
+     * 5任务审核任务
+     */
+    @TableField(value = "type")
+    private Integer type;
+
+    /**
+     * 内部人员：人员id
+     * 外部人员：人员的邮箱
+     */
+    @TableField(value = "handle")
+    private String handle;
+
+    /**
+     * 0内部人员1外部人员
+     */
+    @TableField(value = "handle_type")
+    private Integer handleType;
+
+    /**
+     * 上一级任务id
+     */
+    @TableField(value = "last_task_id")
+    private Integer lastTaskId;
+
+    /**
+     * 被审核的任务id
+     */
+    @TableField(value = "asso_task_id")
+    private Integer assoTaskId;
+}

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

@@ -0,0 +1,90 @@
+package cn.cslg.pas.controller;
+
+import cn.cslg.pas.common.core.base.Constants;
+import cn.cslg.pas.common.dto.business.ProductMarketDataDTO;
+import cn.cslg.pas.common.dto.business.ProjectOpenAuditTaskDTO;
+import cn.cslg.pas.common.dto.business.UpdateProductMarketDataDTO;
+import cn.cslg.pas.common.model.cronModel.Records;
+import cn.cslg.pas.common.model.request.StringRequest;
+import cn.cslg.pas.common.utils.Response;
+import cn.cslg.pas.exception.ConditionException;
+import cn.cslg.pas.exception.UnLoginException;
+import cn.cslg.pas.exception.XiaoShiException;
+import cn.cslg.pas.factorys.businessFactory.Business;
+import cn.cslg.pas.factorys.businessFactory.BusinessFactory;
+import cn.cslg.pas.service.business.ProjectTaskService;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 项目任务的Controller层
+ * @Author xiexiang
+ * @Date 2023/11/22
+ */
+@Slf4j
+@RequestMapping(Constants.API_XiaoSHI + "/projectTask")
+@RestController
+public class ProjectTaskController {
+    @Autowired
+    private BusinessFactory businessFactory;
+
+    @Autowired
+    private ProjectTaskService projectTaskService;
+
+    @Operation(summary = "查询项目任务")
+    @PostMapping("/addProjectOpenExamineTask")
+    public Response addProjectOpenExamineTask(@RequestBody ProjectOpenAuditTaskDTO projectOpenAuditTaskDTO) throws Exception {
+        Integer id = (Integer) projectTaskService.addProjectOpenExamineTask(projectOpenAuditTaskDTO);
+        return Response.success(id);
+    }
+//
+//    @Operation(summary = "添加项目任务")
+//    @PostMapping("/addProjectTask")
+//    public Response addProjectTask(@RequestBody ProductMarketDataDTO productMarketDataDTO) throws Exception {
+//        Business business = businessFactory.getClass("projectTaskService");
+//        Integer id = null;
+//        try {
+//            id = (Integer) business.addMessage(productMarketDataDTO);
+//        } catch (Exception e){
+//            if(e instanceof XiaoShiException) {
+//                return Response.error(e.getMessage());
+//            } else if (e instanceof UnLoginException) {
+//                return Response.unLogin(e.getMessage());
+//            } else if (e instanceof ConditionException) {
+//                return Response.conditionError(e.getMessage());
+//            }
+//        }
+//        return Response.success(id);
+//    }
+//
+//    @Operation(summary = "更新产品营销数据")
+//    @PostMapping("/updateProductMarketData")
+//    public Response updateProductMarketData(@RequestBody UpdateProductMarketDataDTO updateProductMarketDataDTO) throws Exception {
+//        if (updateProductMarketDataDTO != null) {
+//            Business business = businessFactory.getClass("projectTaskService");
+//            Integer id = (Integer) business.updateMessage(updateProductMarketDataDTO);
+//            return Response.success(id);
+//        } else {
+//            return Response.error("网络异常");
+//        }
+//    }
+//
+//    @Operation(summary = "删除产品营销数据")
+//    @PostMapping("/deleteProductMarketData")
+//    public String deleteProductMarketData(@RequestBody List<Integer> ids) throws Exception {
+//        if (ids != null && ids.size() != 0) {
+//            Business business = businessFactory.getClass("projectTaskService");
+//            business.deleteMessage(ids);
+//            return Response.success();
+//        } else {
+//            throw new XiaoShiException("需要删除的ids不能为空!");
+//        }
+//    }
+}

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

@@ -0,0 +1,43 @@
+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 java.util.Date;
+
+/**
+ * 任务审核结果与文件关联表
+ * @Author xiexiang
+ * @Date 2023/11/22
+ */
+@Data
+@TableName("asso_audit_result_file")
+public class AssoAuditResultFile extends BaseEntity<AssoAuditResultFile> {
+    /**
+     * 审核结果id
+     */
+    @TableField(value = "task_audit_result_id")
+    private Integer taskAuditResultId;
+
+    /**
+     * 文件guid
+     */
+    @TableField(value = "file_guid")
+    private String fileGuid;
+
+
+    /**
+     * 创建人
+     */
+    @TableField(value = "create_id")
+    private String createId;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    private Date createTime;
+
+}

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

@@ -14,7 +14,7 @@ import java.util.Date;
  */
 @Data
 @TableName("project_task")
-public class projectTask extends BaseEntity<projectTask> {
+public class ProjectTask extends BaseEntity<ProjectTask> {
     /**
      * 任务名称
      */

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

@@ -0,0 +1,54 @@
+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 java.util.Date;
+
+/**
+ * 任务审核结果
+ * @Author xiexiang
+ * @Date 2023/11/22
+ */
+@Data
+@TableName("task_audit_result")
+public class TaskAuditResult extends BaseEntity<TaskAuditResult> {
+    /**
+     * 审核结果
+     */
+    @TableField(value = "audit_result")
+    private String auditResult;
+
+    /**
+     * 描述/说明
+     */
+    @TableField(value = "description")
+    private String description;
+
+    /**
+     * 下一个审核人
+     */
+    @TableField(value = "next_auditor")
+    private String nextAuditor;
+
+    /**
+     * 是否内部人员
+     */
+    @TableField(value = "if_inner")
+    private Boolean ifInner;
+
+    /**
+     * 创建人
+     */
+    @TableField(value = "create_id")
+    private String createId;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    private Date createTime;
+
+}

src/main/java/cn/cslg/pas/factorys/reGroupFactory/GetMatterGroup.java

@@ -28,8 +28,6 @@ public class GetMatterGroup implements QueryGroupImp {
         List<Map<String, Object>> maps = new ArrayList<>();
         String selectField = groupField;
         List<Matter> matters = matterService.list();
-
-           tableName+=" left join pas_prod2.asso_project_event as aspe on p.id = aspe.project_id";
         //分组查询应用场景
         List<GroupReVO> matterIds = eventMapper.getGroups(sqls, tableName, groupField, selectField);
         Long total =eventMapper.getGroupsCount(sqls, tableName, groupField, selectField);

src/main/java/cn/cslg/pas/factorys/reGroupFactory/GetScenarioGroup.java

@@ -31,7 +31,7 @@ public class GetScenarioGroup implements QueryGroupImp {
         Long total =eventMapper.getGroupsCount(sqls, tableName, groupField, selectField);
         //装载应用场景名称
         scenarioIds.forEach(item->{
-     SystemDict systemDict = systemDictList.stream().filter(tem->tem.getValue().equals(item.getValue())).findFirst().orElse(null);
+        SystemDict systemDict = systemDictList.stream().filter(tem->tem.getValue().equals(item.getValue())).findFirst().orElse(null);
             if(systemDict!=null)
             {
                 Map<String,Object> map =new HashMap<>();

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

@@ -0,0 +1,14 @@
+package cn.cslg.pas.mapper;
+
+import cn.cslg.pas.domain.business.AssoAuditResultFile;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 任务审核结果与文件关联的Mapper层
+ * @Author xiexiang
+ * @Date 2023/11/22
+ */
+@Repository
+public interface AssoAuditResultFileMapper extends BaseMapper<AssoAuditResultFile> {
+}

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

@@ -0,0 +1,14 @@
+package cn.cslg.pas.mapper;
+
+import cn.cslg.pas.domain.business.ProjectTask;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 项目任务的Mapper层
+ * @Author xiexiang
+ * @Date 2023/11/21
+ */
+@Repository
+public interface ProjectTaskMapper extends BaseMapper<ProjectTask> {
+}

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

@@ -0,0 +1,14 @@
+package cn.cslg.pas.mapper;
+
+import cn.cslg.pas.domain.business.TaskAuditResult;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 任务审核结果的Mapper层
+ * @Author xiexiang
+ * @Date 2023/11/22
+ */
+@Repository
+public interface TaskAuditResultMapper extends BaseMapper<TaskAuditResult> {
+}

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

@@ -0,0 +1,15 @@
+package cn.cslg.pas.service.business;
+
+import cn.cslg.pas.domain.business.AssoAuditResultFile;
+import cn.cslg.pas.mapper.AssoAuditResultFileMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * 任务审核结果与文件关联的Service层
+ * @Author xiexiang
+ * @Date 2023/11/22
+ */
+@Service
+public class AssoAuditResultFileService extends ServiceImpl<AssoAuditResultFileMapper, AssoAuditResultFile> {
+}

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

@@ -148,7 +148,7 @@ public class PatentDigProjectService extends ServiceImpl<PatentDigProjectMapper,
             }
         }
 
-        tableName = "patent_dig_project as dp left join project as p on dp.project_id =p.id left join rd_project rp on dp.rd_project_id =rp.id";
+        tableName = "patent_dig_project as dp left join project as p on dp.project_id =p.id left join rd_project rp on dp.rd_project_id =rp.id left join asso_project_event as aspe on p.id =aspe.project_id";
         //返回分组数据
         QueryGroupImp queryGroupImp = queryGroupFactory.getClass(groupConfig.getGroupClass());
         ReGroupDataVO reGroupDataVO = queryGroupImp.getGroup(sqls, tableName, groupConfig.getSqlField());

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

@@ -180,7 +180,7 @@ public class PatentProjectService extends ServiceImpl<PatentProjectMapper, Paten
     }
 
     /**
-     * 查询事件分组信息
+     * 查询专题库分组信息
      *
      * @param groupRequest
      * @return
@@ -202,7 +202,7 @@ public class PatentProjectService extends ServiceImpl<PatentProjectMapper, Paten
             }
         }
 
-        tableName = "patent_project as pp left join project as p on pp.project_id = p.id ";
+        tableName = "patent_project as pp left join project as p on pp.project_id = p.id left join asso_project_event as aspe on p.id = aspe.project_id";
         //返回分组数据
         QueryGroupImp queryGroupImp = queryGroupFactory.getClass(groupConfig.getGroupClass());
         ReGroupDataVO reGroupDataVO = queryGroupImp.getGroup(sqls, tableName, groupConfig.getSqlField());

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

@@ -0,0 +1,157 @@
+package cn.cslg.pas.service.business;
+
+import cn.cslg.pas.common.dto.business.ProjectOpenAuditTaskDTO;
+import cn.cslg.pas.common.dto.business.TaskAuditTaskDTO;
+import cn.cslg.pas.common.model.cronModel.PersonnelVO;
+import cn.cslg.pas.common.model.request.GroupRequest;
+import cn.cslg.pas.common.model.request.QueryRequest;
+import cn.cslg.pas.common.utils.CacheUtils;
+import cn.cslg.pas.common.utils.LoginUtils;
+import cn.cslg.pas.domain.business.ProjectTask;
+import cn.cslg.pas.exception.UnLoginException;
+import cn.cslg.pas.exception.XiaoShiException;
+import cn.cslg.pas.factorys.businessFactory.Business;
+import cn.cslg.pas.mapper.ProjectTaskMapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * 专利挖掘任务模块
+ * @Author xiexiang
+ * @Date 2023/11/21
+ */
+@Service
+public class ProjectTaskService extends ServiceImpl<ProjectTaskMapper, ProjectTask> implements Business {
+
+    @Autowired
+    private CacheUtils cacheUtils;
+
+    @Autowired
+    private LoginUtils loginUtils;
+
+    /**
+     * 项目开卷审核任务
+     * @param projectOpenAuditTaskDTO
+     * @return
+     */
+    public Object addProjectOpenExamineTask(ProjectOpenAuditTaskDTO projectOpenAuditTaskDTO){
+        Integer type = projectOpenAuditTaskDTO.getType();
+        if (type == null && type > 5) {
+            throw new XiaoShiException("任务类型不能为空!");
+        }
+        //判断专题库id不为空
+        Integer projectId = projectOpenAuditTaskDTO.getProjectId();
+        if (projectId == null) {
+            throw new XiaoShiException("专题库id不能为空!");
+        }
+        //判断任务名称不为空
+        projectOpenAuditTaskDTO.setName(projectOpenAuditTaskDTO.getName().trim());
+        String name = projectOpenAuditTaskDTO.getName();
+        if (name == null || name.equals("")) {
+            throw new XiaoShiException("任务名称不能为空!");
+        }
+        LambdaQueryWrapper<ProjectTask> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ProjectTask::getName, name);
+        queryWrapper.eq(ProjectTask::getProjectId, projectId);
+        List<ProjectTask> projectTasks = this.list(queryWrapper);
+        if (projectTasks != null && projectTasks.size() != 0) {
+            throw new XiaoShiException("任务名称不能重复!");
+        }
+        ProjectTask projectTask = new ProjectTask();
+        BeanUtils.copyProperties(projectOpenAuditTaskDTO, projectTask);
+        //获取登录人信息
+        PersonnelVO personnelVO = new PersonnelVO();
+        try {
+            personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
+        } catch (Exception e) {
+            throw new UnLoginException("未登录");
+        }
+        projectTask.setCreateId(personnelVO.getId());
+        projectTask.insert();
+        return projectTask.getId();
+    }
+
+    /**
+     * 任务审核任务
+     * @param taskAuditTaskDTO
+     * @return
+     */
+    public Object addTaskExamineTask(TaskAuditTaskDTO taskAuditTaskDTO){
+        Integer type = taskAuditTaskDTO.getType();
+        if (type == null && type > 5) {
+            throw new XiaoShiException("任务类型不能为空!");
+        }
+        //判断专题库id不为空
+        Integer projectId = taskAuditTaskDTO.getProjectId();
+        if (projectId == null) {
+            throw new XiaoShiException("专题库id不能为空!");
+        }
+        //判断任务名称不为空
+        taskAuditTaskDTO.setName(taskAuditTaskDTO.getName().trim());
+        String name = taskAuditTaskDTO.getName();
+        if (name == null || name.equals("")) {
+            throw new XiaoShiException("任务名称不能为空!");
+        }
+        LambdaQueryWrapper<ProjectTask> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ProjectTask::getName, name);
+        queryWrapper.eq(ProjectTask::getProjectId, projectId);
+        List<ProjectTask> projectTasks = this.list(queryWrapper);
+        if (projectTasks != null && projectTasks.size() != 0) {
+            throw new XiaoShiException("任务名称不能重复!");
+        }
+        ProjectTask projectTask = new ProjectTask();
+        BeanUtils.copyProperties(taskAuditTaskDTO, projectTask);
+        //获取登录人信息
+        PersonnelVO personnelVO = new PersonnelVO();
+        try {
+            personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
+        } catch (Exception e) {
+            throw new UnLoginException("未登录");
+        }
+        projectTask.setCreateId(personnelVO.getId());
+        projectTask.insert();
+        return projectTask.getId();
+    }
+
+    @Override
+    public Object queryMessage(QueryRequest queryRequest) throws Exception {
+        return null;
+    }
+
+    @Override
+    public Object addMessage(Object object, List<MultipartFile> files) {
+        return null;
+    }
+
+    @Override
+    public Object deleteMessage(List<Integer> ids) throws IOException {
+        return null;
+    }
+
+    @Override
+    public Object updateMessage(Object object, List<MultipartFile> files) {
+        return null;
+    }
+
+    @Override
+    public Object getGroup(GroupRequest groupRequest, String tableName) throws Exception {
+        return null;
+    }
+
+    @Override
+    public Object addMessage(Object object) {
+        return null;
+    }
+
+    @Override
+    public Object updateMessage(Object object) {
+        return null;
+    }
+}

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

@@ -196,7 +196,7 @@ public class ReportProjectService extends ServiceImpl<ReportProjectMapper, Repor
                 throw new XiaoShiException("未找到配置");
             }
         }
-        tableName = "report as rp left join project as p on rp.project_id =p.id ";
+        tableName = "report as rp left join project as p on rp.project_id =p.id left join asso_project_event as aspe on p.id =aspe.project_id";
         //返回分组数据
         QueryGroupImp queryGroupImp = queryGroupFactory.getClass(groupConfig.getGroupClass());
         ReGroupDataVO reGroupDataVO = queryGroupImp.getGroup(sqls, tableName, groupConfig.getSqlField());

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

@@ -0,0 +1,43 @@
+package cn.cslg.pas.service.business;
+
+import cn.cslg.pas.common.dto.business.TaskAuditResultDTO;
+import cn.cslg.pas.common.model.cronModel.PersonnelVO;
+import cn.cslg.pas.common.utils.CacheUtils;
+import cn.cslg.pas.common.utils.LoginUtils;
+import cn.cslg.pas.domain.business.TaskAuditResult;
+import cn.cslg.pas.exception.UnLoginException;
+import cn.cslg.pas.mapper.TaskAuditResultMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 任务审核结果Service层
+ * @Author xiexiang
+ * @Date 2023/11/22
+ */
+@Service
+public class TaskAuditResultService extends ServiceImpl<TaskAuditResultMapper, TaskAuditResult> {
+
+    @Autowired
+    private CacheUtils cacheUtils;
+
+    @Autowired
+    private LoginUtils loginUtils;
+
+    public Object addTaskAuditResult(TaskAuditResultDTO taskAuditResultDTO){
+        TaskAuditResult taskAuditResult = new TaskAuditResult();
+        BeanUtils.copyProperties(taskAuditResultDTO, taskAuditResult);
+        //获取登录人信息
+        PersonnelVO personnelVO = new PersonnelVO();
+        try {
+            personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
+        } catch (Exception e) {
+            throw new UnLoginException("未登录");
+        }
+        taskAuditResult.setCreateId(personnelVO.getId());
+        taskAuditResult.insert();
+        return taskAuditResult.getId();
+    }
+}

src/main/java/cn/cslg/pas/service/query/FormatQueryService.java

@@ -168,7 +168,7 @@ public class FormatQueryService {
                     //判断 参数类型
                     String json = CommonService.readJsonFile(tableName + ".json");
                     List<SqlObject> sqlObjects = JSON.parseArray(json, SqlObject.class);
-                    SqlObject sqlObject = sqlObjects.stream().filter(item -> item.getValue().equals(field)).findFirst().orElse(null);
+                    SqlObject sqlObject = sqlObjects.stream().filter(item -> item.getValue().equals(field)&&item.getIfSearch().equals(true)).findFirst().orElse(null);
                     if (sqlObject != null) {
                         getSqlObjectLocal = getSqlFactory.getClass(sqlObject.getSqlClass());
                         sqlObject.setOption(optionName);

src/main/resources/jsons/patentDigProject.json

@@ -259,29 +259,31 @@
     "ifGroup": "false",
     "ifShow": "true"
   },
-  {"name":"相关事件",
-    "type":"Array",
-    "value":"eventNames",
+  {
+    "name": "相关事件",
+    "type": "Array",
+    "value": "eventNames",
     "field": "eventNames",
     "sqlField": "aspe.event_id",
     "sqlClass": "getComSql",
     "orderClass": "getEventOrder",
-    "groupClass":"getScenarioGroup",
-    "ifSearch":"false",
+    "groupClass": "getScenarioGroup",
+    "ifSearch": "false",
     "ifGroup": "false",
-    "ifShow":"true"
+    "ifShow": "true"
   },
-  {"name":"相关事件",
-    "type":"String",
-    "value":"eventNames",
+  {
+    "name": "相关事件",
+    "type": "String",
+    "value": "eventNames",
     "field": "eventNames",
     "sqlField": "aspe.event_id",
     "sqlClass": "getEventNameSql",
     "orderClass": "getEventOrder",
-    "groupClass":"getScenarioGroup",
-    "ifSearch":"true",
+    "groupClass": "getScenarioGroup",
+    "ifSearch": "true",
     "ifGroup": "false",
-    "ifShow":"false"
+    "ifShow": "false"
   },
   {
     "name": "创建月份",
@@ -295,5 +297,32 @@
     "ifSearch": "false",
     "ifGroup": "true",
     "ifShow": "false"
+  },
+  {
+    "name": "调查类型",
+    "type": "Array",
+    "value": "matterNames",
+    "field": "matterNames",
+    "sqlField": "aspe.matter_id",
+    "sqlClass": "getComSql",
+    "orderClass": "getMatterOrder",
+    "groupClass": "getMatterGroup",
+    "ifSearch": "true",
+    "ifGroup": "true",
+    "ifShow": "false",
+    "defaultHidden": "true"
+  },
+  {
+    "name": "应用场景",
+    "type": "Array",
+    "value": "scenarioNames",
+    "field": "scenarioNames",
+    "sqlField": "aspe.scenario_id",
+    "sqlClass": "getComSql",
+    "orderClass": "getProjectScenarioOrder",
+    "groupClass": "getScenarioGroup",
+    "ifSearch": "true",
+    "ifGroup": "true",
+    "ifShow": "true"
   }
 ]

src/main/resources/jsons/reportProject.json

@@ -262,7 +262,7 @@
     "sqlClass": "getComSql",
     "orderClass": "getMatterOrder",
     "groupClass":"getMatterGroup",
-    "ifSearch":"false",
+    "ifSearch":"true",
     "ifGroup": "true",
     "ifShow":"false",
     "defaultHidden": "true"

src/main/resources/mapper/PatentDigProjectFilesMapper.xml

@@ -1,18 +1,15 @@
 <?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.PatentDigProjectFilesMapper">
-  <select id="getPatentDigProjectFiles"  resultType="cn.cslg.pas.common.vo.business.PatentDigProjectFilesVO">
-   ,if_final as ifFinal,event_date as eventDate,type,status,create_id as createId,create_time as createTime from patent_dig_project_files
-
-
+    <select id="getPatentDigProjectFiles"  resultType="cn.cslg.pas.common.vo.business.PatentDigProjectFilesVO">
+    ,
+           if_final as ifFinal,event_date as eventDate,type,status,create_id as createId,create_time as createTime
+    from patent_dig_project_files
         <if test="sql1!=''">
-
         where    ${sql1}
         </if>
-
-
       ${sql2} ${sql3}
-  </select>
+    </select>
 
     <select id="getPatentDigProjectFilesCount" resultType="java.lang.Long">
         select count(*) from patent_dig_project_files

src/main/resources/mapper/PatentDigProjectMapper.xml

@@ -9,6 +9,7 @@
         p.entrust_type as entrustType,p.entrust_id as entrustId
         from patent_dig_project as dp left join project as p
         on dp.project_id =p.id left join rd_project rp on dp.rd_project_id =rp.id
+        left join asso_project_event as aspe on p.id =aspe.project_id
         <if test="sql1!=''">
             where ${sql1}
         </if>
@@ -20,6 +21,7 @@
         select count(*)
         from patent_dig_project as dp left join project as p
         on dp.project_id =p.id left join rd_project rp on dp.rd_project_id =rp.id
+        left join asso_project_event as aspe on p.id =aspe.project_id
         <if test="sql1!=''">
             where ${sql1}
         </if>

src/main/resources/mapper/PatentProjectMapper.xml

@@ -8,7 +8,7 @@
         p.entrust_type as  entrustType,p.entrust_id as entrustId,p.head_id as headId,p.department_id as departmentId
         from patent_project as pp left join project as p
         on pp.project_id =p.id  left join asso_project_tree_node as aspt on p.id =aspt.project_id
-        left join asso_project_event as aspe on p.id =aspe.project_id
+        left join asso_project_event as aspe on p.id = aspe.project_id
         <if test="sql1!=''">
             where ${sql1}
         </if>