Merge remote-tracking branch 'origin/master'

fhKeeper/formulahousekeeper/inva_4_tivo/js/iframe.js

@@ -4,7 +4,8 @@ const backcolor = {
   project: { background: '#F6FEF9', color: '#3C86DF', logo: './image/logos.jpg' },
   mobile: { background: 'none', color: '#000', logo: './image/logos.jpg' },
   about: { background: 'none', color: '#000', logo: './image/logos.jpg' },
-  dynamic: { background: 'none', color: '#000', logo: './image/logos.jpg' }
+  dynamic: { background: 'none', color: '#000', logo: './image/logos.jpg' },
+  customerNew: { background: '#fff', color: '#000', logo: './image/logos.jpg' }
 }
 
 function removeListener() {

fhKeeper/formulahousekeeper/inva_4_tivo/moduleView/header.html

@@ -29,10 +29,10 @@
       <div class="headerView-right">
         <div class="header-list" @mouseleave="mouseleave('right')" v-if="showRight">
           <div :class="`header-item`" @mouseenter="mouseenter('right', 1)" v-if="urlFiled != 'workshop'">
-            <a :href="rightCilckUrl[urlFiled] && rightCilckUrl[urlFiled].signIn" :class="`${ rightItemIndex == 1 ? 'item-hover' : '' }`" target="_top">立即注册</a>
+            <a :href="(rightCilckUrl[urlFiled] && rightCilckUrl[urlFiled].signIn) ? rightCilckUrl[urlFiled] && rightCilckUrl[urlFiled].signIn : 'http://worktime.ttkuaiban.com/#/register'" :class="`${ rightItemIndex == 1 ? 'item-hover' : '' }`" target="_top">立即注册</a>
           </div>
           <div :class="`header-item`" @mouseenter="mouseenter('right', 0)">
-            <a :href="rightCilckUrl[urlFiled] && rightCilckUrl[urlFiled].logIn" :class="`${ rightItemIndex == 0 ? 'item-hover' : '' }`" target="_top">后台登陆</a>
+            <a :href="(rightCilckUrl[urlFiled] && rightCilckUrl[urlFiled].logIn) ? rightCilckUrl[urlFiled] && rightCilckUrl[urlFiled].logIn : 'http://worktime.ttkuaiban.com/#/login'" :class="`${ rightItemIndex == 0 ? 'item-hover' : '' }`" target="_top">后台登陆</a>
           </div>
         </div>
       </div>

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

@@ -10329,6 +10329,26 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 resultList.add(map);
             }
         }
+        //反向，检测有填报日报但是没有考勤的数据
+        for (Report report : reportList) {
+            boolean hasCardTime = false;
+            for (UserCorpwxTime corpwxTime : userCorpwxTimeList) {
+                if (corpwxTime.getCreateDate().isEqual(report.getCreateDate())) {
+                    if (corpwxTime.getWorkHours() > 0) {
+                        hasCardTime = true;
+                    }
+                    break;
+                }
+            }
+            if (!hasCardTime) {
+                Map<String, Object> map = new HashMap<>();
+                map.put("name", user.getName());
+                map.put("createDate", dateTimeFormatter.format(report.getCreateDate()));
+                map.put("workHours", 0);
+                map.put("reportTime", report.getWorkingTime());
+                resultList.add(map);
+            }
+        }
         HttpRespMsg msg = new HttpRespMsg();
         msg.setData(resultList);
         return msg;

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ProjectMapper.xml

@@ -1238,7 +1238,7 @@
         from report a
         left join task_group b on a.group_id=b.id
         left join project c on a.project_id=c.id
-        where c.company_id=#{companyId} and a.state=1
+        where c.company_id=#{companyId}
         <if test="startDate!=null and endDate!=null">
             and a.create_date &gt;=#{startDate} and a.create_date &lt;=#{endDate}
         </if>
@@ -1274,7 +1274,7 @@
         from report a
         left join task_group b on a.group_id=b.id
         left join project c on a.project_id=c.id
-        where c.company_id=#{companyId} and a.state=1
+        where c.company_id=#{companyId}
         <if test="startDate!=null and endDate!=null">
             and a.create_date &gt;=#{startDate} and a.create_date &lt;=#{endDate}
         </if>
@@ -1313,7 +1313,7 @@
         <if test="projectCategorySub!=null and projectCategorySub!=''">
             left join project_separate ps on ps.id=c.id
         </if>
-        where c.company_id=#{companyId} and a.state=1
+        where c.company_id=#{companyId}
         <if test="startDate!=null and endDate!=null">
             and a.create_date &gt;=#{startDate} and a.create_date &lt;=#{endDate}
         </if>
@@ -1357,7 +1357,7 @@
         <if test="projectCategorySub!=null and projectCategorySub!=''">
             left join project_separate ps on ps.id=c.id
         </if>
-        where c.company_id=#{companyId} and a.state=1
+        where c.company_id=#{companyId}
         <if test="startDate!=null and endDate!=null">
             and a.create_date &gt;=#{startDate} and a.create_date &lt;=#{endDate}
         </if>

fhKeeper/formulahousekeeper/timesheet/src/i18n/en.json

@@ -2193,7 +2193,7 @@
   "zhuanYIGongShi": "Transfer of working hours",
   "zhuanYiChengGong": "Transfer successful",
   "zhuanYiZhi": "Transfer to",
-  "cardtimenotfull": "ReportTime less than cardTime data list",
+  "cardtimenotfull": "ReportTime and cardTime abnormal list",
   "fillReportTime": "Fill report time",
   "kaoqingjiabanjiaoyanTip": "Man-hour management type"
 }

fhKeeper/formulahousekeeper/timesheet/src/i18n/zh.json

@@ -2194,6 +2194,6 @@
   "zhuanYiZhi": "转移至",
   "queRenZhuanYi": "确认转移",
   "zhuanYiChengGong": "转移成功",
-  "cardtimenotfull": "考勤工时未完全填报列表",
+  "cardtimenotfull": "考勤工时异常列表",
   "fillReportTime": "填报时长"
 }