Merge branch 'develop' of 120.24.24.239:8timerv2/8timerapiv200 into wdz

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

@@ -2478,7 +2478,7 @@ public class AttController {
 				apr.setLeanum(leanum);//
 				apr.setLeahours(leahours);//
 				/**********/
-				AttendanceGroup attgro = attendancegroupservice.getAttendanceGroupInformationByUserid(Integer.valueOf(kqry.getEmpNum())); //考勤组信息
+				AttendanceGroup attgro = attendancegroupservice.getAttendanceGroupInformationByUserid(Integer.valueOf(kqry.getEmpNum()),qyid); //考勤组信息
 				//pbfs;// 排班方式 1：固定排班；2：自由排班；3：自由工时
 				if(attgro != null){//该员工是否加入到考勤组
 					if(attgro.getPbfs() == 1){
@@ -2856,7 +2856,7 @@ public class AttController {
 				}
 			}
 			
-			AttendanceGroup attgro = attendancegroupservice.getAttendanceGroupInformationByUserid(userid); //考勤组信息
+			AttendanceGroup attgro = attendancegroupservice.getAttendanceGroupInformationByUserid(userid,qyid); //考勤组信息
 			//pbfs;// 排班方式 1：固定排班；2：自由排班；3：自由工时
 			if(attgro != null){//该员工是否加入到考勤组
 				
@@ -3105,7 +3105,7 @@ public class AttController {
 			}
 		}
 		
-		AttendanceGroup attgro = attendancegroupservice.getAttendanceGroupInformationByUserid(userid); //考勤组信息
+		AttendanceGroup attgro = attendancegroupservice.getAttendanceGroupInformationByUserid(userid,qyid); //考勤组信息
 		
 		//pbfs;// 排班方式 1：固定排班；2：自由排班；3：自由工时
 		if(attgro != null){//该员工是否加入到考勤组
@@ -3706,7 +3706,7 @@ public class AttController {
 				 
 			     
 			     
-			     AttendanceGroup attgro = attendancegroupservice.getAttendanceGroupInformationByUserid(userid); //考勤组信息
+			     AttendanceGroup attgro = attendancegroupservice.getAttendanceGroupInformationByUserid(userid,qyid); //考勤组信息
 			     
 			     //pbfs：排班方式 1：固定排班；2：自由排班；3：自由工时
 				 if(attgro != null){//判断当前用户是否加入到考勤组
@@ -4206,7 +4206,7 @@ public class AttController {
 				e.printStackTrace();
 		 }
 		 
-		 AttendanceGroup attgro = attendancegroupservice.getAttendanceGroupInformationByUserid(userid); //考勤组信息
+		 AttendanceGroup attgro = attendancegroupservice.getAttendanceGroupInformationByUserid(userid,qyid); //考勤组信息
 		 Schedule ispbmx = scheduleservice.getCustomRoster(userid,str);//
 		 if(ispbmx != null && attgro != null){//新增
 			 Schedule ahe = new Schedule();
@@ -5168,7 +5168,7 @@ public class AttController {
 		 int qyid = userBean.getOrgCode();//坏小孩【企业id】
 		 int userid = userBean.getEmpNum();//用户id	
 		 
-		 AttendanceGroup attgro = attendancegroupservice.getAttendanceGroupInformationByUserid(userid); //考勤组信息
+		 AttendanceGroup attgro = attendancegroupservice.getAttendanceGroupInformationByUserid(userid,qyid); //考勤组信息
 		 //pbfs;// 排班方式 1：固定排班；2：自由排班；3：自由工时
 		 
 	     String putime = new SimpleDateFormat("yyyy-MM-dd").format(Double.valueOf(clock.getPunchtime()));//转换打卡时间格式
@@ -5892,7 +5892,7 @@ public class AttController {
 			int qyid = user.getOrgCode();//坏小孩【企业id】
 			int userid = user.getEmpNum();//用户id	
 			 
-			 AttendanceGroup attgro = attendancegroupservice.getAttendanceGroupInformationByUserid(userid); //考勤组信息
+			 AttendanceGroup attgro = attendancegroupservice.getAttendanceGroupInformationByUserid(userid,qyid); //考勤组信息
 			 //pbfs;// 排班方式 1：固定排班；2：自由排班；3：自由工时
 			 if(attgro != null) {
 				 List<AttGroupBinPunchMode> kqjs = attgroupbinpunchmodeservice.selectMachineByKqzId(attgro.getId());//该考勤组所绑定的考勤机
@@ -6433,7 +6433,7 @@ public class AttController {
 				e.printStackTrace();
 		 }
 		 
-			     AttendanceGroup attgro = attendancegroupservice.getAttendanceGroupInformationByUserid(userid); //考勤组信息
+			     AttendanceGroup attgro = attendancegroupservice.getAttendanceGroupInformationByUserid(userid,qyid); //考勤组信息
 			     
 			     //pbfs：排班方式 1：固定排班；2：自由排班；3：自由工时
 				 if(attgro != null){//判断当前用户是否加入到考勤组
@@ -6740,7 +6740,7 @@ public class AttController {
 				apr.setLeanum(leanum);//
 				apr.setLeahours(leahours);//
 				/**********/
-				AttendanceGroup attgro = attendancegroupservice.getAttendanceGroupInformationByUserid(Integer.valueOf(kqry.getEmpNum())); //考勤组信息
+				AttendanceGroup attgro = attendancegroupservice.getAttendanceGroupInformationByUserid(Integer.valueOf(kqry.getEmpNum()),qyid); //考勤组信息
 				//pbfs;// 排班方式 1：固定排班；2：自由排班；3：自由工时
 				if(attgro != null){//该员工是否加入到考勤组
 					if(attgro.getPbfs() == 1){

src/main/java/cn/timer/api/dao/kqgl/AttendanceGroupMapper.java

@@ -35,7 +35,7 @@ public interface AttendanceGroupMapper {
     
     List<AttendanceGroup> selectAttGroupMachineByQyid(int qyid);
     
-    AttendanceGroup getAttendanceGroupInformationByUserid(int userid);
+    AttendanceGroup getAttendanceGroupInformationByUserid(int userid,int qyid);
     
     List<YgglMainEmp> selectAttendanceOfficer(String orgCode,String text);
     

src/main/resources/mapping/kqgl/AttendanceGroupMapper.xml

@@ -417,7 +417,7 @@
   <select id="getAttendanceGroupInformationByUserid" resultMap="BaseResultMap">
   	select * from kqgl_main_kqz kqz
 		where kqz.id = (select yhkqz.kqzid from kqgl_asso_yhkqz yhkqz
-		where yhkqz.userid = #{userid,jdbcType=INTEGER})
+		where yhkqz.userid = #{userid,jdbcType=INTEGER} and yhkqz.qyid = #{qyid,jdbcType=INTEGER})
   </select>
   
   
@@ -434,8 +434,6 @@
   <select id="EmployeeListByorgCode" resultMap="YgglEmpInfoMap">
     select * from yggl_main_emp
     where org_code = #{orgCode,jdbcType=VARCHAR}
-    <!-- and emp_num not in (select yhkqz.userid from kqgl_asso_yhkqz yhkqz
-		where yhkqz.qyid = #{orgCode,jdbcType=VARCHAR}) -->
   </select>
   
   <select id="selectByPrimaryByempNum" resultMap="YgglEmpInfoMap" parameterType="java.lang.Integer" >