feat：修改任务列表页面

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

@@ -1,8 +1,16 @@
 package com.bs.ct.controller;
 
+import java.text.SimpleDateFormat;
+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.common.core.domain.entity.SysDept;
+import com.bs.ct.domain.CtTaskBranch;
+import com.bs.ct.service.ICtTaskBranchService;
+import com.bs.system.service.ISysDeptService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -39,6 +47,10 @@ import javax.annotation.Resource;
 public class CtTaskInfoController extends BaseController {
     @Resource
     private ICtTaskInfoService ctTaskInfoService;
+    @Autowired
+    private ISysDeptService deptService;
+    @Resource
+    private ICtTaskBranchService ctTaskBranchService;
 
     /**
      * 分页查询任务信息列表
@@ -50,6 +62,7 @@ public class CtTaskInfoController extends BaseController {
         LambdaQueryWrapper<CtTaskInfo> queryWrapper = new LambdaQueryWrapper();
         condition(queryWrapper,ctTaskInfo);
         List<CtTaskInfo> list = ctTaskInfoService.list(queryWrapper);
+        setAll(list);
         return getDataTable(list);
     }
 
@@ -65,6 +78,42 @@ public class CtTaskInfoController extends BaseController {
         return success(list);
     }
 
+    private void setAll(List<CtTaskInfo> list) {
+        List<SysDept> depts = deptService.selectDeptList(new SysDept());
+        Map<Long, String> deptMap = depts.stream()
+                .collect(Collectors.toMap(SysDept::getDeptId, SysDept::getDeptName));
+        for (CtTaskInfo taskInfo : list) {
+            Date startDate = taskInfo.getStartDate();
+            Date endDate = taskInfo.getEndDate();
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd");
+            // 转换日期为字符串
+            String startDateStr = sdf.format(startDate);
+            String endDateStr = sdf.format(endDate);
+            taskInfo.setStartToEndDate(startDateStr + "-" + endDateStr);
+            String deptName = deptMap.get(taskInfo.getDeptId());
+            taskInfo.setDeptName(deptName);
+        }
+    }
+
+    /**
+     * 撤回其他任务
+     */
+    @ApiOperation("撤回其他任务")
+    @GetMapping("/withdraw/{ids}")
+    public void withdraw(@PathVariable List<Long> ids) {
+        List<CtTaskInfo> sdTaskOthers = ctTaskInfoService.listByIds(ids);
+        for (CtTaskInfo sdTaskOther : sdTaskOthers) {
+            sdTaskOther.setStatus("0");
+        }
+        List<CtTaskBranch> sdTaskOtherBranches = ctTaskBranchService.list(new LambdaQueryWrapper<CtTaskBranch>()
+                .in(CtTaskBranch::getTaskId, ids));
+        for (CtTaskBranch sdTaskOtherBranch : sdTaskOtherBranches) {
+            sdTaskOtherBranch.setTaskStatus("0");
+        }
+        ctTaskBranchService.updateBatchById(sdTaskOtherBranches);
+        ctTaskInfoService.updateBatchById(sdTaskOthers);
+    }
+
     /**
      * 导出任务信息列表
      */
@@ -136,7 +185,7 @@ public class CtTaskInfoController extends BaseController {
 
         //任务标题
         if(Validator.isNotEmpty(ctTaskInfo.getTaskTitle())){
-            queryWrapper.eq(CtTaskInfo::getTaskTitle,ctTaskInfo.getTaskTitle());
+            queryWrapper.like(CtTaskInfo::getTaskTitle,ctTaskInfo.getTaskTitle());
         }
 
         //任务编号
@@ -146,17 +195,17 @@ public class CtTaskInfoController extends BaseController {
 
         //开始时间
         if(Validator.isNotEmpty(ctTaskInfo.getStartDate())){
-            queryWrapper.eq(CtTaskInfo::getStartDate,ctTaskInfo.getStartDate());
+            queryWrapper.ge(CtTaskInfo::getStartDate,ctTaskInfo.getStartDate());
         }
 
         //结束时间
         if(Validator.isNotEmpty(ctTaskInfo.getEndDate())){
-            queryWrapper.eq(CtTaskInfo::getEndDate,ctTaskInfo.getEndDate());
+            queryWrapper.le(CtTaskInfo::getEndDate,ctTaskInfo.getEndDate());
         }
 
         //任务要求
         if(Validator.isNotEmpty(ctTaskInfo.getTaskContent())){
-            queryWrapper.eq(CtTaskInfo::getTaskContent,ctTaskInfo.getTaskContent());
+            queryWrapper.like(CtTaskInfo::getTaskContent,ctTaskInfo.getTaskContent());
         }
 
         //完成状态

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

@@ -63,6 +63,11 @@ public class CtTaskInfo extends BaseEntity{
     @ApiModelProperty(value = "结束时间")
     private Date endDate;
 
+    //@Excel(name = "任务要求")
+    @ApiModelProperty(value = "任务期限")
+    @TableField(exist = false)
+    private String startToEndDate;
+
     /** 任务要求 */
 
     @Excel(name = "任务要求")
@@ -101,10 +106,17 @@ public class CtTaskInfo extends BaseEntity{
 
     /** 任务发起部门 */
 
-    @Excel(name = "任务发起部门")
+    //@Excel(name = "任务发起部门")
     @ApiModelProperty(value = "任务发起部门")
     private Long deptId;
 
+    /** 任务发起部门 */
+
+    @Excel(name = "任务发起部门")
+    @ApiModelProperty(value = "任务发起部门")
+    @TableField(exist = false)
+    private String deptName;
+
     /** 任务发布日期 */
 
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -112,6 +124,21 @@ public class CtTaskInfo extends BaseEntity{
     @ApiModelProperty(value = "任务发布日期")
     private Date taskDate;
 
+    @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 = "备注")

bs-admin/src/main/java/com/bs/web/controller/system/SysDeptController.java

@@ -1,18 +1,16 @@
 package com.bs.web.controller.system;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.bs.common.annotation.Log;
 import com.bs.common.constant.UserConstants;
 import com.bs.common.core.controller.BaseController;
@@ -45,6 +43,42 @@ public class SysDeptController extends BaseController
         return success(depts);
     }
 
+    @GetMapping({"/getTree"})
+    @ResponseBody
+    public List<SysDept> getTree(SysDept dept) {
+        List<SysDept> depts = deptService.selectDeptList(dept);
+        List<SysDept> tree = buildDeptTree(depts);
+        return tree;
+    }
+
+    // 构建树状结构
+    public static List<SysDept> buildDeptTree(List<SysDept> deptList) {
+        Map<Long, SysDept> deptMap = new HashMap<>();
+        List<SysDept> rootDepts = new ArrayList<>();
+        // 将所有部门添加到映射中
+        for (SysDept dept : deptList) {
+            deptMap.put(dept.getDeptId(), dept);
+        }
+        // 构建树状结构
+        for (SysDept dept : deptList) {
+            Long parentId = dept.getParentId();
+            if (parentId == null || parentId == 0 || !deptMap.containsKey(parentId)) {
+                // 如果没有父节点或父节点不在列表中，视为根节点
+                rootDepts.add(dept);
+            } else {
+                SysDept parentDept = deptMap.get(parentId);
+                if (parentDept != null) {
+                    // 确保父节点有一个 children 列表
+                    if (parentDept.getChildren() == null) {
+                        parentDept.setChildren(new ArrayList<>());
+                    }
+                    parentDept.getChildren().add(dept);
+                }
+            }
+        }
+        return rootDepts;
+    }
+
     /**
      * 查询部门列表（排除节点）
      */

bs-common/src/main/java/com/bs/common/core/domain/BaseEntity.java

@@ -67,8 +67,8 @@ public class BaseEntity implements Serializable {
     /**
      * 更新时间
      */
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private String remark;
+//    @TableField(fill = FieldFill.INSERT_UPDATE)
+//    private String remarks;
     /**
      * 逻辑删除标示
      */
@@ -147,15 +147,15 @@ public class BaseEntity implements Serializable {
         this.updateTime = updateTime;
     }
 
-    public String getRemark()
-    {
-        return remark;
-    }
+    //public String getRemarks()
+//    {
+//        return remarks;
+//    }
 
-    public void setRemark(String remark)
-    {
-        this.remark = remark;
-    }
+    //public void setRemarks(String remarks)
+//    {
+//        this.remarks = remarks;
+//    }
 
     public Map<String, Object> getParams()
     {

bs-ui/src/api/system/dept.js

@@ -9,6 +9,15 @@ export function listDept(query) {
   })
 }
 
+// 查询部门列表
+export function getAllTree(query) {
+  return request({
+    url: '/system/dept/getTree',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询部门列表（排除节点）
 export function listDeptExcludeChild(deptId) {
   return request({

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

@@ -26,6 +26,14 @@ export function getInfo(id) {
   })
 }
 
+// 撤回其他任务
+export function withdrawOther(id) {
+  return request({
+    url: '/task/info/withdraw/' + id,
+    method: 'get'
+  })
+}
+
 // 新增任务信息
 export function addInfo(data) {
   return request({

bs-ui/src/components/BranchCascaderDialog/index.vue

@@ -20,7 +20,7 @@
 </template>
 
 <script>
-// import { getAllTree } from "@/api/";
+import { getAllTree } from "@/api/system/dept";
 
 export default {
   name: "BranchCascaderDialog",

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

@@ -6,39 +6,44 @@
       <div>
         <div :span="24">
           <el-form ref="seachForm" :inline="true" class="demo-form-inline">
-            <el-form-item label="机构代码">
+            <el-form-item label="任务名称">
               <el-input
-                v-model="query.branchCode"
+                v-model="query.taskTitle"
                 placeholder="请输入"
                 maxlength="32"
                 clearable
               />
             </el-form-item>
-            <el-form-item label="机构名称">
+            <el-form-item label="任务类型">
               <el-input
-                v-model="query.branchName"
+                v-model="query.taskType"
                 placeholder="请输入"
                 maxlength="32"
                 clearable
               />
             </el-form-item>
-            <el-form-item label="开始时间">
-              <el-date-picker
-                v-model="query.startDate"
-                value-format="yyyy-MM-dd"
-                type="date"
-                placeholder="选择日期"
+            <el-form-item label="任务内容">
+              <el-input
+                v-model="query.taskContent"
+                placeholder="请输入"
+                maxlength="32"
                 clearable
-              ></el-date-picker>
+              />
             </el-form-item>
-            <el-form-item label="结束时间">
-              <el-date-picker
-                v-model="query.endDate"
-                value-format="yyyy-MM-dd"
-                type="date"
-                placeholder="选择日期"
+            <el-form-item label="任务状态">
+              <el-input
+                v-model="query.status"
+                placeholder="请输入"
+                maxlength="32"
                 clearable
-              ></el-date-picker>
+              />
+            </el-form-item>
+
+            <el-form-item label="申请日期">
+              <!-- <el-date-picker v-model="query.applyTimeVo" value-format="yyyy-MM-dd" type="date" placeholder="选择日期"
+                clearable></el-date-picker> -->
+              <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>
             </el-form-item>
             <el-form-item>
               <el-button
@@ -83,54 +88,84 @@
         <!-- <el-table-column type="selection" width="50" /> -->
         <el-table-column
           align="center"
-          label="机构代码"
+          label="任务名称"
           show-overflow-tooltip
-          min-width="90"
-          prop="branchCode"
-        >
-        </el-table-column>
+          min-width="160"
+          prop="taskTitle"
+        />
         <el-table-column
           align="center"
-          label="机构名称"
+          label="任务类型"
+          show-overflow-tooltip
+          min-width="160"
+          prop="taskType"
+        />
+        <el-table-column
+          align="center"
+          label="任务内容"
+          show-overflow-tooltip
+          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="任务标题"
+          label="发布人"
           show-overflow-tooltip
           min-width="160"
-          prop="sdTaskOther.taskTitle"
-        />
+          prop="taskInitiator"
+        >
+        </el-table-column>
         <el-table-column
           align="center"
-          label="开始时间"
+          label="任务期限"
           show-overflow-tooltip
           min-width="120"
-          prop="sdTaskOther.startDate"
+          prop="startToEndDate"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          label="结束时间"
+          label="办理单位"
           show-overflow-tooltip
           min-width="120"
-          prop="sdTaskOther.endDate"
+          prop="transactBranchName"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          label="反馈时间"
+          label="办理部门"
           show-overflow-tooltip
           min-width="120"
-          prop="sdTaskOtherFeedbackByFeedback.feedbackTime"
+          prop="transactDeptName"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          label="反馈状态"
+          label="办理人"
+          show-overflow-tooltip
+          min-width="120"
+          prop="transactInitiator"
+        >
+        </el-table-column>
+        <el-table-column
+          align="center"
+          label="任务状态"
           show-overflow-tooltip
           min-width="90"
         >
@@ -185,7 +220,7 @@
 <script>
 import AuditDialog from "@/views/task-distribut/send/other-task/components/AuditDialog";
 import TableMixin from "@/mixins/table-mixin";
-import { pageListBranch } from "@/api/task/branch";
+import { pageListInfo } from "@/api/task/info";
 
 export default {
   name: "BranchOtherTask",
@@ -195,8 +230,8 @@ export default {
   mixins: [TableMixin],
   pageInfo: {
     title: "机构任务",
-    exportUrl: "/task/other/branch/export",
-    pageListApi: pageListBranch,
+    exportUrl: "/task/info/export",
+    pageListApi: pageListInfo,
     // deleteApi: delOther,
     defaultQuery: {
       isPublish: "1",
@@ -229,12 +264,18 @@ export default {
     },
   },
   data() {
-    return {};
+    return {
+      dateRange: [],
+    };
   },
   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.query.taskId = null;

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

@@ -272,6 +272,7 @@ export default {
         });
     },
     branchChange(val) {
+      console.log(this.branchList);
       val.forEach((item) => {
         if (this.branchList.some((v) => v.branchCode === item.deptId + "")) {
           return;
@@ -317,7 +318,7 @@ export default {
             return newVal;
           }),
           status: this.isSubmit, // 发布
-          taskDate: getDateStr(),
+          // taskDate: getDateStr(),
         };
       }
       return {

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

@@ -188,7 +188,7 @@
           @pagination="getTableList"
         />
       </el-card>
-      <BranchOtherTask customLoad :isPublish="false" :taskId="selectTask.id"></BranchOtherTask>
+<!--      <BranchOtherTask customLoad :isPublish="false" :taskId="selectTask.id"></BranchOtherTask>-->
       <EditDialog ref="editDialog" @refresh="getTableList"></EditDialog>
       <RemarkDialog ref="remarkDialog" @refresh="getTableList"></RemarkDialog>
   </div>
@@ -199,7 +199,7 @@
 import EditDialog from "./components/EditDialog";
 import RemarkDialog from "./components/RemarkDialog";
 import TableMixin from "@/mixins/table-mixin";
-import { pageListInfo, delInfo, getInfo as withdrawOther,getInfo as editByAffiliation } from "@/api/task/info";
+import { pageListInfo, delInfo, withdrawOther,getInfo as editByAffiliation } from "@/api/task/info";
 import BranchOtherTask from '@/views/task-distribut/feedback/other-task';
 
 export default {
@@ -256,16 +256,16 @@ export default {
       this.$refs.remarkDialog.open(row);
     },
     // 设为私有
-    toPrivate(row) {
-      this.$confirm(`确定设置为${row.affiliation ? '公开':'私有'}吗？`, '温馨提示', {
-        type: 'warning'
-      }).then(res => {
-        editByAffiliation(row.id).then(() => {
-          this.$message.success('设置成功');
-          this.getTableList();
-        });
-      });
-    }
+    // toPrivate(row) {
+    //   this.$confirm(`确定设置为${row.affiliation ? '公开':'私有'}吗？`, '温馨提示', {
+    //     type: 'warning'
+    //   }).then(res => {
+    //     editByAffiliation(row.id).then(() => {
+    //       this.$message.success('设置成功');
+    //       this.getTableList();
+    //     });
+    //   });
+    // }
   }
 };
 </script>