From 90f6140c7bf48006022c599f2add2f020acae87b Mon Sep 17 00:00:00 2001
From: 1073413548 <14628403+gjb0917@user.noreply.gitee.com>
Date: Thu, 5 Sep 2024 10:45:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E5=90=88=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/pusong/common/core/utils/DateUtils.java    | 2 +-
 .../business/controller/PsTaskWorkRecordController.java      | 2 +-
 .../com/pusong/business/service/impl/PsTaskServiceImpl.java  | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/DateUtils.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/DateUtils.java
index 3f36aa0..14b01ff 100644
--- a/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/DateUtils.java
+++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/DateUtils.java
@@ -125,7 +125,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
      * 计算相差天数
      */
     public static int differentDaysByMillisecond(Date date1, Date date2) {
-        return Math.abs((int) ((date2.getTime() - date1.getTime()) / (1000 * 3600 * 24)));
+        return (int) ((date2.getTime() - date1.getTime()) / (1000 * 3600 * 24));
     }
     /**
      * 计算相差天数(只计算工作日：周一到周五,包括两边)
diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsTaskWorkRecordController.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsTaskWorkRecordController.java
index 670e93d..f371af4 100644
--- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsTaskWorkRecordController.java
+++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsTaskWorkRecordController.java
@@ -48,7 +48,7 @@ public class PsTaskWorkRecordController extends BaseController {
     }
 
     /**
-     * 根据任务委派id查询工作进度列表
+     * 根据主任务id查询工作进度列表
      */
     @Log(title = "根据主任务id查询工作进度列表")
     @SaCheckPermission("business:taskWorkRecord:listByTaskId")
diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java
index 243356b..a979980 100644
--- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java
+++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java
@@ -116,9 +116,14 @@ public class PsTaskServiceImpl implements IPsTaskService {
     public TableDataInfo<PsTaskMainVo> queryChildPageList(PsTaskQueryBo bo, PageQuery pageQuery){
         Long id = bo.getId(); //此时是子任务的id
         bo.setId(null);
+        //执行者的查询条件与主任中不同需要单独处理
+        String ex = bo.getExecutor();
+        bo.setExecutor(null);
         QueryWrapper<PsTaskMain> lqw = buildQueryWrapper(bo);
+        lqw.exists(StringUtils.isNotBlank(ex), "select 1 from sys_user su where  appo.executor = su.user_id and  su.nick_name like '%" + ex + "%'");
         lqw.eq("appo.appoint_type",bo.getAppointType());
         lqw.eq(id != null,"appo.id",id);
+        log.info(lqw.getCustomSqlSegment());
         Page<PsTaskMainVo> page = baseMapper.queryChildTaskPageList(pageQuery.build(), lqw);
         for (PsTaskMainVo vo : page.getRecords()) {
             if(vo.getStartDate() != null){