@ -100,6 +100,26 @@ public class HandleCBDataThread extends BaseBean implements Runnable{
if(cnt>0){
return;
}
// 判断是否关账, 关账则不更新
intuserSubCompany1=0;
intuserDepartment=0;
if(userSubCompany1<=0||userDepartment<=0){
rs.execute("select departmentid, subcompanyid1 from hrmresource where id = "+userId);
if(rs.next()){
userSubCompany1=rs.getInt("subcompanyid1");
userDepartment=rs.getInt("departmentid");
}
}
StringgzSql="select count(*) as cnt from uf_kqfz where (','+CAST(bm AS varchar(max))+',' like '%,'+CAST("+userDepartment+" AS varchar(10))+',%' "+
"or ','+CAST(fb AS varchar(max))+',' like '%,'+CAST("+userSubCompany1+" AS varchar(10))+',%') and fczt = 1 and fzksrq <= '"+kqDate+"' and fzjsrq >= '"+kqDate+"'";
@ -1015,7 +1015,28 @@ public class KQFormatData extends BaseBean {
/*考勤二开--零点补助start*/
intzeroPointSub=0;
// 判断是否关账
RecordSetrs=newRecordSet();
intuserSubCompany1=0;
intuserDepartment=0;
if(userSubCompany1<=0||userDepartment<=0){
rs.execute("select departmentid, subcompanyid1 from hrmresource where id = "+userId);
if(rs.next()){
userSubCompany1=rs.getInt("subcompanyid1");
userDepartment=rs.getInt("departmentid");
}
}
StringgzSql="select count(*) as cnt from uf_kqfz where (','+CAST(bm AS varchar(max))+',' like '%,'+CAST("+userDepartment+" AS varchar(10))+',%' "+
"or ','+CAST(fb AS varchar(max))+',' like '%,'+CAST("+userSubCompany1+" AS varchar(10))+',%') and fczt = 1 and fzksrq <= '"+kqDate+"' and fzjsrq >= '"+kqDate+"'";
rs.execute(gzSql);
booleanisClose=false;
if(rs.next()){
intcnt=rs.getInt("cnt");
if(cnt>0){
isClose=true;
}
}
if(!isClose){
Map<String,Object>groupMap=newHashMap<>();
StringacqSql="select kqgroup, grouptype from uf_ZeroPointSubSft";
rs.executeQuery(acqSql);
@ -1171,6 +1192,16 @@ public class KQFormatData extends BaseBean {
if(offGood&&inGood){
zeroPointSub=1;
}
}else{
rs.executeQuery("select zeropoint from kq_format_total where resourceid = ? and kqdate = ?",userId,kqDate);
@ -307,7 +307,7 @@ public class PunchOutButtonCmd extends AbstractCommonCommand<Map<String, Object>
// +userId+" AS varchar(10))+',%') and ksrq <='" + sqlDate + "' and (((sjjsrq is null or sjjsrq = '') and yjjsrq >= '"
// + sqlDate + "') or (sjjsrq is not null and sjjsrq != '' and sjjsrq >= '" + sqlDate + "'))) ";
StringacqEvecAndOutSql=" SELECT requestid,kssj FROM "+evectionTableName+" WHERE (sjccr = '"+userId+"' or ','+CAST(nbtxr AS varchar(max))+',' like '%,'+CAST("
+userId+" AS varchar(10))+',%') and ksrq <='"+sqlDate+"' and (((sjjsrq is null or sjjsrq = '') and yjjsrq >= '"
+userId+" AS varchar(10))+',%') and ksrq <='"+sqlDate+"' and (((sjjsrq is null or sjjsrq = '') and yjjsrq >= '"
+sqlDate+"') or (sjjsrq is not null and sjjsrq != '' and sjjsrq >= '"+sqlDate+"')) ";
// " AND currentnodetype = 3 " +
// " UNION all " +
@ -352,6 +352,33 @@ public class PunchOutButtonCmd extends AbstractCommonCommand<Map<String, Object>
bb.writeLog("number: "+number);
if(number>0){
// 判断是否关账
intuserSubCompany1=user.getUserSubCompany1();
intuserDepartment=user.getUserDepartment();
if(userSubCompany1<=0||userDepartment<=0){
rs.execute("select departmentid, subcompanyid1 from hrmresource where id = "+userId);
if(rs.next()){
userSubCompany1=rs.getInt("subcompanyid1");
userDepartment=rs.getInt("departmentid");
}
}
StringsqlDateA="";
if(StringUtils.isNotBlank(belongdate)){
sqlDateA=belongdate;
}else{
sqlDateA=signDate;
}
StringgzSql="select count(*) as cnt from uf_kqfz where (','+CAST(bm AS varchar(max))+',' like '%,'+CAST("+userDepartment+" AS varchar(10))+',%' "+
"or ','+CAST(fb AS varchar(max))+',' like '%,'+CAST("+userSubCompany1+" AS varchar(10))+',%') and fczt = 1 and fzksrq <= '"+sqlDateA+"' and fzjsrq >= '"+sqlDateA+"'";
StringpunchSql="insert into HrmScheduleSign(userId,userType,signType,signDate,signTime,clientAddress,isInCom,timeZone,belongdate,signfrom,longitude,latitude,addr,deviceInfo,isdev) "+
StringpunchSql="insert into HrmScheduleSign(userId,userType,signType,signDate,signTime,clientAddress,isInCom,timeZone,belongdate,signfrom,longitude,latitude,addr,deviceInfo,isdev) "+
kqLog.info("PunchOutButtonCmd.format in >>>>>userId"+userId+"kqDate=="+signDate+"format.groupId:"+groupid+"format.serialId:"+workTimeEntity.getSerialId());
kqLog.info("PunchOutButtonCmd.format in >>>>>userId"+userId+"kqDate=="+signDate+"format.groupId:"+groupid+"format.serialId:"+workTimeEntity.getSerialId());
@ -127,7 +127,33 @@ public class OutSignSyncAction implements Action {
// continue;
// }
// }
// 判断是否关账
intuserSubCompany1=0;
intuserDepartment=0;
if(userSubCompany1<=0||userDepartment<=0){
rs.execute("select departmentid, subcompanyid1 from hrmresource where id = "+userId);
if(rs.next()){
userSubCompany1=rs.getInt("subcompanyid1");
userDepartment=rs.getInt("departmentid");
}
}
StringsqlDateA="";
if(StringUtils.isNotBlank(belongdate)){
sqlDateA=belongdate;
}else{
sqlDateA=signDate;
}
StringgzSql="select count(*) as cnt from uf_kqfz where (','+CAST(bm AS varchar(max))+',' like '%,'+CAST("+userDepartment+" AS varchar(10))+',%' "+
"or ','+CAST(fb AS varchar(max))+',' like '%,'+CAST("+userSubCompany1+" AS varchar(10))+',%') and fczt = 1 and fzksrq <= '"+sqlDateA+"' and fzjsrq >= '"+sqlDateA+"'";
rs.execute(gzSql);
booleanisClose=false;
if(rs.next()){
intcnt=rs.getInt("cnt");
if(cnt>0){
isClose=true;
}
}
if(!isClose){
StringpunchSql="insert into HrmScheduleSign(userId,userType,signType,signDate,signTime,clientAddress,isInCom,timeZone,belongdate,signfrom,longitude,latitude,addr,deviceInfo,isdev) "+
@ -198,6 +198,27 @@ public class UpdateCbxxjlDataJob extends BaseCronJob {
return;
}
// 判断是否关账, 关账则不更新
intuserSubCompany1=0;
intuserDepartment=0;
if(userSubCompany1<=0||userDepartment<=0){
rs.execute("select departmentid, subcompanyid1 from hrmresource where id = "+userId);
if(rs.next()){
userSubCompany1=rs.getInt("subcompanyid1");
userDepartment=rs.getInt("departmentid");
}
}
StringgzSql="select count(*) as cnt from uf_kqfz where (','+CAST(bm AS varchar(max))+',' like '%,'+CAST("+userDepartment+" AS varchar(10))+',%' "+
"or ','+CAST(fb AS varchar(max))+',' like '%,'+CAST("+userSubCompany1+" AS varchar(10))+',%') and fczt = 1 and fzksrq <= '"+kqDate+"' and fzjsrq >= '"+kqDate+"'";
