fixed

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

@@ -131,7 +131,7 @@ public class PatentProjectVO {
     @Schema(description = "创建人")
     private String createName;
 
-    @Schema(description= "创建时间")
+    @Schema(description = "创建时间")
     private Date createTime;
 
     @Schema(description = "文件信息")
@@ -164,5 +164,6 @@ public class PatentProjectVO {
     @Schema(description = "技术类别名称")
     private String technicalCategoryName;
 
-
+    @Schema(description = "状态")
+    private Integer status;
 }

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

@@ -25,6 +25,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -82,7 +83,12 @@ public class CustomFieldController {
     public Response updateCustomField(@RequestBody UpdateCustomFieldDTO updateCustomFieldDTO) throws Exception {
         if (updateCustomFieldDTO != null) {
             Business business = businessFactory.getClass("customFieldService");
-            Integer id = (Integer) business.updateMessage(updateCustomFieldDTO);
+            Integer id = null;
+            try {
+                id = (Integer) business.updateMessage(updateCustomFieldDTO);
+            } catch (Exception e) {
+                return Response.error(e.getMessage());
+            }
             return Response.success(id);
         } else {
             return Response.error("网络异常");
@@ -93,7 +99,11 @@ public class CustomFieldController {
     @PostMapping("/deleteCustomField")
     public Response deleteCustomField(@RequestBody List<Integer> ids) throws Exception {
         Business business = businessFactory.getClass("customFieldService");
-        business.deleteMessage(ids);
+        try {
+            business.deleteMessage(ids);
+        } catch (IOException e) {
+            return Response.error(e.getMessage());
+        }
         return Response.success("删除成功");
     }
 

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

@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -98,10 +99,14 @@ public class PatentProjectController {
 
     @Operation(summary = "删除专利数据库")
     @PostMapping("/deletePatentProject")
-    public String deletePatentProject(@RequestBody List<Integer> ids) throws Exception {
+    public Response deletePatentProject(@RequestBody List<Integer> ids) throws Exception {
         Business business = businessFactory.getClass("patentProjectService");
-        business.deleteMessage(ids);
-        return Response.success();
+        try {
+            business.deleteMessage(ids);
+        } catch (Exception e) {
+            return Response.error(e.getMessage());
+        }
+        return Response.success("删除成功");
     }
 
     @Operation(summary = "分组专利数据库")

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

@@ -30,7 +30,12 @@ public class ReferencesController {
     @Operation(summary = "上传报告文档")
     @PostMapping("/addReferences")
     public Response addReferences(@RequestBody ReferencesDTO referencesDTO) throws Exception {
-        Integer id = referencesService.add(referencesDTO);
+        Integer id = null;
+        try {
+            id = referencesService.add(referencesDTO);
+        } catch (Exception e) {
+            return Response.error(e.getMessage());
+        }
         Records records = new Records();
         records.setData(id);
         return Response.success(records);

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

@@ -89,7 +89,11 @@ public class TreeNodeController {
         if (treeNode != null) {
             UpdateTreeNodeDTO updateTreeNodeDTO = JSONObject.parseObject(treeNode, UpdateTreeNodeDTO.class);
             Business business = businessFactory.getClass("treeNodeService");
-            business.updateMessage(updateTreeNodeDTO, files);
+            try {
+                business.updateMessage(updateTreeNodeDTO, files);
+            } catch (Exception e) {
+                return Response.error(e.getMessage());
+            }
             return Response.success(1);
         } else {
             return Response.error("网络异常");

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

@@ -26,9 +26,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -72,6 +74,9 @@ public class ReferencesService extends ServiceImpl<ReferencesMapper, References>
                 throw new UnLoginException("未登录");
             }
             References references = new References();
+            if (StringUtils.isEmpty(referencesDTO.getFileGuid())) {
+                throw new XiaoShiException("附件不得为空");
+            }
             BeanUtils.copyProperties(referencesDTO, references);
             references.setCreateId(personnelVO.getId());
             references.insert();
@@ -205,13 +210,15 @@ public class ReferencesService extends ServiceImpl<ReferencesMapper, References>
                         referencesVO.setProjectName(project.getName());
                     }
 
-                    SystemFile systemFile = systemFiles
-                            .stream()
-                            .filter(file -> file.getGuid() != null && file.getGuid().equals(item.getFileGuid()))
-                            .findFirst()
-                            .orElse(null);
-                    if (systemFile != null) {
-                        referencesVO.setType(systemFile.getType());
+                    if (!CollectionUtils.isEmpty(systemFiles)) {
+                        SystemFile systemFile = systemFiles
+                                .stream()
+                                .filter(file -> file.getGuid() != null && file.getGuid().equals(item.getFileGuid()))
+                                .findFirst()
+                                .orElse(null);
+                        if (systemFile != null) {
+                            referencesVO.setType(systemFile.getType());
+                        }
                     }
 
                     Personnel personnel = personnels

src/main/resources/jsons/importTask.json

@@ -133,7 +133,8 @@
     "groupClass": "getComGroup",
     "ifSearch": "true",
     "ifGroup": "false",
-    "ifShow": "true"
+    "ifShow": "true",
+    "ifAsCondition": "true"
   },
   {
     "name": "创建时间",
@@ -146,7 +147,8 @@
     "groupClass": "getTimeGroup",
     "ifSearch": "true",
     "ifGroup": "false",
-    "ifShow": "true"
+    "ifShow": "true",
+    "ifAsCondition": "true"
   },
   {
     "name": "专利数据库id",

src/main/resources/mapper/PatentProjectMapper.xml

@@ -4,10 +4,11 @@
     <select id="getPatentProject" resultType="cn.cslg.pas.common.vo.business.PatentProjectVO">
         select distinct p.id as id,p.name as name ,p.contract_no as contract_no,p.volume_number as
         volumeNumber,p.commission_case_day as commissionCaseDay,p.description as description,p.create_id as
-        createId,p.create_time as createTime,pp.if_update as ifUpdate,pp.crons as crons,
+        createId,p.create_time as createTime,pp.if_update as ifUpdate,pp.crons as crons,pp.status as status,
         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
+        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 (select * from asso_project_event where scenario_id is not null ) as asps on p.id = asps.project_id
         left join (select * from asso_project_event where event_id is not null ) as aspe on p.id = aspe.project_id
         left join (select * from asso_project_event where matter_id is not null ) as aspm on p.id = aspm.project_id