修改前台查询任务bug

research-admin/src/main/java/com/research/web/controller/client/task/TaskController.java

@@ -46,6 +46,18 @@ public class TaskController {
         return JsonResponse.ok(new PageInfo<>(taskService.queryList(query.getParam())));
     }
 
+    @ApiOperation(value = "查询任务")
+    @RequestMapping(value = "/queryListClient", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<List<TaskVo.ClientList>> queryListClient(@ApiParam @Validated @RequestBody BaseDto<TaskDto.QueryTask> query){
+        return JsonResponse.ok(taskService.queryListClient(query.getParam()));
+    }
+
+    @ApiOperation(value = "查询任务")
+    @RequestMapping(value = "/detail", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<TaskVo.TaskResult> detail(@ApiParam @Validated @RequestBody TaskDto.QueryDetail dto){
+        return JsonResponse.ok(taskService.detail(dto.getId()));
+    }
+
     @ApiOperation(value = "新增任务")
     @RequestMapping(value = "/add", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse<Integer> add(@ApiParam @Validated @RequestBody TaskDto.AddTask dto) {
@@ -106,4 +118,11 @@ public class TaskController {
         return JsonResponse.ok();
     }
 
+    @ApiOperation(value = "交付物审核")
+    @RequestMapping(value = "/aduitDeliverable", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<Integer> aduit(@ApiParam @Validated @RequestBody TaskDto.AduitDeliverable dto){
+        taskService.aduit(dto.getTaskId(), dto.getDeliverableId(), dto.getStatus());
+        return JsonResponse.ok();
+    }
+
 }

research-admin/src/main/java/com/research/web/controller/system/SysLoginController.java

@@ -55,6 +55,22 @@ public class SysLoginController
         ajax.put(Constants.TOKEN, token);
         return ajax;
     }
+    /**
+     * 登录方法
+     *
+     * @param loginBody 登录信息
+     * @return 结果
+     */
+    @PostMapping("/loginSimple")
+    public AjaxResult loginSimple(@RequestBody LoginBody loginBody)
+    {
+        AjaxResult ajax = AjaxResult.success();
+        // 生成令牌
+        String token = loginService.loginSimple(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
+                loginBody.getUuid());
+        ajax.put(Constants.TOKEN, token);
+        return ajax;
+    }
 
 
     /**

research-admin/src/main/resources/application.yml

@@ -7,7 +7,7 @@ research:
   # 版权年份
   copyrightYear: 2025
   # 文件路径 示例（ Windows配置D:/research/uploadPath，Linux配置 /home/research/uploadPath）
-  profile: /home/research/profile
+  profile: D:\Projects\research\server\profile
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数字计算 char 字符验证

research-framework/src/main/java/com/research/framework/config/SecurityConfig.java

@@ -112,7 +112,7 @@ public class SecurityConfig
             .authorizeHttpRequests((requests) -> {
                 permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll());
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                requests.antMatchers("/login", "/register", "/captchaImage", "web/login", "web/loginSimple").permitAll()
+                requests.antMatchers("/login","/loginSimple", "/register", "/captchaImage", "web/login", "web/loginSimple").permitAll()
                     // 静态资源，可匿名访问
                     .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                     .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()

research-generator/src/main/resources/mbg.xml

@@ -62,7 +62,7 @@
 <!--            <table tableName="tms_tenant_user" domainObjectName="TmsTenantUser" enableDeleteByExample="false"/>-->
 <!--            <table tableName="tms_tenant_config" domainObjectName="TmsTenantConfig" enableDeleteByExample="false"/>-->
 <!--        <table tableName="tms_tenant_srv_relation" domainObjectName="TmsTenantSrvRelation" enableDeleteByExample="false"/>-->
-        <table tableName="ach_achievement" domainObjectName="AchAchievement" enableDeleteByExample="false"/>
+<!--        <table tableName="ach_achievement" domainObjectName="AchAchievement" enableDeleteByExample="false"/>-->
 <!--        <table tableName="ach_achievement_category" domainObjectName="AchAchievementCategory" enableDeleteByExample="false"/>-->
 <!--        <table tableName="fud_fund_record" domainObjectName="FudFundRecord" enableDeleteByExample="false"/>-->
 <!--        <table tableName="kts_kt_group" domainObjectName="KtsKtGroup" enableDeleteByExample="false"/>-->
@@ -84,9 +84,9 @@
 <!--        <table tableName="shs_res_device" domainObjectName="ShsResDevice" enableDeleteByExample="false"/>-->
 <!--        <table tableName="res_research_integrity_template" domainObjectName="ResResearchIntegrityTemplate" enableDeleteByExample="false"/>-->
 <!--        <table tableName="res_research_integrity" domainObjectName="ResResearchIntegrity" enableDeleteByExample="false"/>-->
-<!--        <table tableName="task_list" domainObjectName="TaskList" enableDeleteByExample="false"/>-->
+        <table tableName="task_list" domainObjectName="TaskList" enableDeleteByExample="false"/>
 <!--        <table tableName="task_executor" domainObjectName="TaskExecutor" enableDeleteByExample="false"/>-->
-<!--        <table tableName="task_deliverable" domainObjectName="TaskDeliverable" enableDeleteByExample="false"/>-->
+        <table tableName="task_deliverable" domainObjectName="TaskDeliverable" enableDeleteByExample="false"/>
 <!--        <table tableName="shs_syff_info" domainObjectName="ShsSyffInfo" enableDeleteByExample="false"/>-->
 <!--        <table tableName="pro_progress" domainObjectName="ProProgress" enableDeleteByExample="false"/>-->
         <!-- 有些表的字段需要指定java类型

research-system/src/main/java/com/research/system/domain/dto/MeetingDto.java

@@ -1,10 +1,12 @@
 package com.research.system.domain.dto;
 
+import cn.hutool.core.collection.CollUtil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Author zzc
@@ -36,7 +38,7 @@ public class MeetingDto {
         private String meetingTitle;
 
         private String meetingFqr;
-
+        private String meetingUrl;
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
         private Date meetingBeginTime;
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
@@ -48,10 +50,11 @@ public class MeetingDto {
 
         private String remark;
         private List<Long> metMeetingParticipantList;
-        private Byte meetingType;
+        private String meetingType;
 
         private String meetingPlace;
 
         private String meetingNumber;
+
     }
 }

research-system/src/main/java/com/research/system/domain/dto/MemberAduitDto.java

@@ -89,7 +89,7 @@ public class MemberAduitDto {
     public static class Query {
         private String username;
         private String phone;
-        private String type;
+        private Byte type;
         private Long id;
         private Long ktGroupId;
         private String memberName;

research-system/src/main/java/com/research/system/domain/dto/OutcomeDto.java

@@ -1,5 +1,6 @@
 package com.research.system.domain.dto;
 
+import cn.hutool.core.collection.CollUtil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.research.system.domain.po.AchAchievement;
 import com.research.system.domain.po.AchAchievementCategory;
@@ -7,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Author zzc
@@ -54,7 +56,7 @@ public class OutcomeDto {
 
         private String paperDoi;
 
-        private String authors;
+        private List<String> authors;
         @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
         private Date applyDate;
 
@@ -93,6 +95,13 @@ public class OutcomeDto {
         private String partition;
         @ApiModelProperty("影响因子")
         private String impactFactor;
+
+        public String getAuthors() {
+            if (CollUtil.isNotEmpty(authors)) {
+                return String.join(",", authors);
+            }
+            return null;
+        }
     }
 
     @Data

research-system/src/main/java/com/research/system/domain/dto/ProProgressDto.java

@@ -34,7 +34,6 @@ public class ProProgressDto {
 
         private String projectName;
         private String fzr;
-
         private String stageName;
         private String stageGoal;
 

research-system/src/main/java/com/research/system/domain/dto/ShsCkwxDto.java

@@ -1,9 +1,13 @@
 package com.research.system.domain.dto;
 
+import cn.hutool.core.collection.CollUtil;
 import com.research.system.domain.po.ShsCkwxCategory;
 import com.research.system.domain.po.ShsCkwxInfo;
 import lombok.Data;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * @Author zzc
  * @Package com.research.system.domain.dto
@@ -45,6 +49,16 @@ public class ShsCkwxDto {
         private Long uploaderName;
 
         private Long uploaderOrg;
+        private String publicationYear;
+        private List<String> type;
+        private String impactFactor;
+
+        public String getType() {
+            if (CollUtil.isNotEmpty(type)) {
+                return type.stream().collect(Collectors.joining(","));
+            }
+            return null;
+        }
     }
 
     @Data

research-system/src/main/java/com/research/system/domain/dto/ShsResDeviceDto.java

@@ -22,7 +22,7 @@ public class ShsResDeviceDto {
     public static class Query {
         @ApiModelProperty("平台id")
         private Long platformId;
-        private String projOrgId;
+        private Long projOrgId;
         @ApiModelProperty("仪器名")
         private String deviceName;
     }

research-system/src/main/java/com/research/system/domain/dto/ShsSyffCategoryDto.java

@@ -61,6 +61,7 @@ public class ShsSyffCategoryDto {
         private String steps;
 
         private String result;
+        private String versionRemark;
     }
 
     @Data

research-system/src/main/java/com/research/system/domain/dto/TaskDto.java

@@ -2,12 +2,14 @@ package com.research.system.domain.dto;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.research.common.utils.SecurityUtils;
 import com.research.system.domain.po.TaskDeliverable;
 import com.research.system.domain.po.TaskExecutor;
 import com.research.system.domain.po.TaskList;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 import java.util.List;
 
@@ -22,6 +24,29 @@ public class TaskDto {
     @Data
     public static class QueryTask{
         private String taskName;
+        @ApiModelProperty("日期查询  0全部 1今日 2本周 3本月")
+        private Integer dateType;
+
+        @ApiModelProperty("任务状态 0全部 1未完成 2已完成 3待审核")
+        private Integer completedStatus;
+        private Long groupId;
+
+        private Date startTime;
+        private Date endTime;
+        @ApiModelProperty("是否我的任务 0全部 1我的")
+        private Byte isMine;
+        private Long userId;
+//        private Long getUserId(){
+//            return SecurityUtils.getUserId();
+//        }
+        private String getUserName(){
+            return SecurityUtils.getUsername();
+        }
+    }
+
+    @Data
+    public static class QueryDetail{
+        private Long id;
     }
 
     @Data
@@ -66,12 +91,12 @@ public class TaskDto {
         private List<AddExecutor> executorList;
 
         @ApiModelProperty("应交付物")
-        private List<String> deliverables;
+        private List<String> deliverableList;
 
-        public String getDeliverables() {
+        public String getDeliverableList() {
-            if (CollectionUtil.isNotEmpty(deliverables)) {
+            if (CollectionUtil.isNotEmpty(deliverableList)) {
                 StringBuilder sb = new StringBuilder();
-                for (String deliverable : deliverables) {
+                for (String deliverable : deliverableList) {
                     sb.append(deliverable).append(",");
                 }
                 return sb.toString();
@@ -122,4 +147,16 @@ public class TaskDto {
         private Date reviewTime;
     }
 
+    @Data
+    public static class AduitDeliverable{
+        @ApiModelProperty("任务ID")
+        @NotNull(message = "任务ID不能为空")
+        private Long taskId;
+        @NotNull(message = "交付物ID不能为空")
+        @ApiModelProperty("交付物ID")
+        private Long deliverableId;
+        @NotNull(message = "审核状态不能为空")
+        @ApiModelProperty("审核状态 0未审核 1通过 2未通过")
+        private Byte status;
+    }
 }

research-system/src/main/java/com/research/system/domain/po/MetMeetingRecord.java

@@ -36,12 +36,14 @@ public class MetMeetingRecord implements Serializable {
 
     private Date updateTime;
 
-    private Byte meetingType;
+    private String meetingType;
 
     private String meetingPlace;
 
     private String meetingNumber;
 
+    private String meetingUrl;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -172,12 +174,12 @@ public class MetMeetingRecord implements Serializable {
         this.updateTime = updateTime;
     }
 
-    public Byte getMeetingType() {
+    public String getMeetingType() {
         return meetingType;
     }
 
-    public void setMeetingType(Byte meetingType) {
+    public void setMeetingType(String meetingType) {
-        this.meetingType = meetingType;
+        this.meetingType = meetingType == null ? null : meetingType.trim();
     }
 
     public String getMeetingPlace() {
@@ -196,6 +198,14 @@ public class MetMeetingRecord implements Serializable {
         this.meetingNumber = meetingNumber == null ? null : meetingNumber.trim();
     }
 
+    public String getMeetingUrl() {
+        return meetingUrl;
+    }
+
+    public void setMeetingUrl(String meetingUrl) {
+        this.meetingUrl = meetingUrl == null ? null : meetingUrl.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -221,6 +231,7 @@ public class MetMeetingRecord implements Serializable {
         sb.append(", meetingType=").append(meetingType);
         sb.append(", meetingPlace=").append(meetingPlace);
         sb.append(", meetingNumber=").append(meetingNumber);
+        sb.append(", meetingUrl=").append(meetingUrl);
         sb.append("]");
         return sb.toString();
     }

research-system/src/main/java/com/research/system/domain/po/MetMeetingRecordExample.java

@@ -1145,52 +1145,62 @@ public class MetMeetingRecordExample {
             return (Criteria) this;
         }
 
-        public Criteria andMeetingTypeEqualTo(Byte value) {
+        public Criteria andMeetingTypeEqualTo(String value) {
             addCriterion("meeting_type =", value, "meetingType");
             return (Criteria) this;
         }
 
-        public Criteria andMeetingTypeNotEqualTo(Byte value) {
+        public Criteria andMeetingTypeNotEqualTo(String value) {
             addCriterion("meeting_type <>", value, "meetingType");
             return (Criteria) this;
         }
 
-        public Criteria andMeetingTypeGreaterThan(Byte value) {
+        public Criteria andMeetingTypeGreaterThan(String value) {
             addCriterion("meeting_type >", value, "meetingType");
             return (Criteria) this;
         }
 
-        public Criteria andMeetingTypeGreaterThanOrEqualTo(Byte value) {
+        public Criteria andMeetingTypeGreaterThanOrEqualTo(String value) {
             addCriterion("meeting_type >=", value, "meetingType");
             return (Criteria) this;
         }
 
-        public Criteria andMeetingTypeLessThan(Byte value) {
+        public Criteria andMeetingTypeLessThan(String value) {
             addCriterion("meeting_type <", value, "meetingType");
             return (Criteria) this;
         }
 
-        public Criteria andMeetingTypeLessThanOrEqualTo(Byte value) {
+        public Criteria andMeetingTypeLessThanOrEqualTo(String value) {
             addCriterion("meeting_type <=", value, "meetingType");
             return (Criteria) this;
         }
 
-        public Criteria andMeetingTypeIn(List<Byte> values) {
+        public Criteria andMeetingTypeLike(String value) {
+            addCriterion("meeting_type like", value, "meetingType");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeetingTypeNotLike(String value) {
+            addCriterion("meeting_type not like", value, "meetingType");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeetingTypeIn(List<String> values) {
             addCriterion("meeting_type in", values, "meetingType");
             return (Criteria) this;
         }
 
-        public Criteria andMeetingTypeNotIn(List<Byte> values) {
+        public Criteria andMeetingTypeNotIn(List<String> values) {
             addCriterion("meeting_type not in", values, "meetingType");
             return (Criteria) this;
         }
 
-        public Criteria andMeetingTypeBetween(Byte value1, Byte value2) {
+        public Criteria andMeetingTypeBetween(String value1, String value2) {
             addCriterion("meeting_type between", value1, value2, "meetingType");
             return (Criteria) this;
         }
 
-        public Criteria andMeetingTypeNotBetween(Byte value1, Byte value2) {
+        public Criteria andMeetingTypeNotBetween(String value1, String value2) {
             addCriterion("meeting_type not between", value1, value2, "meetingType");
             return (Criteria) this;
         }
@@ -1334,6 +1344,76 @@ public class MetMeetingRecordExample {
             addCriterion("meeting_number not between", value1, value2, "meetingNumber");
             return (Criteria) this;
         }
+
+        public Criteria andMeetingUrlIsNull() {
+            addCriterion("meeting_url is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeetingUrlIsNotNull() {
+            addCriterion("meeting_url is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeetingUrlEqualTo(String value) {
+            addCriterion("meeting_url =", value, "meetingUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeetingUrlNotEqualTo(String value) {
+            addCriterion("meeting_url <>", value, "meetingUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeetingUrlGreaterThan(String value) {
+            addCriterion("meeting_url >", value, "meetingUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeetingUrlGreaterThanOrEqualTo(String value) {
+            addCriterion("meeting_url >=", value, "meetingUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeetingUrlLessThan(String value) {
+            addCriterion("meeting_url <", value, "meetingUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeetingUrlLessThanOrEqualTo(String value) {
+            addCriterion("meeting_url <=", value, "meetingUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeetingUrlLike(String value) {
+            addCriterion("meeting_url like", value, "meetingUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeetingUrlNotLike(String value) {
+            addCriterion("meeting_url not like", value, "meetingUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeetingUrlIn(List<String> values) {
+            addCriterion("meeting_url in", values, "meetingUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeetingUrlNotIn(List<String> values) {
+            addCriterion("meeting_url not in", values, "meetingUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeetingUrlBetween(String value1, String value2) {
+            addCriterion("meeting_url between", value1, value2, "meetingUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeetingUrlNotBetween(String value1, String value2) {
+            addCriterion("meeting_url not between", value1, value2, "meetingUrl");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

research-system/src/main/java/com/research/system/domain/po/ShsCkwxInfo.java

@@ -38,6 +38,12 @@ public class ShsCkwxInfo implements Serializable {
 
     private Date updateTime;
 
+    private String publicationYear;
+
+    private String type;
+
+    private String impactFactor;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -176,6 +182,30 @@ public class ShsCkwxInfo implements Serializable {
         this.updateTime = updateTime;
     }
 
+    public String getPublicationYear() {
+        return publicationYear;
+    }
+
+    public void setPublicationYear(String publicationYear) {
+        this.publicationYear = publicationYear == null ? null : publicationYear.trim();
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type == null ? null : type.trim();
+    }
+
+    public String getImpactFactor() {
+        return impactFactor;
+    }
+
+    public void setImpactFactor(String impactFactor) {
+        this.impactFactor = impactFactor == null ? null : impactFactor.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -199,6 +229,9 @@ public class ShsCkwxInfo implements Serializable {
         sb.append(", createTime=").append(createTime);
         sb.append(", updateBy=").append(updateBy);
         sb.append(", updateTime=").append(updateTime);
+        sb.append(", publicationYear=").append(publicationYear);
+        sb.append(", type=").append(type);
+        sb.append(", impactFactor=").append(impactFactor);
         sb.append("]");
         return sb.toString();
     }

research-system/src/main/java/com/research/system/domain/po/ShsCkwxInfoExample.java

@@ -1214,6 +1214,216 @@ public class ShsCkwxInfoExample {
             addCriterion("update_time not between", value1, value2, "updateTime");
             return (Criteria) this;
         }
+
+        public Criteria andPublicationYearIsNull() {
+            addCriterion("publication_year is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublicationYearIsNotNull() {
+            addCriterion("publication_year is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublicationYearEqualTo(String value) {
+            addCriterion("publication_year =", value, "publicationYear");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublicationYearNotEqualTo(String value) {
+            addCriterion("publication_year <>", value, "publicationYear");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublicationYearGreaterThan(String value) {
+            addCriterion("publication_year >", value, "publicationYear");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublicationYearGreaterThanOrEqualTo(String value) {
+            addCriterion("publication_year >=", value, "publicationYear");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublicationYearLessThan(String value) {
+            addCriterion("publication_year <", value, "publicationYear");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublicationYearLessThanOrEqualTo(String value) {
+            addCriterion("publication_year <=", value, "publicationYear");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublicationYearLike(String value) {
+            addCriterion("publication_year like", value, "publicationYear");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublicationYearNotLike(String value) {
+            addCriterion("publication_year not like", value, "publicationYear");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublicationYearIn(List<String> values) {
+            addCriterion("publication_year in", values, "publicationYear");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublicationYearNotIn(List<String> values) {
+            addCriterion("publication_year not in", values, "publicationYear");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublicationYearBetween(String value1, String value2) {
+            addCriterion("publication_year between", value1, value2, "publicationYear");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublicationYearNotBetween(String value1, String value2) {
+            addCriterion("publication_year not between", value1, value2, "publicationYear");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNull() {
+            addCriterion("type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNotNull() {
+            addCriterion("type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeEqualTo(String value) {
+            addCriterion("type =", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotEqualTo(String value) {
+            addCriterion("type <>", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThan(String value) {
+            addCriterion("type >", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("type >=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThan(String value) {
+            addCriterion("type <", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThanOrEqualTo(String value) {
+            addCriterion("type <=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLike(String value) {
+            addCriterion("type like", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotLike(String value) {
+            addCriterion("type not like", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIn(List<String> values) {
+            addCriterion("type in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotIn(List<String> values) {
+            addCriterion("type not in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeBetween(String value1, String value2) {
+            addCriterion("type between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotBetween(String value1, String value2) {
+            addCriterion("type not between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andImpactFactorIsNull() {
+            addCriterion("impact_factor is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andImpactFactorIsNotNull() {
+            addCriterion("impact_factor is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andImpactFactorEqualTo(String value) {
+            addCriterion("impact_factor =", value, "impactFactor");
+            return (Criteria) this;
+        }
+
+        public Criteria andImpactFactorNotEqualTo(String value) {
+            addCriterion("impact_factor <>", value, "impactFactor");
+            return (Criteria) this;
+        }
+
+        public Criteria andImpactFactorGreaterThan(String value) {
+            addCriterion("impact_factor >", value, "impactFactor");
+            return (Criteria) this;
+        }
+
+        public Criteria andImpactFactorGreaterThanOrEqualTo(String value) {
+            addCriterion("impact_factor >=", value, "impactFactor");
+            return (Criteria) this;
+        }
+
+        public Criteria andImpactFactorLessThan(String value) {
+            addCriterion("impact_factor <", value, "impactFactor");
+            return (Criteria) this;
+        }
+
+        public Criteria andImpactFactorLessThanOrEqualTo(String value) {
+            addCriterion("impact_factor <=", value, "impactFactor");
+            return (Criteria) this;
+        }
+
+        public Criteria andImpactFactorLike(String value) {
+            addCriterion("impact_factor like", value, "impactFactor");
+            return (Criteria) this;
+        }
+
+        public Criteria andImpactFactorNotLike(String value) {
+            addCriterion("impact_factor not like", value, "impactFactor");
+            return (Criteria) this;
+        }
+
+        public Criteria andImpactFactorIn(List<String> values) {
+            addCriterion("impact_factor in", values, "impactFactor");
+            return (Criteria) this;
+        }
+
+        public Criteria andImpactFactorNotIn(List<String> values) {
+            addCriterion("impact_factor not in", values, "impactFactor");
+            return (Criteria) this;
+        }
+
+        public Criteria andImpactFactorBetween(String value1, String value2) {
+            addCriterion("impact_factor between", value1, value2, "impactFactor");
+            return (Criteria) this;
+        }
+
+        public Criteria andImpactFactorNotBetween(String value1, String value2) {
+            addCriterion("impact_factor not between", value1, value2, "impactFactor");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

research-system/src/main/java/com/research/system/domain/po/ShsSyffInfo.java

@@ -44,6 +44,8 @@ public class ShsSyffInfo implements Serializable {
 
     private Date updateTime;
 
+    private String versionRemark;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -206,6 +208,14 @@ public class ShsSyffInfo implements Serializable {
         this.updateTime = updateTime;
     }
 
+    public String getVersionRemark() {
+        return versionRemark;
+    }
+
+    public void setVersionRemark(String versionRemark) {
+        this.versionRemark = versionRemark == null ? null : versionRemark.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -232,6 +242,7 @@ public class ShsSyffInfo implements Serializable {
         sb.append(", createTime=").append(createTime);
         sb.append(", updateBy=").append(updateBy);
         sb.append(", updateTime=").append(updateTime);
+        sb.append(", versionRemark=").append(versionRemark);
         sb.append("]");
         return sb.toString();
     }

research-system/src/main/java/com/research/system/domain/po/ShsSyffInfoExample.java

@@ -1441,6 +1441,76 @@ public class ShsSyffInfoExample {
             addCriterion("update_time not between", value1, value2, "updateTime");
             return (Criteria) this;
         }
+
+        public Criteria andVersionRemarkIsNull() {
+            addCriterion("version_remark is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionRemarkIsNotNull() {
+            addCriterion("version_remark is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionRemarkEqualTo(String value) {
+            addCriterion("version_remark =", value, "versionRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionRemarkNotEqualTo(String value) {
+            addCriterion("version_remark <>", value, "versionRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionRemarkGreaterThan(String value) {
+            addCriterion("version_remark >", value, "versionRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionRemarkGreaterThanOrEqualTo(String value) {
+            addCriterion("version_remark >=", value, "versionRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionRemarkLessThan(String value) {
+            addCriterion("version_remark <", value, "versionRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionRemarkLessThanOrEqualTo(String value) {
+            addCriterion("version_remark <=", value, "versionRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionRemarkLike(String value) {
+            addCriterion("version_remark like", value, "versionRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionRemarkNotLike(String value) {
+            addCriterion("version_remark not like", value, "versionRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionRemarkIn(List<String> values) {
+            addCriterion("version_remark in", values, "versionRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionRemarkNotIn(List<String> values) {
+            addCriterion("version_remark not in", values, "versionRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionRemarkBetween(String value1, String value2) {
+            addCriterion("version_remark between", value1, value2, "versionRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionRemarkNotBetween(String value1, String value2) {
+            addCriterion("version_remark not between", value1, value2, "versionRemark");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

research-system/src/main/java/com/research/system/domain/po/TaskDeliverable.java

@@ -6,7 +6,7 @@ import java.util.Date;
 public class TaskDeliverable implements Serializable {
     private Long id;
 
-    private String taskId;
+    private Long taskId;
 
     private String deliverableName;
 
@@ -14,6 +14,8 @@ public class TaskDeliverable implements Serializable {
 
     private Byte deliveryStatus;
 
+    private Byte aduitStatus;
+
     private String submitterAccount;
 
     private Date submissionTime;
@@ -42,12 +44,12 @@ public class TaskDeliverable implements Serializable {
         this.id = id;
     }
 
-    public String getTaskId() {
+    public Long getTaskId() {
         return taskId;
     }
 
-    public void setTaskId(String taskId) {
+    public void setTaskId(Long taskId) {
-        this.taskId = taskId == null ? null : taskId.trim();
+        this.taskId = taskId;
     }
 
     public String getDeliverableName() {
@@ -74,6 +76,14 @@ public class TaskDeliverable implements Serializable {
         this.deliveryStatus = deliveryStatus;
     }
 
+    public Byte getAduitStatus() {
+        return aduitStatus;
+    }
+
+    public void setAduitStatus(Byte aduitStatus) {
+        this.aduitStatus = aduitStatus;
+    }
+
     public String getSubmitterAccount() {
         return submitterAccount;
     }
@@ -157,6 +167,7 @@ public class TaskDeliverable implements Serializable {
         sb.append(", deliverableName=").append(deliverableName);
         sb.append(", deliverableUrl=").append(deliverableUrl);
         sb.append(", deliveryStatus=").append(deliveryStatus);
+        sb.append(", aduitStatus=").append(aduitStatus);
         sb.append(", submitterAccount=").append(submitterAccount);
         sb.append(", submissionTime=").append(submissionTime);
         sb.append(", reviewerAccount=").append(reviewerAccount);

research-system/src/main/java/com/research/system/domain/po/TaskDeliverableExample.java

@@ -175,62 +175,52 @@ public class TaskDeliverableExample {
             return (Criteria) this;
         }
 
-        public Criteria andTaskIdEqualTo(String value) {
+        public Criteria andTaskIdEqualTo(Long value) {
             addCriterion("task_id =", value, "taskId");
             return (Criteria) this;
         }
 
-        public Criteria andTaskIdNotEqualTo(String value) {
+        public Criteria andTaskIdNotEqualTo(Long value) {
             addCriterion("task_id <>", value, "taskId");
             return (Criteria) this;
         }
 
-        public Criteria andTaskIdGreaterThan(String value) {
+        public Criteria andTaskIdGreaterThan(Long value) {
             addCriterion("task_id >", value, "taskId");
             return (Criteria) this;
         }
 
-        public Criteria andTaskIdGreaterThanOrEqualTo(String value) {
+        public Criteria andTaskIdGreaterThanOrEqualTo(Long value) {
             addCriterion("task_id >=", value, "taskId");
             return (Criteria) this;
         }
 
-        public Criteria andTaskIdLessThan(String value) {
+        public Criteria andTaskIdLessThan(Long value) {
             addCriterion("task_id <", value, "taskId");
             return (Criteria) this;
         }
 
-        public Criteria andTaskIdLessThanOrEqualTo(String value) {
+        public Criteria andTaskIdLessThanOrEqualTo(Long value) {
             addCriterion("task_id <=", value, "taskId");
             return (Criteria) this;
         }
 
-        public Criteria andTaskIdLike(String value) {
+        public Criteria andTaskIdIn(List<Long> values) {
-            addCriterion("task_id like", value, "taskId");
-            return (Criteria) this;
-        }
-
-        public Criteria andTaskIdNotLike(String value) {
-            addCriterion("task_id not like", value, "taskId");
-            return (Criteria) this;
-        }
-
-        public Criteria andTaskIdIn(List<String> values) {
             addCriterion("task_id in", values, "taskId");
             return (Criteria) this;
         }
 
-        public Criteria andTaskIdNotIn(List<String> values) {
+        public Criteria andTaskIdNotIn(List<Long> values) {
             addCriterion("task_id not in", values, "taskId");
             return (Criteria) this;
         }
 
-        public Criteria andTaskIdBetween(String value1, String value2) {
+        public Criteria andTaskIdBetween(Long value1, Long value2) {
             addCriterion("task_id between", value1, value2, "taskId");
             return (Criteria) this;
         }
 
-        public Criteria andTaskIdNotBetween(String value1, String value2) {
+        public Criteria andTaskIdNotBetween(Long value1, Long value2) {
             addCriterion("task_id not between", value1, value2, "taskId");
             return (Criteria) this;
         }
@@ -435,6 +425,66 @@ public class TaskDeliverableExample {
             return (Criteria) this;
         }
 
+        public Criteria andAduitStatusIsNull() {
+            addCriterion("aduit_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAduitStatusIsNotNull() {
+            addCriterion("aduit_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAduitStatusEqualTo(Byte value) {
+            addCriterion("aduit_status =", value, "aduitStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAduitStatusNotEqualTo(Byte value) {
+            addCriterion("aduit_status <>", value, "aduitStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAduitStatusGreaterThan(Byte value) {
+            addCriterion("aduit_status >", value, "aduitStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAduitStatusGreaterThanOrEqualTo(Byte value) {
+            addCriterion("aduit_status >=", value, "aduitStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAduitStatusLessThan(Byte value) {
+            addCriterion("aduit_status <", value, "aduitStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAduitStatusLessThanOrEqualTo(Byte value) {
+            addCriterion("aduit_status <=", value, "aduitStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAduitStatusIn(List<Byte> values) {
+            addCriterion("aduit_status in", values, "aduitStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAduitStatusNotIn(List<Byte> values) {
+            addCriterion("aduit_status not in", values, "aduitStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAduitStatusBetween(Byte value1, Byte value2) {
+            addCriterion("aduit_status between", value1, value2, "aduitStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAduitStatusNotBetween(Byte value1, Byte value2) {
+            addCriterion("aduit_status not between", value1, value2, "aduitStatus");
+            return (Criteria) this;
+        }
+
         public Criteria andSubmitterAccountIsNull() {
             addCriterion("submitter_account is null");
             return (Criteria) this;

research-system/src/main/java/com/research/system/domain/vo/HomeVo.java

@@ -1,5 +1,8 @@
 package com.research.system.domain.vo;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.collection.ListUtil;
+import cn.hutool.core.util.StrUtil;
 import com.research.system.domain.dto.GroupDto;
 import com.research.system.domain.po.PrjProjInfo;
 import io.swagger.annotations.ApiModel;
@@ -53,6 +56,8 @@ public class HomeVo {
     public static class TaskResult {
         private Long id;
 
+        private String leader;
+
         private Long projId;
 
         private Long projOrgId;
@@ -99,6 +104,26 @@ public class HomeVo {
 
         private Date createTime;
         private String ktGroupName;
+
+        private Byte completedStatus = 0;
+
+        public List<String> getDeliverableList() {
+            if (StrUtil.isNotEmpty(deliverables)) {
+                return ListUtil.toList(deliverables.split(","));
+            }
+            return CollectionUtil.newArrayList();
+        }
+
+        public Long getDuration(){
+            if (startTime != null && endTime != null) {
+                return (endTime.getTime() - startTime.getTime()) / (1000 * 60 * 60 * 24) >= 0 ? (endTime.getTime() - startTime.getTime()) / (1000 * 60 * 60 * 24) : 0L;
+            }
+            return 0L;
+        }
+
+        public String getLeader() {
+            return initiator;
+        }
     }
 
     @Data

research-system/src/main/java/com/research/system/domain/vo/MeetingVo.java

@@ -1,10 +1,13 @@
 package com.research.system.domain.vo;
 
+import cn.hutool.core.util.StrUtil;
 import com.research.system.domain.po.MetMeetingRecord;
 import lombok.Data;
 
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Author zzc
@@ -46,11 +49,13 @@ public class MeetingVo {
         private String  ktGroupName;
 
         private List<ParticipantResult> metMeetingParticipantList;
-        private Byte meetingType;
+        private String meetingType;
 
         private String meetingPlace;
 
         private String meetingNumber;
+        private String meetingUrl;
+
     }
 
     @Data

research-system/src/main/java/com/research/system/domain/vo/ResPlatformVo.java

@@ -26,6 +26,8 @@ public class ResPlatformVo {
         @ApiModelProperty("")
         private String remark;
         private Integer deviceNum;
+        private Long projId;
+        private Long projOrgId;
     }
 
 }

research-system/src/main/java/com/research/system/domain/vo/ResResearchIntegrityVo.java

@@ -37,6 +37,8 @@ public class ResResearchIntegrityVo {
         private String tplDownloadUrl;
         private String createBy;
         private Date createTime;
+        private String projOrgName;
+        private String  ktGroupName;
     }
 
     @Data

research-system/src/main/java/com/research/system/domain/vo/ShsCkwxVo.java

@@ -1,8 +1,12 @@
 package com.research.system.domain.vo;
 
+import cn.hutool.core.util.StrUtil;
 import lombok.Data;
 
+import java.util.Arrays;
 import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Author zzc
@@ -43,6 +47,16 @@ public class ShsCkwxVo {
         private Date createTime;
         private String categoryName;
         private String uploaderOrgName;
+        private String publicationYear;
+        private String type;
+        private String impactFactor;
+
+        public List<String> getType() {
+            if (StrUtil.isNotEmpty(type)) {
+                return Arrays.stream(type.split(",")).collect(Collectors.toList());
+            }
+            return null;
+        }
     }
 
     @Data

research-system/src/main/java/com/research/system/domain/vo/ShsSyffCategoryVo.java

@@ -56,6 +56,8 @@ public class ShsSyffCategoryVo {
         private String steps;
 
         private String result;
+
+        private String versionRemark;
     }
 
 

research-system/src/main/java/com/research/system/domain/vo/TaskVo.java

@@ -2,6 +2,7 @@ package com.research.system.domain.vo;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.collection.ListUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -57,16 +58,51 @@ public class TaskVo {
 
         private List<ExecutorResult> executorList;
 
-        private List<DeliverableResult> deliverableList;
+        private List<DeliverableResult> deliverableShouldList;
 
         private String deliverables;
 
-        public List<String> getDeliverables() {
+        private Byte complateStatus;
+
+        public Byte getComplateStatus() {
+            if (CollectionUtil.isNotEmpty(deliverableShouldList) && getDeliverableList().size() > deliverableShouldList.size()) {
+                return 1;
+            }
+            return 0;
+        }
+
+        public List<String> getDeliverableList() {
             if (StrUtil.isNotEmpty(deliverables)) {
                 return ListUtil.toList(deliverables.split(","));
             }
             return CollectionUtil.newArrayList();
         }
+
+        public String getMonth(){
+            if (startTime != null) {
+                return DateUtil.format(startTime, "yyyy-MM");
+            }
+            return null;
+        }
+        public String getDay(){
+            if (startTime != null) {
+                return DateUtil.format(startTime, "yyyy-MM-dd");
+            }
+            return null;
+        }
+
+    }
+
+    @Data
+    public static class ClientList{
+        private String time;
+        private List<DateResult> clientList;
+
+        @Data
+        public static class DateResult{
+            private String date;
+            private List<TaskResult> taskResultList;
+        }
     }
 
     @Data
@@ -95,6 +131,8 @@ public class TaskVo {
 
         private Byte deliveryStatus;
 
+        private Byte aduitStatus;
+
         private String submitterAccount;
 
         private Date submissionTime;

research-system/src/main/java/com/research/system/persist/dao/TaskDao.java

@@ -17,6 +17,7 @@ public interface TaskDao {
 
     List<TaskVo.TaskResult> queryList(@Param("dto") TaskDto.QueryTask dto);
 
+    TaskVo.TaskResult detail(@Param("id") Long id);
     List<TaskVo.ExecutorResult> queryExecutorList(@Param("dto") TaskDto.QueryExecutor dto);
 
     List<TaskVo.DeliverableResult> queryDeliverableList(@Param("id") Long id);

research-system/src/main/java/com/research/system/service/TaskService.java

@@ -16,6 +16,10 @@ public interface TaskService {
 
     List<TaskVo.TaskResult> queryList(TaskDto.QueryTask query);
 
+    List<TaskVo.ClientList> queryListClient(TaskDto.QueryTask query);
+
+    TaskVo.TaskResult detail(Long id);
+
     void add(TaskDto.AddTask dto);
 
     void del(CommonDto.DelDto dto);
@@ -32,4 +36,11 @@ public interface TaskService {
 
     void delDeliverable(CommonDto.DelDto dto);
 
+    /**
+     * 交付物审核
+     * @param taskId 任务ID
+     * @param deliverableId 交付物ID
+     * @param status 审核状态（0未审核；1已通过；2不通过）
+     */
+    void aduit(Long taskId, Long deliverableId, Byte status);
 }

research-system/src/main/java/com/research/system/service/impl/ClientPrjProjInfoServiceImpl.java

@@ -100,7 +100,7 @@ public class ClientPrjProjInfoServiceImpl implements ClientPrjProjInfoService {
             for (ClientPrjProjInfoVo.Result result : results) {
                 //查询合作单位
                 PrjProjOrgExample prjProjOrgExample = new PrjProjOrgExample();
-                prjProjOrgExample.createCriteria().andProjIdEqualTo(result.getId());
+                prjProjOrgExample.createCriteria().andProjIdEqualTo(result.getId()).andCategoryEqualTo((byte) 1);
                 List<PrjProjOrg> prjProjOrgs = prjProjOrgMapper.selectByExample(prjProjOrgExample);
                 if (CollUtil.isNotEmpty(prjProjOrgs)) {
                     result.setPrjProjOrgList(BeanUtil.copyToList(prjProjOrgs, ClientPrjProjInfoVo.OrgVo.class));

research-system/src/main/java/com/research/system/service/impl/HomeServiceImpl.java

@@ -10,6 +10,7 @@ import com.research.system.persist.dao.HomeDao;
 import com.research.system.persist.mapper.KtsKtGroupMapper;
 import com.research.system.persist.mapper.PrjProjOrgMapper;
 import com.research.system.persist.mapper.ProProgressMapper;
+import com.research.system.persist.mapper.TaskDeliverableMapper;
 import com.research.system.service.HomeService;
 import org.springframework.stereotype.Service;
 
@@ -35,6 +36,8 @@ public class HomeServiceImpl implements HomeService {
     private ProProgressMapper proProgressMapper;
     @Resource
     private KtsKtGroupMapper ktsKtGroupMapper;
+    @Resource
+    private TaskDeliverableMapper taskDeliverableMapper;
 
     @Override
     public HomeVo.Result queryHomeInfo() {
@@ -87,7 +90,25 @@ public class HomeServiceImpl implements HomeService {
 
     @Override
     public List<HomeVo.TaskResult> queryTaskList() {
-        return homeDao.queryTaskList(SecurityUtils.getUserId());
+        List<HomeVo.TaskResult> taskResults = homeDao.queryTaskList(SecurityUtils.getUserId());
+        if (CollUtil.isNotEmpty(taskResults)) {
+            //查询任务状态
+            for (HomeVo.TaskResult taskResult : taskResults) {
+                TaskDeliverableExample taskDeliverableExample = new TaskDeliverableExample();
+                taskDeliverableExample.createCriteria().andTaskIdEqualTo(taskResult.getId()).andAduitStatusEqualTo((byte) 1);
+                List<TaskDeliverable> taskDeliverables = taskDeliverableMapper.selectByExample(taskDeliverableExample);
+                if (CollUtil.isEmpty(taskDeliverables)) {
+                    taskResult.setCompletedStatus((byte) 1);
+                }else {
+                    if (taskDeliverables.size() >= taskResult.getDeliverableList().size()) {
+                        taskResult.setCompletedStatus((byte) 2);
+                    }else {
+                        taskResult.setCompletedStatus((byte) 1);
+                    }
+                }
+            }
+        }
+        return taskResults;
     }
 
     @Override
@@ -95,7 +116,14 @@ public class HomeServiceImpl implements HomeService {
         HomeVo.ProjressMemberResult projressMemberResult = new HomeVo.ProjressMemberResult();
         projressMemberResult.setOrgMemberList(homeDao.orgMemberList());
         projressMemberResult.setXlList(homeDao.resultList());
-        projressMemberResult.setTitleList(homeDao.titleList());
+        List<HomeVo.ProjressMemberResult.TitleResult> titleResults = homeDao.titleList();
+        if (CollUtil.isNotEmpty(titleResults)) {
+            HomeVo.ProjressMemberResult.TitleResult titleResult = new HomeVo.ProjressMemberResult.TitleResult();
+            titleResult.setTitle("其他");
+            titleResult.setNum(projressMemberResult.getOrgMemberList().stream().mapToInt(HomeVo.ProjressMemberResult.OrgMemberResult::getNum).sum() - titleResults.stream().mapToInt(HomeVo.ProjressMemberResult.TitleResult::getNum).sum());
+            titleResults.add(titleResult);
+        }
+        projressMemberResult.setTitleList(titleResults);
         return projressMemberResult;
     }
 

research-system/src/main/java/com/research/system/service/impl/MemberAduitServiceImpl.java

@@ -140,6 +140,7 @@ public class MemberAduitServiceImpl implements MemberAduitService {
                 addMember.setRoleIdList(Arrays.stream(split).map(Long::parseLong).collect(Collectors.toList()));
             }
             BeanUtil.copyProperties(ktsKtGroupMemberAduit, addMember);
+            addMember.setId(null);
             ktsGroupService.addMember(addMember);
 
 //            //添加主库租户用户

research-system/src/main/java/com/research/system/service/impl/SysRoleServiceImpl.java

@@ -52,7 +52,7 @@ public class SysRoleServiceImpl implements ISysRoleService
      * @return 角色数据集合信息
      */
     @Override
-    @DataScope(deptAlias = "d")
+//    @DataScope(deptAlias = "d")
     public List<SysRole> selectRoleList(SysRole role)
     {
         return roleMapper.selectRoleList(role);

research-system/src/main/java/com/research/system/service/impl/TaskServiceImpl.java

@@ -1,6 +1,8 @@
 package com.research.system.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import com.research.common.exception.base.BaseException;
 import com.research.common.utils.SecurityUtils;
@@ -9,6 +11,7 @@ import com.research.system.domain.dto.TaskDto;
 import com.research.system.domain.po.*;
 import com.research.system.domain.vo.TaskVo;
 import com.research.system.persist.dao.TaskDao;
+import com.research.system.persist.mapper.KtsKtGroupMemberMapper;
 import com.research.system.persist.mapper.TaskDeliverableMapper;
 import com.research.system.persist.mapper.TaskExecutorMapper;
 import com.research.system.persist.mapper.TaskListMapper;
@@ -17,8 +20,8 @@ import com.research.system.service.TaskService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.Date;
+import java.util.*;
-import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Author zzc
@@ -38,13 +41,98 @@ public class TaskServiceImpl implements TaskService {
     @Resource
     private ClientPrjProjInfoService clientPrjProjInfoService;
     @Resource
+    private KtsKtGroupMemberMapper ktsKtGroupMemberMapper;
+    @Resource
     private TaskDao taskDao;
 
     @Override
     public List<TaskVo.TaskResult> queryList(TaskDto.QueryTask query) {
+
+        if (query.getDateType() != null) {
+            //日期查询  0全部 1今日 2本周 3本月
+            switch (query.getDateType()){
+                case 0:
+                    query.setStartTime(null);
+                    query.setEndTime(null);
+                    break;
+                case 1:
+                    query.setStartTime(DateUtil.beginOfDay(new Date()));
+                    query.setEndTime(DateUtil.endOfDay(new Date()));
+                    break;
+                case 2:
+                    query.setStartTime(DateUtil.beginOfWeek(new Date()));
+                    query.setEndTime(DateUtil.endOfWeek(new Date()));
+                    break;
+                case 3:
+                    query.setStartTime(DateUtil.beginOfMonth(new Date()));
+                    query.setEndTime(DateUtil.endOfMonth(new Date()));
+            }
+        }
+
         return taskDao.queryList(query);
     }
 
+    @Override
+    public List<TaskVo.ClientList> queryListClient(TaskDto.QueryTask query) {
+        List<TaskVo.ClientList> result = new ArrayList<>();
+        if (query.getDateType() != null) {
+            //日期查询  0全部 1今日 2本周 3本月
+            switch (query.getDateType()){
+                case 0:
+                    query.setStartTime(null);
+                    query.setEndTime(null);
+                    break;
+                case 1:
+                    query.setStartTime(DateUtil.beginOfDay(new Date()));
+                    query.setEndTime(DateUtil.endOfDay(new Date()));
+                    break;
+                case 2:
+                    query.setStartTime(DateUtil.beginOfWeek(new Date()));
+                    query.setEndTime(DateUtil.endOfWeek(new Date()));
+                    break;
+                case 3:
+                    query.setStartTime(DateUtil.beginOfMonth(new Date()));
+                    query.setEndTime(DateUtil.endOfMonth(new Date()));
+            }
+        }
+        //获取课题组ID
+        Long userId = SecurityUtils.getUserId();
+        KtsKtGroupMemberExample ktsKtGroupMemberExample = new KtsKtGroupMemberExample();
+        ktsKtGroupMemberExample.createCriteria().andUserIdEqualTo(userId);
+        List<KtsKtGroupMember> ktsKtGroupMembers = ktsKtGroupMemberMapper.selectByExample(ktsKtGroupMemberExample);
+        if (CollectionUtil.isNotEmpty(ktsKtGroupMembers)) {
+            query.setUserId(ktsKtGroupMembers.get(0).getId());
+        }
+        List<TaskVo.TaskResult> taskResults = taskDao.queryList(query);
+        if (CollectionUtil.isNotEmpty(taskResults)) {
+            Map<String, List<TaskVo.TaskResult>> collect = taskResults.stream().collect(Collectors.groupingBy(TaskVo.TaskResult::getMonth));
+            for (Map.Entry<String, List<TaskVo.TaskResult>> entry : collect.entrySet()) {
+                TaskVo.ClientList clientList = new TaskVo.ClientList();
+                clientList.setTime(entry.getKey());
+                List<TaskVo.ClientList.DateResult> dateResultList = new ArrayList<>();
+                List<TaskVo.TaskResult> value = entry.getValue();
+                if (CollectionUtil.isNotEmpty( value)){
+                    Map<String, List<TaskVo.TaskResult>> collect1 = value.stream().collect(Collectors.groupingBy(TaskVo.TaskResult::getDay));
+                    for (Map.Entry<String, List<TaskVo.TaskResult>> entry1 : collect1.entrySet()) {
+                        TaskVo.ClientList.DateResult dateResult = new TaskVo.ClientList.DateResult();
+                        dateResult.setTaskResultList(entry1.getValue());
+                        dateResult.setDate(entry1.getKey());
+                        dateResultList.add(dateResult);
+                    }
+                    dateResultList.stream().sorted(Comparator.comparing(TaskVo.ClientList.DateResult::getDate)).collect(Collectors.toList());
+                    clientList.setClientList(dateResultList);
+                }
+                result.add(clientList);
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public TaskVo.TaskResult detail(Long id) {
+        return taskDao.detail(id);
+    }
+
     @Override
     public void add(TaskDto.AddTask dto) {
         TaskListWithBLOBs taskList = BeanUtil.copyProperties(dto, TaskListWithBLOBs.class);
@@ -59,6 +147,7 @@ public class TaskServiceImpl implements TaskService {
             taskList.setDelFlag((byte) 0);
             taskList.setInitiator(SecurityUtils.getUsername());
             taskList.setId(IdUtil.getSnowflake().nextId());
+            taskList.setDeliverables(dto.getDeliverableList());
             taskListMapper.insertSelective(taskList);
 
             if (dto.getExecutorList() != null) {
@@ -73,10 +162,11 @@ public class TaskServiceImpl implements TaskService {
                     taskExecutorMapper.insertSelective(taskExecutor);
                 }
             }
-        }else {
+        } else {
             taskList.setUpdateBy(SecurityUtils.getUsername());
             taskList.setUpdateTime(new Date());
             taskList.setDelFlag((byte) 0);
+            taskList.setDeliverables(dto.getDeliverableList());
             taskListMapper.updateByPrimaryKeyWithBLOBs(taskList);
 
             TaskExecutor taskExecutor1 = new TaskExecutor();
@@ -111,7 +201,7 @@ public class TaskServiceImpl implements TaskService {
 
     @Override
     public List<TaskVo.ExecutorResult> queryExecutorList(TaskDto.QueryExecutor query) {
-        return taskDao.queryExecutorList( query);
+        return taskDao.queryExecutorList(query);
     }
 
     @Override
@@ -123,7 +213,7 @@ public class TaskServiceImpl implements TaskService {
             taskExecutor.setCreateBy(SecurityUtils.getUsername());
             taskExecutor.setCreateTime(new Date());
             taskExecutorMapper.insertSelective(taskExecutor);
-        }else {
+        } else {
             taskExecutor.setUpdateBy(SecurityUtils.getUsername());
             taskExecutor.setUpdateTime(new Date());
             taskExecutorMapper.updateByPrimaryKeySelective(taskExecutor);
@@ -155,7 +245,7 @@ public class TaskServiceImpl implements TaskService {
             taskDeliverable.setSubmitterAccount(SecurityUtils.getUsername());
             taskDeliverable.setCreateTime(new Date());
             taskDeliverableMapper.insertSelective(taskDeliverable);
-        }else {
+        } else {
             taskDeliverable.setUpdateBy(SecurityUtils.getUsername());
             taskDeliverable.setUpdateTime(new Date());
             taskDeliverableMapper.updateByPrimaryKeySelective(taskDeliverable);
@@ -171,4 +261,23 @@ public class TaskServiceImpl implements TaskService {
         taskDeliverableMapper.updateByExampleSelective(taskDeliverableWithBLOBs, taskDeliverableExample);
 
     }
+
+    @Override
+    public void aduit(Long taskId, Long deliverableId, Byte status) {
+        TaskList taskList = taskListMapper.selectByPrimaryKey(taskId);
+        if (taskList == null) {
+            throw new RuntimeException("任务不存在或任务已结束");
+        }
+        TaskDeliverableWithBLOBs taskDeliverableWithBLOBs = taskDeliverableMapper.selectByPrimaryKey(deliverableId);
+        if (taskDeliverableWithBLOBs == null) {
+            throw new RuntimeException("交付物不存在或已交付");
+        }
+        taskDeliverableWithBLOBs.setAduitStatus(status);
+        taskDeliverableWithBLOBs.setReviewTime(new Date());
+        //状态为通过，则交付完成
+        if (status == 1) {
+            taskDeliverableWithBLOBs.setDeliveryStatus((byte) 1);
+        }
+        taskDeliverableMapper.updateByPrimaryKeySelective(taskDeliverableWithBLOBs);
+    }
 }

research-system/src/main/resources/mapper/dao/HomeDao.xml

@@ -48,10 +48,12 @@
             task_list t
         left join
             kts_kt_group g on t.kt_group_id = g.id and g.del_flag = 0
+        LEFT JOIN
+            task_executor e on e.task_id = t.id
         where
             t.del_flag = 0
             and
-            t.id in (select task_id from task_executor where del_flag = 0 and executor_id in (select id from kts_kt_group_member where user_id = #{userId}))
+            (t.id in (select task_id from task_executor where del_flag = 0 and executor_id in (select id from kts_kt_group_member where user_id = #{userId}) or e.id = #{userId}))
     </select>
 
     <select id="orgMemberList" resultType="com.research.system.domain.vo.HomeVo$ProjressMemberResult$OrgMemberResult">

research-system/src/main/resources/mapper/dao/MeetingDao.xml

@@ -4,6 +4,7 @@
     <resultMap id="ResuleMap" type="com.research.system.domain.vo.MeetingVo$Result" extends="com.research.system.persist.mapper.MetMeetingRecordMapper.BaseResultMap">
         <result property="projOrgName" column="projOrgName"/>
         <result property="ktGroupName" column="ktGroupName"/>
+        <result property="meetingUrl" column="meetingUrl"/>
         <collection property="metMeetingParticipantList" ofType="com.research.system.domain.vo.MeetingVo$ParticipantResult"
                     select="selectByMeetingId" column="id"/>
     </resultMap>
@@ -25,6 +26,7 @@
         r.remark,
         r.create_by,
         r.create_time,
+        r.meeting_url as meetingUrl,
         o.org_name as projOrgName,
         g.kt_group_name as ktGroupName
         from

research-system/src/main/resources/mapper/dao/MemberAduitDao.xml

@@ -68,17 +68,17 @@
         left join kts_kt_group g1 on g1.id = a.parent_kt_id
         WHERE
             a.del_flag = 0 and
-            a.reviewer like concat('%', #{userId}, '%')
+            a.reviewer = #{userId}
         <if test="dto.status != null">
             and a.status = #{dto.status}
         </if>
-        <if test="dto.username != null">
+        <if test="dto.username != null and dto.username != ''">
             and a.username like concat('%', #{dto.username}, '%')
         </if>
-        <if test="dto.memberName != null">
+        <if test="dto.memberName != null and dto.memberName != ''">
             and a.member_name like concat('%', #{dto.memberName}, '%')
         </if>
-        <if test="dto.memberPhone != null">
+        <if test="dto.memberPhone != null and dto.memberPhone != ''">
             and a.member_phone like concat('%', #{dto.memberPhone}, '%')
         </if>
         <if test="dto.type != null">

research-system/src/main/resources/mapper/dao/ResResearchIntegrityDao.xml

@@ -4,26 +4,34 @@
 
     <select id="query" resultType="com.research.system.domain.vo.ResResearchIntegrityVo$Result">
         select
-            id,
+            i.id,
-            proj_id as projId,
+            i.proj_id as projId,
-            proj_org_id as projOrgId,
+            i.proj_org_id as projOrgId,
-            kt_group_id as ktGroupId,
+            i.kt_group_id as ktGroupId,
-            tpl_id as tplId,
+            i.tpl_id as tplId,
-            category,
+            i.category,
-            business_id as businessId,
+            i.business_id as businessId,
-            title,
+            i.title,
-            sign_username as signUsername,
+            i.sign_username as signUsername,
-            sign_time as signTime,
+            i.sign_time as signTime,
-            tpl_download_url as tplDownloadUrl
+            i.tpl_download_url as tplDownloadUrl,
+            i.create_by as createBy,
+            i.create_time as createTime,
+            o.org_name as projOrgName,
+            g.kt_group_name as ktGroupName
         from
-            res_research_integrity
+            res_research_integrity i
+        left join
+        prj_proj_org o on i.proj_org_id = o.id
+        left join
+        kts_kt_group g on g.id = i.kt_group_id
         where
-            del_flag = 0
+            i.del_flag = 0
         <if test="projId != null">
-            and proj_id = #{projId}
+            and i.proj_id = #{projId}
         </if>
         <if test="dto.title != null and dto.title != ''">
-            and title like concat('%',#{dto.title},'%')
+            and i.title like concat('%',#{dto.title},'%')
         </if>
     </select>
 

research-system/src/main/resources/mapper/dao/ShsCkwxDao.xml

@@ -18,6 +18,9 @@
             s.uploader_org as uploaderOrg,
             s.create_by as createBy,
             s.create_time as createTime,
+            s.publication_year as publicationYear,
+            s.type,
+            s.impact_factor as impactFactor,
             c.category_name as categoryName,
             o.org_name as uploaderOrgName
         from

research-system/src/main/resources/mapper/dao/ShsSyffDao.xml

@@ -14,6 +14,7 @@
             i.authors_org as authorsOrg,
             i.purpose,
             i.principle,
+            i.version_remark as versionRemark,
             i.parameters,
             i.pdf_download_url as pdfDownloadUrl,
             i.uploader_name as uploaderName,

research-system/src/main/resources/mapper/dao/TaskDao.xml

@@ -19,7 +19,7 @@
         <result column="ktGroupName" jdbcType="BIGINT" property="ktGroupName" />
         <result column="description" jdbcType="LONGVARCHAR" property="description" />
         <result column="deliverables" jdbcType="LONGVARCHAR" property="deliverables" />
-        <collection property="deliverableList" select="queryDeliverableList"
+        <collection property="deliverableShouldList" select="queryDeliverableList"
                     ofType="com.research.system.domain.vo.TaskVo$DeliverableResult"
                     column="id">
         </collection>
@@ -37,11 +37,52 @@
             task_list t
         left join
         kts_kt_group g on g.id = t.kt_group_id
+        left join
+        task_executor e on e.task_id = t.id
         where
         t.del_flag = 0
-            <if test="dto.taskName != null">
+            <if test="dto.taskName != null and dto.taskName != ''">
                 and t.task_name like concat('%',#{dto.taskName},'%')
             </if>
+        <if test="dto.startTime != null">
+            and t.start_time between #{dto.startTime} and #{dto.endTime}
+        </if>
+        <if test="dto.endTime != null">
+            and t.end_time between #{dto.startTime} and #{dto.endTime}
+        </if>
+        <if test="dto.completedStatus != null and dto.completedStatus != 0">
+            <if test="dto.completedStatus != 2">
+                and t.delivery_status = #{dto.completedStatus}
+            </if>
+        <if test="dto.completedStatus == 3">
+            and t.aduit_status = 0
+        </if>
+        </if>
+        <if test="dto.isMine != null and dto.isMine == 1">
+            and (t.create_by = #{dto.userName}
+                or e.executor_id = #{dto.userId} )
+        </if>
+        <if test="dto.isMine == 0 ">
+            and e.executor_id = #{dto.userId}
+        </if>
+        group by t.id
+        order by
+        t.id desc
+    </select>
+
+    <select id="detail" resultMap="BaseResultMap">
+        select
+        t.*,
+        g.kt_group_name as ktGroupName
+        from
+        task_list t
+        left join
+        kts_kt_group g on g.id = t.kt_group_id
+        where
+        t.del_flag = 0
+        <if test="id != null">
+            and t.id = #{id}
+        </if>
         order by
         t.id desc
     </select>
@@ -57,8 +98,7 @@
         where
         e.del_flag = 0
         <if test="id != null">
-            and
+            and e.task_id = #{id}
-            e.task_id = #{id}
         </if>
     </select>
 
@@ -69,6 +109,7 @@
         deliverable_name as deliverableName,
         deliverable_url as deliverableUrl,
         delivery_status as deliveryStatus,
+        aduit_status as aduitStatus,
         submitter_account as submitterAccount,
         delivery_instructions as deliveryInstructions,
         reference_materials as referenceMaterials,
@@ -82,8 +123,7 @@
         where
             del_flag = 0
         <if test="id != null">
-            and
+            and task_id = #{id}
-            task_id = #{id}
         </if>
     </select>
 

research-system/src/main/resources/mapper/system/AchAchievementMapper.xml

@@ -675,7 +675,7 @@
         paper_doi = #{paperDoi,jdbcType=VARCHAR},
       </if>
       <if test="partition != null">
-        partition = #{partition,jdbcType=VARCHAR},
+        `partition` = #{partition,jdbcType=VARCHAR},
       </if>
       <if test="impactFactor != null">
         impact_factor = #{impactFactor,jdbcType=VARCHAR},

research-system/src/main/resources/mapper/system/MetMeetingRecordMapper.xml

@@ -18,9 +18,10 @@
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="meeting_type" jdbcType="TINYINT" property="meetingType" />
+    <result column="meeting_type" jdbcType="VARCHAR" property="meetingType" />
     <result column="meeting_place" jdbcType="VARCHAR" property="meetingPlace" />
     <result column="meeting_number" jdbcType="VARCHAR" property="meetingNumber" />
+    <result column="meeting_url" jdbcType="VARCHAR" property="meetingUrl" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -83,7 +84,8 @@
   <sql id="Base_Column_List">
     id, proj_id, proj_org_id, kt_group_id, meeting_title, meeting_fqr, meeting_begin_time, 
     meeting_end_time, meeting_abstract, meeting_note_url, remark, del_flag, create_by, 
-    create_time, update_by, update_time, meeting_type, meeting_place, meeting_number
+    create_time, update_by, update_time, meeting_type, meeting_place, meeting_number, 
+    meeting_url
   </sql>
   <select id="selectByExample" parameterType="com.research.system.domain.po.MetMeetingRecordExample" resultMap="BaseResultMap">
     select
@@ -116,14 +118,14 @@
       meeting_note_url, remark, del_flag, 
       create_by, create_time, update_by, 
       update_time, meeting_type, meeting_place, 
-      meeting_number)
+      meeting_number, meeting_url)
     values (#{id,jdbcType=BIGINT}, #{projId,jdbcType=BIGINT}, #{projOrgId,jdbcType=BIGINT}, 
       #{ktGroupId,jdbcType=BIGINT}, #{meetingTitle,jdbcType=VARCHAR}, #{meetingFqr,jdbcType=VARCHAR}, 
       #{meetingBeginTime,jdbcType=TIMESTAMP}, #{meetingEndTime,jdbcType=TIMESTAMP}, #{meetingAbstract,jdbcType=VARCHAR}, 
       #{meetingNoteUrl,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{delFlag,jdbcType=TINYINT}, 
       #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{meetingType,jdbcType=TINYINT}, #{meetingPlace,jdbcType=VARCHAR}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{meetingType,jdbcType=VARCHAR}, #{meetingPlace,jdbcType=VARCHAR}, 
-      #{meetingNumber,jdbcType=VARCHAR})
+      #{meetingNumber,jdbcType=VARCHAR}, #{meetingUrl,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.research.system.domain.po.MetMeetingRecord">
     insert into met_meeting_record
@@ -185,6 +187,9 @@
       <if test="meetingNumber != null">
         meeting_number,
       </if>
+      <if test="meetingUrl != null">
+        meeting_url,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -236,7 +241,7 @@
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="meetingType != null">
-        #{meetingType,jdbcType=TINYINT},
+        #{meetingType,jdbcType=VARCHAR},
       </if>
       <if test="meetingPlace != null">
         #{meetingPlace,jdbcType=VARCHAR},
@@ -244,6 +249,9 @@
       <if test="meetingNumber != null">
         #{meetingNumber,jdbcType=VARCHAR},
       </if>
+      <if test="meetingUrl != null">
+        #{meetingUrl,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.research.system.domain.po.MetMeetingRecordExample" resultType="java.lang.Long">
@@ -304,7 +312,7 @@
         update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="record.meetingType != null">
-        meeting_type = #{record.meetingType,jdbcType=TINYINT},
+        meeting_type = #{record.meetingType,jdbcType=VARCHAR},
       </if>
       <if test="record.meetingPlace != null">
         meeting_place = #{record.meetingPlace,jdbcType=VARCHAR},
@@ -312,6 +320,9 @@
       <if test="record.meetingNumber != null">
         meeting_number = #{record.meetingNumber,jdbcType=VARCHAR},
       </if>
+      <if test="record.meetingUrl != null">
+        meeting_url = #{record.meetingUrl,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -335,9 +346,10 @@
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       update_by = #{record.updateBy,jdbcType=VARCHAR},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      meeting_type = #{record.meetingType,jdbcType=TINYINT},
+      meeting_type = #{record.meetingType,jdbcType=VARCHAR},
       meeting_place = #{record.meetingPlace,jdbcType=VARCHAR},
-      meeting_number = #{record.meetingNumber,jdbcType=VARCHAR}
+      meeting_number = #{record.meetingNumber,jdbcType=VARCHAR},
+      meeting_url = #{record.meetingUrl,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -391,7 +403,7 @@
         update_time = #{updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="meetingType != null">
-        meeting_type = #{meetingType,jdbcType=TINYINT},
+        meeting_type = #{meetingType,jdbcType=VARCHAR},
       </if>
       <if test="meetingPlace != null">
         meeting_place = #{meetingPlace,jdbcType=VARCHAR},
@@ -399,6 +411,9 @@
       <if test="meetingNumber != null">
         meeting_number = #{meetingNumber,jdbcType=VARCHAR},
       </if>
+      <if test="meetingUrl != null">
+        meeting_url = #{meetingUrl,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -419,9 +434,10 @@
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_by = #{updateBy,jdbcType=VARCHAR},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
-      meeting_type = #{meetingType,jdbcType=TINYINT},
+      meeting_type = #{meetingType,jdbcType=VARCHAR},
       meeting_place = #{meetingPlace,jdbcType=VARCHAR},
-      meeting_number = #{meetingNumber,jdbcType=VARCHAR}
+      meeting_number = #{meetingNumber,jdbcType=VARCHAR},
+      meeting_url = #{meetingUrl,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

research-system/src/main/resources/mapper/system/ShsCkwxInfoMapper.xml

@@ -19,6 +19,9 @@
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="publication_year" jdbcType="VARCHAR" property="publicationYear" />
+    <result column="type" jdbcType="VARCHAR" property="type" />
+    <result column="impact_factor" jdbcType="VARCHAR" property="impactFactor" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -81,7 +84,7 @@
   <sql id="Base_Column_List">
     id, proj_id, category_id, title, authors, keywords, source, abstracts, paper_link, 
     pdf_download_url, uploader_name, uploader_org, del_flag, create_by, create_time, 
-    update_by, update_time
+    update_by, update_time, publication_year, type, impact_factor
   </sql>
   <select id="selectByExample" parameterType="com.research.system.domain.po.ShsCkwxInfoExample" resultMap="BaseResultMap">
     select
@@ -113,13 +116,15 @@
       source, abstracts, paper_link, 
       pdf_download_url, uploader_name, uploader_org, 
       del_flag, create_by, create_time, 
-      update_by, update_time)
+      update_by, update_time, publication_year, 
+      type, impact_factor)
     values (#{id,jdbcType=BIGINT}, #{projId,jdbcType=BIGINT}, #{categoryId,jdbcType=BIGINT}, 
       #{title,jdbcType=VARCHAR}, #{authors,jdbcType=VARCHAR}, #{keywords,jdbcType=VARCHAR}, 
       #{source,jdbcType=VARCHAR}, #{abstracts,jdbcType=VARCHAR}, #{paperLink,jdbcType=VARCHAR}, 
       #{pdfDownloadUrl,jdbcType=VARCHAR}, #{uploaderName,jdbcType=BIGINT}, #{uploaderOrg,jdbcType=BIGINT}, 
       #{delFlag,jdbcType=TINYINT}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP})
+      #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{publicationYear,jdbcType=VARCHAR}, 
+      #{type,jdbcType=VARCHAR}, #{impactFactor,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.research.system.domain.po.ShsCkwxInfo">
     insert into shs_ckwx_info
@@ -175,6 +180,15 @@
       <if test="updateTime != null">
         update_time,
       </if>
+      <if test="publicationYear != null">
+        publication_year,
+      </if>
+      <if test="type != null">
+        type,
+      </if>
+      <if test="impactFactor != null">
+        impact_factor,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -228,6 +242,15 @@
       <if test="updateTime != null">
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="publicationYear != null">
+        #{publicationYear,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null">
+        #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="impactFactor != null">
+        #{impactFactor,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.research.system.domain.po.ShsCkwxInfoExample" resultType="java.lang.Long">
@@ -290,6 +313,15 @@
       <if test="record.updateTime != null">
         update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.publicationYear != null">
+        publication_year = #{record.publicationYear,jdbcType=VARCHAR},
+      </if>
+      <if test="record.type != null">
+        type = #{record.type,jdbcType=VARCHAR},
+      </if>
+      <if test="record.impactFactor != null">
+        impact_factor = #{record.impactFactor,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -313,7 +345,10 @@
       create_by = #{record.createBy,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       update_by = #{record.updateBy,jdbcType=VARCHAR},
-      update_time = #{record.updateTime,jdbcType=TIMESTAMP}
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      publication_year = #{record.publicationYear,jdbcType=VARCHAR},
+      type = #{record.type,jdbcType=VARCHAR},
+      impact_factor = #{record.impactFactor,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -369,6 +404,15 @@
       <if test="updateTime != null">
         update_time = #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="publicationYear != null">
+        publication_year = #{publicationYear,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null">
+        type = #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="impactFactor != null">
+        impact_factor = #{impactFactor,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -389,7 +433,10 @@
       create_by = #{createBy,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_by = #{updateBy,jdbcType=VARCHAR},
-      update_time = #{updateTime,jdbcType=TIMESTAMP}
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      publication_year = #{publicationYear,jdbcType=VARCHAR},
+      type = #{type,jdbcType=VARCHAR},
+      impact_factor = #{impactFactor,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

research-system/src/main/resources/mapper/system/ShsSyffInfoMapper.xml

@@ -22,6 +22,7 @@
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="version_remark" jdbcType="VARCHAR" property="versionRemark" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.research.system.domain.po.ShsSyffInfoWithBLOBs">
     <result column="material_list" jdbcType="LONGVARCHAR" property="materialList" />
@@ -89,7 +90,7 @@
   <sql id="Base_Column_List">
     id, proj_id, category_id, title, code, version, valid_date, authors, authors_org, 
     purpose, principle, parameters, pdf_download_url, uploader_name, uploader_org, del_flag, 
-    create_by, create_time, update_by, update_time
+    create_by, create_time, update_by, update_time, version_remark
   </sql>
   <sql id="Blob_Column_List">
     material_list, steps, result
@@ -143,16 +144,18 @@
       purpose, principle, parameters, 
       pdf_download_url, uploader_name, uploader_org, 
       del_flag, create_by, create_time, 
-      update_by, update_time, material_list, 
+      update_by, update_time, version_remark, 
-      steps, result)
+      material_list, steps, result
+      )
     values (#{id,jdbcType=BIGINT}, #{projId,jdbcType=BIGINT}, #{categoryId,jdbcType=BIGINT}, 
       #{title,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, #{version,jdbcType=VARCHAR}, 
       #{validDate,jdbcType=DATE}, #{authors,jdbcType=VARCHAR}, #{authorsOrg,jdbcType=VARCHAR}, 
       #{purpose,jdbcType=VARCHAR}, #{principle,jdbcType=VARCHAR}, #{parameters,jdbcType=VARCHAR}, 
       #{pdfDownloadUrl,jdbcType=VARCHAR}, #{uploaderName,jdbcType=BIGINT}, #{uploaderOrg,jdbcType=BIGINT}, 
       #{delFlag,jdbcType=TINYINT}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{materialList,jdbcType=LONGVARCHAR}, 
+      #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{versionRemark,jdbcType=VARCHAR}, 
-      #{steps,jdbcType=LONGVARCHAR}, #{result,jdbcType=LONGVARCHAR})
+      #{materialList,jdbcType=LONGVARCHAR}, #{steps,jdbcType=LONGVARCHAR}, #{result,jdbcType=LONGVARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.research.system.domain.po.ShsSyffInfoWithBLOBs">
     insert into shs_syff_info
@@ -217,6 +220,9 @@
       <if test="updateTime != null">
         update_time,
       </if>
+      <if test="versionRemark != null">
+        version_remark,
+      </if>
       <if test="materialList != null">
         material_list,
       </if>
@@ -288,6 +294,9 @@
       <if test="updateTime != null">
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="versionRemark != null">
+        #{versionRemark,jdbcType=VARCHAR},
+      </if>
       <if test="materialList != null">
         #{materialList,jdbcType=LONGVARCHAR},
       </if>
@@ -368,6 +377,9 @@
       <if test="record.updateTime != null">
         update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.versionRemark != null">
+        version_remark = #{record.versionRemark,jdbcType=VARCHAR},
+      </if>
       <if test="record.materialList != null">
         material_list = #{record.materialList,jdbcType=LONGVARCHAR},
       </if>
@@ -404,6 +416,7 @@
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       update_by = #{record.updateBy,jdbcType=VARCHAR},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      version_remark = #{record.versionRemark,jdbcType=VARCHAR},
       material_list = #{record.materialList,jdbcType=LONGVARCHAR},
       steps = #{record.steps,jdbcType=LONGVARCHAR},
       result = #{record.result,jdbcType=LONGVARCHAR}
@@ -432,7 +445,8 @@
       create_by = #{record.createBy,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       update_by = #{record.updateBy,jdbcType=VARCHAR},
-      update_time = #{record.updateTime,jdbcType=TIMESTAMP}
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      version_remark = #{record.versionRemark,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -497,6 +511,9 @@
       <if test="updateTime != null">
         update_time = #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="versionRemark != null">
+        version_remark = #{versionRemark,jdbcType=VARCHAR},
+      </if>
       <if test="materialList != null">
         material_list = #{materialList,jdbcType=LONGVARCHAR},
       </if>
@@ -530,6 +547,7 @@
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_by = #{updateBy,jdbcType=VARCHAR},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
+      version_remark = #{versionRemark,jdbcType=VARCHAR},
       material_list = #{materialList,jdbcType=LONGVARCHAR},
       steps = #{steps,jdbcType=LONGVARCHAR},
       result = #{result,jdbcType=LONGVARCHAR}
@@ -555,7 +573,8 @@
       create_by = #{createBy,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_by = #{updateBy,jdbcType=VARCHAR},
-      update_time = #{updateTime,jdbcType=TIMESTAMP}
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      version_remark = #{versionRemark,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

research-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -51,8 +51,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
 			and date_format(r.create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
 		</if>
-		<!-- 数据范围过滤 -->
+<!--		&lt;!&ndash; 数据范围过滤 &ndash;&gt;-->
-		${params.dataScope}
+<!--		${params.dataScope}-->
 		order by r.role_sort
 	</select>
     

research-system/src/main/resources/mapper/system/TaskDeliverableMapper.xml

@@ -3,10 +3,11 @@
 <mapper namespace="com.research.system.persist.mapper.TaskDeliverableMapper">
   <resultMap id="BaseResultMap" type="com.research.system.domain.po.TaskDeliverable">
     <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="task_id" jdbcType="VARCHAR" property="taskId" />
+    <result column="task_id" jdbcType="BIGINT" property="taskId" />
     <result column="deliverable_name" jdbcType="VARCHAR" property="deliverableName" />
     <result column="deliverable_url" jdbcType="VARCHAR" property="deliverableUrl" />
     <result column="delivery_status" jdbcType="TINYINT" property="deliveryStatus" />
+    <result column="aduit_status" jdbcType="TINYINT" property="aduitStatus" />
     <result column="submitter_account" jdbcType="VARCHAR" property="submitterAccount" />
     <result column="submission_time" jdbcType="TIMESTAMP" property="submissionTime" />
     <result column="reviewer_account" jdbcType="VARCHAR" property="reviewerAccount" />
@@ -80,7 +81,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, task_id, deliverable_name, deliverable_url, delivery_status, submitter_account, 
+    id, task_id, deliverable_name, deliverable_url, delivery_status, aduit_status, submitter_account, 
     submission_time, reviewer_account, review_time, del_flag, create_by, create_time, 
     update_by, update_time
   </sql>
@@ -131,17 +132,19 @@
   </delete>
   <insert id="insert" parameterType="com.research.system.domain.po.TaskDeliverableWithBLOBs">
     insert into task_deliverable (id, task_id, deliverable_name, 
-      deliverable_url, delivery_status, submitter_account, 
+      deliverable_url, delivery_status, aduit_status, 
-      submission_time, reviewer_account, review_time, 
+      submitter_account, submission_time, reviewer_account, 
-      del_flag, create_by, create_time, 
+      review_time, del_flag, create_by, 
-      update_by, update_time, reference_materials, 
+      create_time, update_by, update_time, 
-      delivery_instructions)
+      reference_materials, delivery_instructions
-    values (#{id,jdbcType=BIGINT}, #{taskId,jdbcType=VARCHAR}, #{deliverableName,jdbcType=VARCHAR}, 
+      )
-      #{deliverableUrl,jdbcType=VARCHAR}, #{deliveryStatus,jdbcType=TINYINT}, #{submitterAccount,jdbcType=VARCHAR}, 
+    values (#{id,jdbcType=BIGINT}, #{taskId,jdbcType=BIGINT}, #{deliverableName,jdbcType=VARCHAR}, 
-      #{submissionTime,jdbcType=TIMESTAMP}, #{reviewerAccount,jdbcType=VARCHAR}, #{reviewTime,jdbcType=TIMESTAMP}, 
+      #{deliverableUrl,jdbcType=VARCHAR}, #{deliveryStatus,jdbcType=TINYINT}, #{aduitStatus,jdbcType=TINYINT}, 
-      #{delFlag,jdbcType=TINYINT}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{submitterAccount,jdbcType=VARCHAR}, #{submissionTime,jdbcType=TIMESTAMP}, #{reviewerAccount,jdbcType=VARCHAR}, 
-      #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{referenceMaterials,jdbcType=LONGVARCHAR}, 
+      #{reviewTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=TINYINT}, #{createBy,jdbcType=VARCHAR}, 
-      #{deliveryInstructions,jdbcType=LONGVARCHAR})
+      #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{referenceMaterials,jdbcType=LONGVARCHAR}, #{deliveryInstructions,jdbcType=LONGVARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.research.system.domain.po.TaskDeliverableWithBLOBs">
     insert into task_deliverable
@@ -161,6 +164,9 @@
       <if test="deliveryStatus != null">
         delivery_status,
       </if>
+      <if test="aduitStatus != null">
+        aduit_status,
+      </if>
       <if test="submitterAccount != null">
         submitter_account,
       </if>
@@ -200,7 +206,7 @@
         #{id,jdbcType=BIGINT},
       </if>
       <if test="taskId != null">
-        #{taskId,jdbcType=VARCHAR},
+        #{taskId,jdbcType=BIGINT},
       </if>
       <if test="deliverableName != null">
         #{deliverableName,jdbcType=VARCHAR},
@@ -211,6 +217,9 @@
       <if test="deliveryStatus != null">
         #{deliveryStatus,jdbcType=TINYINT},
       </if>
+      <if test="aduitStatus != null">
+        #{aduitStatus,jdbcType=TINYINT},
+      </if>
       <if test="submitterAccount != null">
         #{submitterAccount,jdbcType=VARCHAR},
       </if>
@@ -259,7 +268,7 @@
         id = #{record.id,jdbcType=BIGINT},
       </if>
       <if test="record.taskId != null">
-        task_id = #{record.taskId,jdbcType=VARCHAR},
+        task_id = #{record.taskId,jdbcType=BIGINT},
       </if>
       <if test="record.deliverableName != null">
         deliverable_name = #{record.deliverableName,jdbcType=VARCHAR},
@@ -270,6 +279,9 @@
       <if test="record.deliveryStatus != null">
         delivery_status = #{record.deliveryStatus,jdbcType=TINYINT},
       </if>
+      <if test="record.aduitStatus != null">
+        aduit_status = #{record.aduitStatus,jdbcType=TINYINT},
+      </if>
       <if test="record.submitterAccount != null">
         submitter_account = #{record.submitterAccount,jdbcType=VARCHAR},
       </if>
@@ -311,10 +323,11 @@
   <update id="updateByExampleWithBLOBs" parameterType="map">
     update task_deliverable
     set id = #{record.id,jdbcType=BIGINT},
-      task_id = #{record.taskId,jdbcType=VARCHAR},
+      task_id = #{record.taskId,jdbcType=BIGINT},
       deliverable_name = #{record.deliverableName,jdbcType=VARCHAR},
       deliverable_url = #{record.deliverableUrl,jdbcType=VARCHAR},
       delivery_status = #{record.deliveryStatus,jdbcType=TINYINT},
+      aduit_status = #{record.aduitStatus,jdbcType=TINYINT},
       submitter_account = #{record.submitterAccount,jdbcType=VARCHAR},
       submission_time = #{record.submissionTime,jdbcType=TIMESTAMP},
       reviewer_account = #{record.reviewerAccount,jdbcType=VARCHAR},
@@ -333,10 +346,11 @@
   <update id="updateByExample" parameterType="map">
     update task_deliverable
     set id = #{record.id,jdbcType=BIGINT},
-      task_id = #{record.taskId,jdbcType=VARCHAR},
+      task_id = #{record.taskId,jdbcType=BIGINT},
       deliverable_name = #{record.deliverableName,jdbcType=VARCHAR},
       deliverable_url = #{record.deliverableUrl,jdbcType=VARCHAR},
       delivery_status = #{record.deliveryStatus,jdbcType=TINYINT},
+      aduit_status = #{record.aduitStatus,jdbcType=TINYINT},
       submitter_account = #{record.submitterAccount,jdbcType=VARCHAR},
       submission_time = #{record.submissionTime,jdbcType=TIMESTAMP},
       reviewer_account = #{record.reviewerAccount,jdbcType=VARCHAR},
@@ -354,7 +368,7 @@
     update task_deliverable
     <set>
       <if test="taskId != null">
-        task_id = #{taskId,jdbcType=VARCHAR},
+        task_id = #{taskId,jdbcType=BIGINT},
       </if>
       <if test="deliverableName != null">
         deliverable_name = #{deliverableName,jdbcType=VARCHAR},
@@ -365,6 +379,9 @@
       <if test="deliveryStatus != null">
         delivery_status = #{deliveryStatus,jdbcType=TINYINT},
       </if>
+      <if test="aduitStatus != null">
+        aduit_status = #{aduitStatus,jdbcType=TINYINT},
+      </if>
       <if test="submitterAccount != null">
         submitter_account = #{submitterAccount,jdbcType=VARCHAR},
       </if>
@@ -403,10 +420,11 @@
   </update>
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.research.system.domain.po.TaskDeliverableWithBLOBs">
     update task_deliverable
-    set task_id = #{taskId,jdbcType=VARCHAR},
+    set task_id = #{taskId,jdbcType=BIGINT},
       deliverable_name = #{deliverableName,jdbcType=VARCHAR},
       deliverable_url = #{deliverableUrl,jdbcType=VARCHAR},
       delivery_status = #{deliveryStatus,jdbcType=TINYINT},
+      aduit_status = #{aduitStatus,jdbcType=TINYINT},
       submitter_account = #{submitterAccount,jdbcType=VARCHAR},
       submission_time = #{submissionTime,jdbcType=TIMESTAMP},
       reviewer_account = #{reviewerAccount,jdbcType=VARCHAR},
@@ -422,10 +440,11 @@
   </update>
   <update id="updateByPrimaryKey" parameterType="com.research.system.domain.po.TaskDeliverable">
     update task_deliverable
-    set task_id = #{taskId,jdbcType=VARCHAR},
+    set task_id = #{taskId,jdbcType=BIGINT},
       deliverable_name = #{deliverableName,jdbcType=VARCHAR},
       deliverable_url = #{deliverableUrl,jdbcType=VARCHAR},
       delivery_status = #{deliveryStatus,jdbcType=TINYINT},
+      aduit_status = #{aduitStatus,jdbcType=TINYINT},
       submitter_account = #{submitterAccount,jdbcType=VARCHAR},
       submission_time = #{submissionTime,jdbcType=TIMESTAMP},
       reviewer_account = #{reviewerAccount,jdbcType=VARCHAR},