Merge branch 'lal' into 'develop'

Lal

See merge request 8timerv2/8timerapiv200!367

src/main/java/cn/timer/api/controller/kqgl/ClockInController.java

@@ -2217,6 +2217,7 @@ public class ClockInController {
 				String commentary = "未知";
 				if(sbyf == 1) {
 					commentary = "打卡成功";
+					msg = "打卡成功";
 				}else {
 					commentary = msg;
 				}
@@ -2248,11 +2249,12 @@ public class ClockInController {
 		 }else {
 			 return ResultUtil.error("打卡失败！，用户不存在！");
 		 }
-		 if(sbyf == 1) {
-			return  ResultUtil.data(null, "打卡成功");
-		 }else {
-			return  ResultUtil.data(msg, "打卡失败");
-		 }
+//		 if(sbyf == 1) {
+//			return  ResultUtil.data("打卡成功");
+//		 }else {
+//			return  ResultUtil.data(msg, "打卡失败"); 
+//		 }
+		 return ResultUtil.success(msg);
 	 }
 	 
 	 
@@ -2712,6 +2714,8 @@ public class ClockInController {
 	    	    		
 	    	    		if(EmptyUtil.isNotEmpty(attdate.getAttsch())) {//班次不为空
 	    	    			
+	    	    			KqglAssoBcsz bcsts = KqglAssoBcsz.builder().build().selectOne(new QueryWrapper<KqglAssoBcsz>().lambda().eq(KqglAssoBcsz::getId, ashss.get(0).getId()));
+	    	    			
 	    	    			if(ashss.get(0).getId() != 0) {
 	    	    				KqglAssoDkmx dkmc = KqglAssoDkmx.builder().build().selectOne(new QueryWrapper<KqglAssoDkmx>().lambda().eq(KqglAssoDkmx::getUserid, userBean.getEmpNum()).eq(KqglAssoDkmx::getQyid, userBean.getOrgCode())
 	    								.ge(KqglAssoDkmx::getDksj, start_time).le(KqglAssoDkmx::getDksj, end_time));
@@ -2720,24 +2724,51 @@ public class ClockInController {
 	    			    				if(dkmc.getSbdk1() != null && dkmc.getSbdk1jg() == 0 && dkmc.getXbdk1() != null && dkmc.getXbdk1jg() == 0) {
 	    			    					wocal.setCalendar_status(1);//打卡正常
 	    			    				}else {
+	    			    					if(dkmc.getXbdk1() == null && attdate.getAttsch().size() == 2) {
+	    			    						if(bcsts.getIsXbdk()==1) {//下班不用打卡
+	    			    							wocal.setCalendar_status(1);//打卡正常
+	    			    						}else {
+	    			    							wocal.setCalendar_status(3);//打卡异常
+	    			    						}
+	    			    					}else {
 	    			    						wocal.setCalendar_status(3);//打卡异常
 	    			    					}
+//	    			    					wocal.setCalendar_status(3);//打卡异常
+	    			    				}
 	    			    			}
 	    		    				
 	    		    				if(attdate.getAttsch().size() == 4 || attdate.getAttsch().size() == 6) {
 	    		    					if(dkmc.getSbdk2() != null && dkmc.getSbdk2jg() == 0 && dkmc.getXbdk2() != null && dkmc.getXbdk2jg() == 0) {
 	    			    					wocal.setCalendar_status(1);//打卡正常
 	    			    				}else {
+	    			    					if(dkmc.getXbdk2() == null && attdate.getAttsch().size() == 4) {
+	    			    						if(bcsts.getIsXbdk()==1) {//下班不用打卡
+	    			    							wocal.setCalendar_status(1);//打卡正常
+	    			    						}else {
+	    			    							wocal.setCalendar_status(3);//打卡异常
+	    			    						}
+	    			    					}else {
 	    			    						wocal.setCalendar_status(3);//打卡异常	
 	    			    					}
+//	    			    					wocal.setCalendar_status(3);//打卡异常
+	    			    				}
 	    		    				}
 	    		    				
 	    		    				if(attdate.getAttsch().size() == 6) {
 	    		    					if(dkmc.getSbdk3() != null && dkmc.getSbdk3jg() == 0 && dkmc.getXbdk3() != null && dkmc.getXbdk3jg() == 0) {
 	    			    					wocal.setCalendar_status(1);//打卡正常
 	    			    				}else {
+	    			    					if(dkmc.getXbdk3() == null && attdate.getAttsch().size() == 6) {
+	    			    						if(bcsts.getIsXbdk()==1) {//下班不用打卡
+	    			    							wocal.setCalendar_status(1);//打卡正常
+	    			    						}else {
+	    			    							wocal.setCalendar_status(3);//打卡异常
+	    			    						}
+	    			    					}else {
 	    			    						wocal.setCalendar_status(3);//打卡异常	
 	    			    					}
+//	    			    					wocal.setCalendar_status(3);//打卡异常
+	    			    				}
 	    		    				}
 	    		    				
 	    		    				KqglAssoRelationSummary asssum = KqglAssoRelationSummary.builder().build().selectOne(new QueryWrapper<KqglAssoRelationSummary>().lambda().eq(KqglAssoRelationSummary::getUserId, userBean.getEmpNum())

src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java

@@ -65,6 +65,7 @@ import cn.timer.api.bean.kqmk.KqglAssoYhkqz;
 import cn.timer.api.bean.kqmk.KqglAssoYhsb;
 import cn.timer.api.bean.kqmk.KqglAssoZhoupaiban;
 import cn.timer.api.bean.kqmk.KqglMainKqz;
+import cn.timer.api.bean.qyxx.CmsContent;
 import cn.timer.api.bean.yggl.YgglMainEmp;
 import cn.timer.api.config.annotation.CurrentUser;
 import cn.timer.api.config.annotation.UserBean;
@@ -1138,8 +1139,11 @@ public class TimeCardController {
 				KqglMainKqzDto mas = KqglMainKqzDto.builder().build();
 				BeanUtil.copyProperties(makq, mas , "kqzdkfslist");
 				
-				List<KqglAssoKqzdkfs> assfs = KqglAssoKqzdkfs.builder().build().selectList(new QueryWrapper<KqglAssoKqzdkfs>().lambda().eq(KqglAssoKqzdkfs::getQyid, userBean.getOrgCode())
-						.eq(KqglAssoKqzdkfs::getKqzId, mas.getId()));
+				QueryWrapper<KqglAssoKqzdkfs> queryWrapper = new QueryWrapper<>();
+				queryWrapper.select("kqz_id","type","qyid","state").eq("qyid", userBean.getOrgCode())
+						.eq("kqz_id", mas.getId()).groupBy("kqz_id","type","qyid","state");
+				List<KqglAssoKqzdkfs> assfs = KqglAssoKqzdkfs.builder().build().selectList(queryWrapper);
+				
 				List<KqglAssoKqzdkfs> kqzdkfslist = new ArrayList<KqglAssoKqzdkfs>();
 				for(KqglAssoKqzdkfs fs : assfs) {
 					KqglAssoKqzdkfs dkfs = KqglAssoKqzdkfs.builder().build();

src/main/java/cn/timer/api/controller/kqgl/atttimer/RealTimeUpdate.java

@@ -102,7 +102,9 @@ public class RealTimeUpdate{
 		
 		String str = new SimpleDateFormat("yyyy-MM-dd").format(new Date()).toString();//
 		String ttstr = new SimpleDateFormat("yyyy-MM").format(new Date()).toString();//
-		String yesterday = ClockInTool.requires_extra_times(str,-1,3,1);//前一天
+		
+		
+		String yesterday = str;//ClockInTool.requires_extra_times(str,-1,3,1);//前一天
 		String[] rangeArray=ClockInTool.listToString(ClockInTool.getDays(sdf1.format(c.getTime()),yesterday)).split(";");//目前为止所有日期
 		String[] range=rangeArray[0].split(",");
 		Long endDateyesterday = DateUtil.getnowEndTime(23,DateUtil.getStringTime(yesterday,"yyyy-MM-dd")).getTime();

src/main/resources/application-dev.yml

@@ -4,7 +4,7 @@ server:
   servlet:
     # context-path: /YoulinghrApiV100
     session: 
-      timeout: 3600   # session会话过期时间
+      timeout: 2592000   # session会话过期时间
 spring:
   servlet: 
     multipart: 

src/main/resources/application-pro.yml

@@ -4,7 +4,7 @@ server:
   servlet:
     # context-path: /YoulinghrApiV100
     session: 
-      timeout: 3600   # session会话过期时间
+      timeout: 2592000   # session会话过期时间
 spring:
   servlet: 
     multipart: 

src/main/resources/application-test.yml

@@ -4,7 +4,7 @@ server:
   servlet:
     # context-path: /YoulinghrApiV100
     session: 
-      timeout: 3600   # session会话过期时间
+      timeout: 2592000   # session会话过期时间
 spring:
   servlet: 
     multipart: