泓浒工时

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

@@ -1682,10 +1682,9 @@ public class ReportController {
             for (Report report : reportList) {
                 report.setDepartmentAuditState(0);
                 //优先按照当前日报填写人的直属审核人审核
-                if (!StringUtils.isEmpty(reportOwner.getSuperiorId())) {
+                if (!report.getIsAssist() && !StringUtils.isEmpty(reportOwner.getSuperiorId())) {
                     User auditor = tempAuditorUserList.stream().filter(t -> t.getId().equals(reportOwner.getSuperiorId())).findFirst().get();
                     report.setProjectAuditorId(auditor.getId());
-                    report.setProjectAuditorName(auditor.getName());
                     report.setProjectAuditState(0);
                     if (report.getCreatorId().equals(auditor.getId())) {
                         report.setState(1);

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

@@ -347,9 +347,9 @@ public class FinanceMonthlyWorktimeServiceImpl extends ServiceImpl<FinanceMonthl
         //查询数据
         QueryWrapper<FmwDetail> detailQueryWrapper = new QueryWrapper<FmwDetail>().eq("fmw_id", financeMonthlyWorktime.getId());
         if (isItAWorkOrder!=null&&isItAWorkOrder==2){
-            detailQueryWrapper.isNotNull("extra_field4");//有工单号的数据
+            detailQueryWrapper.ne("extra_field4","");//有工单号的数据
         } else if (isItAWorkOrder != null && isItAWorkOrder == 3) {
-            detailQueryWrapper.isNull("extra_field4");//非工单则工单号为空的数据
+            detailQueryWrapper.eq("extra_field4","");//非工单则工单号为空的数据
         }
         List<FmwDetail> details = fmwDetailMapper.selectList(detailQueryWrapper);
         financeMonthlyWorktime.setDetailList(details);
@@ -530,7 +530,7 @@ public class FinanceMonthlyWorktimeServiceImpl extends ServiceImpl<FinanceMonthl
                         (fmwDetail.getRepairTime() != null ? fmwDetail.getRepairTime() : 0)
                         + (fmwDetail.getDebugTime() != null ? fmwDetail.getDebugTime() : 0)
                         + (fmwDetail.getWaitingTime() != null ? fmwDetail.getWaitingTime() : 0)
-                        + (fmwDetail.getAssistTime() != null ? fmwDetail.getAssistTime() : 0)
+//                        + (fmwDetail.getAssistTime() != null ? fmwDetail.getAssistTime() : 0)
                         + (fmwDetail.getPublicTime() != null ? fmwDetail.getPublicTime() : 0)
                         + (fmwDetail.getComposeTime() != null ? fmwDetail.getComposeTime() : 0);
 

fhKeeper/formulahousekeeper/management-platform/src/main/resources/application.yml

@@ -148,7 +148,7 @@ referer:
     - app71020.eapps.dingtalkcloud.com
     - mldmobworktime.ttkuaiban.com
     - mldworktime.ttkuaiban.com
-    - worktime2.ttkuaiban.com
+    - worktime.huoshishanxin.com
     - 1.94.62.58
 excludeUrls: /wxcorp/*,/wxcorp/*/*,/dingding/*,/feishu-info/*,/error,/testClient,/corpWXAuth,/corpWXScanningAuth,/corpInsideWXAuth,/wx-corp-info/*,/clean/*,/innerRoles/*,/project/getProjectListByToken,/project/getTimeCostByToken,/report/getReportListByToken,/report/getProcessErrorData,/project/synchronizationProject,/user/updateUserDeptHierarchy,/report/getUserTimeCostByThird,/report/getProjectTimeCostByThird,/leave-sheet-fv/*,/report/getNotFullReportUserList
 

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

@@ -29,7 +29,7 @@
     </sql>
     <select id="getTisTime" resultType="com.management.platform.entity.vo.TisTimeVO">
         select extra_field4 as orderId,extra_field5 as line
-             ,sum(compose_time+repair_time+debug_time+waiting_time+assist_time+public_time) as workTime
+             ,sum(compose_time+repair_time+debug_time+waiting_time+public_time) as workTime
         from fmw_detail
         where fmw_id = #{fmwId}
         group by extra_field4,extra_field5

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

@@ -978,13 +978,15 @@ export default {
         cardtimeRefresh(workdate) {  // 考勤记录刷新
             if (!workdate) return;
             this.cardRefLoading = true;
-            this.$axios.post('/user-corpwx-time/getPunchRecordBySelf', {
-                date: workdate
+            this.$axios.post(this.user.timeType.syncDingding == 1?'/dingding/refreshUserCardTime':'/user-corpwx-time/getPunchRecordBySelf', {
+                date: workdate,
+                companyId: this.user.companyId,
+                userId: this.user.id
             })
                 .then(res => {
                     if (res.code == 'ok') {
                         this.cardRefLoading = false;
-                        this.report.time = res.data.time;
+                        this.report.time = this.user.timeType.syncDingding == 1?res.data:res.data.time;
                     } else {
                         this.cardRefLoading = false;
                         this.$toast.fail('获取失败:' + res.msg);