凌云集团更改公司

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

@@ -184,7 +184,7 @@ public interface MsReportMapper extends BaseMapper<MsReport> {
      * @return
      */
     @Select("select a.* from ms_report a LEFT JOIN ms_suspected b on a.report_id=b.report_id left join ms_trip c on b.suspected_id=c.trip_id where (c.work_local " +
-            "!=c.today_local or c.work_local_other !=c.today_local_other) and c.is_trip=1 and a.report_status=1 and a.user_create=#{userId} and a.report_date>#{reportDate} ORDER BY a.report_date desc LIMIT 15")
+            "=c.today_local or c.work_local_other =c.today_local_other) and c.is_trip=0 and a.report_status=1 and a.user_create=#{userId} and a.report_date>#{reportDate} ORDER BY a.report_date desc LIMIT 14")
     List<MsReport> returnWorkTime(@Param("reportDate") String reportDate, @Param("userId") Long userId);
 
 }

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

@@ -149,7 +149,7 @@ public class ScanController {
                     String returnWork = msReportMapper.returnWork(userOpen.getUserId());
                     if (returnWork != null) {
                         List<MsReport> msReports2 = msReportMapper.returnWorkTime(returnWork, userOpen.getUserId());
-                        if (msReports2.size() < 15) {
+                        if (msReports2.size() < 14) {
                             model.put("collor", "red");
                             model.put("into", "不许进入");
                             model.put("errorMsg", "您返回工作驻地后未满14日，不许进入。"+day15(msReports2)+"起方可进入！");
@@ -435,7 +435,7 @@ public class ScanController {
                 String returnWork = msReportMapper.returnWork(userOpen.getUserId());
                 if (returnWork != null) {
                     List<MsReport> msReports2 = msReportMapper.returnWorkTime(returnWork, userOpen.getUserId());
-                    if (msReports2.size() < 15) {
+                    if (msReports2.size() < 14) {
                         model.put("collor", "red");
                         model.put("into", "不许进入");
                         model.put("errorMsg", "您返回工作驻地后未满14日，不许进入。"+day15(msReports2)+"起方可进入！");