修改企业微信推送消息中的链接地址

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/WxCorpInfoController.java

@@ -68,7 +68,7 @@ public class WxCorpInfoController {
         jsonObj.put("value", "测试提醒消息");
         dataJson.add(jsonObj);
         json.put("template_id","tty9TkCAAAYoevY-40ciWD5lDncDfR5w");
-        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("url", "https://open.weixin.qq.com/connect/oauth2/authorize?appid=ww4e237fd6abb635af&redirect_uri=http://worktime.ttkuaiban.com/api/corpWXAuth&response_type=code&scope=snsapi_base&state=0#wechat_redirect");
         json.put("content_item",dataJson);
         wxCorpInfoService.sendWXCorpTemplateMsg(corpInfo, corpUid, json);
         return new HttpRespMsg();

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

@@ -1552,7 +1552,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                                     item2.put("key","日期");
                                     item2.put("value",report.getCreateDate());
                                     dataJson.add(item2);
-                                    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("url","https://open.weixin.qq.com/connect/oauth2/authorize?appid=ww4e237fd6abb635af&redirect_uri=http://worktime.ttkuaiban.com/api/corpWXAuth&response_type=code&scope=snsapi_base&state=0#wechat_redirect");
                                     json.put("content_item",dataJson);
                                     wxCorpInfoService.sendWXCorpTemplateMsg(wxCorpInfoList.get(0),u.getCorpwxUserid(),json);
                                 }
@@ -1597,7 +1597,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                                     item3.put("value",report.getCreateDate());
                                     dataJson.add(item3);
                                     json.put("template_id","tty9TkCAAAwOgmzwS2uFogWgOmPDdIRQ");
-                                    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("url","https://open.weixin.qq.com/connect/oauth2/authorize?appid=ww4e237fd6abb635af&redirect_uri=http://worktime.ttkuaiban.com/api/corpWXAuth&response_type=code&scope=snsapi_base&state=0#wechat_redirect");
                                     json.put("content_item",dataJson);
                                     wxCorpInfoService.sendWXCorpTemplateMsg(wxCorpInfoList.get(0),u.getCorpwxUserid(),json);
                                 }
@@ -2494,7 +2494,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                                     item2.put("key","日期");
                                     item2.put("value",report.getCreateDate());
                                     dataJson.add(item2);
-                                    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("url","https://open.weixin.qq.com/connect/oauth2/authorize?appid=ww4e237fd6abb635af&redirect_uri=http://worktime.ttkuaiban.com/api/corpWXAuth&response_type=code&scope=snsapi_base&state=0#wechat_redirect");
                                     json.put("content_item",dataJson);
                                     wxCorpInfoService.sendWXCorpTemplateMsg(wxCorpInfoList.get(0),u.getCorpwxUserid(),json);
                                 }

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

@@ -1688,7 +1688,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                             jsonObj.put("value", "您"+(StringUtils.isEmpty(date)?"":date)+"的工时报告还未填写");
                             dataJson.add(jsonObj);
                             json.put("template_id","tty9TkCAAAYoevY-40ciWD5lDncDfR5w");
-                            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("url", "https://open.weixin.qq.com/connect/oauth2/authorize?appid=ww4e237fd6abb635af&redirect_uri=http://worktime.ttkuaiban.com/api/corpWXAuth&response_type=code&scope=snsapi_base&state=0#wechat_redirect");
                             json.put("content_item",dataJson);
                             if (cpList.size() > 0) {
                                 wxCorpInfoService.sendWXCorpTemplateMsg(cpList.get(0), corpUid, json);

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/TimingTask.java

@@ -367,7 +367,7 @@ public class TimingTask {
                     jsonObj.put("value",StringUtils.isEmpty(map.get("num"))?"":map.get("num"));
                     dataJson.add(jsonObj);
                     json.put("template_id","tty9TkCAAAuPvPjabDdQXGocnG0K24EQ");
-                    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("url","https://open.weixin.qq.com/connect/oauth2/authorize?appid=ww4e237fd6abb635af&redirect_uri=http://worktime.ttkuaiban.com/api/corpWXAuth&response_type=code&scope=snsapi_base&state=0#wechat_redirect");
                     json.put("content_item",dataJson);
                     wxCorpInfoService.sendWXCorpTemplateMsg(wxCorpInfo, corpwxUserid, json);
                     }
@@ -582,7 +582,7 @@ public class TimingTask {
                         jsonObj.put("value", StringUtils.isEmpty(t.getAlertMsg())?"":t.getAlertMsg());
                         dataJson.add(jsonObj);
                         json.put("template_id","tty9TkCAAAYoevY-40ciWD5lDncDfR5w");
-                        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("url", "https://open.weixin.qq.com/connect/oauth2/authorize?appid=ww4e237fd6abb635af&redirect_uri=http://worktime.ttkuaiban.com/api/corpWXAuth&response_type=code&scope=snsapi_base&state=0#wechat_redirect");
                         json.put("content_item",dataJson);
                         if (cpList.size() > 0) {
                             wxCorpInfoService.sendWXCorpTemplateMsg(cpList.get(0), corpUid, json);

fhKeeper/formulahousekeeper/timesheet/src/views/Register.vue

@@ -49,7 +49,7 @@
     export default {
         data() {
             return {
-                typeList:[{id:0,name:'工时统计表简易版'},{id:1,name:'工时统计基础版'},
+                typeList:[{id:1,name:'工时统计基础版'},
                 {id:2,name:'项目管理专业版'},{id:3,name:'企业办公旗舰版'},{id:4,name:'工程管理专业版'}],
                 logining: false,
                 showTimer: false,

fhKeeper/formulahousekeeper/timesheet/src/views/project/finance.vue

@@ -1328,7 +1328,7 @@ import { error } from 'dingtalk-jsapi';
                         return prev;
                     }
                     }, 0);
-                    sums[index] += this.$t('yuan');
+                    sums[index] = sums[index].toFixed(2) + this.$t('yuan');
                 } else {
                     sums[index] = 'N/A';
                 }

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -4076,6 +4076,7 @@
                         this.jsTime = quanbu
                         var list = res.data;
                         this.report = list;
+                        this.reportTimeType = this.report.timeType;
                         //从后端接口的数据设置是否是周末，后端会判断节假日以及中航工业一周6天工作日的情况
                         this.isWeekend = !this.report.isWorkDay;