Merge remote-tracking branch 'origin/master'

whepi-ui/templates/home/home.ftl

@@ -163,8 +163,6 @@
             $.alert("您选择的部门和原来的部门一样")
             return false;
         }
-        $("#unitId").val(newUnitId);
-        $("#unitMsg").text(newUnitText);
         $.ajax({
             url: '/home/changeUnitId.json',
             type: "post",
@@ -174,6 +172,33 @@
             }, success: function (date) {
                 $("#unitId").val(newUnitId);
                 $("#unitMsg").text(newUnitText);
+                $.alert("更改成功")
+                return false;
+            }
+        });
+    }
+    // 凌云更换工号后保存
+    function changeDoorplate() {
+        var doorplate = $("#doorplateMsg").text();
+        var newDoorplate = $("#newDoorplate").val().trim();
+        if (!newDoorplate) {
+            $.alert("请输入工号")
+            return false;
+        }
+        if (doorplate == newDoorplate) {
+            $.alert("您输入的工号和原本的工号一样")
+            return false;
+        }
+        $.ajax({
+            url: '/home/changeDoorplate.json',
+            type: "post",
+            data: {
+                userId: $('#userId').val(),
+                newDoorplate: newDoorplate,
+            }, success: function (date) {
+                $("#doorplateMsg").text(newDoorplate);
+                $.alert("更改成功")
+                return false;
             }
         });
     }

whepi-ui/templates/home/ribao.ftl

@@ -347,7 +347,7 @@
                 <div class="weui-panel weui-panel_access">
                 <#--                    <div class="weui-panel__hd" style=" font-size: large">${uptown_name!''}小区</div>-->
                     <div class="weui-panel__hd" style=" font-size: large">${linkman!''}
-                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;工号${doorplate!''}</div>
+                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;工号<span id="doorplateMsg">${doorplate!''}</span></div>
                     <div class="weui-panel__hd" style=" font-size: large"><span
                             id="unitMsg">${ridgepole!''}${unit!''}</span></div>
                     <input id="unitId" type="text" hidden="hidden" value="${unitId!''}"/>
@@ -362,7 +362,20 @@
                         </div>
                     </div>
                     <div class="weui-form__opr-area">
-                        <a class="weui-btn weui-btn_primary" href="javascript:;" onclick="changeUnitId();">确定</a>
+                        <a class="weui-btn weui-btn_primary" href="javascript:;" onclick="changeUnitId();">确定部门更改</a>
+                    </div>
+                    <div>
+                        <div class="weui-cells__title" id="menpaiTitle">更改工号</div>
+                        <div class="weui-cells">
+                            <div class="weui-cell">
+                                <div class="weui-cell__bd">
+                                    <input class="weui-input" type="text" id="newDoorplate" placeholder="请输入工号"/>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="weui-form__opr-area">
+                        <a class="weui-btn weui-btn_primary" href="javascript:;" onclick="changeDoorplate();">确定工号更改</a>
                     </div>
                     <br/><br/>
                 </div>

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

@@ -74,12 +74,11 @@ public interface MsReportMapper extends BaseMapper<MsReport> {
     MsReport selectMsReportToday(@Param("userId") Long userId);
 
     /**
-     * 最近15天确诊
-     *
+     * 最近15天确诊,疑似,密切接触者
      * @param userId
      * @return
      */
-    @Select("select * from ms_report where report_status=1 and report_date > date_sub(curdate(),interval 15 day) and sure_num > 0 and user_create=#{userId}")
+    @Select("select * from ms_report where report_status=1 and report_date > date_sub(curdate(),interval 15 day) and ms_status=2 and user_create=#{userId}")
     List<MsReport> queryMsReportBySure(@Param("userId") Long userId);
 
 }

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

@@ -110,4 +110,11 @@ public class UserOpenService {
         uptownHouse.setUnitId(unitId);
         uptownHouseMapper.updateById(uptownHouse);
     }
+
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
+    public void changeDoorplate(Long userId, String doorplate) {
+        UptownHouse uptownHouse = uptownHouseMapper.getUptownHouseByUser(userId);
+        uptownHouse.setDoorplate(doorplate);
+        uptownHouseMapper.updateById(uptownHouse);
+    }
 }

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

@@ -84,8 +84,8 @@ public class ScanController {
                              @RequestParam(value = "inType", required = false, defaultValue = "0") Integer inType) {
         UserOpen userOpen = homeService.getUserOpenByCode(request.getParameter("code"));
         List<UserRole> list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
-//        List<UserRole> list = userRoleMapper.getUserRoleByUserId(1L);
-//        UserOpen userOpen = userOpenMapper.selectByUserId(1L);
+//        List<UserRole> list = userRoleMapper.getUserRoleByUserId(1234L);
+//        UserOpen userOpen = userOpenMapper.selectByUserId(1234L);
         model.put("user", userOpen);
         model.put("user_id", "\"" + userOpen.getUserId() + "\"");
         if (list.size() == 0) {
@@ -95,7 +95,7 @@ public class ScanController {
             UptownDoor uptownDoor = uptownDoorMapper.getUptownDoorById(doorId);
             List<UptownHome> uptownHomes =  uptownHomeMapper.getUptownHomeByUserId(userOpen.getUserId());
             UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userOpen.getUserId());
-            if (unit.getUptownId() == 1238790987234L) {
+            if (unit.getUptownId() == 1238790987234L || unit.getUptownId() == 5) {
                 model.put("tittle", "凌云");
                 ly = true;
             }
@@ -147,25 +147,25 @@ public class ScanController {
                         scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
                         return new ModelAndView("/user/scan.ftl", model);
                     } else if (msReports.size() < 3) {
-                        model.put("collor", "orange");
-                        model.put("into", "可以" + getMsg(inType));
-                        model.put("errorMsg", "您最近三日健康日报漏报，请说明原因并及时填报，配合监测人员。");
-                        scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), 1, "");
-                        return new ModelAndView("/user/scan.ftl", model);
-                    }
-                    MsReport msReport = msReportMapper.selectMsReportToday(userOpen.getUserId());
-                    if (msReport != null && msReport.getMsStatus() == 2) {
                         model.put("collor", "red");
-                        model.put("into", "禁止通行");
-                        model.put("errorMsg", "由于您健康或家人健康评估存在问题，禁止进入，如有疑问请联系直管领导。");
+                        model.put("into", "禁止进入");
+                        model.put("errorMsg", "您最近三日健康日报漏报，请说明原因并及时填报，配合监测人员。");
                         scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
                         return new ModelAndView("/user/scan.ftl", model);
                     }
+//                    MsReport msReport = msReportMapper.selectMsReportToday(userOpen.getUserId());
+//                    if (msReport != null && msReport.getMsStatus() == 2) {
+//                        model.put("collor", "red");
+//                        model.put("into", "禁止通行");
+//                        model.put("errorMsg", "由于您健康或家人健康评估存在问题，禁止进入，如有疑问请联系直管领导。");
+//                        scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
+//                        return new ModelAndView("/user/scan.ftl", model);
+//                    }
                     List<MsReport> msReports1 = msReportMapper.queryMsReportBySure(userOpen.getUserId());
                     if (msReports1.size() > 0) {
                         model.put("collor", "red");
                         model.put("into", "禁止通行");
-                        model.put("errorMsg", "由于您或家人曾确诊患冠状病毒肺炎，评估正常未满15日隔离规定，禁止进入。");
+                        model.put("errorMsg", "由于您新冠确诊、新冠疑似、密切接触者，评估正常未满15日隔离规定，禁止进入。");
                         scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
                         return new ModelAndView("/user/scan.ftl", model);
                     }

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

@@ -231,7 +231,7 @@ public class UserOpenController {
     }
 
     /**
-     * 凌云集团更改公司
+     * 凌云集团更改部门
      * @return
      */
     @PostMapping("/home/changeUnitId.json")
@@ -241,6 +241,17 @@ public class UserOpenController {
         userOpenService.changeUnitId(userId, unitId);
     }
 
+    /**
+     * 凌云集团更改工号
+     * @return
+     */
+    @PostMapping("/home/changeDoorplate.json")
+    public void changeDoorplate(ModelMap model, HttpServletRequest request) {
+        Long userId = Long.parseLong(request.getParameter("userId"));
+        String doorplate = request.getParameter("newDoorplate");
+        userOpenService.changeDoorplate(userId, doorplate);
+    }
+
     @PostMapping("/home/checkHouseId.json")
     public ResultModel checkHouseId(HttpServletRequest request) {
         ResultModel resultModel = new ResultModel();