diff --git a/bs-admin/src/main/java/com/bs/ct/controller/CtTaskInfoController.java b/bs-admin/src/main/java/com/bs/ct/controller/CtTaskInfoController.java index 5a54401..ab50912 100644 --- a/bs-admin/src/main/java/com/bs/ct/controller/CtTaskInfoController.java +++ b/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 queryWrapper = new LambdaQueryWrapper(); condition(queryWrapper,ctTaskInfo); List 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 list) { + List depts = deptService.selectDeptList(new SysDept()); + Map 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 ids) { + List sdTaskOthers = ctTaskInfoService.listByIds(ids); + for (CtTaskInfo sdTaskOther : sdTaskOthers) { + sdTaskOther.setStatus("0"); + } + List sdTaskOtherBranches = ctTaskBranchService.list(new LambdaQueryWrapper() + .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()); } //完成状态 diff --git a/bs-admin/src/main/java/com/bs/ct/domain/CtTaskInfo.java b/bs-admin/src/main/java/com/bs/ct/domain/CtTaskInfo.java index a2c9856..1d5fd7e 100644 --- a/bs-admin/src/main/java/com/bs/ct/domain/CtTaskInfo.java +++ b/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 = "备注") diff --git a/bs-admin/src/main/java/com/bs/web/controller/system/SysDeptController.java b/bs-admin/src/main/java/com/bs/web/controller/system/SysDeptController.java index bf15568..d5de088 100644 --- a/bs-admin/src/main/java/com/bs/web/controller/system/SysDeptController.java +++ b/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 getTree(SysDept dept) { + List depts = deptService.selectDeptList(dept); + List tree = buildDeptTree(depts); + return tree; + } + + // 构建树状结构 + public static List buildDeptTree(List deptList) { + Map deptMap = new HashMap<>(); + List 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; + } + /** * 查询部门列表（排除节点） */ diff --git a/bs-common/src/main/java/com/bs/common/core/domain/BaseEntity.java b/bs-common/src/main/java/com/bs/common/core/domain/BaseEntity.java index 3c24f3f..6838537 100644 --- a/bs-common/src/main/java/com/bs/common/core/domain/BaseEntity.java +++ b/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 getParams() { diff --git a/bs-ui/src/api/system/dept.js b/bs-ui/src/api/system/dept.js index fc943cd..f2a0c59 100644 --- a/bs-ui/src/api/system/dept.js +++ b/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({ @@ -49,4 +58,4 @@ export function delDept(deptId) { url: '/system/dept/' + deptId, method: 'delete' }) -} \ No newline at end of file +} diff --git a/bs-ui/src/api/task/info.js b/bs-ui/src/api/task/info.js index 3adf796..cf66f86 100644 --- a/bs-ui/src/api/task/info.js +++ b/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({ diff --git a/bs-ui/src/components/BranchCascaderDialog/index.vue b/bs-ui/src/components/BranchCascaderDialog/index.vue index b8c775d..e247881 100644 --- a/bs-ui/src/components/BranchCascaderDialog/index.vue +++ b/bs-ui/src/components/BranchCascaderDialog/index.vue @@ -20,7 +20,7 @@ \ No newline at end of file + diff --git a/bs-ui/src/views/task-distribut/feedback/other-task/index.vue b/bs-ui/src/views/task-distribut/feedback/other-task/index.vue index aadad63..7ebc827 100644 --- a/bs-ui/src/views/task-distribut/feedback/other-task/index.vue +++ b/bs-ui/src/views/task-distribut/feedback/other-task/index.vue @@ -6,39 +6,44 @@
- + - + - - + + /> - - + + /> + + + + + --> - + min-width="160" + prop="taskTitle" + /> + + + + + prop="taskInitiator" + > + + + @@ -185,7 +220,7 @@