Merge branch 'lal' into 'develop'

Lal

See merge request 8timerv2/8timerapiv200!337

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

@@ -1471,6 +1471,8 @@ public class TimeCardController {
 	@ApiOperation(value = "考勤设置成员", httpMethod = "POST", notes = "接口发布说明")
 	public Result<Object> Attsetmembers(@CurrentUser UserBean userBean,@RequestBody AttMemberSettings attsetuser) {
 		
+		KqglMainKqz kqzm = KqglMainKqz.builder().id(attsetuser.getAttgroupid()).build().selectById();
+		
 		List<AdditionalDto> userlist = new ArrayList<AdditionalDto>();
 		
 		List<KqglAssoKqzdkfs> qtdkfs = kqglassokqzdkfsmapper.selectList(new QueryWrapper<KqglAssoKqzdkfs>().lambda().ne(KqglAssoKqzdkfs::getType, 1).eq(KqglAssoKqzdkfs::getKqzId, attsetuser.getAttgroupid()));
@@ -1478,6 +1480,12 @@ public class TimeCardController {
 			//考勤组新增员工
 			String[] addmember = attsetuser.getAddMember();
 			for(int a=0;a<addmember.length;a++){
+				
+				if(kqzm.getPbfs() == 2){
+					KqglAssoPbmx.builder().build().delete(new QueryWrapper<KqglAssoPbmx>().lambda().eq(KqglAssoPbmx::getUserid, Integer.valueOf(addmember[a])));
+				}
+				KqglAssoYhkqz.builder().build().delete(new QueryWrapper<KqglAssoYhkqz>().lambda().eq(KqglAssoYhkqz::getUserid, Integer.valueOf(addmember[a])).eq(KqglAssoYhkqz::getQyid, userBean.getOrgCode()));
+				
 				KqglAssoYhkqz.builder().kqzid(attsetuser.getAttgroupid()).userid(Integer.valueOf(addmember[a])).qyid(userBean.getOrgCode()).build().insert();
 			}
 			
@@ -1523,6 +1531,11 @@ public class TimeCardController {
 					if (!uskqj.insert()) 
 						return ResultUtil.error("操作失败--新增用户与设备关系");
 					
+					if(kqzm.getPbfs() == 2){
+						KqglAssoPbmx.builder().build().delete(new QueryWrapper<KqglAssoPbmx>().lambda().eq(KqglAssoPbmx::getUserid, Integer.valueOf(addmember[a])));
+					}
+					KqglAssoYhkqz.builder().build().delete(new QueryWrapper<KqglAssoYhkqz>().lambda().eq(KqglAssoYhkqz::getUserid, Integer.valueOf(addmember[a])).eq(KqglAssoYhkqz::getQyid, userBean.getOrgCode()));
+					
 					KqglAssoYhkqz.builder().kqzid(attsetuser.getAttgroupid()).userid(Integer.valueOf(addmember[a])).qyid(userBean.getOrgCode()).build().insert();
 				}
 				
@@ -2677,6 +2690,12 @@ public class TimeCardController {
 	@ApiOperation(value = "999: 日历打卡详情", httpMethod = "GET", notes = "查询数据")
 	public Result<Object> Calendar_punch_details(@CurrentUser UserBean userBean,@PathVariable("date") String date) throws ParseException {
 		
+		KqglMainKqz kqza = null;
+		KqglAssoYhkqz yhz = KqglAssoYhkqz.builder().build().selectOne(new QueryWrapper<KqglAssoYhkqz>().lambda().eq(KqglAssoYhkqz::getUserid, userBean.getEmpNum()).eq(KqglAssoYhkqz::getQyid, userBean.getOrgCode()));
+		if(yhz != null) {
+			kqza = KqglMainKqz.builder().id(yhz.getKqzid()).build().selectById();
+		}
+		
 		AttendanceCardListDto attdate = MethodCall(userBean.getOrgCode(),userBean.getEmpNum(),date);//获取当天所打卡班次
 		
 		List<AttSchedule> ashss = attdate.getAttsch();//获取今天应打卡时间
@@ -2711,6 +2730,13 @@ public class TimeCardController {
 		    	dets.setXbdksj3jg(dkmc.getXbdk3jg());
 		    }
 		    
+		    if(kqza != null && kqza.getPbfs() == 1) {
+		    	KqglAssoTeshu tss = KqglAssoTeshu.builder().build().selectOne(new QueryWrapper<KqglAssoTeshu>().lambda().eq(KqglAssoTeshu::getKqzid, kqza.getId()).eq(KqglAssoTeshu::getTsrq, date));
+		    	if(tss != null) {
+		    		bcid = tss.getBcid();
+		    	}
+		    }
+		    
 		    if(bcid > 0) {
 		    	KqglAssoBcsz bcs = KqglAssoBcsz.builder().build().selectOne(new QueryWrapper<KqglAssoBcsz>().lambda().eq(KqglAssoBcsz::getId, bcid));
 		    	if(bcs != null) {