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

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

@@ -3,6 +3,10 @@ package com.management.platform.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.management.platform.entity.ReportLog;
+import com.management.platform.entity.User;
+import com.management.platform.entity.WxCorpInfo;
+import com.management.platform.mapper.UserMapper;
+import com.management.platform.mapper.WxCorpInfoMapper;
 import com.management.platform.service.ReportLogService;
 import com.management.platform.service.ReportService;
 import com.management.platform.util.HttpRespMsg;
@@ -27,11 +31,28 @@ public class ReportLogController {
 
     @Resource
     private ReportLogService reportLogService;
+    @Resource
+    private UserMapper userMapper;
+    @Resource
+    WxCorpInfoMapper wxCorpInfoMapper;
 
     @RequestMapping("/get")
     public HttpRespMsg get(String creatorId, String createDate) {
         HttpRespMsg msg = new HttpRespMsg();
+        User user = userMapper.selectById(creatorId);
         List<ReportLog> list = reportLogService.list(new QueryWrapper<ReportLog>().eq("creator_id", creatorId).eq("create_date", createDate));
+        WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id",user.getCompanyId()));
+        if (wxCorpInfo!=null && wxCorpInfo.getSaasSyncContact() == 1){
+            List<User> users = userMapper.selectList(new QueryWrapper<User>().eq("company_id",user.getCompanyId()));
+            for (ReportLog reportLog : list) {
+                String operatorId = reportLog.getOperatorId();
+                for (User item : users) {
+                    if (item.getId().equals(operatorId)){
+                        reportLog.getMsg().replace(item.getName(),"$userName=" + item.getCorpwxUserid() + "$");
+                    }
+                }
+            }
+        }
         msg.data = list;
         return msg;
     }

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

@@ -5980,7 +5980,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             stringObjectHashMap.put("unPublic",0.0);
             stringObjectHashMap.put("userId",map.get("id"));
             if (wxCorpInfo!=null && wxCorpInfo.getSaasSyncContact()==1){
-                stringObjectHashMap.put("username",map.get("wxOpenId"));
+                stringObjectHashMap.put("username",map.get("userId"));
             }else {
                 stringObjectHashMap.put("username",map.get("name"));
             }

fhKeeper/formulahousekeeper/management-platform/src/main/resources/i18n/messages.properties

@@ -754,4 +754,10 @@ contract.editSuc = 修改成功
 contract.operationSuc = 操作成功
 contract.numberRepeat = 合同编号已存在
 contract.typeNameEmpty = 合同类型名不可为空
-contract.typeNameRepeat = 合同类型名已存在
+contract.typeNameRepeat = 合同类型名已存在
+Contract.No = 合同编号
+Contract.dataNull = 请填写合同数据
+Contract.nameNullError=第{0}行缺少合同名称
+Contract.NoExists=第{0}行合同编号已存在
+Contract.NoRepeat=第{0}行合同编号与第{1}行合同编号重复
+Contract.typeExists=第{0}行合同类型不存在

fhKeeper/formulahousekeeper/management-platform/src/main/resources/i18n/messages_en_US.properties

@@ -746,12 +746,18 @@ contract.lease= Lease contract
 contract.loan= Loan contract
 contract.warehousing= Warehousing contract
 contract.entrust= Entrustment contract
-contract.name = name
-contract.type = type
+contract.name = contract name
+contract.type = Contract type
 contract.export = contract_
 contract.addSuc = Successfully added
 contract.editSuc = Modification succeeded
 contract.operationSuc = Operation succeeded
 contract.numberRepeat = Contract No. already exists
 contract.typeNameEmpty = Contract type name cannot be empty
-contract.typeNameRepeat = Contract type name already exists
+contract.typeNameRepeat = Contract type name already exists
+Contract.No = Contract No
+Contract.dataNull = Please fill in the contract data
+Contract.nameNullError=The contract name is missing in row {0}
+Contract.NoExists=Contract No. in row {0} already exists
+Contract.NoRepeat=The contract number in line {0} is duplicate with that in line {1}
+Contract.typeExists=The contract type in row {0} does not exist

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

@@ -56,7 +56,7 @@
 
     <!-- 查询某段时间内全部请假的人员信息 -->
     <select id="selectLeaveAll" resultType="map">
-        select leave_sheet.start_date as startDate,leave_sheet.end_date as endDate,leave_sheet.time_hours as hours,user.id as id,user.department_id as departmentId,user.wx_openid as wxOpenId,user.job_number as jobNumber,user.name as name
+        select leave_sheet.start_date as startDate,leave_sheet.end_date as endDate,leave_sheet.time_hours as hours,user.id as id,user.department_id as departmentId,user.corpwx_userid as userId,user.job_number as jobNumber,user.name as name
         from leave_sheet
         left join user
         on user.id = leave_sheet.owner_id

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

@@ -189,7 +189,7 @@ export default {
         },
         subjectId: {
             handler(newValue, oldValue) {
-                console.log(newValue, oldValue)
+                console.log(newValue, '过来的id')
                 this.optionsOId = newValue
                 if(this.optionsOId && this.optionsOId.length != 0) {
                     this.traverseArr(this.options, this.optionsOId)
@@ -231,6 +231,8 @@ export default {
         }
         if(this.subjectId) {
             this.optionsOId = JSON.parse(JSON.stringify(this.subjectId))
+            console.log(this.options, '过来的数据')
+            this.traverseArr(this.options, this.optionsOId)
             for(let i in this.options) {
                 if(this.options[i].id == this.optionsOId || this.options[i].auditorId == this.optionsOId) {
                      this.selectName = this.options[i].name || this.options[i].auditorName
@@ -247,11 +249,12 @@ export default {
     methods: {
         // 循环取值
         traverseArr(arr, idd){
-            console.log(arr, idd, '传过来的值')
             let id = idd[0]
             if(arr) {
                 for(var i in arr) {
-                    if(arr[i].value == id) {
+                    console.log(arr[i].value, idd)
+                    if(arr[i].value == idd) {
+                        console.log('将要付给的值', arr[i])
                         this.selectName = arr[i].label
                         if(arr[i].type) {
                             this.selectNameType = arr[i].type

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

@@ -429,7 +429,6 @@
                     <icon class="iconfont firerock-iconInsertLine addNode" @click="showNodeDialog(0)"></icon>
                     <icon class="iconfont firerock-iconright"></icon>
                     <span v-for="(item, index) in dataArray" :key="item.seq" >
-                        
                         <el-button type="primary" v-if="item.auditorType == 1 && user.userNameNeedTranslate == 1" @click="editNodeDialog(index, item)">
                           <!-- {{item.auditDeptName}} -->
                           <ww-open-data type='departmentName' :openid='item.auditDeptName'></ww-open-data>
@@ -472,7 +471,7 @@
                   <el-cascader filterable ref="deptCascader"  v-model="curDeptId" :placeholder="$t('defaultText.pleaseChoose')" style="width: 100%" @change="chooseDept"
                     :options="soption" :props="{ checkStrictly: true,expandTrigger: 'hover' }" :show-all-levels="false" clearable v-show="user.userNameNeedTranslate != 1"></el-cascader>
 
-                  <vueCascader :size="'small'" :widthStr="'200'" :clearable="true" :userName="true" :subject="soption" :radios="true" :distinction="'1'" @vueCasader="vueCasader" v-if="user.userNameNeedTranslate == 1"></vueCascader>
+                  <vueCascader :size="'small'" :widthStr="'200'" :clearable="true" :userName="true" :subjectId="this.selectedAuuid" :subject="soption" :radios="true" :distinction="'1'" @vueCasader="vueCasader" v-if="user.userNameNeedTranslate == 1"></vueCascader>
 
               </el-form-item>
               </el-form>
@@ -925,6 +924,7 @@ export default {
       curWorkflowList:{},
       denyReasonVisible : false,
       auditLogList:[],
+      selectedAuuid: ''
     };
   },
   computed: {},
@@ -1433,8 +1433,10 @@ export default {
                             this.isAdd = false;
                             this.sindex = index;
                             this.curUserId = item.userId;
-                            this.dialogVisible = true;
                             this.curDeptId = item.auditDeptId;
+                            this.selectedAuuid = item.userId || item.auditDeptId
+                            console.log(this.selectedAuuid, '看看数据类')
+                            this.dialogVisible = true;
                         } else {
                             this.$message({
                                 message: res.msg,
@@ -1490,8 +1492,13 @@ export default {
                 
               } else {
                 //编辑
-                this.dataArray[this.sindex].auditDeptId = node.value;
-                this.dataArray[this.sindex].auditDeptName = node.label;
+                if(node.type == 'dep') {
+                  this.dataArray[this.sindex].auditDeptId = node.value;
+                  this.dataArray[this.sindex].auditDeptName = node.label;
+                } else {
+                  this.dataArray[this.sindex].userId = node.value;
+                  this.dataArray[this.sindex].userName = node.label;
+                }
               }
             },
     deleteNode() {