提交

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

@@ -53,6 +53,7 @@ import cn.timer.api.bean.kqmk.KqglAssoKqj;
 import cn.timer.api.bean.kqmk.KqglAssoKqzdkfs;
 import cn.timer.api.bean.kqmk.KqglAssoLeaveBalance;
 import cn.timer.api.bean.kqmk.KqglAssoLeaveRules;
+import cn.timer.api.bean.kqmk.KqglAssoMonthPunchSummary;
 import cn.timer.api.bean.kqmk.KqglAssoOvertimeBasics;
 import cn.timer.api.bean.kqmk.KqglAssoOvertimeRange;
 import cn.timer.api.bean.kqmk.KqglAssoOvertimeRules;
@@ -2248,7 +2249,7 @@ public class TimeCardController {
 			int sbdk1jg = 0,xbdk1jg = 0,sbdk2jg = 0,xbdk2jg = 0,sbdk3jg = 0,xbdk3jg = 0;
 			
 			//kqgl_asso_dkmx 打卡明细是否存在打卡记录
-			KqglAssoDkmx dkmx = kqglassodkmxmapper.selectOne(new QueryWrapper<KqglAssoDkmx>().lambda().eq(KqglAssoDkmx::getData, chpunchr.getData()).eq(KqglAssoDkmx::getUserid, chpunchr.getNum()));
+			KqglAssoDkmx dkmx = kqglassodkmxmapper.selectOne(new QueryWrapper<KqglAssoDkmx>().lambda().eq(KqglAssoDkmx::getData, chpunchr.getData()).eq(KqglAssoDkmx::getUserid, chpunchr.getNum()).eq(KqglAssoDkmx::getQyid, userBean.getOrgCode()));
 			if(dkmx != null) {
 				if(chpunchr.getClocktype() == 1) {
 					sbdk1 = changed_time;
@@ -2393,7 +2394,7 @@ public class TimeCardController {
 					if(rul != null) {
 						if(id == 1) {
 							if(rul.getIsWorkovertime() == 1 && rul.getWorkSwitch() == 1) {
-								if(rul.getWorkOne() != "0") {
+								if(!("0").equals(rul.getWorkOne())) {
 									CompensateDto com = CompensateDto.builder().build();
 									com.setId(1);
 									com.setValue("调休");
@@ -2405,7 +2406,7 @@ public class TimeCardController {
 									com2.setValue("加班费");
 									coms.add(com2);
 								}
-								if(rul.getWorkThree() != "0") {
+								if(!("0").equals(rul.getWorkThree())) {
 									CompensateDto com3 = CompensateDto.builder().build();
 									com3.setId(3);
 									com3.setValue("调休/加班费");
@@ -2414,7 +2415,7 @@ public class TimeCardController {
 							}
 						}else if(id == 2) {
 							if(rul.getIsRestovertime() == 1 && rul.getRestSwitch() == 1) {
-								if(rul.getRestOne() != "0") {
+								if(!("0").equals(rul.getRestOne())) {
 									CompensateDto com = CompensateDto.builder().build();
 									com.setId(1);
 									com.setValue("调休");
@@ -2426,7 +2427,7 @@ public class TimeCardController {
 									com2.setValue("加班费");
 									coms.add(com2);
 								}
-								if(rul.getRestThree() != "0") {
+								if(!("0").equals(rul.getRestThree())) {
 									CompensateDto com3 = CompensateDto.builder().build();
 									com3.setId(3);
 									com3.setValue("调休/加班费");
@@ -2435,7 +2436,7 @@ public class TimeCardController {
 							}
 						}else {
 							if(rul.getIsHolidays() == 1 && rul.getHolidaysSwitch() == 1) {
-								if(rul.getHolidaysOne() != "0") {
+								if(!("0").equals(rul.getHolidaysOne())) {
 									CompensateDto com = CompensateDto.builder().build();
 									com.setId(1);
 									com.setValue("调休");
@@ -2447,7 +2448,7 @@ public class TimeCardController {
 									com2.setValue("加班费");
 									coms.add(com2);
 								}
-								if(rul.getHolidaysThree() != "0") {
+								if(!("0").equals(rul.getHolidaysThree())) {
 									CompensateDto com3 = CompensateDto.builder().build();
 									com3.setId(3);
 									com3.setValue("调休/加班费");
@@ -2785,7 +2786,7 @@ public class TimeCardController {
 		    		}
 	    			
 	    			if(ashss.get(0).getId() != 0) {
-	    				KqglAssoDkmx dkmc = KqglAssoDkmx.builder().build().selectOne(new QueryWrapper<KqglAssoDkmx>().lambda().eq(KqglAssoDkmx::getUserid, userBean.getEmpNum())
+	    				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));
 		    			if(dkmc != null) {
 		    				if(attdate.getAttsch().size() == 2 || attdate.getAttsch().size() == 4 || attdate.getAttsch().size() == 6) {
@@ -2840,7 +2841,7 @@ public class TimeCardController {
 	    Long starttime = DateUtil.getStartTime(0,DateUtil.getStringTime(current,"yyyy-MM-dd")).getTime();
         Long endtime = DateUtil.getnowEndTime(23,DateUtil.getStringTime(current,"yyyy-MM-dd")).getTime();
 	    
-	    KqglAssoDkmx dkmc = KqglAssoDkmx.builder().build().selectOne(new QueryWrapper<KqglAssoDkmx>().lambda().eq(KqglAssoDkmx::getUserid, userBean.getEmpNum())
+	    KqglAssoDkmx dkmc = KqglAssoDkmx.builder().build().selectOne(new QueryWrapper<KqglAssoDkmx>().lambda().eq(KqglAssoDkmx::getUserid, userBean.getEmpNum()).eq(KqglAssoDkmx::getQyid, userBean.getOrgCode())
 				.ge(KqglAssoDkmx::getDksj, starttime).le(KqglAssoDkmx::getDksj, endtime));
 	    
 	    if(dkmc!=null) {
@@ -2913,7 +2914,7 @@ public class TimeCardController {
 		    dets.setDate(date);
 		    Long starttime = DateUtil.getStartTime(0,DateUtil.getStringTime(date,"yyyy-MM-dd")).getTime();
 	        Long endtime = DateUtil.getnowEndTime(23,DateUtil.getStringTime(date,"yyyy-MM-dd")).getTime();
-		    KqglAssoDkmx dkmc = KqglAssoDkmx.builder().build().selectOne(new QueryWrapper<KqglAssoDkmx>().lambda().eq(KqglAssoDkmx::getUserid, userBean.getEmpNum())
+		    KqglAssoDkmx dkmc = KqglAssoDkmx.builder().build().selectOne(new QueryWrapper<KqglAssoDkmx>().lambda().eq(KqglAssoDkmx::getUserid, userBean.getEmpNum()).eq(KqglAssoDkmx::getQyid, userBean.getOrgCode())
 					.ge(KqglAssoDkmx::getDksj, starttime).le(KqglAssoDkmx::getDksj, endtime));
 		    if(dkmc!=null) {
 		    	dets.setSbdksj1(dkmc.getSbdk1() == null ? "" : ClockInTool.stampToDate3(String.valueOf(dkmc.getSbdk1())));
@@ -3004,4 +3005,17 @@ public class TimeCardController {
 		return ResultUtil.data(ils, "操作成功!");
 	}
 	
+	@GetMapping(value = "/worktable_attendance_from")
+	@ApiOperation(value = "999:工作台考勤表格", httpMethod = "GET", notes = "查询数据")
+	public Result<Object> worktable_attendance_from(@CurrentUser UserBean userBean) throws ParseException {
+		
+		String belongyear = new SimpleDateFormat("yyyy").format(new Date());
+		String belongmonth = new SimpleDateFormat("MM").format(new Date());
+		
+		KqglAssoMonthPunchSummary punsum = KqglAssoMonthPunchSummary.builder().build().selectOne(new QueryWrapper<KqglAssoMonthPunchSummary>().lambda().eq(KqglAssoMonthPunchSummary::getNum, userBean.getEmpNum())
+				.eq(KqglAssoMonthPunchSummary::getOrgCode, userBean.getOrgCode()).eq(KqglAssoMonthPunchSummary::getBelongYear, belongyear).eq(KqglAssoMonthPunchSummary::getBelongMonth, belongmonth));
+		
+		return ResultUtil.data(punsum, "操作成功!");
+	}
+	
 }