未选中二级部门报错

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

@@ -199,6 +199,17 @@ define(function (require) {
               queryGrid1();
             },
           },
+
+          {
+            name: 'isBand',
+            xtype: 'combobox',
+            label: '是否迁移',
+            data: [{id: '', text: '全部'}, {id: '1', text: '否'}, {id: '2', text: '是'}],
+            value: '',
+            onChange: function (value) {
+              queryGrid1();
+            },
+          },
         ]]
       };
 
@@ -353,6 +364,17 @@ define(function (require) {
                     },
                     {field: 'phone', title: '联系电话', maxWidth: 200, align: 'left',},
                     {field: 'doorplate', title: '工号', maxWidth: 200, align: 'left',},
+
+                    {field: 'oldOpenId', title: '旧openId',hidden: true},
+                    {field: 'isBand', title: '是否迁移', maxWidth: 200, align:  'center', formatter: function (value, row) {
+                        if (row.rowData.oldOpenId) {
+                          return "<span style='color: green;'>是<span>";
+                        } else {
+                          return "<span style='color: red;'>否<span>";
+                        }
+                      }
+                    },
+
                     {field: 'bingqingDesc', title: '病情表述', align: 'left',},
                     {field: 'isContactDesc', title: '家人确诊或接触', align: 'left',formatter: function (value) {
                         if (value == "否") {

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

@@ -179,6 +179,16 @@ define(function (require) {
               queryGrid1();
             },
           },
+          {
+            name: 'isBand',
+            xtype: 'combobox',
+            label: '是否迁移',
+            data: [{id: '', text: '全部'}, {id: '1', text: '否'}, {id: '2', text: '是'}],
+            value: '',
+            onChange: function (value) {
+              queryGrid1();
+            },
+          },
         ]]
       };
 
@@ -331,6 +341,17 @@ define(function (require) {
                     },
                     {field: 'phone', title: '联系电话', maxWidth: 200, align: 'left',},
                     {field: 'doorplate', title: '工号', maxWidth: 200, align: 'left',},
+
+                    {field: 'oldOpenId', title: '旧openId',hidden: true},
+                    {field: 'isBand', title: '是否迁移', maxWidth: 200, align:  'center', formatter: function (value, row) {
+                        if (row.rowData.oldOpenId) {
+                          return "<span style='color: green;'>是<span>";
+                        } else {
+                          return "<span style='color: red;'>否<span>";
+                        }
+                      }
+                    },
+
                     {field: 'bingqingDesc', title: '病情表述', maxWidth: 200, align: 'left',},
                     {field: 'isContactDesc', title: '家人确诊或接触', align: 'left',formatter: function (value) {
                         if (value == "否") {

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

@@ -205,7 +205,7 @@ define(function (require) {
                     {field: 'phone', title: '联系电话', maxWidth: 200, align: 'left',},
                     {field: 'doorplate', title: '工号', maxWidth: 200, align: 'left',},
                     {field: 'oldOpenId', title: '旧openId',hidden: true},
-                    {field: 'isBand', title: '是否绑定', maxWidth: 200, align:  'center', formatter: function (value, row) {
+                    {field: 'isBand', title: '是否迁移', maxWidth: 200, align:  'center', formatter: function (value, row) {
                         if (row.rowData.oldOpenId) {
                           return "<span style='color: green;'>是<span>";
                         } else {

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

@@ -144,7 +144,7 @@ define(function (require) {
             {
               name: 'isBand',
               xtype: 'combobox',
-              label: '是否绑定',
+              label: '是否迁移',
               data: [{id: '', text: '全部'}, {id: '1', text: '否'}, {id: '2', text: '是'}],
               value: '',
               onChange: function (value) {
@@ -293,7 +293,7 @@ define(function (require) {
                           {field: 'phone', title: '联系电话', maxWidth: 200, align: 'left',},
                           {field: 'doorplate', title: '工号', maxWidth: 200, align: 'left',},
                           {field: 'oldOpenId', title: '旧openId', hidden: true},
-                          {field: 'isBand', title: '是否绑定', maxWidth: 200, align:  'center', formatter: function (value, row) {
+                          {field: 'isBand', title: '是否迁移', maxWidth: 200, align:  'center', formatter: function (value, row) {
                               if (row.rowData.oldOpenId) {
                                 return "<span style='color: green;'>是<span>";
                               } else {

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

@@ -61,21 +61,47 @@ public class EpiTemplateMessageService {
 //    指引与文档模版：{{keyword4.DATA}}           指引与文档模板：无
 //    指派人：{{keyword5.DATA}}                 指派人：系统
 //    {{remark.DATA}}                            家园互助平台提醒您，请及时提交今天的健康日报。
+//    public int systemSendRemindMessage(Long userId, String openId) {
+//        int re = 0;
+//        Map<String, String> map = Maps.newHashMap();
+//        List<UptownHome> uptownHomeList = uptownHomeMapper.getUptownHomeByUserId(userId);
+//        if (uptownHomeList != null && uptownHomeList.size()>0) {
+//            map.put("first", "尊敬的 "+uptownHomeList.get(0).getLinkman()+" 先生/女士，");
+//            map.put("keyword1", "家园互助平台");
+//            map.put("keyword2", "健康日报 上报");
+//            SimpleDateFormat sdf1 =new SimpleDateFormat("yyyy-MM-dd" );
+//            Date d1= new Date();
+//            String str1 = sdf1.format(d1);
+//            map.put("keyword3", str1);
+//            map.put("keyword4", "无");
+//            map.put("keyword5", "系统");
+//            map.put("remark", "家园互助平台提醒您，为了您和他人的健康请及时提交每天的健康日报，上报情况将直接关系到您的小区临时出入，如已填报忽略本消息");
+//            re = 1;
+//        }
+//        templateMessageService.sendSysRemindMessage(openId, "", map);
+//        return re;
+//    }
+
+
+//    工作任务提醒
+//    {{first.DATA}}
+//    员工姓名：{{keyword1.DATA}}
+//    提醒时间：{{keyword2.DATA}}
+//    任务内容：{{keyword3.DATA}}
+//    {{remark.DATA}}
     public int systemSendRemindMessage(Long userId, String openId) {
         int re = 0;
         Map<String, String> map = Maps.newHashMap();
         List<UptownHome> uptownHomeList = uptownHomeMapper.getUptownHomeByUserId(userId);
         if (uptownHomeList != null && uptownHomeList.size()>0) {
-            map.put("first", "尊敬的 "+uptownHomeList.get(0).getLinkman()+" 先生/女士，");
-            map.put("keyword1", "家园互助平台");
-            map.put("keyword2", "健康日报 上报");
+            map.put("first", "");
+            map.put("keyword1", "尊敬的 "+uptownHomeList.get(0).getLinkman()+" 先生/女士，");
             SimpleDateFormat sdf1 =new SimpleDateFormat("yyyy-MM-dd" );
             Date d1= new Date();
             String str1 = sdf1.format(d1);
-            map.put("keyword3", str1);
-            map.put("keyword4", "无");
-            map.put("keyword5", "系统");
-            map.put("remark", "家园互助平台提醒您，为了您和他人的健康请及时提交每天的健康日报，上报情况将直接关系到您的小区临时出入，如已填报忽略本消息");
+            map.put("keyword2", str1);
+            map.put("keyword3", "健康日报 上报");
+            map.put("remark", "凌云互助家园提醒您，为了您和他人的健康请及时提交每天的健康日报，上报情况将直接关系到您办公园区的临时出入，如已填报忽略本消息");
             re = 1;
         }
         templateMessageService.sendSysRemindMessage(openId, "", map);
@@ -83,6 +109,7 @@ public class EpiTemplateMessageService {
     }
 
 
+
     public int systemSendRemindMessageTest(Long userId, String openId) {
         int re = 0;
         Map<String, String> map = Maps.newHashMap();

whepi-web/src/main/resources/application-prod.yml

@@ -58,7 +58,9 @@ yvan:
       结账信息: '5t4LSW4cb7j4mcHxoYyzTvLHnp2gehpxn1faf7G4ABs'
       结算信息: 'GoZBKvyqAfP8uM3xrJk40YHhMoM_E44aPLEoKV_1-pQ'
       每日提醒: 'yJDr5rSc9q9OkX-wuchH4N_msKcnA1zXgjEA3XXxKbs'
-      系统提醒: '62x92fgWSbn6OoHVC2MwOkzzzss56AXHYVn_tQW1d6c'
+      系统提醒: 'PQfBWS9Wi07LVuBaZeLxAn_Os05XY1fzXbR6x-88LkI'
+
+      #  备用模板：新任务提醒  1Fj70-L2-CQNAk4ESmGCIwoi753LrYRT9RxaNDMLCtU
 
 
 spring: