@ -4,11 +4,9 @@ import com.engine.jucailinkq.attendance.enums.CheckBoxEnum;
import com.engine.common.biz.AbstractCommonCommand ;
import com.engine.common.entity.BizLogContext ;
import com.engine.jucailinkq.attendance.vacation.util.VocationCommonUtil ;
import com.engine.jucailinkq.common.util.CommonUtil ;
import com.engine.jucailinkq.common.util.DateUtil ;
import com.engine.jucailinkq.common.util.DbTools ;
import com.engine.jucailinkq.common.exception.AttendanceRunTimeException ;
import com.engine.jucailinkq.common.util.* ;
import com.engine.core.interceptor.CommandContext ;
import com.engine.jucailinkq.common.util.Utils ;
import com.google.common.collect.Lists ;
import com.google.common.collect.Maps ;
import lombok.extern.slf4j.Slf4j ;
@ -70,6 +68,11 @@ public class RecordDataCmd extends AbstractCommonCommand<Map<String,Object>> {
if ( "" . equals ( sfxx ) ) {
sfxx = CheckBoxEnum . UNCHECKED . getKey ( ) ;
}
Map < String , Object > gobalSet = ExtensionClassHolder . getGlobalSetMap ( ) ;
String haveRecord = Util . null2String ( gobalSet . get ( "haveRecord" ) ) ;
if ( ! "1" . equals ( haveRecord ) ) {
return null ;
}
String sql = "select ygid,rq from uf_jcl_kq_cqjg where ygid=? and rq=?" ;
List < Map < String , Object > > dataList = DbTools . getSqlToList ( sql , userId , analysisDate ) ;
@ -196,24 +199,29 @@ public class RecordDataCmd extends AbstractCommonCommand<Map<String,Object>> {
//处理加班结果
try {
if ( overTimeResultList . size ( ) > 0 ) {
sql = "select id,jblx,lyid from uf_jcl_kq_jbjg where lyid=? and jbjgly=4" ;
List < Map < String , Object > > oldOverTimeList = DbTools . getSqlToList ( sql , id ) ;
for ( Map < String , Object > overTimeResult : overTimeResultList ) {
overTimeResult . put ( "lyid" , id ) ;
}
sql = "select id,jblx,lyid from uf_jcl_kq_jbjg where lyid=? and jbjgly=4" ;
List < Map < String , Object > > oldOverTimeList = DbTools . getSqlToList ( sql , id ) ;
for ( Map < String , Object > overTimeResult : overTimeResultList ) {
overTimeResult . put ( "lyid" , id ) ;
}
if ( oldOverTimeList . size ( ) > 0 | | overTimeResultList . size ( ) > 0 ) {
updateOverTimeResult ( oldOverTimeList , overTimeResultList ) ;
}
//处理假期余额
if ( overTimeHolidayList . size ( ) > 0 ) {
sql = "select id,jqid,ktsc,yxsc,wxsc,ztsc,zfsc,jxsc,dzkxsc,lyid,lyjblx from uf_jcl_kq_jqye where lyid=? and lylx=4" ;
List < Map < String , Object > > oldOverTimeHolidayList = DbTools . getSqlToList ( sql , id ) ;
for ( Map < String , Object > overTimeHoliday : overTimeHolidayList ) {
overTimeHoliday . put ( "lyid" , id ) ;
}
sql = "select id,jqid,ktsc,yxsc,wxsc,ztsc,zfsc,jxsc,dzkxsc,lyid,lyjblx,sm from uf_jcl_kq_jqye where lyid=? and lylx=4" ;
List < Map < String , Object > > oldOverTimeHolidayList = DbTools . getSqlToList ( sql , id ) ;
oldOverTimeHolidayList = oldOverTimeHolidayList . stream ( ) . filter ( e - > ( Double . valueOf ( e . get ( "zfsc" ) . toString ( ) ) < Double . valueOf ( e . get ( "ktsc" ) . toString ( ) ) ) & & ! "delete" . equals ( e . get ( "sm" ) ) ) . collect ( Collectors . toList ( ) ) ;
for ( Map < String , Object > overTimeHoliday : overTimeHolidayList ) {
overTimeHoliday . put ( "lyid" , id ) ;
}
if ( oldOverTimeHolidayList . size ( ) > 0 | | overTimeHolidayList . size ( ) > 0 ) {
updateOverTimeHoliday ( oldOverTimeHolidayList , overTimeHolidayList ) ;
}
} catch ( Exception e ) {
log . error ( "updateWorkOverTimeDate error : [{}]" , e ) ;
}
@ -386,7 +394,8 @@ public class RecordDataCmd extends AbstractCommonCommand<Map<String,Object>> {
if ( deleteList . size ( ) > 0 ) {
String deleteSql = "delete from uf_jcl_kq_jqye where id in (" + String . join ( "," , deleteList ) + ")" ;
//String deleteSql = "delete from uf_jcl_kq_jqye where id in ("+String.join(",",deleteList)+")";
String deleteSql = "update uf_jcl_kq_jqye set yxsc=0,wxsc=0,ztsc=0,jxsc=0,zfsc=ktsc,sm='delete' where id in (" + String . join ( "," , deleteList ) + ")" ;
DbTools . update ( deleteSql ) ;
}
if ( updateList . size ( ) > 0 ) {
@ -427,4 +436,6 @@ public class RecordDataCmd extends AbstractCommonCommand<Map<String,Object>> {
}
}