修改周薪打卡上传记录周开始结束时间

happy-job-base-system/src/main/webapp/webpage/modules/wscompany/wsUploadRecordList.js

@@ -147,7 +147,7 @@ $(document).ready(function() {
                        formatter:  function operateFormatter(value, row, index) {
                            var text=row.lastDocument?"重新上传":"上传表格"
                            var a = '<a href="#" class="importExcel">【'+text+'】</a>';
-                           if(new Date().getTime()<new Date(row.startDate).getTime() || new Date().getTime()>(new Date(row.endDate).getTime()+24*3600*1000)){
+                           if(new Date().getTime()<(new Date(row.startDate).getTime()+7*24*3600*1000)|| new Date().getTime()>(new Date(row.endDate).getTime()+8*24*3600*1000)){
                                a=""
 						   }
                            var c = '<a href="#" class="downloadExcel">【导出】</a>';

happy-job-module-hpjob/src/main/java/com/jeeplus/modules/wscompany/mapper/xml/WsCompanyMapper.xml

@@ -18,7 +18,7 @@
 	</sql>
 	
 	<sql id="wsCompanyJoins">
-		left join ws_upload_record wur on wur.company_id=a.id and YEARWEEK(date_format(wur.start_date,'%Y-%m-%d'),1) = YEARWEEK(now(),1)
+		left join ws_upload_record wur on wur.company_id=a.id and YEARWEEK(date_format(wur.start_date,'%Y-%m-%d'),1) = YEARWEEK(now(),1)-1
 	</sql>
 	
     

happy-job-module-hpjob/src/main/java/com/jeeplus/modules/wscompany/mapper/xml/WsUploadRecordMapper.xml

@@ -123,6 +123,6 @@
 		FROM ws_upload_record a
 		<include refid="wsUploadRecordJoins"/>
 		WHERE a.company_id = #{0}
-		and YEARWEEK(date_format(a.start_date,'%Y-%m-%d'),1) = YEARWEEK(now(),1)
+		and YEARWEEK(date_format(a.start_date,'%Y-%m-%d'),1) = YEARWEEK(now(),1)-1
 	</select>
 </mapper>

happy-job-module-hpjob/src/main/java/com/jeeplus/modules/wscompany/service/TaskService.java

@@ -44,7 +44,7 @@ public class TaskService extends CrudService implements Job {
         if(dayWeek==1){
             dayWeek = 8;
         }
-        cal.add(Calendar.DATE, cal.getFirstDayOfWeek() - dayWeek);// 根据日历的规则，给当前日期减去星期几与一个星期第一天的差值
+        cal.add(Calendar.DATE, cal.getFirstDayOfWeek() - dayWeek-7);// 根据日历的规则，给当前日期减去星期几与一个星期第一天的差值
         Date mondayDate = cal.getTime();
         String weekBegin = sdf.format(mondayDate);
         cal.add(Calendar.DATE, 4 +cal.getFirstDayOfWeek());