日报审核通过消息提醒

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -1409,14 +1409,17 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                             JSONObject json=new JSONObject();
                             JSONArray dataJson=new JSONArray();
                             JSONObject item=new JSONObject();
-                            item.put("审核人",user.getName());
+                            item.put("key","审核人");
+                            item.put("value",user.getName());
                             if(timeType.getNeedEvaluate()==1){
-                                item.put("评价",report.getEvaluate());
+                                item.put("key","评价");
+                                item.put("value",report.getEvaluate());
                                 json.put("template_id","tty9TkCAAAWoUyhGnXRCZuhkgCqw_Uow");
                             }else {
                                 json.put("template_id","tty9TkCAAANpvEtLrkPUGeOEd1-U7W2w");
                             }
-                            item.put("填报日期",report.getCreateDate());
+                            item.put("key","填报日期");
+                            item.put("value",report.getCreateDate());
                             dataJson.add(item);
                             json.put("url","https://open.weixin.qq.com/connect/oauth2/authorize?appid=ww4e237fd6abb635af&redirect_uri=http://mobworktime.ttkuaiban.com/api/corpWXAuth&response_type=code&scope=snsapi_base&state=0#wechat_redirect");
                             json.put("content_item",dataJson);
@@ -2177,9 +2180,12 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                             JSONObject json=new JSONObject();
                             JSONArray dataJson=new JSONArray();
                             JSONObject item=new JSONObject();
-                            item.put("审核人",user.getName());
-                            item.put("评价",report.getEvaluate());
-                            item.put("填报日期",report.getCreateDate());
+                            item.put("key","审核人");
+                            item.put("value",user.getName());
+                            item.put("key","评价");
+                            item.put("value",report.getEvaluate());
+                            item.put("key","填报日期");
+                            item.put("value",report.getCreateDate());
                             dataJson.add(item);
                             json.put("template_id","tty9TkCAAAWoUyhGnXRCZuhkgCqw_Uow");
                             json.put("url","https://open.weixin.qq.com/connect/oauth2/authorize?appid=ww4e237fd6abb635af&redirect_uri=http://mobworktime.ttkuaiban.com/api/corpWXAuth&response_type=code&scope=snsapi_base&state=0#wechat_redirect");
@@ -2211,7 +2217,6 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             for (Report r : allReports) {
                 LocalDate date = r.getCreateDate();
                 String creatorId = r.getCreatorId();
-                System.out.println("creatorId========="+creatorId);
                 if (!membList.stream().anyMatch(m->m.getCreateDate().isEqual(date) && m.getUserId().equals(creatorId))) {
                     //没有的话，存进去
                     ReportAlogMembdate membdate = new ReportAlogMembdate();