增加当天出行打卡

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

@@ -54,6 +54,17 @@ define(function (require) {
               }
             },
             {
+              field: 'travelRecords', title: '出行轨迹', maxWidth: 100, align: 'center', formatter: function (value) {
+                if (value == 1) {
+                  return "<span style='color: green;'>是<span>";
+                } else if (value == 2) {
+                  return "<span style='color: red;'>否<span>";
+                } else {
+                  return "";
+                }
+              }
+            },
+            {
               field: 'msStatus', title: '个人上报状态', maxWidth: 100, align: 'center', formatter: function (value, row) {
                 if (row.rowData.reportStatus  == 0) {
                   return "<span style='color: #ffb717;'>未上报<span>";

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

@@ -54,6 +54,17 @@ define(function (require) {
               }
             },
             {
+              field: 'travelRecords', title: '出行轨迹', maxWidth: 100, align: 'center', formatter: function (value) {
+                if (value == 1) {
+                  return "<span style='color: green;'>是<span>";
+                } else if (value == 2) {
+                  return "<span style='color: red;'>否<span>";
+                } else {
+                  return "";
+                }
+              }
+            },
+            {
               field: 'msStatus', title: '个人上报状态', maxWidth: 100, align: 'center', formatter: function (value, row) {
                 if (row.rowData.reportStatus  == 0) {
                   return "<span style='color: #ffb717;'>未上报<span>";

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

@@ -54,6 +54,17 @@ define(function (require) {
               }
             },
             {
+              field: 'travelRecords', title: '出行轨迹', maxWidth: 100, align: 'center', formatter: function (value) {
+                if (value == 1) {
+                  return "<span style='color: green;'>是<span>";
+                } else if (value == 2) {
+                  return "<span style='color: red;'>否<span>";
+                } else {
+                  return "";
+                }
+              }
+            },
+            {
               field: 'msStatus', title: '个人上报状态', maxWidth: 100, align: 'center', formatter: function (value, row) {
                 if (row.rowData.reportStatus == 0) {
                   return "<span style='color: #ffb717;'>未上报<span>";

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

@@ -355,6 +355,17 @@ define(function (require) {
                       }
                     },
                     {
+                      field: 'travelRecords', title: '出行轨迹', maxWidth: 100, align: 'center', formatter: function (value) {
+                        if (value == 1) {
+                          return "<span style='color: green;'>是<span>";
+                        } else if (value == 2) {
+                          return "<span style='color: red;'>否<span>";
+                        } else {
+                          return "";
+                        }
+                      }
+                    },
+                    {
                       field: 'returnWork', title: '今日复工', maxWidth: 100, align: 'center', formatter: function (value) {
                         if (value == 1) {
                           return "<span style='color: green;'>允许复工<span>";

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

@@ -331,6 +331,17 @@ define(function (require) {
                       }
                     },
                     {
+                      field: 'travelRecords', title: '出行轨迹', maxWidth: 100, align: 'center', formatter: function (value) {
+                        if (value == 1) {
+                          return "<span style='color: green;'>是<span>";
+                        } else if (value == 2) {
+                          return "<span style='color: red;'>否<span>";
+                        } else {
+                          return "";
+                        }
+                      }
+                    },
+                    {
                       field: 'returnWork', title: '今日复工', maxWidth: 100, align: 'center', formatter: function (value) {
                         if (value == 1) {
                           return "<span style='color: green;'>允许复工<span>";

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

@@ -352,6 +352,17 @@ define(function (require) {
                       }
                     },
                     {
+                      field: 'travelRecords', title: '出行轨迹', maxWidth: 100, align: 'center', formatter: function (value) {
+                        if (value == 1) {
+                          return "<span style='color: green;'>是<span>";
+                        } else if (value == 2) {
+                          return "<span style='color: red;'>否<span>";
+                        } else {
+                          return "";
+                        }
+                      }
+                    },
+                    {
                       field: 'returnWork', title: '今日复工', maxWidth: 100, align: 'center', formatter: function (value) {
                         if (value == 1) {
                           return "<span style='color: green;'>允许复工<span>";

whepi-web/src/main/java/com/bofeng/entity/ExcelRiBaoLYBM4.java

@@ -49,6 +49,7 @@ public class ExcelRiBaoLYBM4 {
     private int isSuspected = 0;
     private int returnWork = 0;
     private int living;
+    private int travelRecords;
 
     private Date reportDate;
     private int msStatus;
@@ -314,22 +315,25 @@ public class ExcelRiBaoLYBM4 {
             bingqingDesc += others;
         }
         bingqingDesc += "评估结果：";
-        if (scoreRezult == 0)
+        if (scoreRezult == 0) {
             bingqingDesc += "未评估";
-        else if (scoreRezult == 1) {
-            if (temperatureScore > 1)
+        } else if (scoreRezult == 1) {
+            if (temperatureScore > 1) {
                 bingqingDesc += "正常,间隔时间服用退烧药，多休息，多喝水";
-            else
+            } else {
                 bingqingDesc += "正常";
+            }
         } else if (scoreRezult == 2) {
-            if (temperatureScore > 1)
+            if (temperatureScore > 1) {
                 bingqingDesc += "注意观察,间隔时间服用退烧药，多休息，多喝水";
-            else
+            } else {
                 bingqingDesc += "注意观察";
-        } else if (scoreRezult == 3)
+            }
+        } else if (scoreRezult == 3) {
             bingqingDesc += "联系社区医生（或者在线问诊）";
-        else if (scoreRezult == 4)
+        } else if (scoreRezult == 4) {
             bingqingDesc += "尽快就诊";
+        }
         return bingqingDesc;
     }
 
@@ -403,6 +407,20 @@ public class ExcelRiBaoLYBM4 {
     @ExcelProperty(value = "居家2公里", index = 14)
     private String livingDesc = "";
 
+    @ExcelProperty(value = "出行轨迹", index = 14)
+    private String travelRecordsDesc;
+
+    public String getTravelRecordsDesc() {
+        if (travelRecords == 1) {
+            travelRecordsDesc = "是";
+        } else if (travelRecords == 2) {
+            travelRecordsDesc = "否";
+        } else {
+            return "";
+        }
+        return travelRecordsDesc;
+    }
+
     @ExcelProperty(value = "密切接触人员", index = 8)
     private String isContactDesc = "";
 

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

@@ -29,6 +29,8 @@ public class MsTripService {
     @Autowired
     private MsReportMapper msReportMapper;
     @Autowired
+    private MsReportLogMapper msReportLogMapper;
+    @Autowired
     private MsTripMapper msTripMapper;
     @Autowired
     private MsTripDetMapper msTripDetMapper;
@@ -54,6 +56,7 @@ public class MsTripService {
         List<MsReport> listReport = msReportMapper.selectByReportDate(reportDate, userCreate);
         Long houseId = msReportMapper.selectHouseIdByUserId(userCreate);
         //首次进入。没有今日报告
+        DateTime data = DateTime.now();
         if (listReport == null || listReport.size() == 0) {
             MsReport msReport = new MsReport();
             msReport.setReportId(IdWorker.getId());
@@ -64,16 +67,28 @@ public class MsTripService {
             msReport.setNormalNum(0);
             msReport.setSingleNum(0);
             msReport.setRemarks("");
-            msReport.setReportDate(DateTime.now().toDate());
+            msReport.setReportDate(data.toDate());
             msReport.setMsStatus(0);
             msReport.setUserCreate(userCreate);
-            msReport.setTimeCreate(DateTime.now());
+            msReport.setTimeCreate(data);
             msReport.setUserUpdate(userCreate);
-            msReport.setTimeUpdate(DateTime.now());
+            msReport.setTimeUpdate(data);
             msReport.setLatitude(latitude);
             msReport.setLongitude(longitude);
             msReportMapper.insert(msReport);
             reportId = msReport.getReportId();
+            // 记录打卡日志
+            MsReportLog msReportLog = new MsReportLog();
+            msReportLog.setLogId(IdWorker.getId());
+            msReportLog.setReportId(msReport.getReportId());
+            msReportLog.setUserId(userCreate);
+            msReportLog.setReportDate(data.toDate());
+            msReportLog.setLongitude(longitude);
+            msReportLog.setLatitude(latitude);
+            msReportLog.setCity(autoLocal);
+            msReportLog.setAddr(autoAddr);
+            msReportLog.setTimeCreate(data);
+            msReportLogMapper.insert(msReportLog);
         } else {
             reportId = listReport.get(0).getReportId();
         }

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

@@ -31,6 +31,8 @@ public class SweepCodeService {
     @Autowired
     private MsSuspectedMapper msSuspectedMapper;
     @Autowired
+    private MsReportLogMapper msReportLogMapper;
+    @Autowired
     private MsReportService msReportService;
     @Autowired
     private ScanService scanService;
@@ -101,6 +103,15 @@ public class SweepCodeService {
                 } else {
                     excelRiBaoLYBM4.setLiving(0);
                 }
+                // 出行轨迹是否出门
+                List<MsReportLog> msReportLogs = msReportLogMapper.logAddr(excelRiBaoLYBM4.getUserId());
+                if (msReportLogs.size() > 1) {
+                    excelRiBaoLYBM4.setTravelRecords(1);
+                } else if (msReportLogs.size() == 1)  {
+                    excelRiBaoLYBM4.setTravelRecords(2);
+                } else {
+                    excelRiBaoLYBM4.setTravelRecords(0);
+                }
             }
         }
         return sysUptownHouses;
@@ -222,6 +233,15 @@ public class SweepCodeService {
                 } else {
                     excelRiBaoLYBM4.setLiving(0);
                 }
+                // 出行轨迹是否出门
+                List<MsReportLog> msReportLogs = msReportLogMapper.logAddr(excelRiBaoLYBM4.getUserId());
+                if (msReportLogs.size() > 1) {
+                    excelRiBaoLYBM4.setTravelRecords(1);
+                } else if (msReportLogs.size() == 1)  {
+                    excelRiBaoLYBM4.setTravelRecords(2);
+                } else {
+                    excelRiBaoLYBM4.setTravelRecords(0);
+                }
             }
         }
         return sysUptownHouses;
@@ -290,6 +310,15 @@ public class SweepCodeService {
                 } else {
                     excelRiBaoLYBM4.setLiving(0);
                 }
+                // 出行轨迹是否出门
+                List<MsReportLog> msReportLogs = msReportLogMapper.logAddr(excelRiBaoLYBM4.getUserId());
+                if (msReportLogs.size() > 1) {
+                    excelRiBaoLYBM4.setTravelRecords(1);
+                } else if (msReportLogs.size() == 1)  {
+                    excelRiBaoLYBM4.setTravelRecords(2);
+                } else {
+                    excelRiBaoLYBM4.setTravelRecords(0);
+                }
             }
         }
         return sysUptownHouses;

whepi-web/src/main/java/com/bofeng/wx/controller/ScanAdminController.java

@@ -586,7 +586,6 @@ public class ScanAdminController {
      * 生成进出门二维码
      * @param doorId 小区大门ID
      * @param inType 1进入;2外出
-     * @param response
      * @throws IOException
      * @throws WriterException
      */