From ab7ddb13ba6ea769748d1ee67255a53ad7913554 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期三, 21 八月 2024 10:40:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/product/administration/service/PunchRecordService.java | 176 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 104 insertions(+), 72 deletions(-)
diff --git a/src/main/java/com/product/administration/service/PunchRecordService.java b/src/main/java/com/product/administration/service/PunchRecordService.java
index 579b0aa..42b282f 100644
--- a/src/main/java/com/product/administration/service/PunchRecordService.java
+++ b/src/main/java/com/product/administration/service/PunchRecordService.java
@@ -1,12 +1,18 @@
package com.product.administration.service;
+
+
+import java.sql.Timestamp;
+import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.List;
+
+
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUnit;
@@ -55,6 +61,7 @@
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
String sign_date = dateFormat.format(date1);
fieldSetEntity.setValue("sign_date",sign_date);
+ DateFormat dateFormatGet = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//鑾峰彇鏃╅��杩熷埌鐨勫垎閽熸暟
List<Object>param1=new ArrayList<>();
@@ -77,6 +84,52 @@
sbPunchTime.append(" where LOCATE(?, concat(attendance_object,','))>0 ");
sbPunchTime.append(" ) ");
DataTableEntity dataTableEntity = baseDao.listTable(sbPunchTime.toString(), param1.toArray());
+
+
+ //澶勭悊琛ュ崱鐨勬儏鍐�
+ List<Object>param2=new ArrayList<>();
+ param2.add(fieldSetEntity.getValue("created_by").toString());
+ param2.add(sign_date);
+
+ StringBuilder sbReplenish=new StringBuilder();
+ sbReplenish.append(" SELECT T1.id,T1.uuid,T1.created_by,T1.applicant,T1.replenish_date,T1.reason,");
+ sbReplenish.append(" SUBSTRING_INDEX( SUBSTRING_INDEX( T1.replacement_card_type, ',', T2.digit + 1 ), ',',- 1 ) AS type ");
+ sbReplenish.append(" FROM (select * from product_oa_replenish_punch where flow_flag=2) T1 ");
+ sbReplenish.append(" JOIN ( SELECT 0 AS digit UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 ) T2");
+ sbReplenish.append(" ON T2.digit < ( length( T1.replacement_card_type )- length( REPLACE ( T1.replacement_card_type, ',', '' ))+ 1 )");
+ sbReplenish.append(" where t1.created_by=? ");
+ sbReplenish.append(" and DATE_FORMAT( t1.replenish_date, '%Y-%m-%d' )=? ");
+ DataTableEntity dataTableEntity1 = baseDao.listTable(sbReplenish.toString(), param2.toArray());
+ if(dataTableEntity1.getRows()!=0){
+
+ for(int j=0;j<dataTableEntity1.getRows();j++){
+ String type = dataTableEntity1.getData().get(j).getValue("type").toString();
+ if(type.equals("1")){
+ String morning_work = dataTableEntity.getData().get(0).getValue("morning_work").toString();
+ Date parse = dateFormatGet.parse(morning_work);
+ fieldSetEntity.setValue("punch_time_one", new Timestamp(parse.getTime()));
+ }
+
+ if(type.equals("2")){
+ String morning_work_off = dataTableEntity.getData().get(0).getValue("morning_work_off").toString();
+ Date parse = dateFormatGet.parse(morning_work_off);
+ fieldSetEntity.setValue("punch_time_two", new Timestamp(parse.getTime()));
+ }
+
+ if(type.equals("3")){
+ String afternoon_work = dataTableEntity.getData().get(0).getValue("afternoon_work").toString();
+ Date parse = dateFormatGet.parse(afternoon_work);
+ fieldSetEntity.setValue("punch_time_three", new Timestamp(parse.getTime()));
+ }
+
+ if(type.equals("4")){
+ String afternoon_work_off = dataTableEntity.getData().get(0).getValue("afternoon_work_off").toString();
+ Date parse = dateFormatGet.parse(afternoon_work_off);
+ fieldSetEntity.setValue("punch_time_four", new Timestamp(parse.getTime()));
+ }
+ }
+ }
+
long beLate1 = 0;
long beLate2 = 0;
long beEarily1 = 0;
@@ -98,31 +151,33 @@
DateTime punch_time_four_date;
SimpleDateFormat dateFormatHHmmss = new SimpleDateFormat("HH:mm:ss");
- morning_work = dataTableEntity.getData().get(0).getValue("morning_work").toString();
- afternoon_work_off = dataTableEntity.getData().get(0).getValue("afternoon_work_off").toString();
- morning_work_date= DateUtil.parse(morning_work.split(" ")[1]);
- afternoon_work_off_date= DateUtil.parse(afternoon_work_off.split(" ")[1]);
StringBuilder lateSb=new StringBuilder();
StringBuilder earilySb=new StringBuilder();
StringBuilder supereffective_distance=new StringBuilder();
if(!ObjectUtil.isNotEmpty(dataTableEntity.getData().get(0).getValue("morning_work_off")) && !ObjectUtil.isNotEmpty(dataTableEntity.getData().get(0).getValue("afternoon_work"))){
- int distance = Integer.parseInt(dataTableEntity.getData().get(0).getValue("distance").toString());
+ morning_work = dataTableEntity.getData().get(0).getValue("morning_work").toString();
+ afternoon_work_off = dataTableEntity.getData().get(0).getValue("afternoon_work_off").toString();
+ morning_work_date= DateUtil.parse(morning_work.split(" ")[1]);
+ afternoon_work_off_date= DateUtil.parse(afternoon_work_off.split(" ")[1]);
+ int distance = Integer.parseInt(dataTableEntity.getData().get(0).getValue("distance").toString());
if(ObjectUtil.isNotEmpty(fieldSetEntity.getValue("punch_time_one"))){
String punch_time_one1 = dateFormatHHmmss.format(fieldSetEntity.getValue("punch_time_one"));
punch_time_one_date = DateUtil.parse(punch_time_one1);
- beLate1 = DateUtil.between(punch_time_one_date, morning_work_date, DateUnit.MINUTE);
- if(beLate1>0){
+ if(punch_time_one_date.after(morning_work_date)){
+ beLate1 = DateUtil.between(punch_time_one_date, morning_work_date, DateUnit.MINUTE);
lateSb.append("杩熷埌:"+beLate1+"鍒嗛挓");
+ //璁＄畻瓒呭嚭鐨勬湁鏁堣窛绂�
+ int punch_range_one = Integer.parseInt(fieldSetEntity.getValue("punch_range_one").toString());
+ if(punch_range_one>distance){
+ int distanceMorning = punch_range_one- distance;
+ fieldSetEntity.setValue("supereffective_distance","涓婄彮瓒呮湁鏁堣窛绂�:"+distanceMorning);
+ }
}
- int punch_range_one = Integer.parseInt(fieldSetEntity.getValue("punch_range_one").toString());
- if(punch_range_one>distance){
- int distanceMorning = punch_range_one- distance;
- fieldSetEntity.setValue("supereffective_distance","涓婄彮瓒呮湁鏁堣窛绂�:"+distanceMorning);
- }
+
}else {
lateSb.append("涓婄彮鏈墦鍗�");
}
@@ -130,35 +185,19 @@
if(ObjectUtil.isNotEmpty(fieldSetEntity.getValue("punch_time_four"))){
String punch_time_four = dateFormatHHmmss.format(fieldSetEntity.getValue("punch_time_four"));
punch_time_four_date = DateUtil.parse(punch_time_four);
- beEarily2 = DateUtil.between(punch_time_four_date, afternoon_work_off_date, DateUnit.MINUTE);
- if(beEarily2>0){
+ if(punch_time_four_date.before(afternoon_work_off_date)){
+ beEarily2 = DateUtil.between(punch_time_four_date, afternoon_work_off_date, DateUnit.MINUTE);
earilySb.append("鏃╅��:"+beEarily2+"鍒嗛挓");
- }
- int punch_range_four = Integer.parseInt(fieldSetEntity.getValue("punch_range_four").toString());
- if(punch_range_four>distance){
- int distanceMorning = punch_range_four- distance;
- fieldSetEntity.setValue("supereffective_distance","涓嬬彮瓒呮湁鏁堣窛绂�:"+distanceMorning);
+ int punch_range_four = Integer.parseInt(fieldSetEntity.getValue("punch_range_four").toString());
+ if(punch_range_four>distance){
+ int distanceMorning = punch_range_four- distance;
+ fieldSetEntity.setValue("supereffective_distance","涓嬬彮瓒呮湁鏁堣窛绂�:"+distanceMorning);
+ }
}
}else {
earilySb.append("涓嬬彮鏈墦鍗�");
}
-
-
-
- int punch_range_four = Integer.parseInt(fieldSetEntity.getValue("punch_range_four").toString());
- int punch_range_one = Integer.parseInt(fieldSetEntity.getValue("punch_range_one").toString());
-
-
- if(punch_range_one>distance){
- fieldSetEntity.setValue("supereffective_distance",punch_range_one-distance);
- }else if(punch_range_four>distance){
- fieldSetEntity.setValue("supereffective_distance",punch_range_four-distance);
- }else {
- fieldSetEntity.setValue("supereffective_distance","姝ｅ父");
- }
-
-
}else {
@@ -177,14 +216,15 @@
if(ObjectUtil.isNotEmpty(fieldSetEntity.getValue("punch_time_one"))){
String punch_time_one1 = dateFormatHHmmss.format(fieldSetEntity.getValue("punch_time_one"));
punch_time_one_date = DateUtil.parse(punch_time_one1);
- beLate1 = DateUtil.between(punch_time_one_date, morning_work_date, DateUnit.MINUTE);
- if(beLate1>0){
+ if(punch_time_one_date.after(morning_work_date)){
+ beLate1 = DateUtil.between(punch_time_one_date, morning_work_date, DateUnit.MINUTE);
lateSb.append("鏃╀笂鐝繜鍒�:"+beLate1+" ");
- }
- int punch_range_one = Integer.parseInt(fieldSetEntity.getValue("punch_range_one").toString());
- if(punch_range_one>distance){
- int distanceMorning = punch_range_one- distance;
- supereffective_distance.append("鏃╀笂鐝秴鏈夋晥璺濈:"+distanceMorning);
+ int punch_range_one = Integer.parseInt(fieldSetEntity.getValue("punch_range_one").toString());
+ if(punch_range_one>distance){
+ int distanceMorning = punch_range_one- distance;
+ supereffective_distance.append("鏃╀笂鐝秴鏈夋晥璺濈:"+distanceMorning);
+ }
+
}
}else {
@@ -195,16 +235,15 @@
if(ObjectUtil.isNotEmpty(fieldSetEntity.getValue("punch_time_two"))){
String punch_time_two= dateFormatHHmmss.format(fieldSetEntity.getValue("punch_time_two"));
punch_time_two_date = DateUtil.parse(punch_time_two);
- beEarily1 = DateUtil.between(punch_time_two_date, morning_work_off_date, DateUnit.MINUTE);
- if(beEarily1>0){
+ if(punch_time_two_date.before(morning_work_off_date)){
+ beEarily1 = DateUtil.between(punch_time_two_date, morning_work_off_date, DateUnit.MINUTE);
earilySb.append("鏃╀笅鐝棭閫�:"+beEarily1+" ");
+ int punch_range_two = Integer.parseInt(fieldSetEntity.getValue("punch_range_two").toString());
+ if(punch_range_two>distance){
+ int distanceMorningoff = punch_range_two- distance;
+ supereffective_distance.append("鏃╀笅鐝秴鏈夋晥璺濈:"+distanceMorningoff);
+ }
}
- int punch_range_two = Integer.parseInt(fieldSetEntity.getValue("punch_range_two").toString());
- if(punch_range_two>distance){
- int distanceMorningoff = punch_range_two- distance;
- supereffective_distance.append("鏃╀笅鐝秴鏈夋晥璺濈:"+distanceMorningoff);
- }
-
}else {
earilySb.append("鏃╀笅鐝湭鎵撳崱"+" ");
@@ -212,16 +251,14 @@
if(ObjectUtil.isNotEmpty(fieldSetEntity.getValue("punch_time_three"))){
String punch_time_three = dateFormatHHmmss.format(fieldSetEntity.getValue("punch_time_three"));
punch_time_three_date = DateUtil.parse(punch_time_three);
-
- beLate2 = DateUtil.between(punch_time_three_date, afternoon_work_date, DateUnit.MINUTE);
- if(beLate2>0){
+ if(punch_time_three_date.after(afternoon_work_date)){
+ beLate2 = DateUtil.between(punch_time_three_date, afternoon_work_date, DateUnit.MINUTE);
lateSb.append("涓嬪崍涓婄彮杩熷埌:"+beLate2+" ");
- }
-
- int punch_range_three = Integer.parseInt(fieldSetEntity.getValue("punch_range_three").toString());
- if(punch_range_three>distance){
- int distanceAfternoon = punch_range_three- distance;
- supereffective_distance.append("涓嬪崍涓婄彮瓒呮湁鏁堣窛绂�:"+distanceAfternoon);
+ int punch_range_three = Integer.parseInt(fieldSetEntity.getValue("punch_range_three").toString());
+ if(punch_range_three>distance){
+ int distanceAfternoon = punch_range_three- distance;
+ supereffective_distance.append("涓嬪崍涓婄彮瓒呮湁鏁堣窛绂�:"+distanceAfternoon);
+ }
}
}else {
lateSb.append("鏃╀笂鐝湭鎵撳崱"+" ");
@@ -229,30 +266,25 @@
if(ObjectUtil.isNotEmpty(fieldSetEntity.getValue("punch_time_four"))){
String punch_time_four = dateFormatHHmmss.format(fieldSetEntity.getValue("punch_time_four"));
punch_time_four_date = DateUtil.parse(punch_time_four);
- beEarily2 = DateUtil.between(punch_time_four_date, afternoon_work_off_date, DateUnit.MINUTE);
- if(beEarily2>0){
+ if(punch_time_four_date.before(afternoon_work_off_date)){
+ beEarily2 = DateUtil.between(punch_time_four_date, afternoon_work_off_date, DateUnit.MINUTE);
earilySb.append("涓嬪崍涓嬬彮鏃╅��:"+beEarily2+" ");
- }
- int punch_range_four = Integer.parseInt(fieldSetEntity.getValue("punch_range_four").toString());
- if(punch_range_four>distance){
- int distanceAfternoonoff = punch_range_four- distance;
- supereffective_distance.append("涓嬪崍涓嬬彮瓒呮湁鏁堣窛绂�:"+distanceAfternoonoff);
- }
+ int punch_range_four = Integer.parseInt(fieldSetEntity.getValue("punch_range_four").toString());
+ if(punch_range_four>distance){
+ int distanceAfternoonoff = punch_range_four- distance;
+ supereffective_distance.append("涓嬪崍涓嬬彮瓒呮湁鏁堣窛绂�:"+distanceAfternoonoff);
+ }
+ }
}else {
earilySb.append("涓嬪崍涓嬬彮鏈墦鍗�"+" ");
}
-
-
}
fieldSetEntity.setValue("be_late",lateSb);
fieldSetEntity.setValue("ealy_leave",earilySb);
fieldSetEntity.setValue("supereffective_distance",supereffective_distance.toString());
-
-
}
-
}
dt.setFieldFormat("punch_time_one", " HH:mm");
--
Gitblit v1.9.2