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

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

@@ -4229,24 +4229,24 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     private String getSupDepartment(Department department) {
         String depHierarchy = department.getDepartmentName();
         //搜到父部门进行添加
-        if (department.getSuperiorId()!=null) {
+        if (department.getSuperiorId()==null) {
+            return depHierarchy;
+        } else {
             Department supDep = departmentMapper.selectById(department.getSuperiorId());
-            depHierarchy = supDep.getDepartmentName() +  "/" + depHierarchy;
-            getSupDepartment(supDep);
+            return getSupDepartment(supDep) + "/" + depHierarchy;
         }
-        return depHierarchy;
     }
 
     //递归获取企业微信所有上级部门字符串，格式："上级部门/上级部门/部门"
     private String getWxDepartment(Department department) {
         String depHierarchy = "$departmentName="+department.getCorpwxDeptid()+"$";
         //搜到父部门进行添加
-        if (department.getCorpwxDeptpid()!=null) {
-            Department supDep = departmentMapper.selectById(department.getCorpwxDeptpid());
-            depHierarchy = "$departmentName="+supDep.getCorpwxDeptid()+"$" +  "/" + depHierarchy;
-            getWxDepartment(supDep);
+        if (department.getCorpwxDeptpid()==null || department.getCorpwxDeptpid()==1) {
+            return depHierarchy;
+        }else{
+            Department supDep = departmentMapper.selectOne(new QueryWrapper<Department>().eq("corpwx_deptid",department.getCorpwxDeptpid()));
+            return getWxDepartment(supDep) + "/" + depHierarchy;
         }
-        return depHierarchy;
     }
 
     @Override
@@ -7268,7 +7268,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 map.put("standardHours",standardHours);
                 map.put("workingTime",map.get("workingTime")==null?0:map.get("workingTime"));
                 map.put("leaveTime",map.get("leaveTime")==null?0:map.get("leaveTime"));
-                if (Float.parseFloat(map.get("workingTime").toString()) != standardHours){
+                if (Float.parseFloat(map.get("workingTime").toString()) < standardHours){
                     map.put("whether",0);
                 }else{
                     map.put("whether",1);

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

@@ -1220,8 +1220,7 @@
         (select allday from time_type te
         where te.company_id=#{companyId}) as allday,
         (select SUM(report.working_time) from report
-        left join task on task.id=report.task_id
-        where report.creator_id=us.id and task_id is not null and report.state=1
+        where report.creator_id=us.id and report.state=1
         and report.create_date >=#{startDate} and report.create_date <=#{endDate})
         as workingTime,
         (select SUM(leave_sheet.time_hours) from leave_sheet

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

@@ -556,16 +556,13 @@
         DATE_FORMAT(r.create_date, '%m') as ofmonth,u.name as userName,u.job_number as jobNumber,d.department_name as departmentName,SUM(r.cost) as cost
         from report r
         left join project p  on p.id=r.project_id
-        left join task_group tg on tg.project_id=p.id and  r.group_id=tg.id
+        left join task_group tg  on  r.group_id=tg.id
         left join user u on u.id=r.creator_id
         left join department d on d.department_id=u.department_id
         where p.company_id=#{companyId}
-        <if test="startDate != null">
-            AND r.create_date &gt;= #{startDate}
-        </if>
-        <if test="endDate != null">
-            AND r.create_date &lt; #{endDate}
-        </if>
+        AND r.state=1
+        AND r.create_date &gt;= #{startDate}
+        AND r.create_date &lt; #{endDate}
         group by p.id,u.id,tg.id
     </select>
     <select id="getReportFillStatus" resultType="java.util.Map">

fhKeeper/formulahousekeeper/timesheet/src/components/select.vue

@@ -32,7 +32,7 @@
         </div>
     </div>
     <transition name="el-zoom-in-top">
-      <div v-show="show" style="position: relative;z-index: 99;">
+      <div v-show="show" style="position: relative;z-index: 99;"> 
         <div class="transitionBox">
             <ul class="transitionBoxUl">
                 <li :class="transitionBoxLiIdx == index ? 'liHover' : ''" v-for="(item, index) in options" :key="index" @mouseover="liMouseOver(index)" @click="liClick(item, index)"> 
@@ -44,6 +44,7 @@
                             <ww-open-data type='userName' :openid='item.auditorName'></ww-open-data>
                         </span>
                         <!-- {{item.name || item.auditorName}} -->
+                        <span v-if="item.jobNumber" class="spanFllat">{{item.jobNumber}}</span>
                     </span>
 
                     <span v-if="multiSelect">
@@ -51,6 +52,7 @@
                             <span>
                                 <ww-open-data type='userName' :openid='item.name'></ww-open-data>
                                 <!-- {{item.name}} -->
+                                <span v-if="item.jobNumber" class="spanFllat">{{item.jobNumber}}</span>
                             </span>
                             <span v-if="item.flg"><i class="el-icon-check"></i></span>
                         </span>
@@ -513,4 +515,8 @@ export default {
         color: #409eff;
         font-weight: 700;
     }
+    .spanFllat {
+        display: inline-block;
+        float: right;
+    }
 </style>

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

@@ -465,7 +465,7 @@
                 </el-select>
             </el-form-item>
             <!-- 目的城市 -->
-            <el-form-item label="$t('destinationcity')" style="width:300px;display: inline-block;" prop="cityTo">
+            <el-form-item :label="$t('destinationcity')" style="width:300px;display: inline-block;" prop="cityTo">
                 <el-select style="width:100%" v-model="editItemForm.cityTo" filterable clearable :placeholder="$t('defaultText.pleaseChoose')">
                     <el-option
                     v-for="item in cityList"

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

@@ -667,8 +667,8 @@
             </el-table>
             
             <!-- 人员月度工时表 -->
-            <el-table v-if="ins == 14" key="14" border :data="monthlyPersonnelList" highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;">
-                <el-table-column prop="name" :label="$t('ren-yuan')" min-width="150">
+            <el-table v-if="ins == 14"  key="14" border :data="monthlyPersonnelList" highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;">
+                <el-table-column align="center" prop="name" :label="$t('ren-yuan')" min-width="150">
                   <template slot-scope="scope">
                     <div>
                       <span v-if="user.userNameNeedTranslate == '1'">
@@ -680,11 +680,29 @@
                     </div>
                   </template>
                 </el-table-column>
-                <el-table-column prop="jobNumber" :label="$t('Worknumber')" min-width="250"></el-table-column>
-                <el-table-column prop="standardHours" :label="$t('biao-zhun-gong-shi')" min-width="250"></el-table-column>
-                <el-table-column prop="workingTime" :label="$t('shi-ji-gong-shi')" min-width="250"></el-table-column>
-                <el-table-column prop="leaveTime" :label="$t('qing-jia-gong-shi')" min-width="250"></el-table-column>
-                <el-table-column prop="whether" :label="$t('shi-fou-man-zu-gong-shi')" min-width="250">
+                <el-table-column align="center" prop="jobNumber" :label="$t('Worknumber')" min-width="250"></el-table-column>
+                <el-table-column align="center" prop="standardHours" :label="$t('biao-zhun-gong-shi') + '(h)'" min-width="180">
+                  <template slot-scope="scope">
+                    <div>
+                      {{scope.row.standardHours | decimalPoint}}
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column align="center" prop="workingTime" :label="$t('shi-ji-gong-shi') + '(h)'" min-width="180">
+                  <template slot-scope="scope">
+                    <div>
+                      {{scope.row.workingTime | decimalPoint}}
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column align="center" prop="leaveTime" :label="$t('qing-jia-gong-shi') + '(h)'" min-width="180">
+                  <template slot-scope="scope">
+                    <div>
+                      {{scope.row.leaveTime | decimalPoint}}
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column align="center" prop="whether" :label="$t('shi-fou-man-zu-gong-shi')" min-width="180">
                   <template slot-scope="scope">
                     <div>
                       <span>{{scope.row.whether == 0 ? '否' : '是'}}</span>
@@ -1027,6 +1045,23 @@ export default {
           return intPartFormat + '.' + floatPart
           }
           return intPartFormat + floatPart
+      },
+      decimalPoint(value) {
+        var f = parseFloat(value);  
+        if (isNaN(f)) {  
+            return false;  
+        }  
+        var f = Math.round(f*100)/100;  
+        var s = f.toString();  
+        var rs = s.indexOf('.');  
+        if (rs < 0) {  
+            rs = s.length;  
+            s += '.';  
+        }  
+        while (s.length <= rs + 2) {  
+            s += '0';  
+        }  
+        return s;  
       }
   },
   methods: {

fhKeeper/formulahousekeeper/timesheet/src/views/settings/timetype.vue

@@ -212,7 +212,11 @@
                             <el-link type="primary" style="float:left;margin-left:15px" :underline="false" @click="addWhite">{{ $t('addTian') }}</el-link>
                         </div>
                         <div class="whiteList_content">
-                            <el-tag style="margin:10px 0 0 10px" v-for="item in whiteList" :key="item.id" closable @close="whiteDelete(item)">{{item.label}}</el-tag>
+                            <el-tag style="margin:10px 0 0 10px" v-for="item in whiteList" :key="item.id" closable @close="whiteDelete(item)">
+                                <!-- {{item.label}} -->
+                                <span v-if="user.userNameNeedTranslate != '1'">{{item.label}}</span>
+                                <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.label'></ww-open-data></span>
+                            </el-tag>
                         </div>
                     </div>
                 </div>
@@ -421,13 +425,27 @@
         <el-dialog :title="$t('screening.selectPeople')"  v-if="whiteListDialog" :visible.sync="whiteListDialog" :close-on-click-modal="false" customClass="customWidth" width="500px">
             <div class="tree" style="height:400px">
                 <el-scrollbar style="height:100%">
-                    <el-input
+                    <el-input v-if="user.userNameNeedTranslate != '1'"
                     :placeholder="$t('keywordfiltering')"
                     v-model="filterText">
                     </el-input>
                 <el-tree :data="whiteListAll" show-checkbox :props="defaultProps" node-key="id"
                     ref="whiteListTree"
-                    highlight-current  :filter-node-method="filterNode"></el-tree>
+                    highlight-current  :filter-node-method="filterNode">
+                        <span class="custom-tree-node" slot-scope="{ node, data }">
+                            <span v-if="user.userNameNeedTranslate == '1'">
+                                <span v-if="node.data.children">
+                                    <ww-open-data type='departmentName' :openid='node.label'></ww-open-data>
+                                </span>
+                                <span v-else>
+                                    <ww-open-data type='userName' :openid='node.label'></ww-open-data>
+                                </span>
+                            </span>
+                            <span v-if="user.userNameNeedTranslate != '1'">
+                                {{ node.label }}
+                            </span>
+                        </span>
+                    </el-tree>
                 </el-scrollbar>
             </div>
             <!-- <div>已选中&nbsp;{{chosenMembCount}}&nbsp;人</div>         :default-checked-keys="alreadyPartArray"  @check-change="onTreeItemChange" -->