出行轨迹修改页面

admin-ui/app/whepi/lingyun/dialogDetail.js

@@ -45,9 +45,9 @@ define(function (require) {
             {
               field: 'living', title: '居家2公里', maxWidth: 100, align: 'center', formatter: function (value) {
                 if (value == 1) {
-                  return "<span style='color: green;'>是<span>";
+                  return "<span style='color: red;'>是<span>";
                 } else if (value == 2) {
-                  return "<span style='color: red;'>否<span>";
+                  return "<span style='color: green;'>否<span>";
                 } else {
                   return "";
                 }
@@ -56,9 +56,9 @@ define(function (require) {
             {
               field: 'travelRecords', title: '出行轨迹', maxWidth: 100, align: 'center', formatter: function (value) {
                 if (value == 1) {
-                  return "<span style='color: green;'>是<span>";
+                  return "<span style='color: red;'>是<span>";
                 } else if (value == 2) {
-                  return "<span style='color: red;'>否<span>";
+                  return "<span style='color: green;'>否<span>";
                 } else {
                   return "";
                 }

admin-ui/app/whepi/lingyun/dialogDetail2.js

@@ -56,9 +56,9 @@ define(function (require) {
             {
               field: 'travelRecords', title: '出行轨迹', maxWidth: 100, align: 'center', formatter: function (value) {
                 if (value == 1) {
-                  return "<span style='color: green;'>是<span>";
+                  return "<span style='color: red;'>是<span>";
                 } else if (value == 2) {
-                  return "<span style='color: red;'>否<span>";
+                  return "<span style='color: green;'>否<span>";
                 } else {
                   return "";
                 }

admin-ui/app/whepi/lingyun/dialogDetail7.js

@@ -56,9 +56,9 @@ define(function (require) {
             {
               field: 'travelRecords', title: '出行轨迹', maxWidth: 100, align: 'center', formatter: function (value) {
                 if (value == 1) {
-                  return "<span style='color: green;'>是<span>";
+                  return "<span style='color: red;'>是<span>";
                 } else if (value == 2) {
-                  return "<span style='color: red;'>否<span>";
+                  return "<span style='color: green;'>否<span>";
                 } else {
                   return "";
                 }

admin-ui/app/whepi/lingyun/lingyunUser.js

@@ -357,9 +357,9 @@ define(function (require) {
                     {
                       field: 'travelRecords', title: '出行轨迹', maxWidth: 100, align: 'center', formatter: function (value) {
                         if (value == 1) {
-                          return "<span style='color: green;'>是<span>";
+                          return "<span style='color: red;'>是<span>";
                         } else if (value == 2) {
-                          return "<span style='color: red;'>否<span>";
+                          return "<span style='color: green;'>否<span>";
                         } else {
                           return "";
                         }

admin-ui/app/whepi/lingyun/lingyunUser2.js

@@ -333,9 +333,9 @@ define(function (require) {
                     {
                       field: 'travelRecords', title: '出行轨迹', maxWidth: 100, align: 'center', formatter: function (value) {
                         if (value == 1) {
-                          return "<span style='color: green;'>是<span>";
+                          return "<span style='color: red;'>是<span>";
                         } else if (value == 2) {
-                          return "<span style='color: red;'>否<span>";
+                          return "<span style='color: green;'>否<span>";
                         } else {
                           return "";
                         }

admin-ui/app/whepi/lingyun/lingyunUser7.js

@@ -354,9 +354,9 @@ define(function (require) {
                     {
                       field: 'travelRecords', title: '出行轨迹', maxWidth: 100, align: 'center', formatter: function (value) {
                         if (value == 1) {
-                          return "<span style='color: green;'>是<span>";
+                          return "<span style='color: red;'>是<span>";
                         } else if (value == 2) {
-                          return "<span style='color: red;'>否<span>";
+                          return "<span style='color: green;'>否<span>";
                         } else {
                           return "";
                         }

whepi-web/src/main/java/com/bofeng/dao/MsReportLogMapper.java

@@ -16,4 +16,8 @@ public interface MsReportLogMapper extends BaseMapper<MsReportLog> {
     // 当天的打卡轨迹
     @Select("select user_id,report_date,city from ms_report_log where user_id = #{userId} and report_date = DATE_FORMAT(now(), '%Y-%m-%d') group by user_id,report_date,city")
     List<MsReportLog> logAddr(@Param("userId") Long userId);
+
+    // 历史的打卡轨迹
+    @Select("select user_id,report_date,city from ms_report_log where user_id = #{userId} and report_date = #{time} group by user_id,report_date,city")
+    List<MsReportLog> logAddrHistory(@Param("userId") Long userId, @Param("time") String time);
 }

whepi-web/src/main/java/com/bofeng/service/SweepCodeService.java

@@ -234,7 +234,7 @@ public class SweepCodeService {
                     excelRiBaoLYBM4.setLiving(0);
                 }
                 // 出行轨迹是否出门
-                List<MsReportLog> msReportLogs = msReportLogMapper.logAddr(excelRiBaoLYBM4.getUserId());
+                List<MsReportLog> msReportLogs = msReportLogMapper.logAddrHistory(excelRiBaoLYBM4.getUserId(), sdf.format(excelRiBaoLYBM4.getReportDate()));
                 if (msReportLogs.size() > 1) {
                     excelRiBaoLYBM4.setTravelRecords(1);
                 } else if (msReportLogs.size() == 1)  {