Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!144

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

@@ -1204,6 +1204,8 @@ public class TimeCardController {
 			        KqglAssoYhsb uskqj = KqglAssoYhsb.builder().userId(Integer.valueOf(addmember[a])).kqjid(kqjid).type(1).isGly(0).build();
 			        KqglAssoYhsb uskqj = KqglAssoYhsb.builder().userId(Integer.valueOf(addmember[a])).kqjid(kqjid).type(1).isGly(0).build();
 					if (!uskqj.insert()) 
 					if (!uskqj.insert()) 
 						return ResultUtil.error("操作失败--新增用户与设备关系");
 						return ResultUtil.error("操作失败--新增用户与设备关系");
+					
+					KqglAssoYhkqz.builder().kqzid(attsetuser.getAttgroupid()).userid(Integer.valueOf(addmember[a])).qyid(userBean.getOrgCode()).build().insert();
 				}
 				}
 				
 				
 				//考勤组减少员工 
 				//考勤组减少员工 
@@ -1223,18 +1225,13 @@ public class TimeCardController {
 		            KqglAssoYhsb.builder().build().delete(new QueryWrapper<KqglAssoYhsb>().lambda().eq(KqglAssoYhsb::getUserId, removemember[r]).eq(KqglAssoYhsb::getKqjid, kqjid).eq(KqglAssoYhsb::getType, 1));
 		            KqglAssoYhsb.builder().build().delete(new QueryWrapper<KqglAssoYhsb>().lambda().eq(KqglAssoYhsb::getUserId, removemember[r]).eq(KqglAssoYhsb::getKqjid, kqjid).eq(KqglAssoYhsb::getType, 1));
 		            //考勤机管理员
 		            //考勤机管理员
 		            KqglAssoKqjgly.builder().build().delete(new QueryWrapper<KqglAssoKqjgly>().lambda().eq(KqglAssoKqjgly::getKqjid, kqjid).eq(KqglAssoKqjgly::getUserid, removemember[r]));
 		            KqglAssoKqjgly.builder().build().delete(new QueryWrapper<KqglAssoKqjgly>().lambda().eq(KqglAssoKqjgly::getKqjid, kqjid).eq(KqglAssoKqjgly::getUserid, removemember[r]));
-		            
+		            //用户和考勤组关系表
+		            KqglAssoYhkqz.builder().build().delete(new QueryWrapper<KqglAssoYhkqz>().lambda().eq(KqglAssoYhkqz::getKqzid, attsetuser.getAttgroupid()).eq(KqglAssoYhkqz::getUserid, removemember[r]));
 				}
 				}
 			}
 			}
 			
 			
 		}
 		}
 		
 		
-        //删除--kqgl_asso_yhkqz[用户和考勤组关系表]
-        
-        
-       
-        
-		
         return ResultUtil.success("成功");
         return ResultUtil.success("成功");
 	}
 	}
 	
 	

src/main/java/cn/timer/api/dto/kqmk/KqglAssoRulesViceDto.java

@@ -11,6 +11,9 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @NoArgsConstructor
 @AllArgsConstructor
 @AllArgsConstructor
 public class KqglAssoRulesViceDto {
 public class KqglAssoRulesViceDto {
-	@ApiModelProperty(value = "假期规则id 假期规则id", example = "101")
-	private Integer leaveRulesId;
+//	@ApiModelProperty(value = "假期规则id 假期规则id", example = "101")
+//	private Integer leaveRulesId;
+	
+	@ApiModelProperty(value = "适用的考勤组id 适用的考勤组id", example = "101")
+	private Integer attgroupId;
 }
 }

src/main/resources/mapping/kqmk/KqglAssoRulesViceMapper.xml

@@ -10,7 +10,7 @@
     </resultMap>
     </resultMap>
     
     
     <resultMap id="RulesViceDtoMap" type="cn.timer.api.dto.kqmk.KqglAssoRulesViceDto" >
     <resultMap id="RulesViceDtoMap" type="cn.timer.api.dto.kqmk.KqglAssoRulesViceDto" >
-                <result column="leave_rules_id" property="leaveRulesId" />
+                <result column="attgroup_id" property="attgroupId" />
     </resultMap>
     </resultMap>
 
 
     <sql id="Base_Column_List">
     <sql id="Base_Column_List">
@@ -42,7 +42,7 @@
   	 <select id="leaveRulesIdload" resultMap="RulesViceDtoMap">
   	 <select id="leaveRulesIdload" resultMap="RulesViceDtoMap">
         SELECT <include refid="Base_Column_List" />
         SELECT <include refid="Base_Column_List" />
         FROM kqgl_asso_rules_vice
         FROM kqgl_asso_rules_vice
-        WHERE leaveRulesId = #{leaverulesid}
+        WHERE leave_rules_id = #{leaverulesid}
     </select>
     </select>
   	 
   	 
 	<!-- 
 	<!--