@ -742,34 +742,60 @@ public class AllowanceServiceImpl extends Service implements AllowanceService {
@Override
public Map < String , Object > getAllowanceRecordList ( Map < String , Object > params ) {
Map < String , Object > resultMap = new HashMap < String , Object > ( ) ;
//获取主表id列表
String targetUserId = Util . null2String ( params . get ( "xjr" ) ) ;
String queryDateRange = Util . null2String ( params . get ( "cxqj" ) ) ;
resultMap . put ( "status" , true ) ;
// 流程表单主表数据
Map < String , String > mainTableData = ( Map < String , String > ) params . get ( "mainTableData" ) ;
String targetUserId = Util . null2String ( mainTableData . get ( "xjr" ) ) ;
String queryDateRange = Util . null2String ( mainTableData . get ( "cxqj" ) ) ;
String startDate = "" ;
String endDate = "" ;
String targetMonth = "" ;
if ( queryDateRange . equals ( "0" ) ) {
if ( "0" . equals ( queryDateRange ) ) {
//上月
targetMonth = DateUtil . beforeMonth ( DateUtil . getCurrentDate ( ) ) ;
} else if ( queryDateRange . equals ( "1" ) ) {
} else if ( "1" . equals ( queryDateRange ) ) {
targetMonth = DateUtil . getCurrentMonth ( ) ;
}
startDate = targetMonth + "-01" ;
//结束日期只作为范围筛选, 不用考虑是目标月份是否存在31号
endDate = targetMonth + "-31" ;
log . info ( "targetUserId : {}, queryDateRange : {}, startDate : {}, endDate : {}" , targetUserId , queryDateRange , startDate , endDate ) ;
String detailSql = "select rq, bc, jtlx, sc, zt , bz as sm from uf_jcl_kq_cqjt where yg = ? and rq >= ? and rq <= ? " ;
String detailSql = "select a.id as jtid, a.rq, a.bc, a.jtlx, a.sc, a.zt , a.bz as sm, c.mc as jtlxName, d.mc as bcName, b.bcbdxx, b.cqzt, b.id as cqjg, " +
"b.j1, b.c1, b.j2, b.c2, b.j3, b.c3, b.j4, b.c4, b.j5, b.c5, b.j6, b.c6, b.j7, b.c7, b.j8, b.c8 from uf_jcl_kq_cqjt a " +
"left join uf_jcl_kq_cqjg b on a.yg = b.ygid and a.rq = b.rq " +
"left join uf_jcl_kq_kqxm c on a.jtlx = c.id " +
"left join uf_jcl_kq_bcxx d on a.bc = d.id " +
"where a.yg = ? and a.rq >= ? and a.rq <= ? " ;
List < Map < String , Object > > detailList = DbTools . getSqlToList ( detailSql , targetUserId , startDate , endDate ) ;
if ( detailList . size ( ) > 0 ) {
String in = "" ;
String out = "" ;
String yxdkxx ;
for ( Map < String , Object > item : detailList ) {
yxdkxx = "" ;
for ( int i = 1 ; i < = 8 ; i + + ) {
in = Util . null2String ( item . get ( "j" + i ) ) ;
out = Util . null2String ( item . get ( "c" + i ) ) ;
yxdkxx = "" . equals ( in ) & & "" . equals ( out ) ? yxdkxx : ( yxdkxx + getHourMinuteInfo ( in ) + "-" + getHourMinuteInfo ( out ) + "|" ) ;
}
item . put ( "yxdkxx" , yxdkxx ) ;
item . put ( "cqjgSign" , "0" . equals ( Util . null2String ( item . get ( "cqzt" ) ) ) ? "正常" : "异常" ) ;
}
resultMap . put ( "data" , detailList ) ;
} else {
resultMap . put ( "data" , null ) ;
}
log . info ( "detailList : [{}]" , detailList ) ;
return resultMap ;
}
//将2024-06-11 07:54:00格式数据, 保留时分数据07: 54
private String getHourMinuteInfo ( String timeInfo ) {
if ( ! "" . equals ( timeInfo ) & & timeInfo . length ( ) > = 16 ) {
return timeInfo . substring ( 11 , 16 ) ;
} else {
return "" ;
}
}
}