xielianghe

whepi-ui/templates/home/ribao.ftl

@@ -273,6 +273,9 @@
                                        style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 5vh;font-size:inherit;color:inherit;"/>
                             </div>
                             <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                                <div style="height: 5vh; line-height: 5vh; color: red">注：本地区出行无需填写行程</div>
+                            </div>
+                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
                                 <div style="height: 5vh; line-height: 5vh; width: 55%;">是否出行</div>
                                 <input id="js_input_sf" class="weui-input" type="text" placeholder="请选择"
                                        style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;width: 145%"

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

@@ -196,6 +196,14 @@ public class MsReportService {
             }
 
         }
+        // //如果是凌云，判断出行是否填写异常
+        // UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userCreate);
+        // if (unit != null) {
+        //     if (unit.getUptownId() == 1238790987234L || unit.getUptownId() == 5)
+        //     {
+        //         //上一天的莫弟弟
+        //     }
+        // }
         MsReport msReport = msReportMapper.selectById(Long.parseLong(listReport.get(0).getReportId().toString()));
         if (msReport != null) {
             msReport.setReportStatus(1);