diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentController.java
index c58834f..f3b230a 100644
--- a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentController.java
+++ b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentController.java
@@ -2364,4 +2364,12 @@ public class EntrustmentController {
         entst.setEntrustRequirement(entrustment.getEntrustRequirement());
         return entrustmentService.updateById(entst) ? R.ok("修改成功") : R.failed("修改失败");
     }
+
+    @ApiOperation("根据委托时间去修改一些时间类型的字段信息，例如 submit_time、check_claim_time、check_time、approve_claim_time、approve_time、" +
+            "deliver_confirm_time、accept_claim_time、accept_time、create_time以及process_info字段中的time类型的数据")
+    @PutMapping("/alertTimeFiledInfoByEntrustDate")
+    public R alertTimeFiledInfoByEntrustDate(@RequestBody Entrustment entrustment){
+        boolean success = entrustmentService.alertTimeFiledInfoByEntrustDate(entrustment);
+        return success ? R.ok("修改成功") : R.failed("修改失败");
+    }
 }
diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/EntrustmentService.java b/src/main/java/digital/laboratory/platform/entrustment/service/EntrustmentService.java
index cb8c5b1..48d34e8 100644
--- a/src/main/java/digital/laboratory/platform/entrustment/service/EntrustmentService.java
+++ b/src/main/java/digital/laboratory/platform/entrustment/service/EntrustmentService.java
@@ -50,55 +50,6 @@ public interface EntrustmentService extends IService<Entrustment> {
 	IPage<EntrustmentVO> getEntrustmentVOPage(IPage<Entrustment> page, QueryWrapper<Entrustment> qw);
 	EntrustmentVO getEntrustmentVOById(String id);
 
-	/**
-	 * 查询任务
-	 * @param userId
-	 * @param group
-	 * @param processInstanceId
-	 * @param businessKey
-	 * @return
-	 */
-	//List<Task> taskQuery(String userId, String group, String processInstanceId, String businessKey);
-
-	/**
-	 * 获取任务列表
-	 * 查询条件可以是 userId, groupId, processInstanceId, busincessKey
-	 */
-	//List<TaskResponse> taskList(String entrustmentId, String userId);
-
-	/**
-	 * 认领任务
-	 * 只有 Assignee 为空才能认领, unclaim 反认领可以置 Assignee 为空
-	 * @param entrustmentId
-	 * @return
-	 */
-	//HashMap<String, String> taskClaim(String entrustmentId);
-
-	/**
-	 * 反认领任务
-	 * @param entrustmentId
-	 * @return
-	 */
-	//HashMap<String, String> taskUnclaim(String entrustmentId);
-
-	/**
-	 * 委派任务
-	 * 把任务指定给某个用户, 与 claim 不同之处于无论之前 assignee 是否为空都可以委派。
-	 * 可以在某个用户长期不作为的情况下重新委派给其他人
-	 * @param entrustmentId
-	 * @param userId
-	 * @return
-	 */
-	//HashMap<String, String> taskAssigneeSet(String entrustmentId, String userId);
-
-	/**
-	 * 提交任务
-	 * @param entrustmentId 委托ID
-	 * @param opCode 操作码: 1=通过, -1=拒绝(驳回), 2...=其他路径
-	 */
-	//HashMap<String, Object> taskApply(String entrustmentId, Integer opCode);
-
-
 	/**
 	 * 取指定环节可用的用户列表
 	 * 当流程进行到某个环节的时候, 需要某个用户对这个环节进行处理(通过或不通过)。
@@ -123,10 +74,8 @@ public interface EntrustmentService extends IService<Entrustment> {
 	List<SysUser> taskAvailableUserList_Approve();
 	List<SysUser> taskAvailableUserList_Confirm(String clientOrgId);
 	List<SysUser> taskAvailableUserList_Accept();
-//	List<SysUser> taskAvailableUserList(String entrustmentId);
 	public long countByCaseId(String caseId);
 	void Entrustment2Word(EntrustmentVO ev) throws IOException;
-//	void Entrustment2Word(EntrustmentVO ev, InputStream tempStream, OutputStream) throws IOException;
 
 	//初始化送检受理系统数据
 	void initCaseSendAccept();
@@ -241,4 +190,12 @@ public interface EntrustmentService extends IService<Entrustment> {
     IPage getEntrustmentAndMaterial(Page page, Integer status,String keywords);
 
 	boolean isMaterialPhoto(String entrustmentId);
+
+	/**
+	 * 根据委托时间去修改一些时间类型的字段信息，例如 submit_time、check_claim_time、check_time、approve_claim_time、approve_time、"
+	 * deliver_confirm_time、accept_claim_time、accept_time、create_time以及process_info字段中的time类型的数据
+	 * @param entrustment
+	 * @return
+	 */
+    boolean alertTimeFiledInfoByEntrustDate(Entrustment entrustment);
 }
diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java
index a1d49d7..d54f3a4 100644
--- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java
+++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java
@@ -23,6 +23,7 @@ import com.deepoove.poi.data.Pictures;
 import com.deepoove.poi.plugin.table.MultipleRowTableRenderPolicy;
 import digital.laboratory.platform.common.core.constant.CommonConstants;
 import digital.laboratory.platform.common.core.constant.OSSDirectoryConstants;
+import digital.laboratory.platform.common.core.exception.ValidateCodeException;
 import digital.laboratory.platform.common.core.util.ClassUtils;
 import digital.laboratory.platform.common.core.util.R;
 import digital.laboratory.platform.common.feign.RemoteGenerateWordService;
@@ -75,6 +76,7 @@ import java.math.BigDecimal;
 import java.security.Principal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
@@ -211,7 +213,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
         String splitSymbol = "-";
         String first_part = prefix + splitSymbol + date.getYear();
         String maxNo = this.getBaseMapper().getMaxEntrustmentNoNew(first_part);
-        String newWtNO = "";
+        String newWtNO;
         if (StringUtils.isNotBlank(maxNo)) {
             maxNo = maxNo.substring(maxNo.lastIndexOf("-") + 1);
             int newCount = Integer.parseInt(maxNo) + 1;
@@ -229,10 +231,10 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
         String splitSymbol = "-";
         String first_part = prefix + splitSymbol + year;
         String maxNo = this.getBaseMapper().getMaxEntrustmentNoNew(first_part);
-        String newWtNO = "";
+        String newWtNO;
         if (StringUtils.isNotBlank(maxNo)) {
             maxNo = maxNo.substring(maxNo.lastIndexOf("-") + 1);
-            int newCount = Integer.valueOf(maxNo) + 1;
+            int newCount = Integer.parseInt(maxNo) + 1;
             String second_part = fillByZero(newCount);
             newWtNO = first_part + splitSymbol + second_part;
         } else {
@@ -250,12 +252,12 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
         int current_year = date.getYear();
         String first_part = prefix + current_year;
         String maxAcceptNo = this.getBaseMapper().getMaxEntrustAcceptNo(first_part);
-        String newAcceptNo = "";
+        String newAcceptNo;
         if (StringUtils.isNotBlank(maxAcceptNo)) {
             //判断跨年的情况，如果跨年肯定现在年份和之前年份不一样，如果是新的一年编号应该从新编号
             String seqNo = maxAcceptNo.substring(maxAcceptNo.lastIndexOf("-") + 1);
-            int newCount = Integer.valueOf(seqNo) + 1;
-            String second_part = "";
+            int newCount = Integer.parseInt(seqNo) + 1;
+            String second_part;
             second_part = fillByZero(newCount);
             newAcceptNo = first_part + splitSymbol + second_part;
         } else {
@@ -275,7 +277,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
         String first_part = prefix + current_year;
         String maxAcceptNo = this.getBaseMapper().getMaxEntrustAcceptNo(first_part);
 
-        String newAcceptNo = "";
+        String newAcceptNo;
         if (StringUtils.isNotBlank(maxAcceptNo)) {
             //判断跨年的情况，如果跨年肯定现在年份和之前年份不一样，如果是新的一年编号应该从新编号
             String seqNo = maxAcceptNo.substring(maxAcceptNo.lastIndexOf("-") + 1);
@@ -543,7 +545,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
 
     //文书发放方式转中文
     private String changePublishWayToZhCn(String flag) {
-        String ret = "";
+        String ret;
         switch (flag) {
             case "0":
                 ret = "自取";
@@ -607,7 +609,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
     private String getSamplingMethod(List<EntrustmentIdentificationMaterial> materialList) {
         int anCount = getCountForAnyRet(materialList, "A").size();
         int reCount = getCountForAnyRet(materialList, "R").size();
-        String ret = "";
+        String ret;
         if (anCount > 0 & reCount > 0) {
             ret = "将检材分装为分析样、留存样";
         } else if (anCount > 0) {
@@ -652,7 +654,6 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
                 }
             }
         }
-        ;
         if (flag.equals("A"))//分析样
         {
             return mount1;
@@ -679,7 +680,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
             eg.setRtSampleQuantity(item.getRtSampleQuantity());
             eg.setRemark(item.getRemark());
             eg.setOrderNo(item.getOrderNo());
-            BigDecimal totalSampleMass = new BigDecimal(0);
+            BigDecimal totalSampleMass;
             //因为现在有的检材可以不用复称，例如送来的一支电子烟，所以我们用送检的数量与单位进行描述即可
             if (item.getSample1RepeatWeigh() == null || item.getSample1RepeatWeigh().compareTo(BigDecimal.ZERO) == 0) {
                 eg.setAnalysisSampleDes(item.getSample1Quantity() + item.getUnit());
@@ -724,7 +725,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
         StringBuffer retSb = new StringBuffer();
         retGroup.forEach((k, v) -> {
             EntrustmentIdentificationMaterial materialObj = v.get(0);
-            String typeName = "";
+            String typeName;
             if (materialObj.getTypeName().equals("inVitro")) {
                 typeName = "常规毒品";
             } else if (materialObj.getTypeName().equals("inVivo")) {
@@ -808,9 +809,9 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
     }
 
     private String getDrugNameMsg(List<DrugLite> drugLites) {
-        StringBuffer sb = new StringBuffer();
-        for (int i = 0; i < drugLites.size(); i++) {
-            DrugLite drugLite = (DrugLite) JSONObject.toJavaObject(JSONObject.parseObject(JSONObject.toJSONString(drugLites.get(i))), DrugLite.class);
+        StringBuilder sb = new StringBuilder();
+        for (DrugLite lite : drugLites) {
+            DrugLite drugLite = (DrugLite) JSONObject.toJavaObject(JSONObject.parseObject(JSONObject.toJSONString(lite)), DrugLite.class);
             sb.append(drugLite.getName());
         }
         return sb.toString();
@@ -838,7 +839,6 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
             }
             executeCount++;
         }
-        ;
         sbMaterialName.delete(sbMaterialName.length() - 1, sbMaterialName.length());
         String req1 = "对" + sbMaterialName.toString() + "检材中的";
         String req2 = sbDrugDes.toString();
@@ -1180,23 +1180,11 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
 
         //-- 更新送检员表的信息
         if (org.apache.commons.lang3.StringUtils.isNotBlank(entrust.getDeliverer1Name())) {
-            Deliverer deliverer1 = new Deliverer();
-            deliverer1.setOwnerUserId(dlpUser.getId());
-            deliverer1.setName(entrust.getDeliverer1Name());
-            deliverer1.setPosition(entrust.getDeliverer1Position());
-            deliverer1.setCert(entrust.getDeliverer1Cert());
-            deliverer1.setIdnum(entrust.getDeliverer1Id());
-            deliverer1.setPhone(entrust.getDeliverer1Phone());
+            Deliverer deliverer1 = getDeliverer1(entrust, dlpUser);
             remoteDeliverService.renew(deliverer1);
         }
         if (org.apache.commons.lang3.StringUtils.isNotBlank(entrust.getDeliverer2Name())) {
-            Deliverer deliverer2 = new Deliverer();
-            deliverer2.setOwnerUserId(dlpUser.getId());
-            deliverer2.setName(entrust.getDeliverer2Name());
-            deliverer2.setPosition(entrust.getDeliverer2Position());
-            deliverer2.setCert(entrust.getDeliverer2Cert());
-            deliverer2.setIdnum(entrust.getDeliverer2Id());
-            deliverer2.setPhone(entrust.getDeliverer2Phone());
+            Deliverer deliverer2 = getDeliverer2(entrust, dlpUser);
             remoteDeliverService.renew(deliverer2);
         }
 
@@ -1361,23 +1349,11 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
             entrustment.setProcessInfo(pis);
             //-- 更新送检员表的信息
             if (org.apache.commons.lang3.StringUtils.isNotBlank(entrust.getDeliverer1Name())) {
-                Deliverer deliverer1 = new Deliverer();
-                deliverer1.setOwnerUserId(dlpUser.getId());
-                deliverer1.setName(entrust.getDeliverer1Name());
-                deliverer1.setPosition(entrust.getDeliverer1Position());
-                deliverer1.setCert(entrust.getDeliverer1Cert());
-                deliverer1.setIdnum(entrust.getDeliverer1Id());
-                deliverer1.setPhone(entrust.getDeliverer1Phone());
+                Deliverer deliverer1 = getDeliverer1(entrust, dlpUser);
                 remoteDeliverService.renew(deliverer1);
             }
             if (org.apache.commons.lang3.StringUtils.isNotBlank(entrust.getDeliverer2Name())) {
-                Deliverer deliverer2 = new Deliverer();
-                deliverer2.setOwnerUserId(dlpUser.getId());
-                deliverer2.setName(entrust.getDeliverer2Name());
-                deliverer2.setPosition(entrust.getDeliverer2Position());
-                deliverer2.setCert(entrust.getDeliverer2Cert());
-                deliverer2.setIdnum(entrust.getDeliverer2Id());
-                deliverer2.setPhone(entrust.getDeliverer2Phone());
+                Deliverer deliverer2 = getDeliverer2(entrust, dlpUser);
                 remoteDeliverService.renew(deliverer2);
             }//-------------------
             entrustment.setDeliverer1Id(entrust.getDeliverer1Id());
@@ -1482,11 +1458,11 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
     @Transactional
     public Entrustment bizChecker_Apply(Entrustment entrust, Integer opCode, DLPUser dlpUser) {
         if (opCode == null) {
-            throw new RuntimeException(String.format("审核结果必须提供 opCode"));
+            throw new RuntimeException("审核结果必须提供 opCode");
         }
 
         if (StrUtil.isBlank(entrust.getCheckComments())) {
-            throw new RuntimeException(String.format("必须提供审核意见"));
+            throw new RuntimeException("必须提供审核意见");
         }
 
         // 检查委托原来的状态
@@ -1793,29 +1769,6 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
         entrustment.setPreviousStatus(entrustment.getStatus());       // 可能是从其他环节转过来的, 一旦提交, 保存上一个状态
         entrustment.setStatus(newStatus);           // 新的状态(环节), 可能会是审批或提交前
 
-//        List<UpdateInfo> pis = entrustment.getProcessInfo();
-//        if (pis == null) {
-//            pis = new ArrayList<UpdateInfo>();
-//        }
-//        if (opCode == 1) {
-//            UpdateInfo pi = new UpdateInfo(dlpUser.getId(),
-//                    dlpUser.getName(),
-//                    dlpUser.getOrgId(),
-//                    dlpUser.getOrgName(),
-//                    "已审批",
-//                    opCode, entrustment.getStatus(), true);
-//            pis.add(pi);
-//        } else {
-//            UpdateInfo pi = new UpdateInfo(dlpUser.getId(),
-//                    dlpUser.getName(),
-//                    dlpUser.getOrgId(),
-//                    dlpUser.getOrgName(),
-//                    "审批不通过",
-//                    opCode, entrustment.getStatus(), false, entrust.getApproveComments());
-//            pis.add(pi);
-//        }
-//        entrustment.setProcessInfo(pis);
-
         this.updateById(entrustment);
 
         // 从数据库表中取出保存的委托对象, 后续的操作我们以此为准
@@ -1945,23 +1898,9 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
             throw new RuntimeException("您只能对自己所在机构的委托进行送检");
         }
         //-- 更新送检员表的信息
-        Deliverer deliverer = new Deliverer();
-        deliverer.setOwnerUserId(dlpUser.getId());
-        deliverer.setName(entrust.getDeliverer1Name());
-        deliverer.setPosition(entrust.getDeliverer1Position());
-        deliverer.setCert(entrust.getDeliverer1Cert());
-        deliverer.setIdnum(entrust.getDeliverer1Id());
-        deliverer.setPhone(entrust.getDeliverer1Phone());
-        remoteDeliverService.renew(deliverer);
-
-        deliverer = new Deliverer();
-        deliverer.setOwnerUserId(dlpUser.getId());
-        deliverer.setName(entrust.getDeliverer2Name());
-        deliverer.setPosition(entrust.getDeliverer2Position());
-        deliverer.setCert(entrust.getDeliverer2Cert());
-        deliverer.setIdnum(entrust.getDeliverer2Id());
-        deliverer.setPhone(entrust.getDeliverer2Phone());
-        remoteDeliverService.renew(deliverer);
+        remoteDeliverService.renew(getDeliverer1(entrust, dlpUser));
+
+        remoteDeliverService.renew(getDeliverer2(entrust, dlpUser));
         //-------------------
 
 
@@ -1981,6 +1920,26 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
         entrustment.setDeliverer2Id(entrust.getDeliverer2Id());
         entrustment.setDeliverer2Phone(entrust.getDeliverer2Phone());
 
+        UpdateWrapper<Entrustment> updateWrapper = getEntrustDeliverUpdateWrapper(entrustment);
+
+        if (!this.update(null, updateWrapper)) {
+            throw new RuntimeException("保存委托信息失败");
+        }
+
+        // 从数据库表中取出保存的委托对象, 后续的操作我们以此为准
+        entrustment = this.getById(entrust.getId());
+        if (entrustment == null) {
+            throw new RuntimeException(String.format("没有找到 id 为 %s 的委托", entrust.getId()));
+        }
+        return entrustment;
+    }
+
+    /**
+     * 设置送检信息
+     * @param entrustment
+     * @return
+     */
+    private static UpdateWrapper<Entrustment> getEntrustDeliverUpdateWrapper(Entrustment entrustment) {
         UpdateWrapper<Entrustment> updateWrapper = new UpdateWrapper<Entrustment>();
         updateWrapper.eq("id", entrustment.getId());        // 查询条件是 id 相等
 
@@ -1997,18 +1956,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
         updateWrapper.set("deliverer2_cert", entrustment.getDeliverer2Cert());
         updateWrapper.set("deliverer2_id", entrustment.getDeliverer2Id());
         updateWrapper.set("deliverer2_phone", entrustment.getDeliverer2Phone());
-
-
-        if (!this.update(null, updateWrapper)) {
-            throw new RuntimeException("保存委托信息失败");
-        }
-
-        // 从数据库表中取出保存的委托对象, 后续的操作我们以此为准
-        entrustment = this.getById(entrust.getId());
-        if (entrustment == null) {
-            throw new RuntimeException(String.format("没有找到 id 为 %s 的委托", entrust.getId()));
-        }
-        return entrustment;
+        return updateWrapper;
     }
 
     /*
@@ -2021,41 +1969,6 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
             throw new RuntimeException(String.format("送检操作必须提供 opCode"));
         }
 
-//        {
-//            if ((StrUtil.isBlank(entrust.getDeliverer1Name())) ||
-//                    (StrUtil.isBlank(entrust.getDeliverer1Cert())) || (StrUtil.isBlank(entrust.getDeliverer1Id())) ||
-//                    (StrUtil.isBlank(entrust.getDeliverer1Phone()))) {
-//                throw new RuntimeException(String.format("送检人1 必须填写姓名、证件类型、证件号和电话号码"));
-//            }
-//        }
-//        {
-//            if ((StrUtil.isBlank(entrust.getDeliverer2Name())) ||
-//                    (StrUtil.isBlank(entrust.getDeliverer2Cert())) || (StrUtil.isBlank(entrust.getDeliverer2Id())) ||
-//                    (StrUtil.isBlank(entrust.getDeliverer2Phone()))) {
-//                throw new RuntimeException(String.format("送检人2 必须填写姓名、证件类型、证件号和电话号码"));
-//            }
-//        }
-//
-//        //-- 更新送检员表的信息
-//        Deliverer deliverer = new Deliverer();
-//        deliverer.setOwnerUserId(dlpUser.getId());
-//        deliverer.setName(entrust.getDeliverer1Name());
-//        deliverer.setPosition(entrust.getDeliverer1Position());
-//        deliverer.setCert(entrust.getDeliverer1Cert());
-//        deliverer.setIdnum(entrust.getDeliverer1Id());
-//        deliverer.setPhone(entrust.getDeliverer1Phone());
-//        remoteDeliverService.renew(deliverer);
-//
-//        deliverer = new Deliverer();
-//        deliverer.setOwnerUserId(dlpUser.getId());
-//        deliverer.setName(entrust.getDeliverer2Name());
-//        deliverer.setPosition(entrust.getDeliverer2Position());
-//        deliverer.setCert(entrust.getDeliverer2Cert());
-//        deliverer.setIdnum(entrust.getDeliverer2Id());
-//        deliverer.setPhone(entrust.getDeliverer2Phone());
-//        remoteDeliverService.renew(deliverer);
-        //-------------------
-
         // 检查委托原来的状态
         Entrustment entrustment = this.getById(entrust.getId());
         if (entrustment == null) {
@@ -2078,20 +1991,6 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
             newStatus = ProcessFlowMapper.getNextStatus(entrustment.getStatus(), opCode);
         }
 
-        //-------------------
-        // 更新数据库表数据
-        //-------------------
-//        entrustment.setDeliverer1Name(entrust.getDeliverer1Name());
-//        entrustment.setDeliverer1Position(entrust.getDeliverer1Position());
-//        entrustment.setDeliverer1Cert(entrust.getDeliverer1Cert());
-//        entrustment.setDeliverer1Id(entrust.getDeliverer1Id());
-//        entrustment.setDeliverer1Phone(entrust.getDeliverer1Phone());
-//        entrustment.setDeliverer2Name(entrust.getDeliverer2Name());
-//        entrustment.setDeliverer2Position(entrust.getDeliverer2Position());
-//        entrustment.setDeliverer2Cert(entrust.getDeliverer2Cert());
-//        entrustment.setDeliverer2Id(entrust.getDeliverer2Id());
-//        entrustment.setDeliverer2Phone(entrust.getDeliverer2Phone());
-
         entrustment.setDeliverTime(LocalDateTime.now());
         entrustment.setDeliverSubmitter(dlpUser.getId());
 
@@ -2116,19 +2015,6 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
         UpdateWrapper<Entrustment> updateWrapper = new UpdateWrapper<Entrustment>();
         updateWrapper.eq("id", entrustment.getId());        // 查询条件是 id 相等
 
-        // updateWrapper.set("deliverer1_user_id", entrustment.getDeliverer1UserId());
-//        updateWrapper.set("deliverer1_name", entrustment.getDeliverer1Name());
-//        updateWrapper.set("deliverer1_position", entrustment.getDeliverer1Position());
-//        updateWrapper.set("deliverer1_cert", entrustment.getDeliverer1Cert());
-//        updateWrapper.set("deliverer1_id", entrustment.getDeliverer1Id());
-//        updateWrapper.set("deliverer1_phone", entrustment.getDeliverer1Phone());
-//
-//        // updateWrapper.set("deliverer2_user_id", entrustment.getDeliverer2UserId());
-//        updateWrapper.set("deliverer2_name", entrustment.getDeliverer2Name());
-//        updateWrapper.set("deliverer2_position", entrustment.getDeliverer2Position());
-//        updateWrapper.set("deliverer2_cert", entrustment.getDeliverer2Cert());
-//        updateWrapper.set("deliverer2_id", entrustment.getDeliverer2Id());
-//        updateWrapper.set("deliverer2_phone", entrustment.getDeliverer2Phone());
 
         updateWrapper.set("deliver_time", entrustment.getDeliverTime());
         updateWrapper.set("deliver_submitter", entrustment.getDeliverSubmitter());
@@ -2303,15 +2189,6 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
         ByteArrayInputStream fisWord = new ByteArrayInputStream(fosWord.toByteArray());
 
 
-        //MockMultipartFile mockMultipartFile = new MockMultipartFile("file", entrustmentLetterFileName + ".docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document", fisWord);
-//        MockMultipartFile mockMultipartFile = new MockMultipartFile("file", entrustmentLetterFileName + ".docx", "image/jpg", fisWord);
-////        Response response = remoteWord2PDFService.word2pdf(mockMultipartFile);
-////        fisWord.close();
-//        ByteArrayOutputStream outPDF = new ByteArrayOutputStream();
-////        IoUtil.copy(response.body().asInputStream(), outPDF, IoUtil.DEFAULT_BUFFER_SIZE);
-//        ByteArrayInputStream isPDF = new ByteArrayInputStream(outPDF.toByteArray());
-//        outPDF.close();
-
         boolean fileSave = ossFile.fileSave(OSSDirectoryConstants.DOCUMENT_ENTRUSTMENT_DIRECTORY + "/" + ev.getId() + "/" + entrustmentLetterFileName + ".docx", fisWord);
         fosWord.close();
         fisWord.close();
@@ -3066,7 +2943,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
         if (imQuantity.getCode() == CommonConstants.SUCCESS) {
             sewageJobIdentificationMaterialQuantity = imQuantity.getData();
         } else {
-            log.error("查询这个账户（机构）下面所送检且已受理的所有污水检材的数量 失败！失败原因：" + imQuantity.getMsg());
+            log.error("查询这个账户（机构）下面所送检且已受理的所有污水检材的数量 失败！失败原因：{}", imQuantity.getMsg());
             sewageJobIdentificationMaterialQuantity = 0;
         }
         markersVOS.add(new MarkersVO("污水送检", sewageJobIdentificationMaterialQuantity, "", "SewageJobGet"));
@@ -3167,7 +3044,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
         if (sewageMarkersR.getCode() == CommonConstants.SUCCESS) {
             sewageMarkers = sewageMarkersR.getData();
         } else {
-            log.error("调用污水系统查询各个状态下的污水检材数量失败！失败原因：" + sewageMarkersR.getMsg());
+            log.error("调用污水系统查询各个状态下的污水检材数量失败！失败原因：{}", sewageMarkersR.getMsg());
         }
 
 
@@ -3260,7 +3137,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
         if (imQuantityForAcceptR.getCode() == CommonConstants.SUCCESS) {
             imQuantityForAccept = imQuantityForAcceptR.getData();
         } else {
-            log.error("受理系统统计已受理的污水检材数量接口数据获取失败！失败原因：" + imQuantityForAcceptR.getMsg());
+            log.error("受理系统统计已受理的污水检材数量接口数据获取失败！失败原因：{}", imQuantityForAcceptR.getMsg());
         }
         markersVOS.add(new MarkersVO("污水任务", imQuantityForAccept, "", "SewageJobCreate"));
 
@@ -3388,7 +3265,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
         if (statisticsDiffStatusJobDTOR.getCode() == CommonConstants.SUCCESS) {
             statisticsDiffStatusSewageJobDTO = statisticsDiffStatusJobDTOR.getData();
         } else {
-            log.error("通过查询接口调用获取污水系统统计数据失败！失败原因：" + statisticsDiffStatusJobDTOR.getMsg());
+            log.error("通过查询接口调用获取污水系统统计数据失败！失败原因：{}", statisticsDiffStatusJobDTOR.getMsg());
         }
 
         ArrayList<Integer> integers = new ArrayList<>();
@@ -3446,26 +3323,14 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
                     if (remainder != 0) {
                         int index = 18 - remainder;
                         for (int i = 0; i < index; i++) {
-                            EntrustmentIdentificationMaterial entrustmentIdentificationMaterial = new EntrustmentIdentificationMaterial();
-                            entrustmentIdentificationMaterial.setAcceptNo("");
-                            entrustmentIdentificationMaterial.setOrderNo(null);
-                            entrustmentIdentificationMaterial.setTypeName("");
-                            entrustmentIdentificationMaterial.setFormName("");
-                            entrustmentIdentificationMaterial.setFundName("");
-                            entrustmentIdentificationMaterial.setAcceptTime(null);
+                            EntrustmentIdentificationMaterial entrustmentIdentificationMaterial = getEntrustmentIdentificationMaterial();
                             entrustmentIdentificationMaterialList.add(entrustmentIdentificationMaterial);
                         }
                     }
                 } else {
                     int remainder = 18 - entrustmentIdentificationMaterialList.size();
                     for (int i = 0; i < remainder; i++) {
-                        EntrustmentIdentificationMaterial entrustmentIdentificationMaterial = new EntrustmentIdentificationMaterial();
-                        entrustmentIdentificationMaterial.setAcceptNo("");
-                        entrustmentIdentificationMaterial.setOrderNo(null);
-                        entrustmentIdentificationMaterial.setTypeName("");
-                        entrustmentIdentificationMaterial.setFormName("");
-                        entrustmentIdentificationMaterial.setFundName("");
-                        entrustmentIdentificationMaterial.setAcceptTime(null);
+                        EntrustmentIdentificationMaterial entrustmentIdentificationMaterial = getEntrustmentIdentificationMaterial();
                         entrustmentIdentificationMaterialList.add(entrustmentIdentificationMaterial);
                     }
                 }
@@ -3565,4 +3430,79 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
             return true;
         } else return false;
     }
+
+    /**
+     * 根据委托时间去取 年月日 修改一些时间类型的字段信息，例如 submit_time、check_claim_time、check_time、approve_claim_time、approve_time、"
+     * deliver_confirm_time、accept_claim_time、accept_time、create_time以及process_info字段中的time类型的数据
+     * @param entrustment
+     * @return
+     */
+    @Override
+    public boolean alertTimeFiledInfoByEntrustDate(Entrustment entrustment) {
+        Entrustment entrust = super.getById(entrustment.getId());
+        LocalDateTime entrustTime = entrust.getEntrustmentTime();
+        if (entrustTime == null) {
+            throw new ValidateCodeException("该委托信息中的委托时间为空！");
+        }
+        // 获取年月日的数值
+        int year = entrustTime.getYear();
+        int monthValue = entrustTime.getMonthValue();
+        int dayValue = entrustTime.getDayOfMonth();
+
+        // 开始更新信息
+        // 定义解析的格式
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        List<UpdateInfo> processInfoList = entrust.getProcessInfo();
+        processInfoList.forEach(process ->
+                process.setProcessTime(
+                        LocalDateTime.parse(process.getProcessTime(), formatter)
+                                .withYear(year).withMonth(monthValue).withDayOfMonth(dayValue)
+                                .format(formatter)
+                ));
+        return this.update(Wrappers.<Entrustment>lambdaUpdate()
+                    .eq(Entrustment::getId, entrust.getId())
+                    .set(Entrustment::getSubmitTime, entrust.getSubmitTime().withYear(year).withMonth(monthValue).withDayOfMonth(dayValue))
+                    .set(Entrustment::getCheckClaimTime, entrust.getCheckClaimTime().withYear(year).withMonth(monthValue).withDayOfMonth(dayValue))
+                    .set(Entrustment::getCheckTime, entrust.getCheckTime().withYear(year).withMonth(monthValue).withDayOfMonth(dayValue))
+                    .set(Entrustment::getApproveClaimTime, entrust.getApproveClaimTime().withYear(year).withMonth(monthValue).withDayOfMonth(dayValue))
+                    .set(Entrustment::getApproveTime, entrust.getApproveTime().withYear(year).withMonth(monthValue).withDayOfMonth(dayValue))
+                    .set(Entrustment::getDeliverConfirmTime, entrust.getDeliverConfirmTime().withYear(year).withMonth(monthValue).withDayOfMonth(dayValue))
+                    .set(Entrustment::getAcceptTime, entrust.getAcceptTime().withYear(year).withMonth(monthValue).withDayOfMonth(dayValue))
+                    .set(Entrustment::getCreateTime, entrust.getCreateTime().withYear(year).withMonth(monthValue).withDayOfMonth(dayValue))
+                    .set(Entrustment::getProcessInfo, processInfoList));
+    }
+
+
+    private Deliverer getDeliverer2(Entrustment entrust, DLPUser dlpUser) {
+        Deliverer deliverer2 = new Deliverer();
+        deliverer2.setOwnerUserId(dlpUser.getId());
+        deliverer2.setName(entrust.getDeliverer2Name());
+        deliverer2.setPosition(entrust.getDeliverer2Position());
+        deliverer2.setCert(entrust.getDeliverer2Cert());
+        deliverer2.setIdnum(entrust.getDeliverer2Id());
+        deliverer2.setPhone(entrust.getDeliverer2Phone());
+        return deliverer2;
+    }
+
+    private Deliverer getDeliverer1(Entrustment entrust, DLPUser dlpUser) {
+        Deliverer deliverer1 = new Deliverer();
+        deliverer1.setOwnerUserId(dlpUser.getId());
+        deliverer1.setName(entrust.getDeliverer1Name());
+        deliverer1.setPosition(entrust.getDeliverer1Position());
+        deliverer1.setCert(entrust.getDeliverer1Cert());
+        deliverer1.setIdnum(entrust.getDeliverer1Id());
+        deliverer1.setPhone(entrust.getDeliverer1Phone());
+        return deliverer1;
+    }
+
+    private EntrustmentIdentificationMaterial getEntrustmentIdentificationMaterial() {
+        EntrustmentIdentificationMaterial entrustmentIdentificationMaterial = new EntrustmentIdentificationMaterial();
+        entrustmentIdentificationMaterial.setAcceptNo("");
+        entrustmentIdentificationMaterial.setOrderNo(null);
+        entrustmentIdentificationMaterial.setTypeName("");
+        entrustmentIdentificationMaterial.setFormName("");
+        entrustmentIdentificationMaterial.setFundName("");
+        entrustmentIdentificationMaterial.setAcceptTime(null);
+        return entrustmentIdentificationMaterial;
+    }
 }