修复钉钉老用户没转译情况下的搜索Bug; 填日报没显示同步考勤按钮。

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

@@ -727,6 +727,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             });
             resultMap.put("report", reports);
             TimeType timeType = timeTypeMapper.selectById(companyId);
+            boolean showRefresh = false;
             if (timeType.getShowDdCardtime() == 1) {
                 List<UserDingdingTime> dingdingTimes = userDingdingTimeMapper.selectList(new QueryWrapper<UserDingdingTime>()
                         .eq("user_id", userId).eq("work_date", date));
@@ -734,6 +735,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     UserDingdingTime time = dingdingTimes.get(0);
                     resultMap.put("time", time);
                 }
+                showRefresh = true;
             }else if(timeType.getSyncFanwei()==1){
                 List<UserFvTime> userFvTimeList = userFvTimeMapper.selectList(new QueryWrapper<UserFvTime>()
                         .eq("user_id", userId).eq("work_date", date));
@@ -741,6 +743,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     UserFvTime time = userFvTimeList.get(0);
                     resultMap.put("time", time);
                 }
+                showRefresh = true;
             } else if (timeType.getShowCorpwxCardtime() == 1) {
                 User user = userMapper.selectById(userId);
                 List<UserCorpwxTime> corpwxTimes = userCorpwxTimeMapper.selectList(new QueryWrapper<UserCorpwxTime>()
@@ -749,7 +752,9 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     UserCorpwxTime time = corpwxTimes.get(0);
                     resultMap.put("time", time);
                 }
+                showRefresh = true;
             }
+            resultMap.put("showRefresh", showRefresh);
 
             //顺便返回公司的工作时间设置
             resultMap.put("timeType",timeType);

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

@@ -881,7 +881,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 data.put("total",total);
             }
             return httpRespMsg;
-        }else if (org.apache.commons.lang3.StringUtils.isNotBlank(keyword) && dingding!=null && dingding.getSyncContact()==1 && matchingType == 0){
+        }else if (org.apache.commons.lang3.StringUtils.isNotBlank(keyword) && dingding!=null && dingding.getContactNeedTranslate()==1 && matchingType == 0){
             System.out.println("====================开始查询通讯录名单======================");
             HttpRespMsg searchUserInfo = companyDingdingService.getSearchUserInfo(dingding, keyword, 0);
             SearchUserResponse searchUserResponse = (SearchUserResponse) searchUserInfo.data;

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

@@ -4761,16 +4761,17 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             ProdProcedureTeam prodProcedureTeam = prodProcedureTeamMapper.selectById(report.getUserProcedureTeamId());
             //总计划任务的工序中有总工时和总工价
             PlanProcedureTotal planProcedureTotal = planProcedureTotalMapper.selectOne(new QueryWrapper<PlanProcedureTotal>().eq("plan_id", report.getPlanId()).eq("prod_procedure_id", report.getProdProcedureId()));
-            //核算本次填报的件数是否合法
-            prodProcedureTeam.setStatus(1);//未完工
-            prodProcedureTeam.setUpdateTime(LocalDateTime.now());
-            //更新填写的钢印号
-            prodProcedureTeam.setSteelNumArray("[]");
             reportMapper.deleteById(id);
             reportSteelNumMapper.delete(new QueryWrapper<ReportSteelNum>().eq("report_id", id));
-
-            //更新自己执行的工序上的数据
-            prodProcedureTeamMapper.updateById(prodProcedureTeam);
+            if (prodProcedureTeam != null) {
+                //核算本次填报的件数是否合法
+                prodProcedureTeam.setStatus(1);//未完工
+                prodProcedureTeam.setUpdateTime(LocalDateTime.now());
+                //更新填写的钢印号
+                prodProcedureTeam.setSteelNumArray("[]");
+                //更新自己执行的工序上的数据
+                prodProcedureTeamMapper.updateById(prodProcedureTeam);
+            }
             //计算该计划工序的总完成工时和完成度
             Report curReportSumItem = reportMapper.selectOne(new QueryWrapper<Report>().select("sum(working_time) as working_time").eq("plan_id", planProcedureTotal.getPlanId()).eq("prod_procedure_id", planProcedureTotal.getProdProcedureId()));
             Double workingTime = 0.0;

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -389,12 +389,12 @@
                         <span v-if="reportTimeType.type == 3 && user.company.companyName != mingyiName">{{$t('time.hour')}}</span>
                         <!-- <span v-if="isBatch && user.company.companyName != mingyiName">, {{$t('other.fillInTheTotal')}} {{jsTime.toFixed(1)}} {{$t('time.hour')}}</span> -->
                         <span v-if="isBatch && user.company.companyName != mingyiName">, {{$t('other.fillInTheTotal')}} <el-input v-model="jsTime" @change="onBatchTimeChange" style="width:80px;"/> {{$t('time.hour')}}</span>
-                        
+
                         <!-- AI智能填报 -->
                         <el-button type="primary" @click="getAIReport()" v-if="!hasWrittenReport" style="margin-left:5px;" >智能填报</el-button>
                     </el-form-item>
                     <!--考勤时长显示-->
-                    <el-form-item :label="$t('other.attendancePunch')" v-if="workForm.time || user.companyId == 5978">
+                    <el-form-item :label="$t('other.attendancePunch')" v-if="workForm.showRefresh || user.companyId == 5978">
                         <span v-if="workForm.time">{{workForm.time.startTime}}-{{workForm.time.endTime}}, 工作{{workForm.time.workHours}}{{$t('time.hour')}}
                         <span v-if="workForm.time.askLeaveTime">|&nbsp;请假{{ workForm.time.askLeaveTime }}小时</span>
                         </span>
@@ -2246,6 +2246,7 @@
                         degreeId: null,
                         auditUserList: [],
                     }],
+                    showRefresh: false,
                 },
                 workRules: {
                     createDate: [{ required: true, message: this.$t('defaultText.pleaseselectaworkdate'), trigger: "change" }],
@@ -5944,7 +5945,8 @@
                                 domains: arr,
                                 userNames:null,
                                 userId:null,
-                                time: list.time
+                                time: list.time,
+                                showRefresh: list.showRefresh
                             }
                             console.log('workForm', this.workForm)
                         } else {
@@ -5968,7 +5970,8 @@
                                 }],
                                 userId:null,
                                 userNames:null,
-                                time: this.report.time
+                                time: this.report.time,
+                                showRefresh: list.showRefresh
                             }
                             if(this.isWeekend && this.user.timeType.lockWorktime != 1){
                                 this.$set(this.workForm.domains[0],'isOvertime',true)