diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcTaskManageController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcTaskManageController.java new file mode 100644 index 0000000..8574953 --- /dev/null +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcTaskManageController.java @@ -0,0 +1,104 @@ +package com.ruoyi.szxc.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.szxc.domain.SzxcTaskManage; +import com.ruoyi.szxc.service.ISzxcTaskManageService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 任务管理Controller + * + * @author hs + * @date 2024-04-28 + */ +@RestController +@RequestMapping("/szxc/taskManage") +public class SzxcTaskManageController extends BaseController +{ + @Autowired + private ISzxcTaskManageService szxcTaskManageService; + + /** + * 查询任务管理列表 + */ + @PreAuthorize("@ss.hasPermi('szxc:taskManage:list')") + @GetMapping("/list") + public TableDataInfo list(SzxcTaskManage szxcTaskManage) + { + startPage(); + List list = szxcTaskManageService.selectSzxcTaskManageList(szxcTaskManage); + return getDataTable(list); + } + + /** + * 导出任务管理列表 + */ + @PreAuthorize("@ss.hasPermi('szxc:taskManage:export')") + @Log(title = "任务管理", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, SzxcTaskManage szxcTaskManage) + { + List list = szxcTaskManageService.selectSzxcTaskManageList(szxcTaskManage); + ExcelUtil util = new ExcelUtil(SzxcTaskManage.class); + util.exportExcel(response, list, "任务管理数据"); + } + + /** + * 获取任务管理详细信息 + */ + @PreAuthorize("@ss.hasPermi('szxc:taskManage:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(szxcTaskManageService.selectSzxcTaskManageById(id)); + } + + /** + * 新增任务管理 + */ + @PreAuthorize("@ss.hasPermi('szxc:taskManage:add')") + @Log(title = "任务管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SzxcTaskManage szxcTaskManage) + { + return toAjax(szxcTaskManageService.insertSzxcTaskManage(szxcTaskManage)); + } + + /** + * 修改任务管理 + */ + @PreAuthorize("@ss.hasPermi('szxc:taskManage:edit')") + @Log(title = "任务管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SzxcTaskManage szxcTaskManage) + { + return toAjax(szxcTaskManageService.updateSzxcTaskManage(szxcTaskManage)); + } + + /** + * 删除任务管理 + */ + @PreAuthorize("@ss.hasPermi('szxc:taskManage:remove')") + @Log(title = "任务管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(szxcTaskManageService.deleteSzxcTaskManageByIds(ids)); + } +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcTaskRecardController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcTaskRecardController.java new file mode 100644 index 0000000..bcd3e97 --- /dev/null +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcTaskRecardController.java @@ -0,0 +1,104 @@ +package com.ruoyi.szxc.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.szxc.domain.SzxcTaskRecard; +import com.ruoyi.szxc.service.ISzxcTaskRecardService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 任务处理记录Controller + * + * @author hs + * @date 2024-04-28 + */ +@RestController +@RequestMapping("/szxc/taskRecard") +public class SzxcTaskRecardController extends BaseController +{ + @Autowired + private ISzxcTaskRecardService szxcTaskRecardService; + + /** + * 查询任务处理记录列表 + */ + @PreAuthorize("@ss.hasPermi('szxc:taskRecard:list')") + @GetMapping("/list") + public TableDataInfo list(SzxcTaskRecard szxcTaskRecard) + { + startPage(); + List list = szxcTaskRecardService.selectSzxcTaskRecardList(szxcTaskRecard); + return getDataTable(list); + } + + /** + * 导出任务处理记录列表 + */ + @PreAuthorize("@ss.hasPermi('szxc:taskRecard:export')") + @Log(title = "任务处理记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, SzxcTaskRecard szxcTaskRecard) + { + List list = szxcTaskRecardService.selectSzxcTaskRecardList(szxcTaskRecard); + ExcelUtil util = new ExcelUtil(SzxcTaskRecard.class); + util.exportExcel(response, list, "任务处理记录数据"); + } + + /** + * 获取任务处理记录详细信息 + */ + @PreAuthorize("@ss.hasPermi('szxc:taskRecard:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(szxcTaskRecardService.selectSzxcTaskRecardById(id)); + } + + /** + * 新增任务处理记录 + */ + @PreAuthorize("@ss.hasPermi('szxc:taskRecard:add')") + @Log(title = "任务处理记录", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SzxcTaskRecard szxcTaskRecard) + { + return toAjax(szxcTaskRecardService.insertSzxcTaskRecard(szxcTaskRecard)); + } + + /** + * 修改任务处理记录 + */ + @PreAuthorize("@ss.hasPermi('szxc:taskRecard:edit')") + @Log(title = "任务处理记录", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SzxcTaskRecard szxcTaskRecard) + { + return toAjax(szxcTaskRecardService.updateSzxcTaskRecard(szxcTaskRecard)); + } + + /** + * 删除任务处理记录 + */ + @PreAuthorize("@ss.hasPermi('szxc:taskRecard:remove')") + @Log(title = "任务处理记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(szxcTaskRecardService.deleteSzxcTaskRecardByIds(ids)); + } +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcTaskManage.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcTaskManage.java new file mode 100644 index 0000000..79903f2 --- /dev/null +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcTaskManage.java @@ -0,0 +1,271 @@ +package com.ruoyi.szxc.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.Date; + +/** + * 任务管理对象 szxc_task_manage + * + * @author hs + * @date 2024-04-28 + */ +public class SzxcTaskManage extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** id */ + private Long id; + + /** 上报人 */ + @Excel(name = "上报人") + private String subName; + + /** 上报日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "上报日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date subDate; + + /** 联系电话 */ + @Excel(name = "联系电话") + private String phone; + + /** 任务分类(字典) */ + @Excel(name = "任务分类(字典)") + private String taskType; + + /** 任务主题(字典) */ + @Excel(name = "任务主题(字典)") + private String title; + + /** 任务描述 */ + @Excel(name = "任务描述") + private String content; + + /** 截止日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "截止日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date expiredDate; + + /** 任务状态(字典) */ + @Excel(name = "任务状态(字典)") + private String status; + + /** 当前分派到部门 */ + @Excel(name = "当前分派到部门") + private String sendedDept; + + /** 当前分派到部门id */ + @Excel(name = "当前分派到部门id") + private Long sendedDeptid; + + /** 分派到用户 */ + @Excel(name = "分派到用户") + private String handleName; + + /** 分派到用户id */ + @Excel(name = "分派到用户id") + private Long userId; + + /** 处理结果 */ + @Excel(name = "处理结果") + private String handleResult; + + /** 处理原由 */ + @Excel(name = "处理原由") + private String handleReason; + + /** 部门id */ + @Excel(name = "部门id") + private Long deptId; + + /** 网格名称 */ + @Excel(name = "网格名称") + private String deptName; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setSubName(String subName) + { + this.subName = subName; + } + + public String getSubName() + { + return subName; + } + public void setSubDate(Date subDate) + { + this.subDate = subDate; + } + + public Date getSubDate() + { + return subDate; + } + public void setPhone(String phone) + { + this.phone = phone; + } + + public String getPhone() + { + return phone; + } + public void setTaskType(String taskType) + { + this.taskType = taskType; + } + + public String getTaskType() + { + return taskType; + } + public void setTitle(String title) + { + this.title = title; + } + + public String getTitle() + { + return title; + } + public void setContent(String content) + { + this.content = content; + } + + public String getContent() + { + return content; + } + public void setExpiredDate(Date expiredDate) + { + this.expiredDate = expiredDate; + } + + public Date getExpiredDate() + { + return expiredDate; + } + public void setStatus(String status) + { + this.status = status; + } + + public String getStatus() + { + return status; + } + public void setSendedDept(String sendedDept) + { + this.sendedDept = sendedDept; + } + + public String getSendedDept() + { + return sendedDept; + } + public void setSendedDeptid(Long sendedDeptid) + { + this.sendedDeptid = sendedDeptid; + } + + public Long getSendedDeptid() + { + return sendedDeptid; + } + public void setHandleName(String handleName) + { + this.handleName = handleName; + } + + public String getHandleName() + { + return handleName; + } + public void setUserId(Long userId) + { + this.userId = userId; + } + + public Long getUserId() + { + return userId; + } + public void setHandleResult(String handleResult) + { + this.handleResult = handleResult; + } + + public String getHandleResult() + { + return handleResult; + } + public void setHandleReason(String handleReason) + { + this.handleReason = handleReason; + } + + public String getHandleReason() + { + return handleReason; + } + public void setDeptId(Long deptId) + { + this.deptId = deptId; + } + + public Long getDeptId() + { + return deptId; + } + public void setDeptName(String deptName) + { + this.deptName = deptName; + } + + public String getDeptName() + { + return deptName; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("subName", getSubName()) + .append("subDate", getSubDate()) + .append("phone", getPhone()) + .append("taskType", getTaskType()) + .append("title", getTitle()) + .append("content", getContent()) + .append("expiredDate", getExpiredDate()) + .append("status", getStatus()) + .append("sendedDept", getSendedDept()) + .append("sendedDeptid", getSendedDeptid()) + .append("handleName", getHandleName()) + .append("userId", getUserId()) + .append("handleResult", getHandleResult()) + .append("handleReason", getHandleReason()) + .append("remark", getRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("deptId", getDeptId()) + .append("deptName", getDeptName()) + .toString(); + } +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcTaskRecard.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcTaskRecard.java new file mode 100644 index 0000000..4ca87bf --- /dev/null +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcTaskRecard.java @@ -0,0 +1,238 @@ +package com.ruoyi.szxc.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 任务处理记录对象 szxc_task_recard + * + * @author hs + * @date 2024-04-28 + */ +public class SzxcTaskRecard extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** id */ + private Long id; + + /** 任务id */ + @Excel(name = "任务id") + private Long taskId; + + /** 记录类型(字典) */ + @Excel(name = "记录类型(字典)") + private String taskRecardType; + + /** 下发部门 */ + @Excel(name = "下发部门") + private String xfDept; + + /** 下发人 */ + @Excel(name = "下发人") + private String xfName; + + /** 下发到部门 */ + @Excel(name = "下发到部门") + private String xfdDept; + + /** 下发到人 */ + @Excel(name = "下发到人") + private String xfdName; + + /** 转派部门 */ + @Excel(name = "转派部门") + private String zpDept; + + /** 转派人 */ + @Excel(name = "转派人") + private String zpName; + + /** 转派到部门 */ + @Excel(name = "转派到部门") + private String zpdDept; + + /** 转派到人 */ + @Excel(name = "转派到人") + private String zpdName; + + /** 处理部门 */ + @Excel(name = "处理部门") + private String clDept; + + /** 处理人 */ + @Excel(name = "处理人") + private String clName; + + /** 处理结果 */ + @Excel(name = "处理结果") + private String clResult; + + /** 转派人 */ + @Excel(name = "转派人") + private String clReason; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setTaskId(Long taskId) + { + this.taskId = taskId; + } + + public Long getTaskId() + { + return taskId; + } + public void setTaskRecardType(String taskRecardType) + { + this.taskRecardType = taskRecardType; + } + + public String getTaskRecardType() + { + return taskRecardType; + } + public void setXfDept(String xfDept) + { + this.xfDept = xfDept; + } + + public String getXfDept() + { + return xfDept; + } + public void setXfName(String xfName) + { + this.xfName = xfName; + } + + public String getXfName() + { + return xfName; + } + public void setXfdDept(String xfdDept) + { + this.xfdDept = xfdDept; + } + + public String getXfdDept() + { + return xfdDept; + } + public void setXfdName(String xfdName) + { + this.xfdName = xfdName; + } + + public String getXfdName() + { + return xfdName; + } + public void setZpDept(String zpDept) + { + this.zpDept = zpDept; + } + + public String getZpDept() + { + return zpDept; + } + public void setZpName(String zpName) + { + this.zpName = zpName; + } + + public String getZpName() + { + return zpName; + } + public void setZpdDept(String zpdDept) + { + this.zpdDept = zpdDept; + } + + public String getZpdDept() + { + return zpdDept; + } + public void setZpdName(String zpdName) + { + this.zpdName = zpdName; + } + + public String getZpdName() + { + return zpdName; + } + public void setClDept(String clDept) + { + this.clDept = clDept; + } + + public String getClDept() + { + return clDept; + } + public void setClName(String clName) + { + this.clName = clName; + } + + public String getClName() + { + return clName; + } + public void setClResult(String clResult) + { + this.clResult = clResult; + } + + public String getClResult() + { + return clResult; + } + public void setClReason(String clReason) + { + this.clReason = clReason; + } + + public String getClReason() + { + return clReason; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("taskId", getTaskId()) + .append("taskRecardType", getTaskRecardType()) + .append("xfDept", getXfDept()) + .append("xfName", getXfName()) + .append("xfdDept", getXfdDept()) + .append("xfdName", getXfdName()) + .append("zpDept", getZpDept()) + .append("zpName", getZpName()) + .append("zpdDept", getZpdDept()) + .append("zpdName", getZpdName()) + .append("clDept", getClDept()) + .append("clName", getClName()) + .append("clResult", getClResult()) + .append("clReason", getClReason()) + .append("remark", getRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcTaskManageMapper.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcTaskManageMapper.java new file mode 100644 index 0000000..c9af579 --- /dev/null +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcTaskManageMapper.java @@ -0,0 +1,62 @@ +package com.ruoyi.szxc.mapper; + +import com.ruoyi.szxc.domain.SzxcTaskManage; + +import java.util.List; + +/** + * 任务管理Mapper接口 + * + * @author hs + * @date 2024-04-28 + */ +public interface SzxcTaskManageMapper +{ + /** + * 查询任务管理 + * + * @param id 任务管理主键 + * @return 任务管理 + */ + public SzxcTaskManage selectSzxcTaskManageById(Long id); + + /** + * 查询任务管理列表 + * + * @param szxcTaskManage 任务管理 + * @return 任务管理集合 + */ + public List selectSzxcTaskManageList(SzxcTaskManage szxcTaskManage); + + /** + * 新增任务管理 + * + * @param szxcTaskManage 任务管理 + * @return 结果 + */ + public int insertSzxcTaskManage(SzxcTaskManage szxcTaskManage); + + /** + * 修改任务管理 + * + * @param szxcTaskManage 任务管理 + * @return 结果 + */ + public int updateSzxcTaskManage(SzxcTaskManage szxcTaskManage); + + /** + * 删除任务管理 + * + * @param id 任务管理主键 + * @return 结果 + */ + public int deleteSzxcTaskManageById(Long id); + + /** + * 批量删除任务管理 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSzxcTaskManageByIds(Long[] ids); +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcTaskRecardMapper.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcTaskRecardMapper.java new file mode 100644 index 0000000..c86edae --- /dev/null +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcTaskRecardMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.szxc.mapper; + +import java.util.List; +import com.ruoyi.szxc.domain.SzxcTaskRecard; + +/** + * 任务处理记录Mapper接口 + * + * @author hs + * @date 2024-04-28 + */ +public interface SzxcTaskRecardMapper +{ + /** + * 查询任务处理记录 + * + * @param id 任务处理记录主键 + * @return 任务处理记录 + */ + public SzxcTaskRecard selectSzxcTaskRecardById(Long id); + + /** + * 查询任务处理记录列表 + * + * @param szxcTaskRecard 任务处理记录 + * @return 任务处理记录集合 + */ + public List selectSzxcTaskRecardList(SzxcTaskRecard szxcTaskRecard); + + /** + * 新增任务处理记录 + * + * @param szxcTaskRecard 任务处理记录 + * @return 结果 + */ + public int insertSzxcTaskRecard(SzxcTaskRecard szxcTaskRecard); + + /** + * 修改任务处理记录 + * + * @param szxcTaskRecard 任务处理记录 + * @return 结果 + */ + public int updateSzxcTaskRecard(SzxcTaskRecard szxcTaskRecard); + + /** + * 删除任务处理记录 + * + * @param id 任务处理记录主键 + * @return 结果 + */ + public int deleteSzxcTaskRecardById(Long id); + + /** + * 批量删除任务处理记录 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSzxcTaskRecardByIds(Long[] ids); +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcTaskManageService.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcTaskManageService.java new file mode 100644 index 0000000..814f0e5 --- /dev/null +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcTaskManageService.java @@ -0,0 +1,62 @@ +package com.ruoyi.szxc.service; + +import com.ruoyi.szxc.domain.SzxcTaskManage; + +import java.util.List; + +/** + * 任务管理Service接口 + * + * @author hs + * @date 2024-04-28 + */ +public interface ISzxcTaskManageService +{ + /** + * 查询任务管理 + * + * @param id 任务管理主键 + * @return 任务管理 + */ + public SzxcTaskManage selectSzxcTaskManageById(Long id); + + /** + * 查询任务管理列表 + * + * @param szxcTaskManage 任务管理 + * @return 任务管理集合 + */ + public List selectSzxcTaskManageList(SzxcTaskManage szxcTaskManage); + + /** + * 新增任务管理 + * + * @param szxcTaskManage 任务管理 + * @return 结果 + */ + public int insertSzxcTaskManage(SzxcTaskManage szxcTaskManage); + + /** + * 修改任务管理 + * + * @param szxcTaskManage 任务管理 + * @return 结果 + */ + public int updateSzxcTaskManage(SzxcTaskManage szxcTaskManage); + + /** + * 批量删除任务管理 + * + * @param ids 需要删除的任务管理主键集合 + * @return 结果 + */ + public int deleteSzxcTaskManageByIds(Long[] ids); + + /** + * 删除任务管理信息 + * + * @param id 任务管理主键 + * @return 结果 + */ + public int deleteSzxcTaskManageById(Long id); +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcTaskRecardService.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcTaskRecardService.java new file mode 100644 index 0000000..275fbcf --- /dev/null +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcTaskRecardService.java @@ -0,0 +1,61 @@ +package com.ruoyi.szxc.service; + +import java.util.List; +import com.ruoyi.szxc.domain.SzxcTaskRecard; + +/** + * 任务处理记录Service接口 + * + * @author hs + * @date 2024-04-28 + */ +public interface ISzxcTaskRecardService +{ + /** + * 查询任务处理记录 + * + * @param id 任务处理记录主键 + * @return 任务处理记录 + */ + public SzxcTaskRecard selectSzxcTaskRecardById(Long id); + + /** + * 查询任务处理记录列表 + * + * @param szxcTaskRecard 任务处理记录 + * @return 任务处理记录集合 + */ + public List selectSzxcTaskRecardList(SzxcTaskRecard szxcTaskRecard); + + /** + * 新增任务处理记录 + * + * @param szxcTaskRecard 任务处理记录 + * @return 结果 + */ + public int insertSzxcTaskRecard(SzxcTaskRecard szxcTaskRecard); + + /** + * 修改任务处理记录 + * + * @param szxcTaskRecard 任务处理记录 + * @return 结果 + */ + public int updateSzxcTaskRecard(SzxcTaskRecard szxcTaskRecard); + + /** + * 批量删除任务处理记录 + * + * @param ids 需要删除的任务处理记录主键集合 + * @return 结果 + */ + public int deleteSzxcTaskRecardByIds(Long[] ids); + + /** + * 删除任务处理记录信息 + * + * @param id 任务处理记录主键 + * @return 结果 + */ + public int deleteSzxcTaskRecardById(Long id); +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcTaskManageServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcTaskManageServiceImpl.java new file mode 100644 index 0000000..8f4648d --- /dev/null +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcTaskManageServiceImpl.java @@ -0,0 +1,97 @@ +package com.ruoyi.szxc.service.impl; + +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.szxc.domain.SzxcTaskManage; +import com.ruoyi.szxc.mapper.SzxcTaskManageMapper; +import com.ruoyi.szxc.service.ISzxcTaskManageService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 任务管理Service业务层处理 + * + * @author hs + * @date 2024-04-28 + */ +@Service +public class SzxcTaskManageServiceImpl implements ISzxcTaskManageService +{ + @Autowired + private SzxcTaskManageMapper szxcTaskManageMapper; + + /** + * 查询任务管理 + * + * @param id 任务管理主键 + * @return 任务管理 + */ + @Override + public SzxcTaskManage selectSzxcTaskManageById(Long id) + { + return szxcTaskManageMapper.selectSzxcTaskManageById(id); + } + + /** + * 查询任务管理列表 + * + * @param szxcTaskManage 任务管理 + * @return 任务管理 + */ + @Override + public List selectSzxcTaskManageList(SzxcTaskManage szxcTaskManage) + { + return szxcTaskManageMapper.selectSzxcTaskManageList(szxcTaskManage); + } + + /** + * 新增任务管理 + * + * @param szxcTaskManage 任务管理 + * @return 结果 + */ + @Override + public int insertSzxcTaskManage(SzxcTaskManage szxcTaskManage) + { + szxcTaskManage.setCreateTime(DateUtils.getNowDate()); + return szxcTaskManageMapper.insertSzxcTaskManage(szxcTaskManage); + } + + /** + * 修改任务管理 + * + * @param szxcTaskManage 任务管理 + * @return 结果 + */ + @Override + public int updateSzxcTaskManage(SzxcTaskManage szxcTaskManage) + { + szxcTaskManage.setUpdateTime(DateUtils.getNowDate()); + return szxcTaskManageMapper.updateSzxcTaskManage(szxcTaskManage); + } + + /** + * 批量删除任务管理 + * + * @param ids 需要删除的任务管理主键 + * @return 结果 + */ + @Override + public int deleteSzxcTaskManageByIds(Long[] ids) + { + return szxcTaskManageMapper.deleteSzxcTaskManageByIds(ids); + } + + /** + * 删除任务管理信息 + * + * @param id 任务管理主键 + * @return 结果 + */ + @Override + public int deleteSzxcTaskManageById(Long id) + { + return szxcTaskManageMapper.deleteSzxcTaskManageById(id); + } +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcTaskRecardServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcTaskRecardServiceImpl.java new file mode 100644 index 0000000..aee3936 --- /dev/null +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcTaskRecardServiceImpl.java @@ -0,0 +1,96 @@ +package com.ruoyi.szxc.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.szxc.mapper.SzxcTaskRecardMapper; +import com.ruoyi.szxc.domain.SzxcTaskRecard; +import com.ruoyi.szxc.service.ISzxcTaskRecardService; + +/** + * 任务处理记录Service业务层处理 + * + * @author hs + * @date 2024-04-28 + */ +@Service +public class SzxcTaskRecardServiceImpl implements ISzxcTaskRecardService +{ + @Autowired + private SzxcTaskRecardMapper szxcTaskRecardMapper; + + /** + * 查询任务处理记录 + * + * @param id 任务处理记录主键 + * @return 任务处理记录 + */ + @Override + public SzxcTaskRecard selectSzxcTaskRecardById(Long id) + { + return szxcTaskRecardMapper.selectSzxcTaskRecardById(id); + } + + /** + * 查询任务处理记录列表 + * + * @param szxcTaskRecard 任务处理记录 + * @return 任务处理记录 + */ + @Override + public List selectSzxcTaskRecardList(SzxcTaskRecard szxcTaskRecard) + { + return szxcTaskRecardMapper.selectSzxcTaskRecardList(szxcTaskRecard); + } + + /** + * 新增任务处理记录 + * + * @param szxcTaskRecard 任务处理记录 + * @return 结果 + */ + @Override + public int insertSzxcTaskRecard(SzxcTaskRecard szxcTaskRecard) + { + szxcTaskRecard.setCreateTime(DateUtils.getNowDate()); + return szxcTaskRecardMapper.insertSzxcTaskRecard(szxcTaskRecard); + } + + /** + * 修改任务处理记录 + * + * @param szxcTaskRecard 任务处理记录 + * @return 结果 + */ + @Override + public int updateSzxcTaskRecard(SzxcTaskRecard szxcTaskRecard) + { + szxcTaskRecard.setUpdateTime(DateUtils.getNowDate()); + return szxcTaskRecardMapper.updateSzxcTaskRecard(szxcTaskRecard); + } + + /** + * 批量删除任务处理记录 + * + * @param ids 需要删除的任务处理记录主键 + * @return 结果 + */ + @Override + public int deleteSzxcTaskRecardByIds(Long[] ids) + { + return szxcTaskRecardMapper.deleteSzxcTaskRecardByIds(ids); + } + + /** + * 删除任务处理记录信息 + * + * @param id 任务处理记录主键 + * @return 结果 + */ + @Override + public int deleteSzxcTaskRecardById(Long id) + { + return szxcTaskRecardMapper.deleteSzxcTaskRecardById(id); + } +} diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcTaskManageMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcTaskManageMapper.xml new file mode 100644 index 0000000..7be5a0c --- /dev/null +++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcTaskManageMapper.xml @@ -0,0 +1,151 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, sub_name, sub_date, phone, task_type, title, content, expired_date, status, sended_dept, sended__deptid, handle__name, user_id, handle__result, handle__reason, remark, create_by, create_time, update_by, update_time, dept_id, dept_name from szxc_task_manage + + + + + + + + insert into szxc_task_manage + + sub_name, + sub_date, + phone, + task_type, + title, + content, + expired_date, + status, + sended_dept, + sended__deptid, + handle__name, + user_id, + handle__result, + handle__reason, + remark, + create_by, + create_time, + update_by, + update_time, + dept_id, + dept_name, + + + #{subName}, + #{subDate}, + #{phone}, + #{taskType}, + #{title}, + #{content}, + #{expiredDate}, + #{status}, + #{sendedDept}, + #{sendedDeptid}, + #{handleName}, + #{userId}, + #{handleResult}, + #{handleReason}, + #{remark}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{deptId}, + #{deptName}, + + + + + update szxc_task_manage + + sub_name = #{subName}, + sub_date = #{subDate}, + phone = #{phone}, + task_type = #{taskType}, + title = #{title}, + content = #{content}, + expired_date = #{expiredDate}, + status = #{status}, + sended_dept = #{sendedDept}, + sended__deptid = #{sendedDeptid}, + handle__name = #{handleName}, + user_id = #{userId}, + handle__result = #{handleResult}, + handle__reason = #{handleReason}, + remark = #{remark}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + dept_id = #{deptId}, + dept_name = #{deptName}, + + where id = #{id} + + + + delete from szxc_task_manage where id = #{id} + + + + delete from szxc_task_manage where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcTaskRecardMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcTaskRecardMapper.xml new file mode 100644 index 0000000..1e68dbf --- /dev/null +++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcTaskRecardMapper.xml @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, task_id, task_recard_type, xf_dept, xf_name, xfd_dept, xfd_name, zp_dept, zp_name, zpd_dept, zpd_name, cl_dept, cl_name, cl_result, cl_reason, remark, create_by, create_time, update_by, update_time from szxc_task_recard + + + + + + + + insert into szxc_task_recard + + task_id, + task_recard_type, + xf_dept, + xf_name, + xfd_dept, + xfd_name, + zp_dept, + zp_name, + zpd_dept, + zpd_name, + cl_dept, + cl_name, + cl_result, + cl_reason, + remark, + create_by, + create_time, + update_by, + update_time, + + + #{taskId}, + #{taskRecardType}, + #{xfDept}, + #{xfName}, + #{xfdDept}, + #{xfdName}, + #{zpDept}, + #{zpName}, + #{zpdDept}, + #{zpdName}, + #{clDept}, + #{clName}, + #{clResult}, + #{clReason}, + #{remark}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update szxc_task_recard + + task_id = #{taskId}, + task_recard_type = #{taskRecardType}, + xf_dept = #{xfDept}, + xf_name = #{xfName}, + xfd_dept = #{xfdDept}, + xfd_name = #{xfdName}, + zp_dept = #{zpDept}, + zp_name = #{zpName}, + zpd_dept = #{zpdDept}, + zpd_name = #{zpdName}, + cl_dept = #{clDept}, + cl_name = #{clName}, + cl_result = #{clResult}, + cl_reason = #{clReason}, + remark = #{remark}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from szxc_task_recard where id = #{id} + + + + delete from szxc_task_recard where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-ui/src/api/szxc/taskManage.js b/ruoyi-ui/src/api/szxc/taskManage.js new file mode 100644 index 0000000..27f83d5 --- /dev/null +++ b/ruoyi-ui/src/api/szxc/taskManage.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询任务管理列表 +export function listTaskManage(query) { + return request({ + url: '/szxc/taskManage/list', + method: 'get', + params: query + }) +} + +// 查询任务管理详细 +export function getTaskManage(id) { + return request({ + url: '/szxc/taskManage/' + id, + method: 'get' + }) +} + +// 新增任务管理 +export function addTaskManage(data) { + return request({ + url: '/szxc/taskManage', + method: 'post', + data: data + }) +} + +// 修改任务管理 +export function updateTaskManage(data) { + return request({ + url: '/szxc/taskManage', + method: 'put', + data: data + }) +} + +// 删除任务管理 +export function delTaskManage(id) { + return request({ + url: '/szxc/taskManage/' + id, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/api/szxc/taskRecard.js b/ruoyi-ui/src/api/szxc/taskRecard.js new file mode 100644 index 0000000..8ff8bff --- /dev/null +++ b/ruoyi-ui/src/api/szxc/taskRecard.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询任务处理记录列表 +export function listTaskRecard(query) { + return request({ + url: '/szxc/taskRecard/list', + method: 'get', + params: query + }) +} + +// 查询任务处理记录详细 +export function getTaskRecard(id) { + return request({ + url: '/szxc/taskRecard/' + id, + method: 'get' + }) +} + +// 新增任务处理记录 +export function addTaskRecard(data) { + return request({ + url: '/szxc/taskRecard', + method: 'post', + data: data + }) +} + +// 修改任务处理记录 +export function updateTaskRecard(data) { + return request({ + url: '/szxc/taskRecard', + method: 'put', + data: data + }) +} + +// 删除任务处理记录 +export function delTaskRecard(id) { + return request({ + url: '/szxc/taskRecard/' + id, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/views/szxc/taskManage/index.vue b/ruoyi-ui/src/views/szxc/taskManage/index.vue new file mode 100644 index 0000000..9a64efd --- /dev/null +++ b/ruoyi-ui/src/views/szxc/taskManage/index.vue @@ -0,0 +1,461 @@ + + + diff --git a/ruoyi-ui/src/views/szxc/taskRecard/index.vue b/ruoyi-ui/src/views/szxc/taskRecard/index.vue new file mode 100644 index 0000000..08094ec --- /dev/null +++ b/ruoyi-ui/src/views/szxc/taskRecard/index.vue @@ -0,0 +1,425 @@ + + +