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

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/TaskGroup.java

@@ -1,9 +1,10 @@
 package com.management.platform.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -16,7 +17,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author Seyason
- * @since 2022-07-22
+ * @since 2022-10-13
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -50,6 +51,9 @@ public class TaskGroup extends Model<TaskGroup> {
 
     private String inchargerId;
 
+    @TableField("wbs_code")
+    private String wbsCode;
+
     @TableField(exist = false)
     private boolean isNew;
 

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

@@ -3180,8 +3180,8 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             List<Map<String, Object>> worktimeList = userMonthWork.worktimeList;
             //dataItem.add(userMonthWork.name+(worktimeList.size()==0?"(未填)":""));
             if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
-                dataItem.add("$userName="+userMonthWork.corpwxUserId+"$"+(worktimeList.size()==0?"("+MessageUtils.message("entry.noFill")+")":""));
-                dataItem.add("$departmentName="+userMonthWork.corpwxDeptId+"$");
+                dataItem.add("$userName="+(userMonthWork.corpwxUserId==null?"":userMonthWork.corpwxUserId)+"$"+(worktimeList.size()==0?"("+MessageUtils.message("entry.noFill")+")":""));
+                dataItem.add("$departmentName="+(userMonthWork.corpwxDeptId==null?"":userMonthWork.corpwxDeptId)+"$");
             }else {
                 dataItem.add(userMonthWork.name+(worktimeList.size()==0?"("+MessageUtils.message("entry.noFill")+")":""));
                 dataItem.add(userMonthWork.departmentName);
@@ -4707,7 +4707,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             object.put("PSPHI",rl.get("projectCode"));
             object.put("GJAHR",rl.get("ofyear"));
             object.put("MONAT",rl.get("ofmonth"));
-            object.put("PROJK",rl.get("taskGroupCode"));
+            object.put("PROJK",rl.get("wbsCode"));
             object.put("DMBTR",rl.get("cost"));
             object.put("ZID",rl.get("jobNumber"));
             object.put("ZUNAM",rl.get("userName"));

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

@@ -552,7 +552,7 @@
     </select>
 
     <select id="getUploadThirdReportData" resultType="java.util.Map">
-        select IFNULL(p.project_code,'其他') as projectCode,IFNULL(tg.task_group_code,'其他')as taskGroupCode,DATE_FORMAT(r.create_date, '%Y') as ofyear,
+        select IFNULL(p.project_code,'其他') as projectCode,IFNULL(tg.wbs_code,'其他')as wbsCode,DATE_FORMAT(r.create_date, '%Y') as ofyear,
         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

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

@@ -9,11 +9,12 @@
         <result column="task_group_code" property="taskGroupCode" />
         <result column="name" property="name" />
         <result column="incharger_id" property="inchargerId" />
+        <result column="wbs_code" property="wbsCode" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_id, task_group_code, name, incharger_id
+        id, project_id, task_group_code, name, incharger_id, wbs_code
     </sql>
 
 </mapper>

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

@@ -687,7 +687,7 @@
                 <el-table-column prop="whether" :label="$t('shi-fou-man-zu-gong-shi')" min-width="250">
                   <template slot-scope="scope">
                     <div>
-                      <span>{{scope.row.whether == 0 ? '不满足' : '满足'}}</span>
+                      <span>{{scope.row.whether == 0 ? '否' : '是'}}</span>
                     </div>
                   </template>
                 </el-table-column>
@@ -1361,7 +1361,7 @@ export default {
           url += "/exportProjectBaseCost"
         } else if(this.ins == 14) {
           fName = this.$t('ren-yuan-yue-du-gong-shi-biao') + '.xls'
-          url += "/project/exportEmpMonthHours"
+          url += "/exportEmpMonthHours"
           sl.userId= this.userId,
           sl.departmentId = this.departmentIdArray.length > 0 ? this.departmentIdArray[this.departmentIdArray.length - 1] : '',
           sl.month = this.monthPersonnel + '-01'

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

@@ -289,7 +289,7 @@
         </el-dialog>
          
          <!--导入时的设置界面 -->
-         <el-dialog :title="$t('Financialdataimport')" v-if="importDialog" :visible.sync="importDialog" :close-on-click-modal="false" customClass="customWidth" width="500px">
+         <el-dialog :title="$t('Financialdataimport')" v-if="importDialog" :visible.sync="importDialog" :close-on-click-modal="false" customClass="customWidth" width="550px">
             <el-form ref="form3" :model="importParam" >
                 <el-form-item :label="$t('Itheimport')" >
                     <!-- <div style="color:orange;">{{date}}</div> -->
@@ -297,6 +297,7 @@
                 </el-form-item>
                 <el-form-item prop="syncHistoryReport"  >
                     <el-checkbox :label="$t('Recalculatereportedcostsforthemonth')" v-model="importParam.syncHistoryReport"></el-checkbox>
+                    <span v-if="user.companyId == '936'">&nbsp;[ 按每月 {{$t(user.timeType.monthDays)}} 天 * 每天 {{$t(user.timeType.allday)}} 小时计算时薪 ]</span>
                 </el-form-item>
                 <el-form-item prop="syncUserCost"  >
                     <el-checkbox :label="$t('Synchronizeemployeemonthlycosttorganizationalstructure')" v-model="importParam.syncUserCost" ></el-checkbox>

fhKeeper/formulahousekeeper/timesheet_h5/src/views/msg/index.vue

@@ -5,7 +5,15 @@
         <div class="login_form">
             <van-list v-model="loading" :finished="finished" finished-text="没有更多了" :error.sync="error" error-text="请求失败，点击重新加载" @load="getMessage">
                 <van-cell @click="readMsg(index)" v-for="(item,index) in list" :key="index" 
-                :title="item.msg==null?msgType[item.type]:item.msg" :label="item.time.replace('T', ' ')" >
+                 :label="item.time.replace('T', ' ')" >
+                <template #title>
+                    <span v-if="user.userNameNeedTranslate == 1 && item.msg != null && item.indexOf('$userName=') != -1">
+                        <span>{{item.split('$')[0]}}</span>
+                        <ww-open-data type='userName' :openid='getmsgtext(item.msg)'></ww-open-data>
+                        <span>{{item.split('$')[2]}}</span>
+                    </span>
+                    <span v-else>{{item.msg}}</span>
+                </template>
                 <div >
                     <span v-if="item.checked == 1" style="color:green">已读</span>
                     <span v-if="item.checked == 0" style="color:red">未读</span>
@@ -46,6 +54,10 @@
                 history.back();
             },
 
+            getmsgtext(text){
+                return text.split('$')[1].split('=')[1]
+            },
+
             readMsg(index) {
                 var item = this.list[index];
                 if (item.type == 0) {

fhKeeper/formulahousekeeper/timesheet_h5/src/views/project/index.vue

@@ -45,11 +45,11 @@
             <van-pull-refresh v-model="isDownLoading" @refresh="onDownRefresh">
                 <van-list v-model="isUpLoading" :finished="upFinished" :immediate-check="false" :offset="100" finished-text="没有更多了" @load="onLoadList">
                     <van-swipe-cell v-for="(item,index) in list" :key="index">
-                        <van-cell :border="false" :title="item.projectName" :value="item.projectCode"/>
+                        <van-cell :border="false" :title="item.projectName" :value="item.projectCode" clickable @click="toProjectInside(item)"/>
                         <template slot="right" v-if="projectManagement || item.creatorId == user.id">
-                            <van-button square type="primary" text="查看" @click="toProjectInside(item)"/>
-                            <van-button square type="info" text="编辑" @click="openDialog(index)"/>
-                            <van-button square type="danger" text="删除" @click="delPro(index)"/>
+                            <!-- <van-button square type="primary" text="查看" @click="toProjectInside(item)"/> -->
+                            <van-button square type="info" text="编辑" @click="openDialog(index)" style="height:100%"/>
+                            <van-button square type="danger" text="删除" @click="delPro(index)" style="height:100%"/>
                         </template>
                     </van-swipe-cell> 
                 </van-list>