Merge remote-tracking branch 'origin/master'

admin-ui/app/whepi/index.js

@@ -113,6 +113,27 @@ $(function () {
         onLoadSuccess: function (node, data) {
         }
       });
+    } else if (userRole == "7") {//凌云集团管理员
+      $('#menutree').tree({
+        url: '/app/whepi/mock/menu7.json',
+        onDblClick: function (node) {
+          var $this = $(this);
+          if (!$this.tree('isLeaf', node.target)) {
+            $this.tree(node.state === 'closed' ? 'expand' : 'collapse', node.target);
+          }
+        },
+        onSelect: function () {
+          return false;
+        },
+        onClick: function (node) {
+          var href = node.href;
+          if ($.trim(href)) {
+            App.addTab({title: node.text, url: node.href, id: node.id, iconCls: node.iconCls});
+          }
+        },
+        onLoadSuccess: function (node, data) {
+        }
+      });
     }
 
 

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

@@ -94,7 +94,6 @@ define(function (require) {
             xtype: 'datebox',
             labelWidth: 'auto',
             width: 250,
-            required: true
           },
         ]]
       };

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

@@ -76,7 +76,6 @@ define(function (require) {
             xtype: 'datebox',
             labelWidth: 'auto',
             width: 250,
-            required: true
           },
         ]]
       };

admin-ui/app/whepi/mock/menu7.json

@@ -0,0 +1,22 @@
+{
+  "success": true,
+  "msg": "",
+  "data": [
+    {
+      "id": "ENT10001",
+      "text": "凌云导出报表",
+      "href": "/app/whepi/lingyun/lingyunUser2.js",
+      "iconCls": "icon-blank fa fa-align-justify",
+      "state": "close",
+      "children": []
+    },
+    {
+      "id": "ENT10002",
+      "text": "特殊人员管理",
+      "href": "/app/whepi/scan/specialPersonnel.js",
+      "iconCls": "icon-blank fa fa-align-justify",
+      "state": "close",
+      "children": []
+    }
+  ]
+}

whepi-ui/templates/home/ribao.ftl

@@ -278,6 +278,9 @@
                                        style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;width: 145%"
                                        onchange="selectinput6(this)"/>
                             </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>
                             <br/>
                         <#--<div style="text-align: center;height: 1vh;">出行情况上报</div>-->
 

whepi-ui/templates/home/ribao.js

@@ -1006,10 +1006,10 @@ function ribao_cancel() {
 }
 
 function ribaoCommit() {
-  if (cantijiao==false) {
+  if (cantijiao == false) {
     return
   }
-  cantijiao==false
+  cantijiao = false
   var sf = $("#js_input_sf").attr("data-values") == undefined ? 3 : $("#js_input_sf").attr("data-values");
   if (listcx.length == 0 && sf == 1) {
     $.alert("请添加出行");
@@ -1063,7 +1063,6 @@ function ribaoCommit() {
 
 
   var medical = $("input[name='radio']:checked").val();
-  console.log(medical)
   if (medical == undefined) {
     $.alert("请选择新冠肺炎");
     return;
@@ -1229,6 +1228,7 @@ function ribaoCommit() {
         $('#notOpenRibao')[0].style.display = '';
         $('#ribao')[0].style.display = 'none';
       }
+      cantijiao = true
       $('#ribao_jinrijujian').empty();
       $('#ribao_jinrijujian').append(data.safetyNum);
       ribao_refrash();
@@ -1328,9 +1328,18 @@ function updateSuspected(suspectedId) {
         // $("#js_input_user_status").attr("data-values", suspected.familyStatus);
 
         // $("#jibenmiaoshu").val(suspected.statusDesp);
-
-        $("#switchQuezhen").val(getMedical(suspected.medical));
-        $("#switchQuezhen").attr("data-values", suspected.medical);
+        if(suspected.medical==0)
+            $("input[id='s18']").prop("checked", "checked");
+        if(suspected.medical==1)
+          $("input[id='s19']").prop("checked", "checked");
+        if(suspected.medical==2)
+          $("input[id='s20']").prop("checked", "checked");
+        if(suspected.medical==3)
+          $("input[id='s21']").prop("checked", "checked");
+        if(suspected.medical==4)
+          $("input[id='s22']").prop("checked", "checked");
+        // $("#switchQuezhen").val(getMedical(suspected.medical));
+        // $("#switchQuezhen").attr("data-values", suspected.medical);
 
         $("#switchDanjiangeli").val(getSingleRoom(suspected.singleRoom));
         $("#switchDanjiangeli").attr("data-values", suspected.singleRoom);
@@ -1826,6 +1835,13 @@ function clearShow() {
   $("#js_input_sf").val(getIsTrip(0));
   $("#js_input_sf").attr("data-values", 0);
   $('#none')[0].style.display = 'none';
+
+
+  $("input[id='s18']").removeAttr("checked");
+  $("input[id='s19']").removeAttr("checked");
+  $("input[id='s20']").removeAttr("checked");
+  $("input[id='s21']").removeAttr("checked");
+  $("input[id='s22']").removeAttr("checked");
 }
 
 //健康评估

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

@@ -147,7 +147,7 @@ public interface MsReportMapper extends BaseMapper<MsReport> {
 
     @Select("select * from (select * from ms_report where report_status=1 and report_date=date_sub(curdate(),interval 1 day) and user_create=#{userId}\n" +
             "union select * from ms_report where report_status=1 and report_date=date_sub(curdate(),interval 2 day) and user_create=#{userId}\n" +
-            "union select * from ms_report where report_status=1 and date_sub(curdate(),interval 3 day) and user_create=#{userId}) aa where aa.ms_status = 2")
+            "union select * from ms_report where report_status=1 and report_date=date_sub(curdate(),interval 3 day) and user_create=#{userId}) aa where aa.ms_status = 2")
     List<MsReport> selectMsReportThereError(@Param("userId") Long userId);
 
     /**
@@ -192,4 +192,14 @@ public interface MsReportMapper extends BaseMapper<MsReport> {
             "=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 15")
     List<MsReport> returnWorkTime(@Param("reportDate") String reportDate, @Param("userId") Long userId);
 
+    /**
+     * 当前人员今天的地址
+     * @param userId
+     * @return
+     */
+    @Select("SELECT a.*,CASE WHEN c.work_local = 4 THEN c.work_local_other ELSE c.work_local END as workMsg,CASE WHEN c.today_local = 4 THEN c.today_local_other ELSE c.today_local END as todayMsg " +
+            "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 a.report_status = 1 AND a.user_create = #{userId} ORDER BY a.report_date DESC LIMIT 1")
+    MsReport msAddr(@Param("userId") Long userId);
+
+
 }

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

@@ -45,10 +45,19 @@ public interface MsSuspectedMapper extends BaseMapper<MsSuspected> {
             "from ms_suspected a \n" +
             "INNER JOIN ms_report b on a.report_id=b.report_id \n" +
             "left JOIN ms_trip c on a.suspected_id=c.trip_id \n" +
-            "where b.user_create=#{userCreate} and b.report_date=(select report_date from ms_report where user_create=#{userCreate} and report_date<curdate() ORDER BY report_date desc LIMIT 1)\n" +
+            "where b.user_create=#{userCreate} and b.report_status=1 and b.report_date=(select report_date from ms_report where user_create=#{userCreate} and b.report_status=1 and report_date<curdate() ORDER BY report_date desc LIMIT 1)\n" +
             "ORDER by a.time_create ")
     List<MsSuspected> selectNextSuspected(@Param("userCreate") Long userCreate);
 
+    //获取最近的一个人一个家人
+    @Select("select a.*,c.* \n" +
+            "from ms_suspected a \n" +
+            "INNER JOIN ms_report b on a.report_id=b.report_id \n" +
+            "left JOIN ms_trip c on a.suspected_id=c.trip_id \n" +
+            "where b.user_create=#{userCreate}  and b.report_status=1 and b.report_date=(select report_date from ms_report where user_create=#{userCreate} and report_date<curdate()  and report_date>date_sub(curdate(),interval 3 day)  and report_status=1 ORDER BY report_date desc LIMIT 1)\n" +
+            "ORDER by a.time_create ")
+    List<MsSuspected> selectNext3Suspected(@Param("userCreate") Long userCreate);
+
     //选择家人
     @Select("select a.*,b.* from ms_suspected a LEFT JOIN ms_trip b on a.suspected_id=b.trip_id where a.suspected_id =#{suspectedId}")
     MsSuspected selectBySuspectedId(@Param("suspectedId") Long suspectedId);

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

@@ -80,4 +80,9 @@ public class MsReport {
     private String userCreateName = "";
     @TableField(exist = false)
     private String userUpdateName = "";
+
+    @TableField(exist = false)
+    private String workMsg;
+    @TableField(exist = false)
+    private String todayMsg;
 }

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

@@ -189,10 +189,32 @@ public class MsReportService {
         List<MsSuspected> listSuspected = msSuspectedMapper.selectByReportId(Long.parseLong(listReport.get(0).getReportId().toString()));
         if (listSuspected == null || listSuspected.size() == 0)
             return 3;
+            // if (unit != null) {
+            //     if (unit.getUptownId() == 1238790987234L || unit.getUptownId() == 5) {
+            //         if (listSuspected != null && listSuspected.size() > 1)
+            //             return 5;
+            //     }
+            // }
         else {
             for (MsSuspected msSuspected : listSuspected) {
+                //体温是否填写
                 if (msSuspected.getTemperature().compareTo(new BigDecimal(0)) == 0)
                     return 2;
+
+                //如果是凌云，判断出行是否填写异常
+                UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userCreate);
+                if (unit != null) {
+                    if (unit.getUptownId() == 1238790987234L || unit.getUptownId() == 5) {
+                        //上一天的上报记录.3天内
+                        List<MsSuspected> listSuspected1 = msSuspectedMapper.selectNext3Suspected(userCreate);
+                        if (listSuspected1 != null && listSuspected1.size() > 0) {
+                            if (listSuspected1.get(0).getTodayLocalOther() != msSuspected.getTodayLocalOther() && listSuspected1.get(0).getTodayLocal() != msSuspected.getTodayLocal() && msSuspected.getIsTrip() == 0) {
+                                return 4;
+                            }
+                        }
+
+                    }
+                }
             }
 
         }

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

@@ -149,32 +149,34 @@ public class MsTripService {
             msSuspectedMapper.insert(msSuspected);
 
             //添加出行
-            MsTrip msTrip = new MsTrip();
-            msTrip.setTripId(msSuspected.getSuspectedId());
-            msTrip.setIsTrip(isTrip);
-            msTrip.setTodayLocal(todayLocal);
-            msTrip.setTodayLocalOther(todayLocalOther);
-            msTrip.setWorkLocal(workLocal);
-            msTrip.setWorkLocalOther(workLocalOther);
-            msTripMapper.insert(msTrip);
-            //添加出行详细
-            if (listTripDet != null && listTripDet.size() > 0) {
-                for (MsTripDet msTripDet : listTripDet) {
-                    MsTripDet msTripDet1 = new MsTripDet();
-                    msTripDet1.setTripDetId(IdWorker.getId());
-                    msTripDet1.setTripId(msSuspected.getSuspectedId());
-                    msTripDet1.setSort(msTripDet.getSort());
-                    msTripDet1.setStartLocal(msTripDet.getStartLocal());
-                    msTripDet1.setStartLocalOther(msTripDet.getStartLocalOther());
-                    msTripDet1.setEndLocal(msTripDet.getEndLocal());
-                    msTripDet1.setEndLocalOther(msTripDet.getEndLocalOther());
-                    msTripDet1.setTripType(msTripDet.getTripType());
-                    msTripDet1.setTripTypeDesp(msTripDet.getTripTypeDesp());
-                    msTripDet1.setTimeCreate(DateTime.now());
-                    msTripDet1.setUserCreate(userCreate);
-                    msTripDet1.setTimeUpdate(DateTime.now());
-                    msTripDet1.setUserUpdate(userCreate);
-                    msTripDetMapper.insert(msTripDet1);
+            if(todayLocal>0 && workLocal>0){
+                MsTrip msTrip = new MsTrip();
+                msTrip.setTripId(msSuspected.getSuspectedId());
+                msTrip.setIsTrip(isTrip);
+                msTrip.setTodayLocal(todayLocal);
+                msTrip.setTodayLocalOther(todayLocalOther);
+                msTrip.setWorkLocal(workLocal);
+                msTrip.setWorkLocalOther(workLocalOther);
+                msTripMapper.insert(msTrip);
+                //添加出行详细
+                if (listTripDet != null && listTripDet.size() > 0) {
+                    for (MsTripDet msTripDet : listTripDet) {
+                        MsTripDet msTripDet1 = new MsTripDet();
+                        msTripDet1.setTripDetId(IdWorker.getId());
+                        msTripDet1.setTripId(msSuspected.getSuspectedId());
+                        msTripDet1.setSort(msTripDet.getSort());
+                        msTripDet1.setStartLocal(msTripDet.getStartLocal());
+                        msTripDet1.setStartLocalOther(msTripDet.getStartLocalOther());
+                        msTripDet1.setEndLocal(msTripDet.getEndLocal());
+                        msTripDet1.setEndLocalOther(msTripDet.getEndLocalOther());
+                        msTripDet1.setTripType(msTripDet.getTripType());
+                        msTripDet1.setTripTypeDesp(msTripDet.getTripTypeDesp());
+                        msTripDet1.setTimeCreate(DateTime.now());
+                        msTripDet1.setUserCreate(userCreate);
+                        msTripDet1.setTimeUpdate(DateTime.now());
+                        msTripDet1.setUserUpdate(userCreate);
+                        msTripDetMapper.insert(msTripDet1);
+                    }
                 }
             }
 

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

@@ -144,6 +144,10 @@ public class MsReportController {
             return ModelOps.newFail("请填报今日体温！");
         } else if (re == 3) { //没有选择家人
             return ModelOps.newFail("请选择家人！");
+        } else if (re == 4) {
+            return ModelOps.newFail("是否出行，请如实填写！");
+        } else if (re == 5) {
+            return ModelOps.newFail("ly集团，只能选择一个人员！");
         }
         return ModelOps.newFail("上报错误");
     }

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

@@ -187,6 +187,15 @@ public class ScanController {
                             return new ModelAndView("/user/scan.ftl", model);
                         }
                     }
+                    MsReport msReport1 = msReportMapper.msAddr(userOpen.getUserId());
+                    if (msReport1 != null && !msReport1.getWorkMsg().equals(msReport1.getTodayMsg())) {
+                        model.put("collor", "red");
+                        model.put("collor2", "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);
+                    }
                     //您近期内离开过工作单位驻地，请遵守返回工作驻地15日隔离规定，您目前未满15日，禁止进入。
                     model.put("collor", "green");
                     model.put("collor2", "green");
@@ -476,6 +485,14 @@ public class ScanController {
                         return new ModelAndView("/user/returnWork.ftl", model);
                     }
                 }
+                MsReport msReport1 = msReportMapper.msAddr(userOpen.getUserId());
+                if (msReport1 != null && !msReport1.getWorkMsg().equals(msReport1.getTodayMsg())) {
+                    model.put("collor", "red");
+                    model.put("collor2", "red");
+                    model.put("into", "不可复工");
+                    model.put("errorMsg", "您本人不在工作驻地，不能入场复工。");
+                    return new ModelAndView("/user/returnWork.ftl", model);
+                }
                 model.put("collor", "green");
                 model.put("collor2", "green");
                 model.put("into", "允许复工");