Merge remote-tracking branch 'origin/master'

fhKeeper/formulahousekeeper/buildWorkshop.bat

@@ -1,6 +1,6 @@
 cd timesheet-workshop
 call build.bat
-cd ../timesheet-workshop_h5
+cd ../timesheet-workshop-h5
 call build.bat
 cd ../management-workshop
 call build_package.bat

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

@@ -191,7 +191,6 @@ public class StagesController {
         //按任务分组查看
         queryWrapper.eq("group_id", item.getGroupId());
         queryWrapper.isNull("parent_tid");
-        queryWrapper.eq("is_task_plan",0);
         //排序根据前端传过来的字段
         if (isDesc) {
             queryWrapper.orderByDesc(order);

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

@@ -53,7 +53,6 @@ public class ExcelParserService {
 
                     // 解析时间记录
                     String timeRecord = getCellValue(timeCell);
-                    System.out.println("dateStr="+dateStr+", TImeRecord:"+timeRecord);
                     if (timeRecord == null || timeRecord.isEmpty() || "-".equals(timeRecord)) {
                         continue;
                     }
@@ -150,7 +149,6 @@ public class ExcelParserService {
                 if (DateUtil.isCellDateFormatted(cell)) {
                     java.util.Date date = cell.getDateCellValue();
                     SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm");
-                    System.out.println("这是datecell:"+cell.getDateCellValue().toString());
                     return simpleDateFormat.format(date);
                 } else {
                     return String.valueOf(cell.getNumericCellValue());

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

@@ -2281,7 +2281,6 @@ public class DingDingServiceImpl implements DingDingService {
         //考虑到可能加班到凌晨，需要设置第二天凌晨6点为下班时间
         endDate = LocalDate.parse(endDate, DateTimeFormatter.ofPattern("yyyy-MM-dd")).plusDays(1).toString();
         req.setCheckDateTo(endDate+ " 06:00:00");
-        System.out.println("请求考勤attendance/listRecord：startTime="+req.getCheckDateFrom()+", endTime="+req.getCheckDateTo());
         req.setIsI18n(false);
         OapiAttendanceListRecordResponse rsp = null;
         try {
@@ -2361,7 +2360,7 @@ public class DingDingServiceImpl implements DingDingService {
                                 long timeInSeconds = localDateTime.toEpochSecond(ZoneOffset.UTC);
                                 onDutyEarleast.setUserCheckTime(timeInSeconds*1000);
                             }
-                            if (8138 == dingding.getCompanyId()) {
+                            if (SysConstant.ZhengBeiCompIds.contains(dingding.getCompanyId())) {
                                 //休息时间段：苏州正北-午休12:00-13:00， 晚修：17:30-18:00
                                 double workHours = ExcelParserService.calculateZhengBeiWorkHours(timeItem.getStartTime(), timeItem.getEndTime());
                                 timeItem.setWorkHours((float)workHours);

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/util/SysConstant.java

@@ -4,5 +4,5 @@ import java.util.Arrays;
 import java.util.List;
 
 public class SysConstant {
-    public static final List<Integer> ZhengBeiCompIds = Arrays.asList(new Integer[]{7703, 8138, 8261});
+    public static final List<Integer> ZhengBeiCompIds = Arrays.asList(new Integer[]{7703, 8138, 8261,8264,8268});
 }

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

@@ -1347,7 +1347,9 @@
                 createGroupWay:'new',
                 modGroupDialog:false,
                 subTaskVisible:false,
-                orderList:[{id:"seq",name:this.$t('manuallydragthesequence'),isDesc:false},{id:"create_date",name:this.$t('creationtimeisthelatest'),isDesc:true},
+                orderList:[{id:"seq",name:this.$t('manuallydragthesequence'),isDesc:false},
+                {id:"create_date",name:this.$t('creationtimeisthelatest'),isDesc:true},
+                {id:"indate",name:'创建时间最早',isDesc:false},
                                 {id:"end_date",name:this.$t('deadlineisthelatest'),isDesc:true},
                                 {id:"task_level",name:this.$t('highestpriority'),isDesc:true}],
                 order:"seq",
@@ -3208,8 +3210,14 @@
             },
             viewChange(index, indexPath) {
                 this.groupType = 1;
-                this.order = "create_date";
-                this.isDesc = true;
+                if (this.user.companyId == 7757) {
+                    this.order = "indate";
+                    this.isDesc = false;
+                } else {
+                    this.order = "create_date";
+                    this.isDesc = true;
+                }
+                
                 this.selectedGroup = this.viewList.filter(g=>g.id == index)[0];
                 this.getViewTaskList();
                 this.displayTable = true;
@@ -3218,8 +3226,14 @@
             groupChange(index, indexPath) {
                 console.log('店家了')
                 this.groupType = 0;
-                this.order = "seq";
-                this.isDesc = false;
+                if (this.user.companyId == 7757) {
+                    this.order = "indate";
+                    this.isDesc = false;
+                } else {
+                    this.order = "seq";
+                    this.isDesc = false;
+                }
+                
                 this.selectedGroup = this.groupList.filter(g=>g.id == index)[0];
                 this.groupResponsibleId = this.selectedGroup.inchargerId
                 this.getStageList();
@@ -4004,6 +4018,9 @@
         mounted() {
             this.curProjectId = parseInt(this.$route.params.id);
             this.activeName = this.$route.path.split("/")[1];
+            if (this.user.companyId == 7757) {
+                this.order = "indate";
+            }
             this.getDetail();
             this.getUsers();
             this.getMyProjectList();

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

@@ -4421,7 +4421,8 @@
           // month: this.date,
           startDate: this.WorktimeDatepickValue[0],
           endDate: this.WorktimeDatepickValue[1],
-          onlyHaveAttendance: this.onlyHaveAttendance?1:0
+          onlyHaveAttendance: this.onlyHaveAttendance?1:0,
+          noReportDeptId: this.deptIdForNoReport.length>0?this.deptIdForNoReport[this.deptIdForNoReport.length-1]:null
         },
         (res) => {
           if (res.code == "ok") {

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

@@ -237,7 +237,10 @@
               </el-table-column>
               <el-table-column prop="cardHours" :label="$t('workAttendance') + '(h)'" v-if="user.timeType.showCorpwxCardtime==1||user.timeType.showDdCardtime==1 || user.timeType.syncFanwei==1">
                   <template slot-scope="scope">
-                      <span :style="scope.row.cardHours != scope.row.reportTime?'color:red':''">{{scope.row.cardHours?scope.row.cardHours.toFixed(1):'-'}}</span>
+                      <span :style="scope.row.cardHours != scope.row.reportTime?'color:red':''">
+                        <span>{{ scope.row.startTime }} --- {{ scope.row.endTime }}</span>  
+                        {{scope.row.cardHours?scope.row.cardHours.toFixed(1):'-'}}
+                      </span>
                   </template>
               </el-table-column>
               
@@ -251,7 +254,7 @@
                       <span v-for="(item, index) in scope.row.data" style="margin-right:10px;" ><template v-if="index==0 || (index>0 && (scope.row.data[index-1].content != item.content))"><b>{{item.project}}</b>{{ ':'+item.content }}</template></span>
                   </template>
               </el-table-column>
-              <el-table-column label="代填人" v-if="user.companyId == 8138 || user.companyId == 7703 || user.companyId == 8261" width="120">
+              <el-table-column label="代填人" v-if="user.companyId == 8138 || user.companyId == 7703 || user.companyId == 8261 || user.companyId == 8264 || user.companyId == 8268" width="120">
                   <template slot-scope="scope">
                       <div>
                           <span v-if="user.userNameNeedTranslate == '1'">

fhKeeper/formulahousekeeper/webttkuaiban/src/main/resources/static/index.html

@@ -30,7 +30,20 @@
 <!--        }-->
 <!--    </script>-->
 </head>
-
+<!-- Default Statcounter code for worktime https://www.ttkuaiban.com -->
+<script type="text/javascript">
+    var sc_project=13147769;
+    var sc_invisible=1;
+    var sc_security="55bc3e62";
+</script>
+<script type="text/javascript"
+        src="https://www.statcounter.com/counter/counter.js" async></script>
+<noscript><div class="statcounter"><a title="Web Analytics Made Easy -
+Statcounter" href="https://statcounter.com/" target="_blank"><img
+        class="statcounter" src="https://c.statcounter.com/13147769/0/55bc3e62/1/"
+        alt="Web Analytics Made Easy - Statcounter"
+        referrerPolicy="no-referrer-when-downgrade"></a></div></noscript>
+<!-- End of Statcounter Code -->
 <body data-spy="scroll" data-target=".fixed-top" id="body">
     <div class="spinner-wrapper">
         <div class="spinner">

fhKeeper/formulahousekeeper/webttkuaiban/src/main/resources/templates/index.html

@@ -30,7 +30,20 @@
 <!--        }-->
 <!--    </script>-->
 </head>
-
+<!-- Default Statcounter code for worktime https://www.ttkuaiban.com -->
+<script type="text/javascript">
+    var sc_project=13147769;
+    var sc_invisible=1;
+    var sc_security="55bc3e62";
+</script>
+<script type="text/javascript"
+        src="https://www.statcounter.com/counter/counter.js" async></script>
+<noscript><div class="statcounter"><a title="Web Analytics Made Easy -
+Statcounter" href="https://statcounter.com/" target="_blank"><img
+        class="statcounter" src="https://c.statcounter.com/13147769/0/55bc3e62/1/"
+        alt="Web Analytics Made Easy - Statcounter"
+        referrerPolicy="no-referrer-when-downgrade"></a></div></noscript>
+<!-- End of Statcounter Code -->
 <body data-spy="scroll" data-target=".fixed-top" id="body">
     <div class="spinner-wrapper">
         <div class="spinner">