修改工作代办列表

dsk-admin/src/main/java/com/dsk/web/controller/business/BusinessBacklogController.java

@@ -4,6 +4,7 @@ import com.dsk.common.core.controller.BaseController;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.system.domain.business.BusinessBacklog;
 import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.system.domain.business.dto.BusinessBacklogListDto;
 import com.dsk.system.service.IBusinessBacklogService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -31,10 +32,10 @@ public class BusinessBacklogController extends BaseController
      */
 //    @PreAuthorize("@ss.hasPermi('system:backlog:list')")
     @GetMapping("/list")
-    public TableDataInfo list(BusinessBacklog businessBacklog)
+    public TableDataInfo list(BusinessBacklogListDto dto)
     {
         startPage();
-        return getDataTable(businessBacklogService.selectBusinessBacklogList(businessBacklog));
+        return getDataTable(businessBacklogService.selectBusinessBacklogList(dto));
     }
 
     /**

dsk-system/src/main/java/com/dsk/system/domain/business/BusinessBacklog.java

@@ -16,7 +16,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @date 2023-05-17
  */
 @Data
-public class BusinessBacklog extends BaseEntity
+public class BusinessBacklog
 {
     private static final long serialVersionUID = 1L;
 
@@ -49,4 +49,8 @@ public class BusinessBacklog extends BaseEntity
     @Excel(name = "状态 0：进行中 1：已到期")
     private Integer state;
 
+    private Date createTime;
+
+    private Date updateTime;
+
 }

dsk-system/src/main/java/com/dsk/system/domain/business/dto/BusinessBacklogListDto.java

+package com.dsk.system.domain.business.dto;
+
+import com.dsk.common.annotation.Excel;
+import com.dsk.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 项目工作待办对象 business_backlog
+ *
+ * @author lxl
+ * @date 2023-05-17
+ */
+@Data
+public class BusinessBacklogListDto extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 项目id */
+    private Integer businessId;
+
+    /** 状态 (0进行中 1已完成 2逾期) */
+    private Integer state;
+
+    private Date startTime;
+
+    private Date endTime;
+
+}

dsk-system/src/main/java/com/dsk/system/mapper/BusinessBacklogMapper.java

 package com.dsk.system.mapper;
 
 import com.dsk.system.domain.business.BusinessBacklog;
+import com.dsk.system.domain.business.dto.BusinessBacklogListDto;
 import com.dsk.system.domain.business.vo.BusinessBacklogListVo;
 
 import java.util.List;
@@ -23,11 +24,8 @@ public interface BusinessBacklogMapper
 
     /**
      * 查询项目工作待办列表
-     *
-     * @param businessBacklog 项目工作待办
-     * @return 项目工作待办集合
      */
-    public List<BusinessBacklogListVo> selectBusinessBacklogList(BusinessBacklog businessBacklog);
+    public List<BusinessBacklogListVo> selectBusinessBacklogList(BusinessBacklogListDto dto);
 
     /**
      * 新增项目工作待办

dsk-system/src/main/java/com/dsk/system/service/IBusinessBacklogService.java

 package com.dsk.system.service;
 
 import com.dsk.system.domain.business.BusinessBacklog;
+import com.dsk.system.domain.business.dto.BusinessBacklogListDto;
 import com.dsk.system.domain.business.vo.BusinessBacklogListVo;
 
 import java.util.List;
@@ -23,11 +24,8 @@ public interface IBusinessBacklogService
 
     /**
      * 查询项目工作待办列表
-     *
-     * @param businessBacklog 项目工作待办
-     * @return 项目工作待办集合
      */
-    public List<BusinessBacklogListVo> selectBusinessBacklogList(BusinessBacklog businessBacklog);
+    public List<BusinessBacklogListVo> selectBusinessBacklogList(BusinessBacklogListDto dto);
 
     /**
      * 新增项目工作待办

dsk-system/src/main/java/com/dsk/system/service/impl/BusinessBacklogServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.dsk.system.domain.business.BusinessBacklog;
 import com.dsk.common.exception.base.BaseException;
 import com.dsk.common.utils.DateUtils;
+import com.dsk.system.domain.business.dto.BusinessBacklogListDto;
 import com.dsk.system.domain.business.vo.BusinessBacklogListVo;
 import com.dsk.system.mapper.BusinessBacklogMapper;
 import com.dsk.system.service.IBusinessBacklogService;
@@ -43,15 +44,31 @@ public class BusinessBacklogServiceImpl implements IBusinessBacklogService {
     /**
      * 查询项目工作待办列表
      *
-     * @param businessBacklog 项目工作待办
+     * @param dto 项目工作待办
      * @return 项目工作待办
      */
     @Override
-    public List<BusinessBacklogListVo> selectBusinessBacklogList(BusinessBacklog businessBacklog) {
-        if (ObjectUtil.isEmpty(businessBacklog.getBusinessId())) {
+    public List<BusinessBacklogListVo> selectBusinessBacklogList(BusinessBacklogListDto dto) {
+        if (ObjectUtil.isEmpty(dto.getBusinessId())) {
             throw new BeanException("项目id不能为空！");
         }
-        return businessBacklogMapper.selectBusinessBacklogList(businessBacklog);
+        if (ObjectUtil.isEmpty(dto.getState())) {
+            throw new BeanException("工作代办状态不能为空！");
+        }
+        switch (dto.getState()){
+            case 0:
+                dto.setStartTime(new Date());
+                break;
+            case 1:
+                break;
+            case 2:
+                dto.setState(0);
+                dto.setEndTime(new Date());
+                break;
+            default:
+                throw new BeanException("工作代办状态参数错误！");
+        }
+        return businessBacklogMapper.selectBusinessBacklogList(dto);
     }
 
     /**

dsk-system/src/main/resources/mapper/business/BusinessBacklogMapper.xml

@@ -35,7 +35,9 @@
         <if test="target != null  and target != ''">and target = #{target}</if>
         <if test="task != null  and task != ''">and task = #{task}</if>
         <if test="finishTime != null ">and finish_time = #{finishTime}</if>
-        <if test="state != null ">and state = #{state}</if>
+        <if test="state != null "> and state = #{state} </if>
+        <if test="startTime != null "> and due_time &gt;= #{startTime} </if>
+        <if test="endTime != null "> and due_time &lt;= #{endTime} </if>
         ORDER BY create_time DESC
     </select>