凌云集团更改公司

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

@@ -43,7 +43,7 @@ define(function (require) {
               }
             },
             {
-              field: 'msStatus', title: '上报状态', maxWidth: 100, align: 'center', formatter: function (value, row) {
+              field: 'msStatus', title: '个人上报状态', maxWidth: 100, align: 'center', formatter: function (value, row) {
                 if (row.rowData.reportStatus  == 0) {
                   return "<span style='color: #ffb717;'>未上报<span>";
                 } else if (value == 1) {

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

@@ -43,7 +43,7 @@ define(function (require) {
               }
             },
             {
-              field: 'msStatus', title: '上报状态', maxWidth: 100, align: 'center', formatter: function (value, row) {
+              field: 'msStatus', title: '个人上报状态', maxWidth: 100, align: 'center', formatter: function (value, row) {
                 if (row.rowData.reportStatus  == 0) {
                   return "<span style='color: #ffb717;'>未上报<span>";
                 } else if (value == 1) {

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

@@ -43,7 +43,7 @@ define(function (require) {
               }
             },
             {
-              field: 'msStatus', title: '上报状态', maxWidth: 100, align: 'center', formatter: function (value, row) {
+              field: 'msStatus', title: '个人上报状态', maxWidth: 100, align: 'center', formatter: function (value, row) {
                 if (row.rowData.reportStatus == 0) {
                   return "<span style='color: #ffb717;'>未上报<span>";
                 } else if (value == 1) {

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

@@ -176,7 +176,8 @@ define(function (require) {
                   },
                   {
                     text: '导出正常复工人员', iconCls: 'fa fa-cloud-upload', onClick: function () {
-                      window.open(api('/returnWork/exReturnWork'));
+                      var unitId = $form.formGet().unitId;
+                      window.open(api('/returnWork/exReturnWork?unitId='+unitId));
                     }
                   },
                   {
@@ -227,6 +228,17 @@ define(function (require) {
                     {field: 'userId', title: '用户ID', hidden: true},
                     {field: 'linkman', title: '姓名', maxWidth: 200, align: 'left',},
                     {field: 'loudong', title: '部门名称', maxWidth: 200, align: 'left',},
+                    {
+                      field: 'msStatus', title: '个人上报状态', maxWidth: 100, align: 'center', formatter: function (value, row) {
+                        if (row.rowData.reportStatus == 0) {
+                          return "<span style='color: #ffb717;'>未上报<span>";
+                        } else if (value == 1) {
+                          return "<span style='color: green;'>正常<span>";
+                        } else {
+                          return "<span style='color: red;'>异常<span>";
+                        }
+                      }
+                    },
                     {field: 'phone', title: '联系电话', maxWidth: 200, align: 'left',},
                     {field: 'doorplate', title: '工号', maxWidth: 200, align: 'left',},
                     {field: 'bingqingDesc', title: '病情表述', align: 'left',},

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

@@ -156,6 +156,12 @@ define(function (require) {
                     }
                   },
                   {
+                    text: '导出正常复工人员', iconCls: 'fa fa-cloud-upload', onClick: function () {
+                      var unitId = $form.formGet().unitId;
+                      window.open(api('/returnWork/exReturnWork?unitId=0'));
+                    }
+                  },
+                  {
                     text: '查看人员上报情况', iconCls: 'fa fa-search', onClick: function () {
                       var row = $grid1.rowData();
                       if ( row == null || row == undefined || row.userId == null || row.userId == "") {
@@ -203,6 +209,17 @@ define(function (require) {
                     {field: 'userId', title: '用户ID', hidden: true},
                     {field: 'linkman', title: '姓名', maxWidth: 200, align: 'left',},
                     {field: 'loudong', title: '部门名称', maxWidth: 200, align: 'left',},
+                    {
+                      field: 'msStatus', title: '个人上报状态', maxWidth: 100, align: 'center', formatter: function (value, row) {
+                        if (row.rowData.reportStatus == 0) {
+                          return "<span style='color: #ffb717;'>未上报<span>";
+                        } else if (value == 1) {
+                          return "<span style='color: green;'>正常<span>";
+                        } else {
+                          return "<span style='color: red;'>异常<span>";
+                        }
+                      }
+                    },
                     {field: 'phone', title: '联系电话', maxWidth: 200, align: 'left',},
                     {field: 'doorplate', title: '工号', maxWidth: 200, align: 'left',},
                     {field: 'bingqingDesc', title: '病情表述', maxWidth: 200, align: 'left',},

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

@@ -176,7 +176,8 @@ define(function (require) {
                   },
                   {
                     text: '导出正常复工人员', iconCls: 'fa fa-cloud-upload', onClick: function () {
-                      window.open(api('/returnWork/exReturnWork'));
+                      var unitId = $form.formGet().unitId;
+                      window.open(api('/returnWork/exReturnWork?unitId='+unitId));
                     }
                   },
                   {
@@ -187,7 +188,7 @@ define(function (require) {
                         return
                       }
                       $.yvan.showDialog(this,
-                        require('/app/whepi/lingyun/dialogDetail7.js')({
+                        require('/app/whepi/lingyun/dialogDetail2.js')({
                           userId: row.userId,
                           linkman: row.linkman,
                           confirm: function () {
@@ -227,6 +228,17 @@ define(function (require) {
                     {field: 'userId', title: '用户ID', hidden: true},
                     {field: 'linkman', title: '姓名', maxWidth: 200, align: 'left',},
                     {field: 'loudong', title: '部门名称', maxWidth: 200, align: 'left',},
+                    {
+                      field: 'msStatus', title: '个人上报状态', maxWidth: 100, align: 'center', formatter: function (value, row) {
+                        if (row.rowData.reportStatus == 0) {
+                          return "<span style='color: #ffb717;'>未上报<span>";
+                        } else if (value == 1) {
+                          return "<span style='color: green;'>正常<span>";
+                        } else {
+                          return "<span style='color: red;'>异常<span>";
+                        }
+                      }
+                    },
                     {field: 'phone', title: '联系电话', maxWidth: 200, align: 'left',},
                     {field: 'doorplate', title: '工号', maxWidth: 200, align: 'left',},
                     {field: 'bingqingDesc', title: '病情表述', align: 'left',},
@@ -248,8 +260,8 @@ define(function (require) {
                     },
                     {field: 'workLoalDesc', title: '工作驻地', maxWidth: 200, align: 'left',},
                     {field: 'todayLoalDesc', title: '今晚住地', maxWidth: 200, align: 'left',},
-                    {field: 'autoLocal', title: '定位地区', maxWidth: 200, align: 'left',},
-                    {field: 'autoAddr', title: '定位地址', maxWidth: 200, align: 'left',},
+                    // {field: 'autoLocal', title: '定位地区', maxWidth: 200, align: 'left',},
+                    // {field: 'autoAddr', title: '定位地址', maxWidth: 200, align: 'left',},
                     {field: 'isTripDesc', title: '是否出行', maxWidth: 200, align: 'left',},
                     {field: 'tripDetDesc', title: '出行详细', align: 'left',},
                   ]

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

@@ -67,14 +67,6 @@
           "children": []
         },
         {
-          "id": "ENT101002",
-          "text": "凌云特殊人员管理",
-          "href": "/app/whepi/scan/specialPersonnelLY.js",
-          "iconCls": "icon-blank fa fa-align-justify",
-          "state": "close",
-          "children": []
-        },
-        {
           "id": "ENT101003",
           "text": "凌云二类特殊人员管理",
           "href": "/app/whepi/scan/specialPersonnelLY2.js",

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

@@ -19,17 +19,9 @@
       "children": []
     },
     {
-      "id": "ENT10003",
-      "text": "特殊人员管理",
-      "href": "/app/whepi/scan/specialPersonnelLY.js",
-      "iconCls": "icon-blank fa fa-align-justify",
-      "state": "close",
-      "children": []
-    },
-    {
       "id": "ENT10004",
       "text": "二类特殊人员管理",
-      "href": "/app/whepi/scan/specialPersonnelLY2.js",
+      "href": "/app/whepi/scan/specialPersonnelLY7.js",
       "iconCls": "icon-blank fa fa-align-justify",
       "state": "close",
       "children": []

admin-ui/app/whepi/mock/注释菜单.txt

@@ -14,4 +14,13 @@
 //      "iconCls": "icon-blank fa fa-align-justify",
 //      "state": "close",
 //      "children": []
-//    }
+//    }
+
+    {
+      "id": "ENT10003",
+      "text": "特殊人员管理",
+      "href": "/app/whepi/scan/specialPersonnelLY.js",
+      "iconCls": "icon-blank fa fa-align-justify",
+      "state": "close",
+      "children": []
+    },

whepi-web/src/main/java/com/bofeng/controller/EpiAdminController.java

@@ -102,7 +102,7 @@ public class EpiAdminController {
 //    @Scheduled(cron = "0 25 22 * * ?")
 //    public void returnWorkTaskByFixedDelay() {
 //        System.out.println("==============执行定时任务开始================");
-//        scanService.returnWorkLY();
+//        scanService.returnWorkLY(0L);
 //        System.out.println("==============执行定时任务完毕================");
 //    }
 

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

@@ -36,5 +36,7 @@ public interface UserOpenMapper extends BaseMapper<UserOpen> {
 
     List<UserOpen> getUsersByUptownId(@Param("uptownId") Long uptownId);
 
+    List<UserOpen> getUsersByunitId(@Param("uptownId") Long uptownId, @Param("unitId") Long unitId);
+
     UserOpen selectUserBaseByUserId(@Param("userId") Long userId);
 }

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

@@ -92,7 +92,7 @@ public class ScanService {
     }
 
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-    public void returnWorkLY() {
+    public void returnWorkLY(Long unitId) {
         new Runnable() {
             @SneakyThrows
             @Override
@@ -100,7 +100,7 @@ public class ScanService {
                 returnWorkLyMapper.deleteReturnWork();
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 SimpleDateFormat s = new SimpleDateFormat("yyyy-MM-dd");
-                List<UserOpen> opens = userOpenMapper.getUsersByUptownId(1238790987234L);
+                List<UserOpen> opens = userOpenMapper.getUsersByunitId(1238790987234L, unitId);
                 ReturnWorkLy r = new ReturnWorkLy();
                 for (int i = 0; i < opens.size(); i++) {
                     OutUser outUser1 = outUserMapper.getOutUserByPhone(4, opens.get(i).getLinkman(), Long.parseLong(opens.get(i).getPhone()));

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

@@ -432,7 +432,7 @@ public class ScanAdminController {
     @ApiOperation("允许复工人员")
     @GetMapping("/whepi/returnWork/returnWork")
     public void returnWork(HttpParameterParser parser) {
-        scanService.returnWorkLY();
+        scanService.returnWorkLY(0L);
         Map<String, Object> map = new HashMap<>();
         List<ReturnWorkLy> list = returnWorkLyMapper.exgetAllUser(map);
     }
@@ -440,9 +440,14 @@ public class ScanAdminController {
     @ApiOperation("导出允许复工人员")
     @SneakyThrows
     @GetMapping("/whepi/returnWork/exReturnWork")
-    public void exReturnWork(HttpParameterParser parser,HttpServletResponse resp) {
-        scanService.returnWorkLY();
+    public void exReturnWork(HttpParameterParser parser,HttpServletResponse resp, @Pd(name = "unitId" , required = false, defaultValue = "0") Long unitId) {
+        Long userId = JwtHelper.getUserId();
+        if (userId > 7000 && userId < 8000) {
+            unitId = userId;
+        }
+        scanService.returnWorkLY(unitId);
         Map<String, Object> map = new HashMap<>();
+        map.put("unitId", unitId);
         List<ReturnWorkLy> list = returnWorkLyMapper.exgetAllUser(map);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         ExcelUtils.writeSheet(ReturnWorkLy.class, list).export(resp,"凌云集团正常复工员工" + sdf.format(new Date()));

whepi-web/src/main/resources/mapper/UserOpen.xml

@@ -29,6 +29,23 @@
           inner join sys_uptown u on u.uptown_id = uu.uptown_id
         where u.uptown_id = #{uptownId}
     </select>
+
+    <select id="getUsersByunitId" resultType="com.bofeng.entity.UserOpen">
+        SELECT
+        suu.ridgepole,suu.unit,suh.doorplate,suho.linkman,suho.phone,ur.user_id AS userId
+        FROM
+        sys_uptown_house suh
+        INNER JOIN sys_uptown_home suho ON suho.house_id = suh.house_id
+        INNER JOIN sys_uptown_unit suu ON suu.unit_id = suh.unit_id
+        AND suu.uptown_id = #{uptownId}
+        INNER JOIN sys_user_role ur ON ur.property_id = suho.house_id
+        AND ur.role_id = 1
+        <where>
+            <if test="unitId != null and unitId !=''">
+                and suu.unit_id = #{unitId}
+            </if>
+        </where>
+    </select>
     <select id="selectUserBaseByUserId" resultType="com.bofeng.entity.UserOpen">
       select g.linkman,g.phone,d.ridgepole,d.unit,e.doorplate
 from sys_user_role t