Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/inva_4_tivo/css/index.css

@@ -584,7 +584,8 @@
 
 
 .conImg {
-    width: 4100px;
+    /* width: 4610px; */
+    width: 4610px;
     display: flex;
     justify-content: space-between;
     position: relative;

fhKeeper/formulahousekeeper/inva_4_tivo/index.html

@@ -16,8 +16,8 @@
     <script src="js/jquery1.42.min.js"></script>
     <script src="js/jquery.SuperSlide.2.1.3.js"></script>
     <!-- 统计文件 -->
-    <!-- <script charset="UTF-8" id="LA_COLLECT" src="//sdk.51.la/js-sdk-pro.min.js"></script>
-    <script>LA.init({id: "Jk62Sh8gvUhl1xcU",ck: "Jk62Sh8gvUhl1xcU"})</script> -->
+    <script charset="UTF-8" id="LA_COLLECT" src="//sdk.51.la/js-sdk-pro.min.js"></script>
+    <script>LA.init({id: "Jk62Sh8gvUhl1xcU",ck: "Jk62Sh8gvUhl1xcU"})</script>
     <script>
         let str = (navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i)) ? 'app': 'pc';
         let url = window.location.href
@@ -366,6 +366,23 @@
         <div class="connonst">
             <h2>来自客户的认可</h2>
             <div class="conImg" style="left: 0;">
+                <!-- 北京首钢 -->
+                <div class="conImgCon">
+                    <div class="mengban"></div>
+                    <img src="./image/kehuone.png" alt="">
+                    <div class="conImgConImg" style="width: 60px;">
+                        <img src="./image/ions/bjsg.png" alt="">
+                    </div>
+                    <div class="conImgFiz">
+                        工时管家能够根据员工的报销情况以及员工的考勤，来核算出整个项目的成本投入，<br/>
+                        也能够从侧面上对员工进行绩效考核，通过甘特图查看各个项目组成员的忙闲情况，<br/>
+                        这样可以对员工进行合理的工作安排。
+                    </div>
+                    <div class="conIngFoot">
+                        <p>北极首钢集团</p>
+                        <span>张经理</span>
+                    </div>
+                </div>
                 <!-- 重庆美莱德生物科技 -->
                 <div class="conImgCon">
                     <div class="mengban"></div>

fhKeeper/formulahousekeeper/inva_4_tivo/js/index.js

@@ -179,13 +179,13 @@ let mobiledistance = 0
 $(function() {
     kehuFlg()
     $('#kehuLeft').click(function() {
-        if(nums > 0 && nums <= 5) {
+        if(nums > 0 && nums <= 6) {
             nums--
             zuoyouClick()
         }
     })
     $('#kehuRight').click(function() {
-        if(nums < 5) {
+        if(nums < 6) {
             nums++
             zuoyouClick()
         }
@@ -208,7 +208,7 @@ function kehuFlg() {
         $('#kehuLeft').find('img').attr("src", './image/ions/zuo.png')
         $('#kehuLeft').removeClass("zhis")
     }
-    if(nums >= 5) {
+    if(nums >= 6) {
         $('#kehuRight').find('img').attr("src", './image/ions/yous.png')
         $('#kehuRight').addClass("zhis")
     } else {

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

@@ -2794,6 +2794,13 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             }
         }
 
+        WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", user.getCompanyId()));
+        if (wxCorpInfo!=null && wxCorpInfo.getSaasSyncContact()==1){
+            for (Map<String, Object> map : list) {
+                String s = map.get("corpwxDeptId") == null ? "" : map.get("corpwxDeptId").toString();
+                map.put("departmentName",s);
+            }
+        }
         msg.data = list;
         return msg;
     }
@@ -6015,6 +6022,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         DecimalFormat dft =  new DecimalFormat("0%");
         User targetUser= userMapper.selectById(request.getHeader("token"));
         TimeType timeType = timeTypeMapper.selectById(targetUser.getCompanyId());
+        WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", targetUser.getCompanyId()));
         Integer timeliness = timeType.getTimeliness();
         List<SysRichFunction> functionAllList = sysFunctionMapper.getRoleFunctions(targetUser.getRoleId(), "全公司填报及时率");
         List<SysRichFunction> functionDeptList = sysFunctionMapper.getRoleFunctions(targetUser.getRoleId(), "负责部门填报及时率");
@@ -6096,6 +6104,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 timelinessRateVO.setDepartmentName(first.get().getDepartmentName());
                 timelinessRateVO.setCorpwxDeptId(first.get().getCorpwxDeptid());
             }
+
+            if (wxCorpInfo!=null && wxCorpInfo.getSaasSyncContact()==1){
+                timelinessRateVO.setDepartmentName(timelinessRateVO.getCorpwxDeptId() == null?"":timelinessRateVO.getCorpwxDeptId().toString());
+            }
             List<Map<String, Object>> mapList = listMap.get(user.getName());
             //去掉填非工作日
             for (LocalDateTime localDateTime : dateTimeList) {
@@ -6527,7 +6539,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                 item.add("$userName="+(map.get("corpwxUserId")==null?"":map.get("corpwxUserId"))+"$");
                 item.add(String.valueOf(StringUtils.isEmpty(map.get("jobNumber"))?"":map.get("jobNumber")));
-                item.add("$deprtmentName="+(map.get("corpwxDeptId")==null?"":map.get("corpwxDeptId"))+"$");
+                item.add("$departmentName="+(map.get("corpwxDeptId")==null?"":map.get("corpwxDeptId"))+"$");
             }else {
                 item.add((String) map.get("name"));
                 item.add(String.valueOf(StringUtils.isEmpty(map.get("jobNumber"))?"":map.get("jobNumber")));
@@ -7831,7 +7843,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             List<String> item=new ArrayList<>();
             if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                 item.add("$userName=" + map.get("name") +"$");
-                item.add("$deprtmentName="+(map.get("corpwxDeptId")==null?"":map.get("corpwxDeptId"))+"$");
+                item.add("$departmentName="+(map.get("corpwxDeptId")==null?"":map.get("corpwxDeptId"))+"$");
             }else {
                 item.add((String) map.get("name"));
                 item.add((String) map.get("departmentName")==null?"":(String) map.get("departmentName"));

fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/list.vue

@@ -1045,6 +1045,12 @@ export default {
       this.$t('statisticsofovertimework'),this.$t('timecostearlywarningtable'),this.$t('personneltimeallocationtable'),
       this.$t('statisticsofstafffillingintimerate'),this.$t('dailyreporttobereviewedstatistics'),this.$t('statisticsofpersonnelhours'),this.$t('taskgrouptimesheet'),this.$t('projectcostbaselinetable'),
       this.$t('ren-yuan-yue-du-gong-shi-biao'), this.$t('bumenchanyuqingkuang')],
+
+      shuzArr: [this.$t('projectreport'),this.$t('projectTaskReport'),this.$t('projectcoststatement'),
+      this.$t('projectbalancesheet'),this.$t('customerprojectprofitstatement'),this.$t('projectphasetimesheet'),
+      this.$t('statisticsofovertimework'),this.$t('timecostearlywarningtable'),this.$t('personneltimeallocationtable'),
+      this.$t('employeereporttimelinessrate'),this.$t('dailyreporttobereviewedstatistics'),this.$t('statisticsofpersonnelhours'),this.$t('taskgrouptimesheet'),this.$t('projectcostbaselinetable'),
+      this.$t('ren-yuan-yue-du-gong-shi-biao'), this.$t('bumenchanyuqingkuang')],
       ins: 10000,
       user: JSON.parse(sessionStorage.user),
       overTimeList: [], // 项目加班情况统计列表
@@ -1120,7 +1126,7 @@ export default {
   mounted() {
     this.getProjectListOvertime()
     this.getProjectList();
-    this.getUserList()
+    // this.getUserList()
     this.getDepartmentList()
     this.getcustomerList()
     this.getcusProjectList()
@@ -1224,7 +1230,7 @@ export default {
 
     getUserList() {
       this.http.post('/user/getUserListByRole', {
-        
+        tableName: this.shuzArr[this.ins]
       },
       res => {
           if (res.code == "ok") {
@@ -1422,6 +1428,7 @@ export default {
                 } else if(this.ins == 15) {
                   this.getDepartmentsInvolved()
                 }
+                this.getUserList()
             },
       exportExcel() {
         var url = "/project";