修改中班考勤规则, 设定上班时间在16点之后, 3点之前
This commit is contained in:
andy
parent
dea7389197
commit
4046a07ca7
@ -75,7 +75,8 @@ public class KqUtils {
|
|||||||
if(eqButton.getWorkHour() ==12 && hours >= 12 && attendance.getWorkStartTime().getHours() > 12){
|
if(eqButton.getWorkHour() ==12 && hours >= 12 && attendance.getWorkStartTime().getHours() > 12){
|
||||||
attendance.setNightNumber(1);
|
attendance.setNightNumber(1);
|
||||||
//必须是8小时倒班制or单班制, 并且工作时长>=8小时, 并且 上班打开时间在12点至21点 算作中班 -- 2026-02-04 因1月份张克龙中班考勤问题, 刘杰面谈
|
//必须是8小时倒班制or单班制, 并且工作时长>=8小时, 并且 上班打开时间在12点至21点 算作中班 -- 2026-02-04 因1月份张克龙中班考勤问题, 刘杰面谈
|
||||||
}else if(eqButton.getWorkHour() == 8 && hours >= 8 && attendance.getWorkStartTime().getHours() >= 12 && attendance.getWorkStartTime().getHours() < 21){
|
//2026-9-11 新版规则 不再限制班制, 工作时长>=8小时, 并且打卡开始时间在16点之后, 或者在3点之前, 全都算作是中班
|
||||||
|
}else if(hours >= 8 && attendance.getWorkStartTime().getHours() >= 16 || attendance.getWorkStartTime().getHours() <= 2){
|
||||||
attendance.setMiddleShiftNumber(1);
|
attendance.setMiddleShiftNumber(1);
|
||||||
}
|
}
|
||||||
//获取工作时长
|
//获取工作时长
|
||||||
|
|||||||
@ -587,157 +587,72 @@ public class TestController {
|
|||||||
|
|
||||||
public static void main(String[] args) throws Exception {
|
public static void main(String[] args) throws Exception {
|
||||||
|
|
||||||
String str = "贾肖,13920,130184199005264914;" +
|
String str = "13013219980911005X,崔雨涛,10;" +
|
||||||
"康璐,7920,133001197912150221;" +
|
"130132199905060056,郝琦龙,10;" +
|
||||||
"梁彩乐,1420,130132199307211942;" +
|
"130402200704113338,刘晓雨,10;" +
|
||||||
"付多利,12920,211022197012194413;" +
|
"130823200510275017,金国林,10;" +
|
||||||
"张振立,120,132331197101062854;" +
|
"130132200312272876,刘学轶,20;" +
|
||||||
"郎夕倩,2420,130124198504292425;" +
|
"131122200405010216,张梧祎,10;" +
|
||||||
"林晓路,3420,130124199309082718;" +
|
"130124200409112713,张泽远,10;" +
|
||||||
"葛闯,3420,13068319930903801X;" +
|
"130132198612102887,谷丽博,10;" +
|
||||||
"李启帆,3420,130124199409122430;" +
|
"130121200506160814,栾晓飞,10;" +
|
||||||
"高影,2920,13012419880927464X;" +
|
"130124198901012722,刘翠青,10;" +
|
||||||
"郭旭冉,2420,130132198903011643;" +
|
"13013219890818288X,王玉霞,20;" +
|
||||||
"王哲雷,7920,130132198407281687;" +
|
"13013219881230001X,闫飞翔,20;" +
|
||||||
"李虹亮,2420,130132198907300020;" +
|
"130132198811222865,宋娇娇,10;" +
|
||||||
"肖大永,13920,130228197901234815;" +
|
"130124198103302418,丁少坤,20;" +
|
||||||
"陈美宇,6920,130684199105252299;" +
|
"130132200704103174,李旭亮,10;" +
|
||||||
"何瑞社,120,132331196610112819;" +
|
"130132198406291699,刘亚宁,10;" +
|
||||||
"王金斗,17920,130682198104093831;" +
|
"132332197909035249,鲁彦芹,20;" +
|
||||||
"康泽松,2420,130132200508260033;" +
|
"132223196903210011,秦孟清,30;" +
|
||||||
"王晓婷,2420,130132199209052861;" +
|
"130123196005286930,王海芳,10;" +
|
||||||
"张若航,2420,130132200307144116;" +
|
"130121198909172019,王颜强,20;" +
|
||||||
"黄新梅,2420,130125198808301526;" +
|
"372925198703276715,丁世强,20;" +
|
||||||
"李伟腾,4920,130132200002182904;" +
|
"130132200507174774,兰子康,30;" +
|
||||||
"宋怡然,2420,130129200312292123;" +
|
"13112120050322385X,南克豪,10;" +
|
||||||
"李泽宇,2420,130132200306101317;" +
|
"130124199112200098,娄世涛,10;" +
|
||||||
"庞蒂,2420,210921199507095741;" +
|
"130102197209081550,陈志学,10;" +
|
||||||
"张开源,3420,13013019970707063X;" +
|
"431124198612294526,何春玲,20;" +
|
||||||
"李涵洋,2420,130132200602043174;" +
|
"132332197812100016,董士杰,10;" +
|
||||||
"刘立业,2920,130104199802160614;" +
|
"130127200610141515,耿泽函,20;" +
|
||||||
"张涛,7920,130103197701221216;" +
|
"130132200407023178,李康帅,10;" +
|
||||||
"刘少磊,2920,130124199908182411;" +
|
"130127198304171820,李晓玉,10;" +
|
||||||
"苏冰,6420,130522198607120019;" +
|
"130981200705293871,秦孝宇,10;" +
|
||||||
"殷立海,120,13233119680929287X;" +
|
"130132200409250016,时瑞璞,10;" +
|
||||||
"来雯慧,3920,61042520030206304X;" +
|
"13233119800512284X,宋少然,10;" +
|
||||||
"薛浩远,2920,130133199803112114;" +
|
"130124199111162464,杨冲冲,10;" +
|
||||||
"张安玲,7920,130123199005030023;" +
|
"130132198208172840,丁小丽,10;" +
|
||||||
"郭江伟,2170,130107199102251514;" +
|
"130132198603101938,胡韶倩,10;" +
|
||||||
"夏凌侠,8920,13118119851104193X;" +
|
"452226198606061307,韦隆香,10;" +
|
||||||
"赵亚东,7670,130682198406176317;" +
|
"13012419821023246X,位会然,40;" +
|
||||||
"王若兵,3220,130132200211203812;" +
|
"130533199710163512,高俊鹏,30;" +
|
||||||
"陈凌志,3920,130732200412172939;" +
|
"130132200108222871,韩家明,20;" +
|
||||||
"陶佳毅,3920,130429200409253581;" +
|
"130628200111056627,李宇萌,10;" +
|
||||||
"尹双双,3920,410923200402064266;" +
|
"41272419901002155X,张荣山,10;" +
|
||||||
"邓锋,8220,130103198712091511;" +
|
"130622200309015814,张学勇,10;" +
|
||||||
"张凡,3420,610523199909296314;" +
|
"130430200310141710,卢敬烨,10;" +
|
||||||
"李德山,18370,130635198110164996;" +
|
"13012119970707241X,田志阳,20;" +
|
||||||
"王永鹏,7170,130185198602273714;" +
|
"130103199209151518,王申,10;" +
|
||||||
"李佳铭,2170,130132200212110052;" +
|
"211222197510192032,胡庆伟,10;" +
|
||||||
"陈明修,10870,130602199103150315;" +
|
"130132198402093804,杜晓华,10;" +
|
||||||
"冯春芳,10270,132201199401243521;" +
|
"130132198605080018,田英泽,10;" +
|
||||||
"王亚丝,3220,130124199411152786;" +
|
"130104199802160614,刘立业,10;" +
|
||||||
"赵秀娟,2070,130124198206180927;" +
|
"130133198801192451,张晓龙,20;" +
|
||||||
"胡庆伟,18370,211222197510192032;" +
|
"130105197803021517,郝卫明,20;" +
|
||||||
"王雨晨,3220,130107199807060312;" +
|
"130522198607120019,苏冰,10;" +
|
||||||
"张学勇,3370,130622200309015814;" +
|
"130132200602043174,李涵洋,20;" +
|
||||||
"刘帅,3920,13108120011122001X;" +
|
"130133200310292415,王文超,20;" +
|
||||||
"杨宇荣,6920,370921199912293922;" +
|
"130132198407281687,王哲雷,10;" +
|
||||||
"张蝶,7920,120223199902042706;" +
|
"130103197701221216,张涛,10;" +
|
||||||
"程才,7920,511324200004107855;" +
|
"130528198608083019,贺光建,30";
|
||||||
"钟铃,3770,430581200308011526;" +
|
|
||||||
"李宇萌,4420,130628200111056627;" +
|
|
||||||
"贾彦冲,3920,130431200010102134;" +
|
|
||||||
"卢敬烨,3370,130430200310141710;" +
|
|
||||||
"余红清,4420,411324200302024042;" +
|
|
||||||
"王浩,6220,130184200002205711;" +
|
|
||||||
"李春草,3770,230802200404083224;" +
|
|
||||||
"王雪宇,3920,130825200206212911;" +
|
|
||||||
"张新怡,2220,131127200012036222;" +
|
|
||||||
"郝晓娟,2770,130121198911161423;" +
|
|
||||||
"安宏生,2370,130825200111035713;" +
|
|
||||||
"史国臣,10920,131122199402103219;" +
|
|
||||||
"王申,10220,130103199209151518;" +
|
|
||||||
"赵燕花,12920,130105197903090923;" +
|
|
||||||
"赵力强,7920,132326197806181115;" +
|
|
||||||
"张晓龙,9720,130133198801192451;" +
|
|
||||||
"张向月,9920,130183198510120152;" +
|
|
||||||
"赵晓,10070,130183199511121733;" +
|
|
||||||
"赵芬静,2720,130132200109252589;" +
|
|
||||||
"张荣山,18920,41272419901002155X;" +
|
|
||||||
"郑杰,2870,130426199310292324;" +
|
|
||||||
"赵世通,4920,131122200212062255;" +
|
|
||||||
"尹国峰,9920,130121198512011612;" +
|
|
||||||
"魏步锋,12920,130103197303040030;" +
|
|
||||||
"王静文,3920,130124198608060071;" +
|
|
||||||
"杨文夺,8770,130524199308192511;" +
|
|
||||||
"田志阳,8920,13012119970707241X;" +
|
|
||||||
"张敏,27920,130105197401210948;" +
|
|
||||||
"田迎州,7920,130183199209261030;" +
|
|
||||||
"田英泽,8070,130132198605080018;" +
|
|
||||||
"尹运书,320,132331196308112850;" +
|
|
||||||
"檀亚茹,2670,130124199008242423;" +
|
|
||||||
"位晓峰,3900,130132199211012877;" +
|
|
||||||
"苏智鹏,2170,230225199412174536;" +
|
|
||||||
"王旭得,3220,130132200008060078;" +
|
|
||||||
"王倩,3420,130683198607126021;" +
|
|
||||||
"徐胜盼,8870,130182198905185317;" +
|
|
||||||
"苏硕,7920,130132199302161958;" +
|
|
||||||
"王晓丛,2670,130132199408014104;" +
|
|
||||||
"王文超,2570,130133200310292415;" +
|
|
||||||
"张家乐,4420,13012919991221211X;" +
|
|
||||||
"姚晓骞,5620,130182198711054888;" +
|
|
||||||
"张茜,2670,130132198903184106;" +
|
|
||||||
"秦立志,6520,130503197711180333;" +
|
|
||||||
"马杰,12920,132926197708050376;" +
|
|
||||||
"李宏叶,2720,130132198902060021;" +
|
|
||||||
"李会召,7470,13013219870403317X;" +
|
|
||||||
"李子权,5070,130130198909182774;" +
|
|
||||||
"刘皓男,7920,13063419930602001X;" +
|
|
||||||
"刘建斌,3470,130105196908150919;" +
|
|
||||||
"刘冉,4420,130125199305200023;" +
|
|
||||||
"吕松林,3920,130130198912281837;" +
|
|
||||||
"马君君,3070,130133199005203011;" +
|
|
||||||
"南正一,18270,222426198009120012;" +
|
|
||||||
"孔德鹏,8220,130106198610102418;" +
|
|
||||||
"李中胜,22920,211322199007056791;" +
|
|
||||||
"李欣,3070,130132199103134105;" +
|
|
||||||
"李瑞娜,9920,130435198708052322;" +
|
|
||||||
"李东辉,3920,130533200012241216;" +
|
|
||||||
"南泽林,4920,130627200109140612;" +
|
|
||||||
"栗巍,4920,13012320000715544X;" +
|
|
||||||
"刘杰,2420,130124199810072425;" +
|
|
||||||
"郝卫明,4045,130105197803021517;" +
|
|
||||||
"何旭阳,7470,130132199711062870;" +
|
|
||||||
"曹立洋,5470,130132198905233493;" +
|
|
||||||
"郭磊,4970,211421199110040412;" +
|
|
||||||
"陈士田,8920,371325198002112714;" +
|
|
||||||
"胡毅鹏,27920,130104199101032433;" +
|
|
||||||
"崔佳佩,2670,130132198602261323;" +
|
|
||||||
"杜惠斌,37770,372901198910196637;" +
|
|
||||||
"耿长胜,8170,133022198108151510;" +
|
|
||||||
"贺光建,4270,130528198608083019;" +
|
|
||||||
"杜晓华,3970,130132198402093804;" +
|
|
||||||
"康会雪,3870,13013219900203288X;" +
|
|
||||||
"段晓滨,4370,131181200110281510;" +
|
|
||||||
"蔡亚光,18270,130104198201291817;" +
|
|
||||||
"董辰龙,2220,130528200005250033;" +
|
|
||||||
"郭亚曼,2670,130429199103228441;" +
|
|
||||||
"次泽召,7020,130132198906230032;" +
|
|
||||||
"次江波,5670,13012419870713243X;" +
|
|
||||||
"韩家明,3220,130132200108222871;" +
|
|
||||||
"胡鹏,6920,130133198709111612;" +
|
|
||||||
"高俊鹏,5720,130533199710163512;" +
|
|
||||||
"范运斌,4170,130928200303095010;" +
|
|
||||||
"毕敏霞,4270,130107199011101529";
|
|
||||||
String[] aa = str.split(";");
|
String[] aa = str.split(";");
|
||||||
for (int i = 0; i < aa.length; i++) {
|
for (int i = 0; i < aa.length; i++) {
|
||||||
String a = aa[i].trim();
|
String a = aa[i].trim();
|
||||||
String[] ss = a.split(",");
|
String[] ss = a.split(",");
|
||||||
|
|
||||||
System.out.println("update sys_staff_detail ssd left join sys_staff ss on ss.user_id = ssd.staff_id set ssd.jobs_salary = "+ss[1]+" where ss.id_card = '"+ss[2]+"';");
|
// System.out.println("update sys_staff_detail ssd left join sys_staff ss on ss.user_id = ssd.staff_id set ssd.jobs_salary = "+ss[1]+" where ss.id_card = '"+ss[2]+"';");
|
||||||
|
|
||||||
// System.out.println("CALL `修改其他补助`('"+ss[0]+"', "+ss[1]+");");
|
System.out.println("CALL `修改其他扣款`('"+ss[1]+"', "+ss[2]+");");
|
||||||
|
|
||||||
// System.out.println("INSERT INTO `evo_cw_dev`.`sys_dict_data` (`dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) " +
|
// System.out.println("INSERT INTO `evo_cw_dev`.`sys_dict_data` (`dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) " +
|
||||||
// "VALUES ( "+(sort++)+", '"+ss[1]+"', '"+ss[0]+"_"+ss[2]+"', 'job_info', NULL, 'default', 'N', '0', 'admin', now(), '', NULL, NULL);");
|
// "VALUES ( "+(sort++)+", '"+ss[1]+"', '"+ss[0]+"_"+ss[2]+"', 'job_info', NULL, 'default', 'N', '0', 'admin', now(), '', NULL, NULL);");
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user