feat：修改任务管理相关代码

bs-admin/src/main/java/com/bs/ct/controller/CtTaskBranchController.java

@@ -1,13 +1,30 @@
 package com.bs.ct.controller;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
+import com.bs.cm.domain.CmAttach;
+import com.bs.cm.service.ICmAttachService;
+import com.bs.common.core.domain.entity.SysDept;
 import com.bs.common.core.domain.entity.SysUser;
+import com.bs.common.exception.UtilException;
+import com.bs.ct.domain.CtTaskFeedback;
+import com.bs.ct.domain.CtTaskInfo;
+import com.bs.ct.service.ICtTaskFeedbackService;
+import com.bs.ct.service.ICtTaskInfoService;
+import com.bs.ct.vo.CtTaskBranchVO;
+import com.bs.ct.vo.MyTaskVO;
+import com.bs.system.service.ISysDeptService;
 import com.bs.system.service.ISysUserService;
+import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -44,6 +61,14 @@ public class CtTaskBranchController extends BaseController {
     private ICtTaskBranchService ctTaskBranchService;
     @Autowired
     private ISysUserService userService;
+    @Resource
+    private ICtTaskInfoService ctTaskInfoService;
+    @Autowired
+    private ISysDeptService deptService;
+    @Autowired
+    private ICtTaskFeedbackService ctTaskFeedbackService;
+    @Resource
+    private ICmAttachService cmAttachService;
     /**
      * 分页查询任务机构信息列表
      */
@@ -57,6 +82,285 @@ public class CtTaskBranchController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 分页查询任务机构信息列表
+     */
+    @ApiOperation("分页查询任务机构信息列表")
+    @GetMapping("/pageListByBranch")
+    public TableDataInfo pageListByBranch(CtTaskBranch ctTaskBranch) {
+        Integer pageNum = ctTaskBranch.getPageNum() != null ? ctTaskBranch.getPageNum() : 1;
+        Integer pageSize = ctTaskBranch.getPageSize() != null ? ctTaskBranch.getPageSize() : 10;
+        List<Long> ownerDeptIds = deptService.getOwnerDeptIds();
+        if (ownerDeptIds.isEmpty()) {
+            ownerDeptIds.add(0L);
+        }
+        Long userId = getUserId();
+        LambdaQueryWrapper<CtTaskBranch> queryWrapper = new LambdaQueryWrapper();
+        condition(queryWrapper,ctTaskBranch);
+        if ((!ownerDeptIds.isEmpty() && ownerDeptIds.size() > 0) && 1 != userId && "1".equals(ctTaskBranch.getIsTask())) {
+            queryWrapper.in(CtTaskBranch::getBranchCode,ownerDeptIds);
+        }
+        queryWrapper.orderByDesc(CtTaskBranch::getCreateTime);
+        String inSqlCondition = "SELECT id FROM ct_task_info WHERE del_flag = '0'";
+        queryWrapper.inSql(CtTaskBranch::getTaskId, inSqlCondition);
+        List<CtTaskBranch> list = ctTaskBranchService.list(queryWrapper);
+        setAll(list);
+        //过滤
+        List<CtTaskBranch> ctTaskBranches = filterCtTaskBranchList(list,ctTaskBranch);
+        Integer start = (pageNum - 1) * pageSize;
+        List<CtTaskBranch> result = ctTaskBranches.stream()
+                .skip(start)  // 跳过前4条数据
+                .limit(pageSize) // 最多取6条数据
+                .collect(Collectors.toList());
+        TableDataInfo data = getDataTable(result);
+        data.setTotal(ctTaskBranches.size());
+        return data;
+    }
+
+
+    private List<CtTaskBranch> filterCtTaskBranchList(List<CtTaskBranch> list, CtTaskBranch filterParams) {
+        List<CtTaskBranch> filteredList = new ArrayList<>(list);
+        if (filterParams.getTaskType() != null && !filterParams.getTaskType().isEmpty()) {
+            filteredList = filteredList.stream()
+                    .filter(item -> filterParams.getTaskType().equals(item.getTaskType()))
+                    .collect(Collectors.toList());
+        }
+        if (filterParams.getTaskTitle() != null && !filterParams.getTaskTitle().isEmpty()) {
+            filteredList = filteredList.stream()
+                    .filter(item -> item.getTaskTitle() != null && item.getTaskTitle().contains(filterParams.getTaskTitle()))
+                    .collect(Collectors.toList());
+        }
+        if (filterParams.getTaskContent() != null && !filterParams.getTaskContent().isEmpty()) {
+            filteredList = filteredList.stream()
+                    .filter(item -> item.getTaskContent() != null && item.getTaskContent().contains(filterParams.getTaskContent()))
+                    .collect(Collectors.toList());
+        }
+        if (filterParams.getTaskStatus() != null && !filterParams.getTaskStatus().isEmpty()) {
+            filteredList = filteredList.stream()
+                    .filter(item -> item.getTaskStatus() != null && item.getTaskStatus().contains(filterParams.getTaskStatus()))
+                    .collect(Collectors.toList());
+        }
+        // 修改为使用 startDate 和 endDate 过滤
+        Date paramStartDate = filterParams.getStartDate();
+        Date paramEndDate = filterParams.getEndDate();
+        if (paramStartDate != null && paramEndDate != null) {
+            filteredList = filteredList.stream()
+                    .filter(item -> {
+                        Date itemStartDate = item.getStartDate();
+                        Date itemEndDate = item.getEndDate();
+                        return itemStartDate != null && itemEndDate != null
+                                &&!itemStartDate.before(paramStartDate)
+                                &&!itemEndDate.after(paramEndDate);
+                    })
+                    .collect(Collectors.toList());
+        }
+        return filteredList;
+    }
+
+
+    /**
+     * 导出任务交办列表
+     */
+    @ApiOperation("导出任务交办列表")
+    @Log(title = "任务交办导出", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportByAssigned")
+    public void exportByAssigned(HttpServletResponse response, CtTaskBranch ctTaskBranch) {
+        List<Long> ownerDeptIds = deptService.getOwnerDeptIds();
+        if (ownerDeptIds.isEmpty()) {
+            ownerDeptIds.add(0L);
+        }
+        Long userId = getUserId();
+        LambdaQueryWrapper<CtTaskBranch> queryWrapper = new LambdaQueryWrapper();
+        condition(queryWrapper,ctTaskBranch);
+        if ((!ownerDeptIds.isEmpty() && ownerDeptIds.size() > 0) && 1 != userId && "1".equals(ctTaskBranch.getIsTask())) {
+            queryWrapper.in(CtTaskBranch::getBranchCode,ownerDeptIds);
+        }
+        queryWrapper.orderByDesc(CtTaskBranch::getCreateTime);
+        String inSqlCondition = "SELECT id FROM ct_task_info WHERE del_flag = '0'";
+        queryWrapper.inSql(CtTaskBranch::getTaskId, inSqlCondition);
+        List<CtTaskBranch> list = ctTaskBranchService.list(queryWrapper);
+        setAll(list);
+        List<CtTaskBranch> ctTaskBranches = filterCtTaskBranchList(list,ctTaskBranch);
+        List<CtTaskBranchVO> ctTaskBranchVOs = new ArrayList<>();
+        for (CtTaskBranch branch : ctTaskBranches) {
+            CtTaskBranchVO ctTaskBranchVO = new CtTaskBranchVO();
+            BeanUtils.copyProperties(branch,ctTaskBranchVO);
+            ctTaskBranchVOs.add(ctTaskBranchVO);
+        }
+        ExcelUtil<CtTaskBranchVO> util = new ExcelUtil<CtTaskBranchVO>(CtTaskBranchVO. class);
+        util.exportExcel(response, ctTaskBranchVOs, "任务交办数据");
+    }
+
+    /**
+     * 分页查询任务机构信息列表
+     */
+    @ApiOperation("分页查询任务机构信息列表")
+    @GetMapping("/pageListByUser")
+    public TableDataInfo pageListByUser(CtTaskBranch ctTaskBranch) {
+        Integer pageNum = ctTaskBranch.getPageNum() != null ? ctTaskBranch.getPageNum() : 1;
+        Integer pageSize = ctTaskBranch.getPageSize() != null ? ctTaskBranch.getPageSize() : 10;
+        String userId = String.valueOf(getUserId());
+        LambdaQueryWrapper<CtTaskBranch> queryWrapper = new LambdaQueryWrapper();
+        condition(queryWrapper,ctTaskBranch);
+        queryWrapper.orderByDesc(CtTaskBranch::getCreateTime);
+        String inSqlCondition = "SELECT id FROM ct_task_info WHERE del_flag = '0'";
+        String inSqlConditionByUserId = "SELECT task_id FROM ct_task_branch WHERE del_flag = '0' and type = '人员' and user_id =" + userId;
+        queryWrapper.inSql(CtTaskBranch::getTaskId, inSqlCondition);
+        queryWrapper.inSql(CtTaskBranch::getId, inSqlConditionByUserId);
+        List<CtTaskBranch> list = ctTaskBranchService.list(queryWrapper);
+        setAll(list);
+        List<CtTaskBranch> ctTaskBranches = filterCtTaskBranchList(list,ctTaskBranch);
+        Integer start = (pageNum - 1) * pageSize;
+        List<CtTaskBranch> result = ctTaskBranches.stream()
+                .skip(start)  // 跳过前4条数据
+                .limit(pageSize) // 最多取6条数据
+                .collect(Collectors.toList());
+        TableDataInfo data = getDataTable(result);
+        data.setTotal(ctTaskBranches.size());
+        return data;
+    }
+
+    /**
+     * 导出任务交办列表
+     */
+    @ApiOperation("导出任务交办列表")
+    @Log(title = "任务交办导出", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportByUser")
+    public void exportByUser(HttpServletResponse response, CtTaskBranch ctTaskBranch) {
+        String userId = String.valueOf(getUserId());
+        LambdaQueryWrapper<CtTaskBranch> queryWrapper = new LambdaQueryWrapper();
+        condition(queryWrapper,ctTaskBranch);
+        queryWrapper.orderByDesc(CtTaskBranch::getCreateTime);
+        String inSqlCondition = "SELECT id FROM ct_task_info WHERE del_flag = '0'";
+        String inSqlConditionByUserId = "SELECT task_id FROM ct_task_branch WHERE del_flag = '0' and type = '人员' and user_id =" + userId;
+        queryWrapper.inSql(CtTaskBranch::getTaskId, inSqlCondition);
+        queryWrapper.inSql(CtTaskBranch::getId, inSqlConditionByUserId);
+        List<CtTaskBranch> list = ctTaskBranchService.list(queryWrapper);
+        setAll(list);
+        List<CtTaskBranch> ctTaskBranches = filterCtTaskBranchList(list,ctTaskBranch);
+        List<MyTaskVO> ctTaskBranchVOs = new ArrayList<>();
+        for (CtTaskBranch branch : ctTaskBranches) {
+            MyTaskVO ctTaskBranchVO = new MyTaskVO();
+            BeanUtils.copyProperties(branch,ctTaskBranchVO);
+            ctTaskBranchVOs.add(ctTaskBranchVO);
+        }
+        ExcelUtil<MyTaskVO> util = new ExcelUtil<MyTaskVO>(MyTaskVO. class);
+        util.exportExcel(response, ctTaskBranchVOs, "我的任务");
+
+    }
+
+
+    private void setAll(List<CtTaskBranch> list) {
+        List<SysDept> depts = deptService.selectDeptList(new SysDept());
+        Map<Long, String> deptMap = depts.stream()
+                .collect(Collectors.toMap(SysDept::getDeptId, SysDept::getDeptName));
+        Map<Long, Long> deptMapByParent = depts.stream()
+                .collect(Collectors.toMap(SysDept::getDeptId, SysDept::getParentId));
+        for (CtTaskBranch taskOtherBranch : list) {
+            Long branchCode = Long.valueOf(taskOtherBranch.getBranchCode());
+            Long branchCodeParent = deptMapByParent.get(branchCode);
+            String branchNameParent = deptMap.get(branchCodeParent);
+            taskOtherBranch.setBranchNameParent(branchNameParent);
+            CtTaskInfo byId = ctTaskInfoService.getById(taskOtherBranch.getTaskId());
+            if (null != byId) {
+                taskOtherBranch.setStatus(byId.getStatus());
+                taskOtherBranch.setTaskType(byId.getTaskType());
+                taskOtherBranch.setTaskTitle(byId.getTaskTitle());
+                taskOtherBranch.setTaskContent(byId.getTaskContent());
+                taskOtherBranch.setTaskDate(byId.getTaskDate());
+                taskOtherBranch.setSdTaskOther(byId);
+            }
+            List<CtTaskFeedback> feedbackListByCreateTime = ctTaskFeedbackService.list(new LambdaQueryWrapper<CtTaskFeedback>()
+                    .eq(CtTaskFeedback::getTaskBranchId, taskOtherBranch.getId())
+                    .ne(CtTaskFeedback::getStatus, 0)
+                    .orderByDesc(CtTaskFeedback::getCreateTime));
+            // 如果根据创建时间查询到的反馈列表不为空且至少有一个元素
+            if (!feedbackListByCreateTime.isEmpty() && feedbackListByCreateTime.size() > 0) {
+                // 将该列表中的第一个元素（因为是倒序排列，所以是最新的一条）设置到当前 SdTaskOtherBranch 对象中
+                taskOtherBranch.setSdTaskOtherFeedbackByCreate(feedbackListByCreateTime.get(0));
+            }
+            List<CtTaskFeedback> feedbackListByFeedbackTime = ctTaskFeedbackService.list(new LambdaQueryWrapper<CtTaskFeedback>()
+                    .eq(CtTaskFeedback::getTaskId, taskOtherBranch.getId())
+                    .eq(CtTaskFeedback::getStatus, 1)
+                    .orderByDesc(CtTaskFeedback::getFeedbackTime));
+            // 如果根据反馈时间查询到的反馈列表不为空且至少有一个元素
+            if (!feedbackListByFeedbackTime.isEmpty() && feedbackListByFeedbackTime.size() > 0) {
+                // 将该列表中的第一个元素（因为是倒序排列，所以是最新的一条）设置到当前 SdTaskOtherBranch 对象中
+                taskOtherBranch.setSdTaskOtherFeedbackByFeedback(feedbackListByFeedbackTime.get(0));
+            }
+        }
+        for (CtTaskBranch taskInfo : list) {
+            if (null != taskInfo.getSdTaskOther()) {
+                CtTaskInfo sdTaskOther = taskInfo.getSdTaskOther();
+                List<CmAttach> cmAttachList = cmAttachService.list(new LambdaQueryWrapper<CmAttach>().eq(CmAttach::getFileId,sdTaskOther.getFileId()));
+                taskInfo.setTaskInitiator(sdTaskOther.getTaskInitiator());
+                sdTaskOther.setFile(cmAttachList);
+                Date startDate = sdTaskOther.getStartDate();
+                Date endDate = sdTaskOther.getEndDate();
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd");
+                // 转换日期为字符串
+                String startDateStr = sdf.format(startDate);
+                String endDateStr = sdf.format(endDate);
+                taskInfo.setStartDate(startDate);
+                taskInfo.setEndDate(endDate);
+                taskInfo.setStartToEndDate(startDateStr + "-" + endDateStr);
+                String deptName = deptMap.get(sdTaskOther.getDeptId());
+                taskInfo.setDeptName(deptName);
+                if ("1".equals(taskInfo.getStatus()) || "0".equals(taskInfo.getStatus())) {
+                    //未完成0
+                    taskInfo.setTaskStatus("0");
+                    // 获取当前日期
+                    Date currentDate = new Date();
+                    if (endDate.compareTo(currentDate) < 0) {
+                        //已逾期1
+                        taskInfo.setTaskStatus("1");
+                    }
+                } else if ("2".equals(taskInfo.getStatus())) {
+                    //已完成
+                    taskInfo.setTaskStatus("2");
+                }
+            }
+            List<CtTaskBranch> ctTaskBranches = ctTaskBranchService.list(new LambdaQueryWrapper<CtTaskBranch>()
+                    .eq(CtTaskBranch::getTaskId,taskInfo.getId())
+                    .eq(CtTaskBranch::getType,"人员"));
+            String transactDeptNames = "";
+            String transactInitiator = "";
+            String transactBranchNames = "";
+            if (null != ctTaskBranches) {
+                List<String> deptNameList = new ArrayList<>();
+                List<String> parentDeptNameList = new ArrayList<>();
+                List<String> userNameList = new ArrayList<>();
+                List<String> userIdList = new ArrayList<>();
+                for (CtTaskBranch ctTaskBranchesItem : ctTaskBranches) {
+                    String deptNameVo = deptMap.get(Long.valueOf(ctTaskBranchesItem.getBranchCode()));
+                    Long parentTaskId = deptMapByParent.get(Long.valueOf(ctTaskBranchesItem.getBranchCode()));
+                    String parentDeptName = deptMap.get(parentTaskId);
+                    String userName = ctTaskBranchesItem.getUserName();
+                    String userId = ctTaskBranchesItem.getUserId();
+                    if (deptNameVo != null) {
+                        deptNameList.add(deptNameVo);
+                    }
+                    if (parentDeptName != null) {
+                        parentDeptNameList.add(parentDeptName);
+                    }
+                    if (userName != null) {
+                        userNameList.add(userName);
+                    }
+                    if (null != userId) {
+                        userIdList.add(userId);
+                    }
+                }
+                transactDeptNames = String.join(",", deptNameList);
+                transactInitiator = String.join(",", userNameList);
+                transactBranchNames =  String.join(",", parentDeptNameList);
+                taskInfo.setTransactDeptName(transactDeptNames);
+                taskInfo.setTransactInitiator(transactInitiator);
+                taskInfo.setTransactBranchName(transactBranchNames);
+                taskInfo.setUserIds(userIdList);
+            }
+        }
+    }
+
     /**
      * 查询任务机构信息列表
      */
@@ -148,6 +452,17 @@ public class CtTaskBranchController extends BaseController {
 
 
     private boolean isTaskUserCombinationExists(Long taskId, String userId) {
+        CtTaskBranch branchServiceById = ctTaskBranchService.getById(taskId);
+        if (null != branchServiceById) {
+            Long taskIdVo = branchServiceById.getTaskId();
+            CtTaskInfo ctTaskInfoServiceById = ctTaskInfoService.getById(taskIdVo);
+            if (null != ctTaskInfoServiceById) {
+                String status = ctTaskInfoServiceById.getStatus();
+                if ("0".equals(status)) {
+                    throw new UtilException("该任务还未发布");
+                }
+            }
+        }
         List<CtTaskBranch> list = ctTaskBranchService.list(new LambdaQueryWrapper<CtTaskBranch>()
                 .eq(CtTaskBranch::getTaskId, taskId)
                 .eq(CtTaskBranch::getType,"人员")
@@ -211,9 +526,9 @@ public class CtTaskBranchController extends BaseController {
         }
 
         //任务状态
-        if(Validator.isNotEmpty(ctTaskBranch.getTaskStatus())){
+//        if(Validator.isNotEmpty(ctTaskBranch.getTaskStatus())){
-            queryWrapper.eq(CtTaskBranch::getTaskStatus,ctTaskBranch.getTaskStatus());
+//            queryWrapper.eq(CtTaskBranch::getTaskStatus,ctTaskBranch.getTaskStatus());
-        }
+//        }
 
         //备注
         if(Validator.isNotEmpty(ctTaskBranch.getRemarks())){

bs-admin/src/main/java/com/bs/ct/controller/CtTaskInfoController.java

@@ -75,6 +75,21 @@ public class CtTaskInfoController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 分页查询任务信息列表
+     */
+    @ApiOperation("分页查询任务信息列表")
+    @GetMapping("/pageListByBranch")
+    public TableDataInfo pageListByBranch(CtTaskInfo ctTaskInfo) {
+        startPage();
+        LambdaQueryWrapper<CtTaskInfo> queryWrapper = new LambdaQueryWrapper();
+        ctTaskInfo.setStatus("1");
+        condition(queryWrapper,ctTaskInfo);
+        List<CtTaskInfo> list = ctTaskInfoService.list(queryWrapper);
+        setAll(list);
+        return getDataTable(list);
+    }
+
     /**
      * 分页查询任务信息列表
      */
@@ -100,7 +115,7 @@ public class CtTaskInfoController extends BaseController {
             // 2. status 不等于 0
             // 3. 按照创建时间（CreateTime）倒序排列
             List<CtTaskFeedback> feedbackListByCreateTime = ctTaskFeedbackService.list(new LambdaQueryWrapper<CtTaskFeedback>()
-                    .eq(CtTaskFeedback::getTaskId, taskOtherBranch.getId())
+                    .eq(CtTaskFeedback::getTaskBranchId, taskOtherBranch.getId())
                     .ne(CtTaskFeedback::getStatus, 0)
                     .orderByDesc(CtTaskFeedback::getCreateTime));
             // 如果根据创建时间查询到的反馈列表不为空且至少有一个元素
@@ -277,19 +292,7 @@ public class CtTaskInfoController extends BaseController {
         util.exportExcel(response, list, "任务信息数据");
     }
 
-    /**
+
-     * 导出任务交办列表
-     */
-    @ApiOperation("导出任务交办列表")
-    @Log(title = "任务交办导出", businessType = BusinessType.EXPORT)
-    @PostMapping("/exportByAssigned")
-    public void exportByAssigned(HttpServletResponse response, CtTaskInfo ctTaskInfo) {
-        LambdaQueryWrapper<CtTaskInfo> queryWrapper = new LambdaQueryWrapper();
-        condition(queryWrapper,ctTaskInfo);
-        List<CtTaskInfo> list = ctTaskInfoService.list(queryWrapper);
-        ExcelUtil<CtTaskInfo> util = new ExcelUtil<CtTaskInfo>(CtTaskInfo. class);
-        util.exportExcel(response, list, "任务交办数据");
-    }
 
     /**
      * 获取任务信息详细信息

bs-admin/src/main/java/com/bs/ct/domain/CtTaskBranch.java

@@ -1,16 +1,15 @@
 package com.bs.ct.domain;
 
+import com.baomidou.mybatisplus.annotation.*;
 import com.bs.common.annotation.Excel;
 import com.bs.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -62,6 +61,13 @@ public class CtTaskBranch extends BaseEntity{
     @ApiModelProperty(value = "机构名称")
     private String branchName;
 
+    /** 机构名称 */
+
+    @Excel(name = "上级机构名称")
+    @ApiModelProperty(value = "上级机构名称")
+    @TableField(exist = false)
+    private String branchNameParent;
+
     /** 机构代码 */
 
     @Excel(name = "用户Id")
@@ -81,7 +87,7 @@ public class CtTaskBranch extends BaseEntity{
     @ApiModelProperty(value = "用户名称")
     private String userName;
 
-    /** 任务状态 */
+    /** 任务状态   0未完成  1已逾期  2已完成  */
 
     @Excel(name = "任务状态")
     @ApiModelProperty(value = "任务状态")
@@ -93,7 +99,110 @@ public class CtTaskBranch extends BaseEntity{
     @ApiModelProperty(value = "备注")
     private String remarks;
 
+    @TableField(exist = false)
+    private CtTaskFeedback sdTaskOtherFeedbackByCreate;
+
+    @TableField(exist = false)
+    private CtTaskFeedback sdTaskOtherFeedbackByFeedback;
+
+    @TableField(exist = false)
+    private CtTaskInfo sdTaskOther;
+
+    /** 任务要求 */
+
+    @Excel(name = "任务内容")
+    @ApiModelProperty(value = "任务内容")
+    @TableField(exist = false)
+    private String taskContent;
+
+    /** 完成状态 */
+
+    @Excel(name = "完成状态")
+    @ApiModelProperty(value = "完成状态")
+    @TableField(exist = false)
+    private String status;
+
+    /** 任务类型 */
+
+    @Excel(name = "任务类型")
+    @ApiModelProperty(value = "任务类型")
+    @TableField(exist = false)
+    private String taskType;
+
+    /** 任务标题 */
+
+    @Excel(name = "任务标题")
+    @ApiModelProperty(value = "任务标题")
+    @TableField(exist = false)
+    private String taskTitle;
+
+    @ApiModelProperty(value = "任务期限")
+    @TableField(exist = false)
+    private String startToEndDate;
+
+    /** 任务发起部门 */
 
+    @Excel(name = "任务发起部门")
+    @ApiModelProperty(value = "任务发起部门")
+    @TableField(exist = false)
+    private String deptName;
+
+    @Excel(name = "办理单位")
+    @ApiModelProperty(value = "办理单位")
+    @TableField(exist = false)
+    private String transactBranchName;
+
+    @Excel(name = "办理部门")
+    @ApiModelProperty(value = "办理部门")
+    @TableField(exist = false)
+    private String transactDeptName;
+
+    @Excel(name = "办理人")
+    @ApiModelProperty(value = "办理人")
+    @TableField(exist = false)
+    private String transactInitiator;
+
+    /** 任务发起人 */
+
+    @Excel(name = "任务发起人")
+    @ApiModelProperty(value = "任务发起人")
+    @TableField(exist = false)
+    private String taskInitiator;
+
+    /** 是否为交办任务 1：是  0：否 */
+
+    @Excel(name = "是否为交办任务")
+    @ApiModelProperty(value = "是否为交办任务")
+    @TableField(exist = false)
+    private String isTask;
+
+    /** 开始时间 */
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty(value = "开始时间")
+    @TableField(exist = false)
+    private Date startDate;
+
+    /** 结束时间 */
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty(value = "结束时间")
+    @TableField(exist = false)
+    private Date endDate;
+
+    /** 任务发布日期 */
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "任务发布日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty(value = "任务发布日期")
+    @TableField(exist = false)
+    private Date taskDate;
 
+    @TableField(exist = false)
+    private Integer pageNum;
 
+    @TableField(exist = false)
+    private Integer pageSize;
 }

bs-admin/src/main/java/com/bs/ct/vo/CtTaskBranchVO.java

@@ -0,0 +1,101 @@
+package com.bs.ct.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.bs.common.annotation.Excel;
+import com.bs.common.core.domain.BaseEntity;
+import com.bs.ct.domain.CtTaskFeedback;
+import com.bs.ct.domain.CtTaskInfo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 任务机构信息对象 ct_task_branch
+ *
+ * @author bs
+ * @date 2025-02-22
+ */
+@Data
+public class CtTaskBranchVO extends BaseEntity{
+
+    /** 任务标题 */
+
+    @Excel(name = "任务名称")
+    @ApiModelProperty(value = "任务名称")
+    private String taskTitle;
+
+    /** 任务类型 */
+
+    @Excel(name = "任务类型",dictType = "task_type")
+    @ApiModelProperty(value = "任务类型")
+    private String taskType;
+
+    /** 任务要求 */
+
+    @Excel(name = "任务内容")
+    @ApiModelProperty(value = "任务内容")
+    private String taskContent;
+
+
+    /** 发布单位 */
+
+    @Excel(name = "发布单位")
+    @ApiModelProperty(value = "发布单位")
+    @TableField(exist = false)
+    private String branchNameParent;
+
+
+    /** 发布部门 */
+
+    @Excel(name = "发布部门")
+    @ApiModelProperty(value = "发布部门")
+    private String branchName;
+
+    /** 发布人 */
+
+    @Excel(name = "发布人")
+    @ApiModelProperty(value = "发布人")
+    private String taskInitiator;
+
+    @Excel(name = "任务期限")
+    @ApiModelProperty(value = "任务期限")
+    private String startToEndDate;
+
+    @Excel(name = "办理单位")
+    @ApiModelProperty(value = "办理单位")
+    private String transactBranchName;
+
+    @Excel(name = "办理部门")
+    @ApiModelProperty(value = "办理部门")
+    private String transactDeptName;
+
+    @Excel(name = "办理人")
+    @ApiModelProperty(value = "办理人")
+    private String transactInitiator;
+
+
+    /** 任务状态 */
+
+    @Excel(name = "任务状态")
+    @ApiModelProperty(value = "任务状态")
+    private String taskStatus;
+
+
+    @TableField(exist = false)
+    private CtTaskFeedback sdTaskOtherFeedbackByCreate;
+
+    @TableField(exist = false)
+    private CtTaskFeedback sdTaskOtherFeedbackByFeedback;
+
+    @TableField(exist = false)
+    private CtTaskInfo sdTaskOther;
+
+}

bs-admin/src/main/java/com/bs/ct/vo/CtTaskTemplateVO.java

@@ -23,28 +23,6 @@ import java.util.List;
 @Data
 public class CtTaskTemplateVO extends BaseEntity{
 
-    /** 创建单位 */
-
-    @Excel(name = "创建单位")
-    @ApiModelProperty(value = "创建单位")
-    @TableField(exist = false)
-    private String createByBranch;
-
-    /** 创建部门 */
-
-    @Excel(name = "创建部门")
-    @ApiModelProperty(value = "创建部门")
-    @TableField(exist = false)
-    private String createByDeptName;
-
-
-    /** 创建人 */
-
-    @Excel(name = "创建人")
-    @ApiModelProperty(value = "创建人")
-    @TableField(exist = false)
-    private String createByUserName;
-
     /** 模板名称 */
 
     @Excel(name = "模板名称")
@@ -53,7 +31,7 @@ public class CtTaskTemplateVO extends BaseEntity{
 
     /** 任务类型 */
 
-    @Excel(name = "任务类型")
+    @Excel(name = "任务类型",dictType = "task_type")
     @ApiModelProperty(value = "任务类型")
     private String taskType;
 
@@ -76,6 +54,29 @@ public class CtTaskTemplateVO extends BaseEntity{
     @TableField(exist = false)
     private String tagNames;
 
+    /** 创建单位 */
+
+    @Excel(name = "创建单位")
+    @ApiModelProperty(value = "创建单位")
+    @TableField(exist = false)
+    private String createByBranch;
+
+    /** 创建部门 */
+
+    @Excel(name = "创建部门")
+    @ApiModelProperty(value = "创建部门")
+    @TableField(exist = false)
+    private String createByDeptName;
+
+
+    /** 创建人 */
+
+    @Excel(name = "创建人")
+    @ApiModelProperty(value = "创建人")
+    @TableField(exist = false)
+    private String createByUserName;
+
+
     @Excel(name = "创建时间")
     @ApiModelProperty(value = "创建时间")
     @TableField(exist = false)

bs-admin/src/main/java/com/bs/ct/vo/MyTaskVO.java

@@ -0,0 +1,80 @@
+package com.bs.ct.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.bs.common.annotation.Excel;
+import com.bs.common.core.domain.BaseEntity;
+import com.bs.ct.domain.CtTaskFeedback;
+import com.bs.ct.domain.CtTaskInfo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 任务机构信息对象 ct_task_branch
+ *
+ * @author bs
+ * @date 2025-02-22
+ */
+@Data
+public class MyTaskVO extends BaseEntity{
+
+    /** 任务标题 */
+
+    @Excel(name = "任务名称")
+    @ApiModelProperty(value = "任务名称")
+    private String taskTitle;
+
+    /** 任务类型 */
+
+    @Excel(name = "任务类型",dictType = "task_type")
+    @ApiModelProperty(value = "任务类型")
+    private String taskType;
+
+    /** 任务要求 */
+
+    @Excel(name = "任务内容")
+    @ApiModelProperty(value = "任务内容")
+    private String taskContent;
+
+
+    /** 发布单位 */
+
+    @Excel(name = "发布单位")
+    @ApiModelProperty(value = "发布单位")
+    @TableField(exist = false)
+    private String branchNameParent;
+
+
+    /** 发布部门 */
+
+    @Excel(name = "发布部门")
+    @ApiModelProperty(value = "发布部门")
+    private String branchName;
+
+    /** 发布人 */
+
+    @Excel(name = "发布人")
+    @ApiModelProperty(value = "发布人")
+    private String taskInitiator;
+
+    @Excel(name = "任务期限")
+    @ApiModelProperty(value = "任务期限")
+    private String startToEndDate;
+
+
+    /** 任务状态 */
+
+    @Excel(name = "任务状态")
+    @ApiModelProperty(value = "任务状态")
+    private String taskStatus;
+
+
+    @TableField(exist = false)
+    private CtTaskFeedback sdTaskOtherFeedbackByCreate;
+
+    @TableField(exist = false)
+    private CtTaskFeedback sdTaskOtherFeedbackByFeedback;
+
+    @TableField(exist = false)
+    private CtTaskInfo sdTaskOther;
+
+}

bs-system/src/main/java/com/bs/system/service/ISysDeptService.java

@@ -121,4 +121,6 @@ public interface ISysDeptService
      * @return 结果
      */
     public int deleteDeptById(Long deptId);
+
+    public List<Long> getOwnerDeptIds();
 }

bs-system/src/main/java/com/bs/system/service/impl/SysDeptServiceImpl.java

@@ -21,6 +21,8 @@ import com.bs.system.mapper.SysDeptMapper;
 import com.bs.system.mapper.SysRoleMapper;
 import com.bs.system.service.ISysDeptService;
 
+import static com.bs.common.utils.SecurityUtils.getDeptId;
+
 /**
  * 部门管理 服务实现
  *
@@ -335,4 +337,38 @@ public class SysDeptServiceImpl implements ISysDeptService
     {
         return getChildList(list, t).size() > 0;
     }
+
+    /**
+     * 删除部门管理信息
+     *
+     * @return 结果
+     */
+    @Override
+    public List<Long> getOwnerDeptIds()
+    {
+        Long deptId = getDeptId();
+        List<Long> parentId = new ArrayList<>();
+        parentId.add(deptId);
+        SysDept sysDept = new SysDept();
+        sysDept.setParentId(deptId);
+        List<SysDept> depts = deptMapper.selectDeptListAll();
+        List<SysDept> sysDepts = filterDeptsByParentId(depts, parentId);
+        List<Long> deptIds = new ArrayList<>();
+        for (SysDept dept : sysDepts) {
+            deptIds.add(dept.getDeptId());
+        }
+        List<SysDept> deptsByParentId = filterDeptsByParentId(depts, deptIds);
+        for (SysDept dept : deptsByParentId) {
+            deptIds.add(dept.getDeptId());
+        }
+        deptIds.add(deptId);
+        return deptIds;
+    }
+
+    public static List<SysDept> filterDeptsByParentId(List<SysDept> depts, List<Long> deptIds) {
+        return depts.stream()
+                .filter(dept -> dept.getParentId() != null && deptIds.contains(dept.getParentId()))
+                .collect(Collectors.toList());
+    }
+
 }

bs-ui/src/api/task/branch.js

@@ -9,6 +9,24 @@ export function pageListBranch(query) {
   })
 }
 
+// 分页查询任务机构信息列表
+export function pageListByBranch(query) {
+  return request({
+    url: '/task/branch/pageListByBranch',
+    method: 'get',
+    params: query
+  })
+}
+
+// 分页查询任务机构信息列表
+export function pageListByUser(query) {
+  return request({
+    url: '/task/branch/pageListByUser',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询任务机构信息列表
 export function listBranch(query) {
   return request({

bs-ui/src/api/task/info.js

@@ -9,6 +9,15 @@ export function pageListInfo(query) {
   })
 }
 
+// 根据部门分页查询任务信息列表
+export function pageListByBranch(query) {
+  return request({
+    url: '/task/info/pageListByBranch',
+    method: 'get',
+    params: query
+  })
+}
+
 // 分页查询任务信息列表
 export function pageListByUser(query) {
   return request({

bs-ui/src/views/task-distribut/feedback/other-task/index.vue

@@ -14,12 +14,19 @@
               />
             </el-form-item>
             <el-form-item label="任务类型">
-              <el-input
+              <el-select
                 v-model="query.taskType"
-                placeholder="请输入"
+                placeholder="请选择"
-                maxlength="32"
                 clearable
-              />
+                filterable
+              >
+                <el-option
+                  v-for="dict in dict.type.task_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
             </el-form-item>
             <el-form-item label="任务内容">
               <el-input
@@ -29,15 +36,29 @@
                 clearable
               />
             </el-form-item>
+<!--            <el-form-item label="任务状态">-->
+<!--              <el-input-->
+<!--                v-model="query.status"-->
+<!--                placeholder="请输入"-->
+<!--                maxlength="32"-->
+<!--                clearable-->
+<!--              />-->
+<!--            </el-form-item>-->
             <el-form-item label="任务状态">
-              <el-input
+              <el-select
-                v-model="query.status"
+                v-model="query.taskStatus"
-                placeholder="请输入"
+                placeholder="请选择"
-                maxlength="32"
                 clearable
-              />
+                filterable
+              >
+                <el-option
+                  v-for="dict in dict.type.task_status"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
             </el-form-item>
-
             <el-form-item label="任务期限">
               <el-date-picker v-model="dateRange" value-format="yyyy-MM-dd" type="daterange" placeholder="选择日期"
                               @change="dateRangeChange" style="width: 220px;" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
@@ -108,13 +129,11 @@
           min-width="160"
           prop="taskTitle"
         />
-        <el-table-column
+        <el-table-column label="任务类型" align="center" prop="taskType" sortable='custom' min-width="100">
-          align="center"
+          <template slot-scope="scope">
-          label="任务类型"
+            <dict-tag :options="dict.type.task_type" :value="scope.row.taskType"/>
-          show-overflow-tooltip
+          </template>
-          min-width="160"
+        </el-table-column>
-          prop="taskType"
-        />
         <el-table-column
           align="center"
           label="任务内容"
@@ -122,12 +141,28 @@
           min-width="160"
           prop="taskContent"
         />
+<!--        <el-table-column-->
+<!--          align="center"-->
+<!--          label="发布单位"-->
+<!--          show-overflow-tooltip-->
+<!--          min-width="160"-->
+<!--          prop="branchName"-->
+<!--        >-->
+<!--        </el-table-column>-->
+<!--        <el-table-column-->
+<!--          align="center"-->
+<!--          label="发布部门"-->
+<!--          show-overflow-tooltip-->
+<!--          min-width="160"-->
+<!--          prop="deptName"-->
+<!--        >-->
+<!--        </el-table-column>-->
         <el-table-column
           align="center"
           label="发布单位"
           show-overflow-tooltip
           min-width="160"
-          prop="branchName"
+          prop="branchNameParent"
         >
         </el-table-column>
         <el-table-column
@@ -135,7 +170,7 @@
           label="发布部门"
           show-overflow-tooltip
           min-width="160"
-          prop="deptName"
+          prop="branchName"
         >
         </el-table-column>
         <el-table-column
@@ -178,9 +213,14 @@
           prop="transactInitiator"
         >
         </el-table-column>
+        <el-table-column label="任务状态" align="center" prop="taskStatus" sortable='custom'   min-width="100">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.task_status" :value="scope.row.taskStatus"/>
+          </template>
+        </el-table-column>
         <el-table-column
           align="center"
-          label="任务状态"
+          label="状态"
           show-overflow-tooltip
           min-width="90"
         >
@@ -208,16 +248,16 @@
             <el-tag v-else type="info">未反馈</el-tag>
           </template>
         </el-table-column>
-        <!--        <el-table-column width="80px" align="center" label="操作" fixed="right">-->
+        <el-table-column width="80px" align="center" label="操作" fixed="right">
-        <!--          <template slot-scope="scope">-->
+          <template slot-scope="scope">
-        <!--            <el-link-->
+            <el-link
-        <!--              class="table-opretar"-->
+              class="table-opretar"
-        <!--              type="primary"-->
+              type="primary"
-        <!--              @click="toEdit(scope.row)"-->
+              @click="toEdit(scope.row)"
-        <!--            >{{ getRowEditTitle(scope.row) }}</el-link-->
+            >{{ getRowEditTitle(scope.row) }}</el-link
-        <!--            >-->
+            >
-        <!--          </template>-->
+          </template>
-        <!--        </el-table-column>-->
+        </el-table-column>
       </el-table>
       <!-- 表格页脚 -->
       <pagination
@@ -236,8 +276,8 @@
 <script>
 import AuditDialog from "@/views/task-distribut/send/other-task/components/AuditDialog";
 import TableMixin from "@/mixins/table-mixin";
-import { pageListInfo } from "@/api/task/info";
+import { pageListByBranch } from "@/api/task/branch";
-import AssignTaskDialog from "./components/AssignTaskDialog"; // 引入新组件
+import AssignTaskDialog from "./components/AssignTaskDialog";
 import { addByUser, deleteByUser } from "@/api/task/branch";
 import { listUser } from "@/api/system/user";
 
@@ -247,12 +287,11 @@ export default {
     AuditDialog,
     AssignTaskDialog,
   },
+  dicts: ['task_type','task_status'],
   mixins: [TableMixin],
   pageInfo: {
     title: "机构任务",
-    //exportUrl: "/task/info/export",
+    pageListApi: pageListByBranch,
-    pageListApi: pageListInfo,
-    // deleteApi: delOther,
     defaultQuery: {
       isPublish: "1",
       taskId: "",
@@ -263,7 +302,6 @@ export default {
       type: Boolean,
       default: false,
     },
-    // 查询发布的
     isPublish: {
       type: Boolean,
       default: true,
@@ -272,6 +310,10 @@ export default {
       type: [Number, String],
       default: "",
     },
+    isComponentCall: {
+      type: Boolean,
+      default: false,
+    }
   },
   watch: {
     taskId(val) {
@@ -286,23 +328,24 @@ export default {
   data() {
     return {
       dateRange: [],
-      selectrows: [], // 存储选中的行
+      selectrows: [],
     };
   },
   methods: {
-    // isMe(row) {
-    //   return row.userId === this.$store.getters?.userInfo?.userId;
-    // },
     dateRangeChange(val) {
       this.query.startDate = val?.[0];
       this.query.endDate = val?.[1];
     },
     MXCreated() {
-      this.$options.pageInfo.defaultQuery.taskId = null,
+      this.$options.pageInfo.defaultQuery.taskId = null;
-        this.query.taskId = null;
+      this.query.taskId = null;
       this.$options.pageInfo.customLoad = this.customLoad;
       this.$options.pageInfo.defaultQuery.isPublish = this.isPublish ? "1" : "";
       this.query.isPublish = this.$options.pageInfo.defaultQuery.isPublish;
+
+      // 根据是否是组件调用设置 isTask 参数
+      this.$options.pageInfo.defaultQuery.isTask = this.isComponentCall ? "0" : "1";
+      this.query.isTask = this.$options.pageInfo.defaultQuery.isTask;
     },
     getRowEditTitle(row) {
       if (row.sdTaskOther && row.sdTaskOther.status === '2') {
@@ -323,14 +366,13 @@ export default {
       }
       return "查看";
     },
-    /** 导出按钮操作 */
     handleExport() {
-      this.download('/task/info/export', {
+      this.download('/task/branch/exportByAssigned', {
         ...this.queryParams
       }, `任务交办_${new Date().getTime()}.xlsx`)
     },
     handleSelectionChange(selection) {
-      this.selectrows = selection; // 更新选中的行
+      this.selectrows = selection;
     },
     openAssignTaskDialog() {
       const taskIds = this.selectrows.map(row => row.id);
@@ -354,5 +396,8 @@ export default {
       }
     }
   },
+  created() {
+    this.MXCreated();
+  }
 };
 </script>

bs-ui/src/views/task-distribut/send/other-task/components/AuditDialog.vue

@@ -1,4 +1,3 @@
-
 <template>
   <el-dialog
     :close-on-click-modal="false"
@@ -7,19 +6,19 @@
     :title="`其他任务${isAudit ? '审核':'反馈'}`"
     width="80%"
   >
-  <div style="height: 70vh;width:100%;overflow-y: scroll;overflow-x: hidden;"  v-loading="loading">
+    <div style="height: 70vh;width:100%;overflow-y: scroll;overflow-x: hidden;"  v-loading="loading">
-    <SectionTitle title="基本信息" desc="" extra=""></SectionTitle>
+      <SectionTitle title="基本信息" desc="" extra=""></SectionTitle>
-    <Detail :info="info" style="margin-top: 10px;"></Detail>
+      <Detail :info="info" style="margin-top: 10px;"></Detail>
-    <SectionTitle title="反馈信息" icon="el-icon-s-comment" :desc="`共${auditList.length}条反馈`" extra=""></SectionTitle>
+      <SectionTitle title="反馈信息" icon="el-icon-s-comment" :desc="`共${auditList.length}条反馈`" extra=""></SectionTitle>
 
-    <el-timeline v-if="auditList.length > 0" style="margin-top: 20px;">
+      <el-timeline v-if="auditList.length > 0" style="margin-top: 20px;">
-      <el-timeline-item v-for="(item, index) in auditList" :key="getKey(item, index)" :timestamp="itemDate(item)" placement="top">
+        <el-timeline-item v-for="(item, index) in auditList" :key="getKey(item, index)" :timestamp="itemDate(item)" placement="top">
-        <el-card>
+          <el-card>
-          <AuditItem :info="info" :item="item" @refresh="auditChange"></AuditItem>
+            <AuditItem :info="info" :item="item" @refresh="auditChange"></AuditItem>
-        </el-card>
+          </el-card>
-      </el-timeline-item>
+        </el-timeline-item>
-    </el-timeline>
+      </el-timeline>
-  </div>
+    </div>
 
     <span slot="footer" class="dialog-footer">
       <el-button @click="closeVisible">关闭</el-button>
@@ -32,7 +31,7 @@ import SectionTitle from "@/views/task-distribut/components/SectionTitle.vue";
 import Detail from './Detail.vue';
 import AuditItem from './AuditItem.vue';
 import { listFeedback } from "@/api/task/feedback";
-// import { getDateStr } from "@/utils/util";
+import moment from'moment';
 
 export default {
   name: 'AuditDialog',
@@ -131,10 +130,16 @@ export default {
       this.getList();
     },
     itemDate(item) {
+      let date = null;
       if (item.status === '0' || item.status === '1') {
-        return item.feedbackTime;
+        date = item.feedbackTime;
+      } else {
+        date = item.checkDate;
+      }
+      if (date) {
+        return moment(date).format('YYYY-MM-DD'); // 使用大写的 YYYY-MM-DD
       }
-      return item.checkDate;
+      return '';
     }
   }
 }

bs-ui/src/views/task-distribut/send/other-task/components/EditDialog.vue

@@ -23,15 +23,28 @@
             </el-input>
           </el-form-item>
           <el-form-item label="任务类型" prop="taskType">
-            <el-input v-model="dialogForm.taskType" placeholder="请输入">
+            <el-select
-              <el-button
+              v-model="dialogForm.taskType"
-                slot="append"
+              placeholder="请选择任务类型"
-                type="primary"
+              clearable
-                icon="el-icon-search"
+              filterable
-                @click="openTemplateDialog"
+              style="width: calc(100% - 125px); display: inline-block;"
-              >选择模板
+            >
-              </el-button>
+              <el-option
-            </el-input>
+                v-for="dict in dict.type.task_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              @click="openTemplateDialog"
+              style="width: 120px; margin-left: 5px;"
+            >
+              选择模板
+            </el-button>
           </el-form-item>
           <el-row :gutter="10">
             <el-col :span="12">
@@ -169,7 +182,11 @@
       >
         <el-table-column type="selection" width="55" align="center"/>
         <el-table-column label="模板名称" align="center" prop="templateName"/>
-        <el-table-column label="任务类型" align="center" prop="taskType"/>
+        <el-table-column label="任务类型" align="center" prop="taskType" sortable='custom'>
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.task_type" :value="scope.row.taskType"/>
+          </template>
+        </el-table-column>
         <el-table-column label="任务要求" align="center" >
           <template slot-scope="scope">
             <div v-html="scope.row.taskContent"></div>
@@ -209,6 +226,7 @@ export default {
     BranchCascaderDialog,
   },
   mixins: [TableEditMixin],
+  dicts: ['task_type'], // 添加字典声明
   pageInfo: {
     defaultForm: {
       status: "0", // 0未发布，1已发布 2已完成/办结
@@ -227,7 +245,7 @@ export default {
           {min: 1, max: 50, message: "长度在 1 到 50 个字符", trigger: "blur"}
         ],
         taskType: [
-          {required: true, message: "请输入任务类型", trigger: "blur"},
+          {required: true, message: "请选择任务类型", trigger: "change"}
         ],
         startDate: [
           {required: true, message: "请输入开始时间", trigger: "change"}

bs-ui/src/views/task-distribut/send/other-task/index.vue

@@ -1,237 +1,245 @@
 <!-- 其他任务 -->
 <template>
   <div v-loading="tableLoading">
-      <el-card class="query-container" shadow="never">
+    <el-card class="query-container" shadow="never">
-        <!-- 表格查询条件 -->
+      <!-- 表格查询条件 -->
-        <div>
+      <div>
-          <div :span="24">
+        <div :span="24">
-            <el-form ref="seachForm" :inline="true" class="demo-form-inline">
+          <el-form ref="seachForm" :inline="true" class="demo-form-inline">
-              <el-form-item label="任务名称">
+            <el-form-item label="任务名称">
-                <el-input
+              <el-input
-                  v-model="query.taskTitle"
+                v-model="query.taskTitle"
-                  placeholder="请输入"
+                placeholder="请输入"
-                  maxlength="32"
+                maxlength="32"
-                  clearable
+                clearable
+              />
+            </el-form-item>
+            <el-form-item label="任务类型">
+              <el-select
+                v-model="query.taskType"
+                placeholder="请选择"
+                clearable
+                filterable
+              >
+                <el-option
+                  v-for="dict in dict.type.task_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
                 />
-              </el-form-item>
+              </el-select>
-              <el-form-item label="任务类型">
+            </el-form-item>
-                <el-input
+            <el-form-item label="发布单位">
-                  v-model="query.taskType"
+              <el-input
-                  placeholder="请输入"
+                v-model="query.branchName"
-                  maxlength="32"
+                placeholder="请输入"
-                  clearable
+                maxlength="32"
-                />
+                clearable
-              </el-form-item>
+              />
-              <el-form-item label="发布单位">
+            </el-form-item>
-                <el-input
+            <el-form-item label="发布部门">
-                  v-model="query.branchName"
+              <el-input
-                  placeholder="请输入"
+                v-model="query.deptName"
-                  maxlength="32"
+                placeholder="请输入"
-                  clearable
+                maxlength="32"
-                />
+                clearable
-              </el-form-item>
+              />
-              <el-form-item label="发布部门">
+            </el-form-item>
-                <el-input
+            <el-form-item label="发布人">
-                  v-model="query.deptName"
+              <el-input
-                  placeholder="请输入"
+                v-model="query.taskInitiator"
-                  maxlength="32"
+                placeholder="请输入"
-                  clearable
+                maxlength="32"
-                />
+                clearable
-              </el-form-item>
+              />
-              <el-form-item label="发布人">
+            </el-form-item>
-                <el-input
+            <el-form-item label="任务期限">
-                  v-model="query.taskInitiator"
+              <el-date-picker v-model="dateRange" value-format="yyyy-MM-dd" type="daterange" placeholder="选择日期"
-                  placeholder="请输入"
+                              @change="dateRangeChange" style="width: 220px;" start-placeholder="开始日期"
-                  maxlength="32"
+                              end-placeholder="结束日期"></el-date-picker>
-                  clearable
+            </el-form-item>
-                />
+            <el-form-item>
-              </el-form-item>
+              <el-button
-              <el-form-item label="任务期限">
+                type="primary"
-                <el-date-picker v-model="dateRange" value-format="yyyy-MM-dd" type="daterange" placeholder="选择日期"
+                icon="el-icon-search"
-                                @change="dateRangeChange" style="width: 220px;" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+                @click="queryTable"
-              </el-form-item>
+              >
-              <el-form-item>
+                查询
-                <el-button
+              </el-button>
-                  type="primary"
+              <el-button
-                  icon="el-icon-search"
+                type="reset"
-                  @click="queryTable"
+                icon="el-icon-refresh"
-                >
+                @click="resetQueryTable"
-                  查询
+              >
-                </el-button>
+                重置
-                <el-button
+              </el-button>
-                  type="reset"
+              <el-button
-                  icon="el-icon-refresh"
+                type="reset"
-                  @click="resetQueryTable"
+                icon="el-icon-download"
-                >
+                @click="exportData"
-                  重置
+              >导出
-                </el-button>
+              </el-button>
-                <el-button
+            </el-form-item>
-                  type="reset"
+          </el-form>
-                  icon="el-icon-download"
-                  @click="exportData"
-                  >导出
-                </el-button>
-              </el-form-item>
-            </el-form>
-          </div>
         </div>
-      </el-card>
+      </div>
+    </el-card>
 
-      <el-card class="el-row-main-container box-card box-card--table">
+    <el-card class="el-row-main-container box-card box-card--table">
-        <div class="table-top-opretar">
+      <div class="table-top-opretar">
-          <el-button
+        <el-button
-            type="primary"
+          type="primary"
-            icon="el-icon-plus"
+          icon="el-icon-plus"
-            @click="toAdd"
+          @click="toAdd"
-            >新增
+        >新增
-          </el-button>
+        </el-button>
-          <el-button
+        <el-button
-            type="reset"
+          type="reset"
-            :disabled="selectrows.length === 0"
+          :disabled="selectrows.length === 0"
-            icon="el-icon-delete"
+          icon="el-icon-delete"
-            @click="toMultDelete"
+          @click="toMultDelete"
-            >删除
+        >删除
-          </el-button>
+        </el-button>
-          <el-button
+        <el-button
-            type="reset"
+          type="reset"
-            :disabled="selectrows.length === 0"
+          :disabled="selectrows.length === 0"
-            icon="el-icon-upload"
+          icon="el-icon-upload"
-            @click="toPublish"
+          @click="toPublish"
-          >发布
+        >发布
-          </el-button>
+        </el-button>
-        </div>
+      </div>
-        <!-- 表格主体 -->
+      <!-- 表格主体 -->
-        <el-table
+      <el-table
-          ref="multipleTable"
+        ref="multipleTable"
-          tooltip-effect="dark"
+        tooltip-effect="dark"
-          :data="tableData"
+        :data="tableData"
-          class="w100p"
+        class="w100p"
-          @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChange"
-          border
+        border
-          @sort-change="sortChange"
+        @sort-change="sortChange"
-          :default-sort="tableSort"
+        :default-sort="tableSort"
-          header-cell-class-name="duojibiaotou"
+        header-cell-class-name="duojibiaotou"
-          highlight-current-row
+        highlight-current-row
-          @row-click="rowClick"
+        @row-click="rowClick"
-        >
+      >
-          <el-table-column type="selection" width="50" fixed />
+        <el-table-column type="selection" width="50" fixed/>
-          <el-table-column
+        <el-table-column
-            align="center"
+          align="center"
-            label="任务名称"
+          label="任务名称"
-            show-overflow-tooltip
+          show-overflow-tooltip
-            min-width="160"
+          min-width="160"
-            prop="taskTitle"
+          prop="taskTitle"
-          />
+        />
-          <el-table-column
+        <el-table-column label="任务类型" align="center" prop="taskType" sortable='custom' min-width="100">
-            align="center"
+          <template slot-scope="scope">
-            label="任务类型"
+            <dict-tag :options="dict.type.task_type" :value="scope.row.taskType"/>
-            show-overflow-tooltip
+          </template>
-            min-width="160"
+        </el-table-column>
-            prop="taskType"
+        <el-table-column
-          />
+          align="center"
-          <el-table-column
+          label="任务内容"
-            align="center"
+          show-overflow-tooltip
-            label="任务内容"
+          min-width="160"
-            show-overflow-tooltip
+          prop="taskContent"
-            min-width="160"
-            prop="taskContent"
-          />
-<!--          <el-table-column-->
-<!--            align="center"-->
-<!--            label="发起单位代码"-->
-<!--            show-overflow-tooltip-->
-<!--            min-width="90"-->
-<!--            prop="branchCode"-->
-<!--          >-->
-<!--          </el-table-column>-->
-          <el-table-column
-            align="center"
-            label="发布单位"
-            show-overflow-tooltip
-            min-width="180"
-            prop="branchName"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            label="发布部门"
-            show-overflow-tooltip
-            min-width="180"
-            prop="deptName"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            label="发布人"
-            show-overflow-tooltip
-            min-width="180"
-            prop="taskInitiator"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            label="任务期限"
-            show-overflow-tooltip
-            min-width="200"
-            prop="startToEndDate"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            label="任务状态"
-            show-overflow-tooltip
-            min-width="90"
-            prop="taskStatus"
-          >
-            <template v-slot="{ row }">
-              <el-tag v-if="row.taskStatus === '已逾期'" type="danger">已逾期</el-tag>
-              <el-tag v-else-if="row.taskStatus === '已完成'" type="success">已完成</el-tag>
-              <el-tag v-else type="info">未完成</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            label="状态"
-            show-overflow-tooltip
-            min-width="90"
-            prop="status"
-          >
-            <template v-slot="{ row }">
-              <el-tag v-if="row.status === '1'">已发布</el-tag>
-              <el-tag v-else-if="row.status === '2'">已办结</el-tag>
-              <el-tag v-else type="info">未发布</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column
-            width="130px"
-            align="center"
-            label="操作"
-            fixed="right"
-          >
-            <template slot-scope="scope">
-              <div class="link-container">
-                <el-link class="table-opretar" type="primary" @click="toEdit(scope.row)">
-                  {{scope.row.status === '0' && isMe(scope.row) ? '编辑':'查看'}}
-                </el-link>
-                <el-link v-if="scope.row.status === '1' && isMe(scope.row)" class="table-opretar" type="primary" @click="toWithdraw(scope.row)">
-                  撤回
-                </el-link>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-        <!-- 表格页脚 -->
-        <pagination
-          v-show="total > 0"
-          :total="total"
-          :pageSizes="[10, 20, 50]"
-          :page.sync="page.pageNum"
-          :limit.sync="page.pageSize"
-          @pagination="getTableList"
         />
-      </el-card>
+        <!--          <el-table-column-->
-      <EditDialog ref="editDialog" @refresh="getTableList"></EditDialog>
+        <!--            align="center"-->
-      <RemarkDialog ref="remarkDialog" @refresh="getTableList"></RemarkDialog>
+        <!--            label="发起单位代码"-->
+        <!--            show-overflow-tooltip-->
+        <!--            min-width="90"-->
+        <!--            prop="branchCode"-->
+        <!--          >-->
+        <!--          </el-table-column>-->
+        <el-table-column
+          align="center"
+          label="发布单位"
+          show-overflow-tooltip
+          min-width="180"
+          prop="branchName"
+        >
+        </el-table-column>
+        <el-table-column
+          align="center"
+          label="发布部门"
+          show-overflow-tooltip
+          min-width="180"
+          prop="deptName"
+        >
+        </el-table-column>
+        <el-table-column
+          align="center"
+          label="发布人"
+          show-overflow-tooltip
+          min-width="180"
+          prop="taskInitiator"
+        >
+        </el-table-column>
+        <el-table-column
+          align="center"
+          label="任务期限"
+          show-overflow-tooltip
+          min-width="200"
+          prop="startToEndDate"
+        >
+        </el-table-column>
+        <el-table-column
+          align="center"
+          label="任务状态"
+          show-overflow-tooltip
+          min-width="90"
+          prop="taskStatus"
+        >
+          <template v-slot="{ row }">
+            <el-tag v-if="row.taskStatus === '已逾期'" type="danger">已逾期</el-tag>
+            <el-tag v-else-if="row.taskStatus === '已完成'" type="success">已完成</el-tag>
+            <el-tag v-else type="info">未完成</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column
+          align="center"
+          label="状态"
+          show-overflow-tooltip
+          min-width="90"
+          prop="status"
+        >
+          <template v-slot="{ row }">
+            <el-tag v-if="row.status === '1'">已发布</el-tag>
+            <el-tag v-else-if="row.status === '2'">已办结</el-tag>
+            <el-tag v-else type="info">未发布</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column
+          width="130px"
+          align="center"
+          label="操作"
+          fixed="right"
+        >
+          <template slot-scope="scope">
+            <div class="link-container">
+              <el-link class="table-opretar" type="primary" @click="toEdit(scope.row)">
+                {{ scope.row.status === '0' && isMe(scope.row) ? '编辑' : '查看' }}
+              </el-link>
+              <el-link v-if="scope.row.status === '1' && isMe(scope.row)" class="table-opretar" type="primary"
+                       @click="toWithdraw(scope.row)">
+                撤回
+              </el-link>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!-- 表格页脚 -->
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :pageSizes="[5, 10, 20, 50]"
+        :page.sync="page.pageNum"
+        :limit.sync="page.pageSize"
+        @pagination="getTableList"
+      />
+    </el-card>
+    <BranchOtherTask customLoad :isPublish="false" :taskId="selectTask.id"  :isComponentCall="true" :isTask="0"></BranchOtherTask>
+    <EditDialog ref="editDialog" @refresh="getTableList"></EditDialog>
+    <RemarkDialog ref="remarkDialog" @refresh="getTableList"></RemarkDialog>
   </div>
 
 </template>
@@ -240,7 +248,7 @@
 import EditDialog from "./components/EditDialog";
 import RemarkDialog from "./components/RemarkDialog";
 import TableMixin from "@/mixins/table-mixin";
-import { pageListInfo, delInfo, withdrawOther,publishOther } from "@/api/task/info";
+import {pageListInfo, delInfo, withdrawOther, publishOther} from "@/api/task/info";
 import BranchOtherTask from '@/views/task-distribut/feedback/other-task';
 import {
   getAllTree,
@@ -252,6 +260,7 @@ export default {
     BranchOtherTask,
     RemarkDialog
   },
+  dicts: ['task_type'], // 添加字典声明
   mixins: [TableMixin],
   pageInfo: {
     title: '其他任务',
@@ -305,7 +314,7 @@ export default {
     MXDefaultPage() {
       return {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 5,
       };
     },
     toRemark(row) {

bs-ui/src/views/task/my-task/index.vue

@@ -14,12 +14,19 @@
               />
             </el-form-item>
             <el-form-item label="任务类型">
-              <el-input
+              <el-select
                 v-model="query.taskType"
-                placeholder="请输入"
+                placeholder="请选择"
-                maxlength="32"
                 clearable
-              />
+                filterable
+              >
+                <el-option
+                  v-for="dict in dict.type.task_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
             </el-form-item>
             <el-form-item label="任务内容">
               <el-input
@@ -30,14 +37,20 @@
               />
             </el-form-item>
             <el-form-item label="任务状态">
-              <el-input
+              <el-select
-                v-model="query.status"
+                v-model="query.taskStatus"
-                placeholder="请输入"
+                placeholder="请选择"
-                maxlength="32"
                 clearable
-              />
+                filterable
+              >
+                <el-option
+                  v-for="dict in dict.type.task_status"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
             </el-form-item>
-
             <el-form-item label="任务期限">
               <el-date-picker v-model="dateRange" value-format="yyyy-MM-dd" type="daterange" placeholder="选择日期"
                               @change="dateRangeChange" style="width: 220px;" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
@@ -90,13 +103,11 @@
           min-width="160"
           prop="taskTitle"
         />
-        <el-table-column
+        <el-table-column label="任务类型" align="center" prop="taskType" sortable='custom'   min-width="100">
-          align="center"
+          <template slot-scope="scope">
-          label="任务类型"
+            <dict-tag :options="dict.type.task_type" :value="scope.row.taskType"/>
-          show-overflow-tooltip
+          </template>
-          min-width="160"
+        </el-table-column>
-          prop="taskType"
-        />
         <el-table-column
           align="center"
           label="任务内容"
@@ -136,19 +147,24 @@
           prop="startToEndDate"
         >
         </el-table-column>
-        <el-table-column
+        <el-table-column label="任务状态" align="center" prop="taskStatus" sortable='custom'   min-width="100">
-          align="center"
+          <template slot-scope="scope">
-          label="任务状态"
+            <dict-tag :options="dict.type.task_status" :value="scope.row.taskStatus"/>
-          show-overflow-tooltip
-          min-width="90"
-          prop="taskStatus"
-        >
-          <template v-slot="{ row }">
-            <el-tag v-if="row.taskStatus === '已逾期'" type="danger">已逾期</el-tag>
-            <el-tag v-else-if="row.taskStatus === '已完成'" type="success">已完成</el-tag>
-            <el-tag v-else type="info">未完成</el-tag>
           </template>
         </el-table-column>
+<!--        <el-table-column-->
+<!--          align="center"-->
+<!--          label="任务状态"-->
+<!--          show-overflow-tooltip-->
+<!--          min-width="90"-->
+<!--          prop="taskStatus"-->
+<!--        >-->
+<!--          <template v-slot="{ row }">-->
+<!--            <el-tag v-if="row.taskStatus === '已逾期'" type="danger">已逾期</el-tag>-->
+<!--            <el-tag v-else-if="row.taskStatus === '已完成'" type="success">已完成</el-tag>-->
+<!--            <el-tag v-else type="info">未完成</el-tag>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
         <el-table-column
           align="center"
           label="状态"
@@ -206,7 +222,8 @@
 <script>
 import AuditDialog from "@/views/task-distribut/send/other-task/components/AuditDialog";
 import TableMixin from "@/mixins/table-mixin";
-import { pageListInfo,pageListByUser } from "@/api/task/info";
+// import { pageListInfo,pageListByUser } from "@/api/task/info";
+import { pageListByUser } from "@/api/task/branch";
 import { addByUser, deleteByUser } from "@/api/task/branch";
 import { listUser } from "@/api/system/user";
 
@@ -215,6 +232,7 @@ export default {
   components: {
     AuditDialog,
   },
+  dicts: ['task_type','task_status'], // 添加字典声明
   mixins: [TableMixin],
   pageInfo: {
     title: "机构任务",
@@ -293,7 +311,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('/task/info/export', {
+      this.download('/task/branch/exportByUser', {
         ...this.queryParams
       }, `我的任务_${new Date().getTime()}.xlsx`)
     },

bs-ui/src/views/task/template/index.vue

@@ -40,17 +40,25 @@
       </el-form-item>
       <!-- 任务类型 -->
       <el-form-item label="任务类型" prop="taskType">
-        <el-input
+        <el-select
           v-model="queryParams.taskType"
-          placeholder="请输入任务类型"
+          placeholder="请选择任务类型"
           clearable
-        />
+          filterable
+        >
+          <el-option
+            v-for="dict in dict.type.task_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
-      <!-- 标签名称 -->
+      <!-- 任务标签 -->
-      <el-form-item label="标签名称" prop="tagNames">
+      <el-form-item label="任务标签" prop="tagNames">
         <el-input
           v-model="queryParams.tagNames"
-          placeholder="请输入标签名称"
+          placeholder="请输入任务标签"
           clearable
         />
       </el-form-item>
@@ -113,11 +121,12 @@
     <el-table v-loading="loading" :data="templateList" @sort-change="handleSortChange"
               @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="创建单位" align="center" prop="createByBranch" />
-      <el-table-column label="创建部门" align="center" prop="createByDeptName" />
-      <el-table-column label="创建人" align="center" prop="createByUserName" />
       <el-table-column label="模板名称" align="center" prop="templateName" />
-      <el-table-column label="任务类型" align="center" prop="taskType" />
+      <el-table-column label="任务类型" align="center" prop="taskType" sortable='custom'>
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.task_type" :value="scope.row.taskType"/>
+        </template>
+      </el-table-column>
       <el-table-column label="任务标题" align="center" prop="taskTitle" />
       <el-table-column label="任务要求" align="center" >
         <template slot-scope="scope">
@@ -125,6 +134,9 @@
         </template>
       </el-table-column>
       <el-table-column label="任务标签" align="center" prop="tagNames" />
+      <el-table-column label="创建单位" align="center" prop="createByBranch" />
+      <el-table-column label="创建部门" align="center" prop="createByDeptName" />
+      <el-table-column label="创建人" align="center" prop="createByUserName" />
       <el-table-column label="创建时间" align="center" prop="createTimeVo" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -168,7 +180,21 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="任务类型" prop="taskType">
-              <el-input v-model="form.taskType" placeholder="请输入任务类型" :disabled="!isEditMode" />
+              <el-select
+                v-model="form.taskType"
+                placeholder="请选择任务类型"
+                :disabled="!isEditMode"
+                clearable
+                filterable
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="dict in dict.type.task_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -225,6 +251,7 @@ export default {
   components: {
     TagTable
   },
+  dicts: ['task_type'], // 添加字典声明
   data() {
     return {
       // 遮罩层
@@ -424,7 +451,7 @@ export default {
     handleExport() {
       this.download('task/template/export', {
         ...this.queryParams
-      }, `template_${new Date().getTime()}.xlsx`)
+      }, `任务模板_${new Date().getTime()}.xlsx`)
     }
   }
 };