From 9d922e338508d56b1e3057a8c27cda73372f2d81 Mon Sep 17 00:00:00 2001
From: ccsens_zhengzhichuan <ccsens_zhengzhichuan>
Date: Wed, 15 Oct 2025 16:22:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BB=BB=E5=8A=A1=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../client/task/TaskController.java           |  13 +++
 research-generator/src/main/resources/mbg.xml |   4 +-
 .../research/system/domain/dto/TaskDto.java   |  18 ++++
 .../system/domain/po/TaskDeliverable.java     |  11 ++
 .../domain/po/TaskDeliverableExample.java     |  60 +++++++++++
 .../com/research/system/domain/vo/TaskVo.java |  31 +++++-
 .../research/system/service/TaskService.java  |   9 ++
 .../system/service/impl/TaskServiceImpl.java  | 101 +++++++++++++++++-
 .../src/main/resources/mapper/dao/TaskDao.xml |  21 +++-
 .../mapper/system/TaskDeliverableMapper.xml   |  41 +++++--
 10 files changed, 287 insertions(+), 22 deletions(-)

diff --git a/research-admin/src/main/java/com/research/web/controller/client/task/TaskController.java b/research-admin/src/main/java/com/research/web/controller/client/task/TaskController.java
index ba247013..91a08ee8 100644
--- a/research-admin/src/main/java/com/research/web/controller/client/task/TaskController.java
+++ b/research-admin/src/main/java/com/research/web/controller/client/task/TaskController.java
@@ -46,6 +46,12 @@ 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){
@@ -112,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();
+    }
+
 }
diff --git a/research-generator/src/main/resources/mbg.xml b/research-generator/src/main/resources/mbg.xml
index ec96541f..9cfdfb21 100644
--- a/research-generator/src/main/resources/mbg.xml
+++ b/research-generator/src/main/resources/mbg.xml
@@ -80,13 +80,13 @@
 <!--        <table tableName="shs_lib_info" domainObjectName="ShsLibInfo" enableDeleteByExample="false"/>-->
 <!--        <table tableName="shs_syff_category" domainObjectName="ShsSyffCategory" enableDeleteByExample="false"/>-->
 <!--        <table tableName="srv_modules" domainObjectName="SrvModules" enableDeleteByExample="false"/>-->
-        <table tableName="res_platform" domainObjectName="ResPlatform" enableDeleteByExample="false"/>
+<!--        <table tableName="res_platform" domainObjectName="ResPlatform" enableDeleteByExample="false"/>-->
 <!--        <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_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类型
diff --git a/research-system/src/main/java/com/research/system/domain/dto/TaskDto.java b/research-system/src/main/java/com/research/system/domain/dto/TaskDto.java
index 708f347d..1ca1278c 100644
--- a/research-system/src/main/java/com/research/system/domain/dto/TaskDto.java
+++ b/research-system/src/main/java/com/research/system/domain/dto/TaskDto.java
@@ -8,6 +8,7 @@ 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;
 
@@ -27,6 +28,11 @@ public class TaskDto {
 
         @ApiModelProperty("任务状态 0全部 1未完成 2已完成 3待审核")
         private Integer status;
+        private Long groupId;
+
+        private Date startTime;
+        private Date endTime;
+
     }
 
     @Data
@@ -132,4 +138,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;
+    }
 }
diff --git a/research-system/src/main/java/com/research/system/domain/po/TaskDeliverable.java b/research-system/src/main/java/com/research/system/domain/po/TaskDeliverable.java
index 05609b65..da5b7017 100644
--- a/research-system/src/main/java/com/research/system/domain/po/TaskDeliverable.java
+++ b/research-system/src/main/java/com/research/system/domain/po/TaskDeliverable.java
@@ -14,6 +14,8 @@ public class TaskDeliverable implements Serializable {
 
     private Byte deliveryStatus;
 
+    private Byte aduitStatus;
+
     private String submitterAccount;
 
     private Date submissionTime;
@@ -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);
diff --git a/research-system/src/main/java/com/research/system/domain/po/TaskDeliverableExample.java b/research-system/src/main/java/com/research/system/domain/po/TaskDeliverableExample.java
index a41cb877..c8ffd677 100644
--- a/research-system/src/main/java/com/research/system/domain/po/TaskDeliverableExample.java
+++ b/research-system/src/main/java/com/research/system/domain/po/TaskDeliverableExample.java
@@ -435,6 +435,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;
diff --git a/research-system/src/main/java/com/research/system/domain/vo/TaskVo.java b/research-system/src/main/java/com/research/system/domain/vo/TaskVo.java
index 4df8929b..576ce50b 100644
--- a/research-system/src/main/java/com/research/system/domain/vo/TaskVo.java
+++ b/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;
@@ -61,12 +62,38 @@ public class TaskVo {
 
         private String deliverables;
 
-        public List<String> getDeliverableList() {
+        public List<String> getDeliverables() {
             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 +122,8 @@ public class TaskVo {
 
         private Byte deliveryStatus;
 
+        private Byte aduitStatus;
+
         private String submitterAccount;
 
         private Date submissionTime;
diff --git a/research-system/src/main/java/com/research/system/service/TaskService.java b/research-system/src/main/java/com/research/system/service/TaskService.java
index cdbd77a1..6fd2ed48 100644
--- a/research-system/src/main/java/com/research/system/service/TaskService.java
+++ b/research-system/src/main/java/com/research/system/service/TaskService.java
@@ -16,6 +16,8 @@ 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);
@@ -34,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);
 }
diff --git a/research-system/src/main/java/com/research/system/service/impl/TaskServiceImpl.java b/research-system/src/main/java/com/research/system/service/impl/TaskServiceImpl.java
index 988b5c89..9ecf6471 100644
--- a/research-system/src/main/java/com/research/system/service/impl/TaskServiceImpl.java
+++ b/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;
@@ -17,8 +19,11 @@ import com.research.system.service.TaskService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Author zzc
@@ -42,9 +47,78 @@ public class TaskServiceImpl implements TaskService {
 
     @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()));
+            }
+        }
+        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);
+                    }
+                    clientList.setClientList(dateResultList);
+                }
+                result.add(clientList);
+            }
+        }
+        return result;
+    }
+
     @Override
     public TaskVo.TaskResult detail(Long id) {
         return taskDao.detail(id);
@@ -79,7 +153,7 @@ public class TaskServiceImpl implements TaskService {
                     taskExecutorMapper.insertSelective(taskExecutor);
                 }
             }
-        }else {
+        } else {
             taskList.setUpdateBy(SecurityUtils.getUsername());
             taskList.setUpdateTime(new Date());
             taskList.setDelFlag((byte) 0);
@@ -118,7 +192,7 @@ public class TaskServiceImpl implements TaskService {
 
     @Override
     public List<TaskVo.ExecutorResult> queryExecutorList(TaskDto.QueryExecutor query) {
-        return taskDao.queryExecutorList( query);
+        return taskDao.queryExecutorList(query);
     }
 
     @Override
@@ -130,7 +204,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);
@@ -162,7 +236,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);
@@ -178,4 +252,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 || taskList.getEndTime().getTime() <= System.currentTimeMillis()) {
+            throw new RuntimeException("任务不存在或任务已结束");
+        }
+        TaskDeliverableWithBLOBs taskDeliverableWithBLOBs = taskDeliverableMapper.selectByPrimaryKey(deliverableId);
+        if (taskDeliverableWithBLOBs == null || taskDeliverableWithBLOBs.getDeliveryStatus() == 1) {
+            throw new RuntimeException("交付物不存在或已交付");
+        }
+        taskDeliverableWithBLOBs.setAduitStatus(status);
+        taskDeliverableWithBLOBs.setReviewTime(new Date());
+        //状态为通过，则交付完成
+        if (status == 1) {
+            taskDeliverableWithBLOBs.setDeliveryStatus((byte) 1);
+        }
+        taskDeliverableMapper.updateByPrimaryKeySelective(taskDeliverableWithBLOBs);
+    }
 }
diff --git a/research-system/src/main/resources/mapper/dao/TaskDao.xml b/research-system/src/main/resources/mapper/dao/TaskDao.xml
index 8d51804f..a47f9017 100644
--- a/research-system/src/main/resources/mapper/dao/TaskDao.xml
+++ b/research-system/src/main/resources/mapper/dao/TaskDao.xml
@@ -42,6 +42,20 @@
             <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.status != null and dto.status != 0">
+            <if test="dto.status != 2">
+                and t.delivery_status = #{dto.status}
+            </if>
+        <if test="dto.status == 3">
+            and t.aduit_status = 0
+        </if>
+        </if>
         order by
         t.id desc
     </select>
@@ -74,8 +88,7 @@
         where
         e.del_flag = 0
         <if test="id != null">
-            and
-            e.task_id = #{id}
+            and e.task_id = #{id}
         </if>
     </select>
 
@@ -86,6 +99,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,
@@ -99,8 +113,7 @@
         where
             del_flag = 0
         <if test="id != null">
-            and
-            task_id = #{id}
+            and task_id = #{id}
         </if>
     </select>
 
diff --git a/research-system/src/main/resources/mapper/system/TaskDeliverableMapper.xml b/research-system/src/main/resources/mapper/system/TaskDeliverableMapper.xml
index a0c9ff45..8e12badd 100644
--- a/research-system/src/main/resources/mapper/system/TaskDeliverableMapper.xml
+++ b/research-system/src/main/resources/mapper/system/TaskDeliverableMapper.xml
@@ -7,6 +7,7 @@
     <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, 
-      submission_time, reviewer_account, review_time, 
-      del_flag, create_by, create_time, 
-      update_by, update_time, reference_materials, 
-      delivery_instructions)
+      deliverable_url, delivery_status, aduit_status, 
+      submitter_account, submission_time, reviewer_account, 
+      review_time, del_flag, create_by, 
+      create_time, update_by, update_time, 
+      reference_materials, delivery_instructions
+      )
     values (#{id,jdbcType=BIGINT}, #{taskId,jdbcType=VARCHAR}, #{deliverableName,jdbcType=VARCHAR}, 
-      #{deliverableUrl,jdbcType=VARCHAR}, #{deliveryStatus,jdbcType=TINYINT}, #{submitterAccount,jdbcType=VARCHAR}, 
-      #{submissionTime,jdbcType=TIMESTAMP}, #{reviewerAccount,jdbcType=VARCHAR}, #{reviewTime,jdbcType=TIMESTAMP}, 
-      #{delFlag,jdbcType=TINYINT}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{referenceMaterials,jdbcType=LONGVARCHAR}, 
-      #{deliveryInstructions,jdbcType=LONGVARCHAR})
+      #{deliverableUrl,jdbcType=VARCHAR}, #{deliveryStatus,jdbcType=TINYINT}, #{aduitStatus,jdbcType=TINYINT}, 
+      #{submitterAccount,jdbcType=VARCHAR}, #{submissionTime,jdbcType=TIMESTAMP}, #{reviewerAccount,jdbcType=VARCHAR}, 
+      #{reviewTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=TINYINT}, #{createBy,jdbcType=VARCHAR}, 
+      #{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>
@@ -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>
@@ -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>
@@ -315,6 +327,7 @@
       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},
@@ -337,6 +350,7 @@
       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},
@@ -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>
@@ -407,6 +424,7 @@
       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},
@@ -426,6 +444,7 @@
       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},