From c44efd457423b48acfcfa5bedfa0e7cb4e0d820d Mon Sep 17 00:00:00 2001
From: victor <121183489011@qq.com>
Date: Mon, 29 Mar 2021 12:32:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=88=B7=E6=96=B0=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 61f896fb4d14527222b16ef36fb968ceaf4e3bff
---
 .../java/com/xjy/ai/api/ApiApplication.java   |  2 +
 .../com/xjy/ai/common/enums/StatusEnum.java   |  3 +-
 .../com/xjy/ai/model/task/RequirTask.java     | 40 +++++++++++++++++++
 .../resources/mapper/sys/DicItemMapper.xml    |  1 +
 4 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 share-model/src/main/java/com/xjy/ai/model/task/RequirTask.java

diff --git a/share-api/src/main/java/com/xjy/ai/api/ApiApplication.java b/share-api/src/main/java/com/xjy/ai/api/ApiApplication.java
index 8a7b725..a372a39 100644
--- a/share-api/src/main/java/com/xjy/ai/api/ApiApplication.java
+++ b/share-api/src/main/java/com/xjy/ai/api/ApiApplication.java
@@ -3,9 +3,11 @@ package com.xjy.ai.api;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
 @ComponentScan("com.xjy.*")
+@EnableScheduling
 public class ApiApplication {
 
 	public static void main(String[] args) {
diff --git a/share-common/src/main/java/com/xjy/ai/common/enums/StatusEnum.java b/share-common/src/main/java/com/xjy/ai/common/enums/StatusEnum.java
index 5e1da04..3bfdc52 100644
--- a/share-common/src/main/java/com/xjy/ai/common/enums/StatusEnum.java
+++ b/share-common/src/main/java/com/xjy/ai/common/enums/StatusEnum.java
@@ -7,7 +7,8 @@ public enum StatusEnum {
     REJECT("3", "审核未通过"),
     FINISH("4", "完成"),
     DELAY("5", "延期"),
-    OTHER("6", "其他");
+    OTHER("6", "其他"),
+    NOT_PASS("7", "验收未通过");
 
     private String key;
     private String value;
diff --git a/share-model/src/main/java/com/xjy/ai/model/task/RequirTask.java b/share-model/src/main/java/com/xjy/ai/model/task/RequirTask.java
new file mode 100644
index 0000000..6e2cea2
--- /dev/null
+++ b/share-model/src/main/java/com/xjy/ai/model/task/RequirTask.java
@@ -0,0 +1,40 @@
+package com.xjy.ai.model.task;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.xjy.ai.common.enums.StatusEnum;
+import com.xjy.ai.model.dao.requirement.entity.Requirement;
+import com.xjy.ai.model.service.requirement.RequirementService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+
+import java.util.Date;
+import java.util.List;
+
+@Component
+public class RequirTask {
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    private RequirementService requirementService;
+    @Scheduled(cron = "0 0/3 * * * *")
+    public void work() {
+        QueryWrapper<Requirement> wrapper = new QueryWrapper<>();
+        wrapper.eq("status", StatusEnum.ING.getKey());
+        List<Requirement> list = requirementService.list(wrapper);
+        if(!CollectionUtils.isEmpty(list)){
+            for(Requirement requirement : list){
+                long diff = new Date().getTime() - requirement.getEndTime().getTime();
+                if(diff > 0){
+                  requirement.setStatus(StatusEnum.DELAY.getKey());
+                  requirementService.updateByPrimaryKey(requirement);
+                    logger.info("update status:{}",requirement.getId());
+                }
+            }
+        }
+    }
+}
diff --git a/share-model/src/main/resources/mapper/sys/DicItemMapper.xml b/share-model/src/main/resources/mapper/sys/DicItemMapper.xml
index 9475ab1..ee0b978 100644
--- a/share-model/src/main/resources/mapper/sys/DicItemMapper.xml
+++ b/share-model/src/main/resources/mapper/sys/DicItemMapper.xml
@@ -281,6 +281,7 @@
     dic_item
     where
     dic_type_code = #{dicTypeCode,jdbcType=VARCHAR}
+    order by dic_item_order
   </select>
 
   <select id="getDicList" resultMap="BaseResultMap"