submit

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

 package com.dsk.system.mapper;
 
 import com.dsk.common.core.domain.entity.BusinessBacklog;
+
 import java.util.List;
 
 /**
@@ -17,7 +18,7 @@ public interface BusinessBacklogMapper
      * @param id 项目工作待办主键
      * @return 项目工作待办
      */
-    public BusinessBacklog selectBusinessBacklogById(Long id);
+    public BusinessBacklog selectBusinessBacklogById(Integer id);
 
     /**
      * 查询项目工作待办列表

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

 package com.dsk.system.service;
 
-import java.util.List;
 import com.dsk.common.core.domain.entity.BusinessBacklog;
 
+import java.util.List;
+
 /**
  * 项目工作待办Service接口
  * 
@@ -17,7 +18,7 @@ public interface IBusinessBacklogService
      * @param id 项目工作待办主键
      * @return 项目工作待办
      */
-    public BusinessBacklog selectBusinessBacklogById(Long id);
+    public BusinessBacklog selectBusinessBacklogById(Integer id);
 
     /**
      * 查询项目工作待办列表

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

 package com.dsk.system.service.impl;
 
 import com.dsk.common.core.domain.entity.BusinessBacklog;
+import com.dsk.common.exception.base.BaseException;
 import com.dsk.common.utils.DateUtils;
 import com.dsk.system.mapper.BusinessBacklogMapper;
 import com.dsk.system.service.IBusinessBacklogService;
@@ -10,6 +11,7 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -32,7 +34,7 @@ public class BusinessBacklogServiceImpl implements IBusinessBacklogService
      * @return 项目工作待办
      */
     @Override
-    public BusinessBacklog selectBusinessBacklogById(Long id)
+    public BusinessBacklog selectBusinessBacklogById(Integer id)
     {
         return businessBacklogMapper.selectBusinessBacklogById(id);
     }
@@ -59,6 +61,7 @@ public class BusinessBacklogServiceImpl implements IBusinessBacklogService
     @Transactional
     public int insertBusinessBacklog(BusinessBacklog businessBacklog)
     {
+        if(businessBacklog.getFinishTime().before(new Date())) throw new BaseException("完成时间必须大于当前时间");
         businessBacklog.setCreateTime(DateUtils.getNowDate());
         //新增记录，状态默认 进行中
         businessBacklog.setState(1);
@@ -75,7 +78,14 @@ public class BusinessBacklogServiceImpl implements IBusinessBacklogService
     @Transactional
     public int updateBusinessBacklog(BusinessBacklog businessBacklog)
     {
-        businessBacklog.setUpdateTime(DateUtils.getNowDate());
+        //从完成状态修改到为完成，判断是否已逾期
+        BusinessBacklog backlog = selectBusinessBacklogById(businessBacklog.getId());
+        if (businessBacklog.getState() == 1 && backlog.getState() == 2 && backlog.getFinishTime().before(new Date())) {
+            businessBacklog.setState(0);
+            businessBacklog.setUpdateTime(new Date());
+            return businessBacklogMapper.updateBusinessBacklog(businessBacklog);
+        }
+        businessBacklog.setUpdateTime(new Date());
         return businessBacklogMapper.updateBusinessBacklog(businessBacklog);
     }
 

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

@@ -84,7 +84,8 @@
     <update id="updateBacklogState">
         update business_backlog
         set state = 0
-        where finish_time &lt; CURRENT_TIMESTAMP
+        where state = 1
+             and finish_time &lt; CURRENT_TIMESTAMP
     </update>
 
     <delete id="deleteBusinessBacklogById" parameterType="Long">

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

@@ -111,7 +111,7 @@
                 and i.investment_amount >= #{minAmount}
             </if>
             <if test="maxAmount != null and maxAmount != '' and maxAmount != minAmount">
-                and i.investment_amount &lt;= #{maxAmount}
+                and i.investment_amount &lt; #{maxAmount}
             </if>
             <if test="minAmount != null and minAmount != '' and maxAmount != null and maxAmount != '' and maxAmount == minAmount">
                 and i.investment_amount = #{minAmount}