Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	.idea/workspace.xml

src/main/java/com/ejweb/modules/report/service/ReportService.java

@@ -994,7 +994,6 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
 
     /**
      * 重新跟踪
-     *
      * @param reportEntity
      * @return
      */

src/main/java/com/ejweb/modules/report/utils/TimedTask.java

+package com.ejweb.modules.report.utils;
+
+import org.springframework.context.annotation.Lazy;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
+/**
+ * Created by haoqm on 2019/7/18.
+ */
+@Service
+@Lazy(false)
+public class TimedTask {
+
+    @Scheduled(cron="0 0 0 * * ?")   //每天晚上12点执行
+    public void job1() {
+        System.out.println("spring task 注解使用。。。任务进行中(每天下午6点触发)");
+        //获取所有转为线索的举报信息
+
+
+    }
+}

src/main/java/com/ejweb/modules/report/web/ReportController.java

@@ -860,7 +860,7 @@ public class ReportController extends BaseController {
                 reportList = reportService.getReportList(reportEntity);
             }
 
-            new ExportExcel("举报列表", ReportEntity.class, isAdmin).setDataList(reportList).write(request, response, fileName).dispose();
+                new ExportExcel("举报列表", ReportEntity.class, isAdmin).setDataList(reportList).write(request, response, fileName).dispose();
             return null;
         } catch (Exception e) {
             addMessage(redirectAttributes, "导出用户失败！失败信息：" + e.getMessage());

src/main/resources/spring-context.xml

@@ -6,8 +6,8 @@
     xmlns:jee="http://www.springframework.org/schema/jee" 
     xmlns:tx="http://www.springframework.org/schema/tx"
     xmlns:aop="http://www.springframework.org/schema/aop"
-    xmlns:util="http://www.springframework.org/schema/util" 
-    xmlns:task="http://www.springframework.org/schema/task" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
+    xmlns:util="http://www.springframework.org/schema/util"
+    xmlns:task="http://www.springframework.org/schema/task"  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
         http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
         http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-4.0.xsd
         http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-4.0.xsd

target/report_sunac/WEB-INF/classes/spring-context.xml

@@ -6,8 +6,8 @@
     xmlns:jee="http://www.springframework.org/schema/jee" 
     xmlns:tx="http://www.springframework.org/schema/tx"
     xmlns:aop="http://www.springframework.org/schema/aop"
-    xmlns:util="http://www.springframework.org/schema/util" 
-    xmlns:task="http://www.springframework.org/schema/task" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
+    xmlns:util="http://www.springframework.org/schema/util"
+    xmlns:task="http://www.springframework.org/schema/task"  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
         http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
         http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-4.0.xsd
         http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-4.0.xsd