From 17a4ea77b0403b584dd8f9f01d7e3f28bee2a1a0 Mon Sep 17 00:00:00 2001
From: 18756 <1875631620@qq.com>
Date: 星期二, 13 八月 2024 17:16:40 +0800
Subject: [PATCH] 考勤功能优化8.13
---
src/main/java/com/product/administration/service/PunchRecordService.java | 230 ++++++++++++++++++++++++-
src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java | 293 ++++++++++++++++++-------------
2 files changed, 384 insertions(+), 139 deletions(-)
diff --git a/src/main/java/com/product/administration/service/PunchRecordService.java b/src/main/java/com/product/administration/service/PunchRecordService.java
index cbfc2c6..7633bbd 100644
--- a/src/main/java/com/product/administration/service/PunchRecordService.java
+++ b/src/main/java/com/product/administration/service/PunchRecordService.java
@@ -1,11 +1,17 @@
package com.product.administration.service;
+
+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;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -34,29 +40,225 @@
@Autowired
BaseDao baseDao;
-
+
/**
* 鑰冨嫟鎵撳崱鍒楄〃
* @param fse
* @return
*/
- public DataTableEntity listRecordInfo(FieldSetEntity fse) {
+ public DataTableEntity listRecordInfo(FieldSetEntity fse) throws ParseException {
DataTableEntity dt=baseDao.listTable(CmnConst.PRODUCT_OA_PUNCH_RECORD, "created_by=?", new Object[] {SpringMVCContextHolder.getCurrentUser().getUser_id()}, null, CmnConst.CREATED_UTC_DATETIME+" DESC", fse.getInteger(CmnConst.PAGESIZE), fse.getInteger(CmnConst.CPAGE));
- dt.setFieldFormat("punch_time_one", "yyyy-MM-dd HH:mm:ss");
- dt.setFieldFormat("punch_time_three", "yyyy-MM-dd HH:mm:ss");
+ for (int i=0;i<dt.getRows();i++){
+ FieldSetEntity fieldSetEntity = dt.getData().get(i);
+ String punch_time_one = fieldSetEntity.getValue("punch_time_one").toString();
+ Date date1=new Date(punch_time_one);
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ String sign_date = dateFormat.format(date1);
+ fieldSetEntity.setValue("sign_date",sign_date);
+
+ //鑾峰彇鏃╅��杩熷埌鐨勫垎閽熸暟
+ List<Object>param1=new ArrayList<>();
+ param1.add(fieldSetEntity.getValue("created_by").toString());
+ param1.add(fieldSetEntity.getValue("punch_congfig_uuid").toString());
+ param1.add(fieldSetEntity.getValue("created_by").toString()+",");
+
+ //鑾峰彇浣跨敤鍒扮殑璁剧疆瑙勫垯
+ StringBuilder sbPunchTime=new StringBuilder();
+ sbPunchTime.append(" SELECT c.* ");
+ sbPunchTime.append(" FROM ( ");
+ sbPunchTime.append(" SELECT d.* ");
+ sbPunchTime.append(" FROM product_oa_punch_time d ");
+ sbPunchTime.append(" left JOIN product_oa_punch_record b ");
+ sbPunchTime.append(" on d.punch_site_uuid=b.punch_congfig_uuid and d.created_by=? where d.punch_site_uuid= ? ");
+ sbPunchTime.append(" ) c ");
+ sbPunchTime.append(" where c.uuid in ( ");
+ sbPunchTime.append(" SELECT DISTINCT uuid ");
+ sbPunchTime.append(" FROM product_oa_punch_time ");
+ sbPunchTime.append(" where LOCATE(?, concat(attendance_object,','))>0 ");
+ sbPunchTime.append(" ) ");
+ DataTableEntity dataTableEntity = baseDao.listTable(sbPunchTime.toString(), param1.toArray());
+ long beLate1 = 0;
+ long beLate2 = 0;
+ long beEarily1 = 0;
+ long beEarily2 = 0;
+ if(dataTableEntity.getRows()!=0){
+
+ String morning_work="";
+ String morning_work_off="";
+ String afternoon_work="";
+ String afternoon_work_off="";
+ Date morning_work_date;
+ Date morning_work_off_date;
+ Date afternoon_work_date;
+ Date afternoon_work_off_date;
+
+ DateTime punch_time_one_date;
+ DateTime punch_time_two_date;
+ DateTime punch_time_three_date;
+ 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());
+
+ 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);
+ 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);
+ }
+ }else {
+ lateSb.append("涓婄彮鏈墦鍗�");
+ }
+
+ 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);
+ 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);
+ }
+
+ }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 {
+
+ morning_work = dataTableEntity.getData().get(0).getValue("morning_work").toString();
+ morning_work_date= DateUtil.parse(morning_work.split(" ")[1]);
+ morning_work_off = dataTableEntity.getData().get(0).getValue("morning_work_off").toString();
+ morning_work_off_date= DateUtil.parse(morning_work_off.split(" ")[1]);
+ afternoon_work =dataTableEntity.getData().get(0).getValue("afternoon_work").toString();
+ afternoon_work_date= DateUtil.parse(afternoon_work.split(" ")[1]);
+ afternoon_work_off = dataTableEntity.getData().get(0).getValue("afternoon_work_off").toString();
+ 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);
+ 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);
+ }
+
+ }else {
+ lateSb.append("鏃╀笂涓婄彮鏈墦鍗�"+" ");
+
+ }
+
+ 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);
+ 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);
+ }
+
+
+ }else {
+ earilySb.append("鏃╀笂涓嬬彮鏈墦鍗�"+" ");
+ }
+ 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);
+ 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);
+ }
+ }else {
+ lateSb.append("鏃╀笂涓婄彮鏈墦鍗�"+" ");
+ }
+ 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);
+ 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);
+ }
+
+ }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");
+ dt.setFieldFormat("punch_time_two", " HH:mm");
+ dt.setFieldFormat("punch_time_three", " HH:mm");
+ dt.setFieldFormat("punch_time_four", " HH:mm");
baseDao.loadPromptData(dt);
return dt;
}
-
+
/**
* 鑰冨嫟鎵撳崱璇︽儏
* @param uuid
- * @return
+ * @return
*/
public FieldSetEntity findRecordInfo(String uuid) {
return baseDao.getFieldSetEntity(CmnConst.PRODUCT_OA_PUNCH_RECORD, uuid, true);
}
-
+
/**
* 鑰冨嫟鎵撳崱鏂板
* @param fse
@@ -64,18 +266,18 @@
*/
public String addRecordInfo(FieldSetEntity fse) {
SimpleDateFormat df = new SimpleDateFormat(CmnConst.YYYYMMDDHHMMSS);
-
+
SystemUser currentUser=SpringMVCContextHolder.getCurrentUser(); //鑾峰彇鎵撳崱浜�
Date created_datetime=fse.getDate("created_datetime"); //鑾峰彇鎵撳崱鏃堕棿
// Date created_datetime=new Date(); //鑾峰彇鎵撳崱鏃堕棿
String string_created_datetime=df.format(created_datetime); //鏃堕棿杞瑂tring
-
+
//鑾峰彇鍏徃鎵撳崱鏃堕棿閰嶇疆淇℃伅
FieldSetEntity fseCompanyPunch=baseDao.getFieldSetEntityByFilter("product_oa_punch_time", "org_level_uuid=?", new Object[] {currentUser.getOrg_level_uuid()}, false);
if (fseCompanyPunch==null) {
throw new BaseException(SystemCode.SYSTEM_CONMAPNY_PUNCH_NO_EXIST.getValue(), SystemCode.SYSTEM_CONMAPNY_PUNCH_NO_EXIST.getText(), this.getClass(), "addRecordInfo");
}
-
+
//鑾峰彇褰撳ぉ鎵撳崱淇℃伅
FieldSetEntity fsePunchInfo=baseDao.getFieldSetEntityByFilter(CmnConst.PRODUCT_OA_PUNCH_RECORD, "created_by=? and DATE_FORMAT(created_utc_datetime,'%Y-%m-%d')like ?", new Object[] {currentUser.getUser_id(),string_created_datetime.substring(0, 10)+"%"}, false);
if (fsePunchInfo==null) {
@@ -89,13 +291,13 @@
//鏂板鎵撳崱淇℃伅
return baseDao.add(fseNewPunchInfo);
}else {
-
+
//鎵撳崱妯″紡(0:鍙屽崱 1:鍥涘崱)
int punchMode=0;
if (StringUtils.isEmpty(fseCompanyPunch.getString("work_time_two"))) {
punchMode=1;
}
-
+
String punch_time_one=fsePunchInfo.getDate("punch_time_one", CmnConst.YYYYMMDDHHMMSS);
String punch_time_two=fsePunchInfo.getDate("punch_time_two", CmnConst.YYYYMMDDHHMMSS);
String punch_time_three=fsePunchInfo.getDate("punch_time_three", CmnConst.YYYYMMDDHHMMSS);
@@ -115,7 +317,7 @@
}
list.add(string_created_datetime);
Collections.sort(list);
-
+
for (int i = 0; i < list.size(); i++) {
if (punchMode==1) {
if (i==0) {
@@ -140,5 +342,5 @@
return fsePunchInfo.getUUID();
}
}
-
+
}
diff --git a/src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java b/src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java
index 6feafc7..4057e7c 100644
--- a/src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java
+++ b/src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java
@@ -5,6 +5,7 @@
import java.util.Date;
import java.util.List;
+import cn.hutool.core.util.ObjectUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -26,7 +27,7 @@
@Autowired
BaseDao baseDao;
-
+
/**
* 鑰冨嫟鎶ヨ〃
* @param dept_uuid 閮ㄩ棬
@@ -37,8 +38,8 @@
Integer monthNum=Integer.valueOf(year_of_month.substring(5, 7)); //鑾峰彇鏈堜唤
Integer yearNum=Integer.valueOf(year_of_month.substring(0,4)); //鑾峰彇骞翠唤
Integer totalDays=WorkDayUtil.getTotalDays(yearNum, monthNum);
-
-
+
+
StringBuilder sb=new StringBuilder();
sb.append(" SELECT USER_ID, ");
for (int i = 1; i <= totalDays; i++) {
@@ -69,10 +70,10 @@
sb.append(" )a GROUP BY USER_ID,DATETIME ORDER BY USER_ID,DATETIME ");
sb.append(" )a ");
sb.append(" GROUP BY USER_ID ");
-
+
return baseDao.listTable(sb.toString(), new Object[] {year_of_month,year_of_month,year_of_month});
}
-
+
/**
* 鎵撳崱鏈堢湅鏉�
* @param fse
@@ -83,48 +84,48 @@
SystemUser currentUser=SpringMVCContextHolder.getCurrentUser();
Integer user_id=currentUser.getUser_id(); //user_id
String org_level_uuid=currentUser.getOrg_level_uuid(); //鍏徃uuid
-
+
//鑾峰彇鍏徃宸ヤ綔鏃堕棿閰嶇疆淇℃伅
FieldSetEntity fseCompanyPunch=baseDao.getFieldSetEntityByFilter(CmnConst.PRODUCT_OA_PUNCH_TIME, "org_level_uuid=?", new Object[] {org_level_uuid}, false);
if (fseCompanyPunch==null) {
throw new BaseException(SystemCode.COMPANY_PUNCH_TIME_NOT_CONFIG.getValue(), SystemCode.COMPANY_PUNCH_TIME_NOT_CONFIG.getText(), this.getClass(), "listMonthKanBan");
}
-
+
//鑾峰彇鏌ヨ鏈堜唤
String yearAndMonth=fse.getString("yearAndMonth");
if (StringUtils.isEmpty(yearAndMonth)) {
yearAndMonth=DateUtils.formatDate(new Date(), "yyyy-MM");
}
-
+
int workTimeMethod=0;
if (!StringUtils.isEmpty(fseCompanyPunch.getString("work_time_two")) && !StringUtils.isEmpty(fseCompanyPunch.getString("work_time_three"))) {
workTimeMethod=1;
}
StringBuilder sb=new StringBuilder();
List<Object> param=new ArrayList<>();
-
+
sb.append(" SELECT ");
sb.append(" DATE_FORMAT(created_utc_datetime,'%Y-%m-%d')punch_date, ");
sb.append(" punch_time_one,IF(punch_time_one IS TRUE,IF(DATE_FORMAT(punch_time_one,'%H:%i:%S')>?,'杩熷埌','姝ｅ父'),'涓婂崍涓婄彮鏈墦鍗�')result_one, ");
param.add(fseCompanyPunch.getDate("work_time_one","HH:mm:ss"));
-
+
if (workTimeMethod==1) {
sb.append(" punch_time_two,IF(punch_time_two IS TRUE,IF(DATE_FORMAT(punch_time_two,'%H:%i:%S')<?,'鏃╅��','姝ｅ父'),'涓婂崍涓嬬彮鏈墦鍗�')result_two, ");
param.add(fseCompanyPunch.getDate("work_time_two","HH:mm:ss"));
sb.append(" punch_time_three,IF(punch_time_three IS TRUE,IF(DATE_FORMAT(punch_time_three,'%H:%i:%S')>?,'杩熷埌','姝ｅ父'),'涓嬪崍涓婄彮鏈墦鍗�')result_three, ");
param.add(fseCompanyPunch.getDate("work_time_three","HH:mm:ss"));
}
-
+
sb.append(" punch_time_four,IF(punch_time_four IS TRUE,IF(DATE_FORMAT(punch_time_four,'%H:%i:%S')<?,'鏃╅��','姝ｅ父'),'涓嬪崍涓婄彮鏈墦鍗�')result_four ");
param.add(fseCompanyPunch.getDate("work_time_four","HH:mm:ss"));
-
+
sb.append(" FROM product_oa_punch_record WHERE created_by=?");
sb.append(" AND DATE_FORMAT(created_utc_datetime,'%Y-%m')=? ");
sb.append(" AND DATE_FORMAT(created_utc_datetime,'%Y-%m-%d') NOT IN (SELECT DATE_FORMAT(date_holiday,'%Y-%m-%d')FROM product_sys_company_holiday WHERE org_level_uuid=?) ");
param.add(user_id);
param.add(yearAndMonth);
param.add(org_level_uuid);
-
+
return baseDao.listTable(sb.toString(), param.toArray());
}
/**
@@ -255,122 +256,164 @@
* @return
*/
public DataTableEntity listMonthReport(FieldSetEntity fse) {
-
+
//鑾峰彇褰撳墠浜轰俊鎭�
SystemUser currentUser=SpringMVCContextHolder.getCurrentUser();
- String org_level_uuid=currentUser.getOrg_level_uuid();
+ List<Object>param1=new ArrayList<>();
+ param1.add(currentUser.getUser_id());
+ param1.add(currentUser.getUser_id()+",");
+ //鑾峰彇浣跨敤鍒扮殑璁剧疆瑙勫垯
+ StringBuilder sbPunchTime=new StringBuilder();
+ sbPunchTime.append(" SELECT DISTINCT c.* ");
+ sbPunchTime.append(" FROM ( ");
+ sbPunchTime.append(" SELECT d.* ");
+ sbPunchTime.append(" FROM product_oa_punch_time d ");
+ sbPunchTime.append(" left JOIN product_oa_punch_record b ");
+ sbPunchTime.append(" on d.punch_site_uuid=b.punch_congfig_uuid and d.created_by=? ");
+ sbPunchTime.append(" ) c ");
+ sbPunchTime.append(" where c.uuid in ( ");
+ sbPunchTime.append(" SELECT DISTINCT uuid ");
+ sbPunchTime.append(" FROM product_oa_punch_time ");
+ sbPunchTime.append(" where LOCATE(?, concat(attendance_object,','))>0 ");
+ sbPunchTime.append(" ) ");
+ DataTableEntity dataTableEntity = baseDao.listTable(sbPunchTime.toString(), param1.toArray());
+ List<DataTableEntity> dataTableEntityLits=new ArrayList<>();
+ for(int i=0;i<dataTableEntity.getRows();i++){
- //鑾峰彇鍏徃宸ヤ綔鏃堕棿閰嶇疆淇℃伅
- FieldSetEntity fseCompanyPunch=baseDao.getFieldSetEntityByFilter(CmnConst.PRODUCT_OA_PUNCH_TIME, "", new Object[] {}, false);
- if (fseCompanyPunch==null) {
- throw new BaseException(SystemCode.COMPANY_PUNCH_TIME_NOT_CONFIG.getValue(), SystemCode.COMPANY_PUNCH_TIME_NOT_CONFIG.getText(), this.getClass(), "listMonthReport");
+ FieldSetEntity fseCompanyPunch = dataTableEntity.getData().get(i);
+ if (fseCompanyPunch==null) {
+ throw new BaseException(SystemCode.COMPANY_PUNCH_TIME_NOT_CONFIG.getValue(), SystemCode.COMPANY_PUNCH_TIME_NOT_CONFIG.getText(), this.getClass(), "listMonthReport");
+ }
+ //鑾峰彇鏌ヨ鏈堜唤
+ String yearAndMonth=fse.getString("yearAndMonth");
+ if (StringUtils.isEmpty(yearAndMonth)) {
+ yearAndMonth=DateUtils.formatDate(new Date(), "yyyy-MM");
+ }
+
+ //鑾峰彇姣忔湀澶╂暟
+ int dayOfMonth = DateUtils.getMonthHasDays(DateUtils.parseDate(yearAndMonth));
+ //鑾峰彇鏈湀鑺傚亣鏃�
+ DataTableEntity dtHoliday=baseDao.listTable("product_sys_company_holiday", "date_holiday like ?", new Object[] {yearAndMonth+"%"});
+ //鑾峰彇姣忔湀搴斾笂鐝ぉ鏁�
+ int dayOfWork = 0;
+ if (BaseUtil.dataTableIsEmpty(dtHoliday)) {
+ dayOfWork=dayOfMonth;
+ }else {
+ dayOfWork=dayOfMonth-dtHoliday.getRows();
+ }
+
+
+ StringBuilder sb=new StringBuilder();
+ List<Object>param=new ArrayList<>();
+ String morinng_work = fseCompanyPunch.getValue("morning_work").toString().split(" ")[1];
+ param.add(morinng_work);
+ if(ObjectUtil.isNotEmpty(fseCompanyPunch.getValue("morning_work_off"))&& ObjectUtil.isNotEmpty(fseCompanyPunch.getValue("afternoon_work"))){
+ String morinng_work_off = fseCompanyPunch.getValue("morning_work_off").toString().split(" ")[1];
+ String afternoon_work = fseCompanyPunch.getValue("afternoon_work").toString().split(" ")[1];
+ param.add(afternoon_work);
+ param.add(morinng_work_off);
+ }
+
+ String afternoon_work_off = fseCompanyPunch.getValue("afternoon_work_off").toString().split(" ")[1];
+ String uuid = fseCompanyPunch.getValue("uuid").toString();
+
+ param.add(afternoon_work_off);
+ param.add(yearAndMonth);
+ param.add(uuid);
+ param.add(yearAndMonth);
+ param.add(yearAndMonth);
+ sb.append(" SELECT ");
+ sb.append(" (SELECT user_name FROM product_sys_users WHERE user_id=a.created_by)created_by, ");
+ sb.append(" (SELECT org_level_name FROM product_sys_org_levels WHERE uuid=dept_uuid)dept_uuid, ");
+ sb.append(" dayOfWork,workDayOfMonth,lateCome,leaveEarly,total_hours,casual_leave,medical_leave,marriage_leave,paid_leave,other_leave,(dayOfWork-workDayOfMonth)absenteeism ");
+ sb.append(" FROM ( ");
+ if(ObjectUtil.isNotEmpty(fseCompanyPunch.getValue("morning_work_off"))&& ObjectUtil.isNotEmpty(fseCompanyPunch.getValue("afternoon_work"))){
+ sb.append(" SELECT b.created_by,b.dayOfWork,b.workDayOfMonth,b.dept_uuid,b.lateCome1+b.lateCome2 lateCome,b.leaveEarly1+b.leaveEarly2 leaveEarly");
+ }else {
+ sb.append(" SELECT b.created_by,b.dayOfWork,b.workDayOfMonth,b.dept_uuid,b.lateCome1 lateCome,b.leaveEarly2 leaveEarly");
+ }
+
+ sb.append(" FROM ( ");
+ sb.append(" SELECT ");
+ sb.append(" a.created_by,"+dayOfWork+" dayOfWork,COUNT(day_of_month)workDayOfMonth,a.dept_uuid, ");
+ sb.append(" COUNT(");
+ sb.append(" IF ");
+ sb.append(" ( result1 = '杩熷埌', TRUE, NULL )) lateCome1,");
+ if(ObjectUtil.isNotEmpty(fseCompanyPunch.getValue("morning_work_off"))&& ObjectUtil.isNotEmpty(fseCompanyPunch.getValue("afternoon_work"))){
+ sb.append(" COUNT(");
+ sb.append(" IF ");
+ sb.append(" ( result2 = '杩熷埌', TRUE, NULL )) lateCome2,");
+ sb.append(" COUNT(");
+ sb.append(" IF ");
+ sb.append(" ( result3 = '鏃╅��', TRUE, NULL )) leaveEarly1,");
+
+ }
+ sb.append(" COUNT(");
+ sb.append(" IF ");
+ sb.append(" ( result4 = '鏃╅��', TRUE, NULL )) leaveEarly2 ");
+ sb.append(" FROM ( ");
+ sb.append(" SELECT d.created_by,d.dept_uuid,DATE_FORMAT( d.created_utc_datetime, '%Y-%m-%d' ) day_of_month,punch_time_one, ");
+ sb.append(" IF ");
+ sb.append(" ( punch_time_one IS TRUE, IF ( DATE_FORMAT( punch_time_one, '%H:%i:%S' )> ?, '杩熷埌', '姝ｅ父' ), '鏈墦鍗�' ) ");
+ sb.append(" result1 ,");
+ if(ObjectUtil.isNotEmpty(fseCompanyPunch.getValue("morning_work_off"))&& ObjectUtil.isNotEmpty(fseCompanyPunch.getValue("afternoon_work"))){
+ sb.append(" IF ");
+ sb.append(" ( punch_time_three IS TRUE, IF ( DATE_FORMAT( punch_time_three, '%H:%i:%S' )> ?, '杩熷埌', '姝ｅ父' ), '鏈墦鍗�' ) ");
+ sb.append(" result2 ,");
+ sb.append(" IF ");
+ sb.append(" ( punch_time_two IS TRUE, IF ( DATE_FORMAT( punch_time_two, '%H:%i:%S' )< ?, '鏃╅��', '姝ｅ父' ), '鏈墦鍗�' ) ");
+ sb.append(" result3 ,");
+ }
+
+ sb.append(" IF ");
+ sb.append(" ( punch_time_four IS TRUE, IF ( DATE_FORMAT( punch_time_four, '%H:%i:%S' ) < ?, '鏃╅��', '姝ｅ父' ), '鏈墦鍗�' ) ");
+ sb.append(" result4 ");
+ sb.append(" FROM product_oa_punch_record d ");
+ sb.append(" left JOIN product_oa_punch_time e ");
+ sb.append(" on d.punch_congfig_uuid=e.punch_site_uuid ");
+ sb.append(" and DATE_FORMAT( d.created_utc_datetime,'%Y-%m')=? AND DATE_FORMAT(punch_time_one,'%Y-%m-%d') NOT IN(SELECT date_holiday FROM product_sys_company_holiday) ");
+ sb.append(" where e.uuid=? ");
+ sb.append(" )a ");
+ sb.append(" GROUP BY a.created_by,a.dept_uuid ");
+ sb.append(" )b");
+ sb.append(" )a ");
+ sb.append(" LEFT JOIN (SELECT user_id, sum( duration ) total_hours FROM product_oa_work_overtime o left join product_oa_work_overtime_sub b on o.uuid=b.main_uuid and DATE_FORMAT( b.start_time, '%Y-%m' )=? GROUP BY o.user_id)b ");
+ sb.append(" ON a.created_by=b.user_id ");
+ sb.append(" LEFT JOIN ( ");
+ sb.append(" SELECT ");
+ sb.append(" created_by,sum(IF(leave_type=1,TRUE,0))casual_leave,sum(IF(leave_type=2,TRUE,0))medical_leave, ");
+ sb.append(" sum(IF(leave_type=9,TRUE,0))marriage_leave,sum(IF(leave_type=4,TRUE,0))paid_leave, ");
+ sb.append(" sum(IF(leave_type!=1 && leave_type!=2 && leave_type!=4 && leave_type!=9,TRUE,0))other_leave ");
+ sb.append(" FROM product_oa_ask_for_leave ");
+ sb.append(" WHERE DATE_FORMAT(start_time,'%Y-%m')=? ");
+ sb.append(" GROUP BY created_by ");
+ sb.append(" )c ");
+ sb.append(" ON a.created_by=c.created_by ");
+ sb.append(" ORDER BY dept_uuid,a.created_by ");
+ DataTableEntity dataTableEntityReport = baseDao.listTable(sb.toString(), param.toArray());
+ if(dataTableEntityReport.getRows()!=0){
+ dataTableEntityLits.add(baseDao.listTable(sb.toString(), param.toArray()));
+ }
+
}
-
- //鑾峰彇鏌ヨ鏈堜唤
- String yearAndMonth=fse.getString("yearAndMonth");
- if (StringUtils.isEmpty(yearAndMonth)) {
- yearAndMonth=DateUtils.formatDate(new Date(), "yyyy-MM");
+ DataTableEntity dataTableEntity1=new DataTableEntity();
+ if(ObjectUtil.isNotEmpty(dataTableEntityLits)){
+ dataTableEntity1=dataTableEntityLits.get(0);
+ //鏈湀鍐呰繜鍒版棭閫�鏁扮殑绱姞
+ for (int i = 1; i < dataTableEntityLits.size(); i++) {
+ FieldSetEntity fieldSetEntity = dataTableEntityLits.get(i).getData().get(0);
+ FieldSetEntity fieldSetEntity1 = dataTableEntity1.getData().get(0);
+ dataTableEntity1.getData().get(0).setValue("lateCome",Integer.parseInt(fieldSetEntity.getValue("lateCome").toString())+Integer.parseInt(fieldSetEntity1.getValue("lateCome").toString()));
+ dataTableEntity1.getData().get(0).setValue("leaveEarly",Integer.parseInt(fieldSetEntity.getValue("leaveEarly").toString())+Integer.parseInt(fieldSetEntity1.getValue("leaveEarly").toString()));
+ dataTableEntity1.getData().get(0).setValue("workDayOfMonth",Integer.parseInt(fieldSetEntity.getValue("workDayOfMonth").toString())+Integer.parseInt(fieldSetEntity1.getValue("workDayOfMonth").toString()));
+ dataTableEntity1.getData().get(0).setValue("absenteeism",Integer.parseInt(fieldSetEntity1.getValue("absenteeism").toString())-Integer.parseInt(fieldSetEntity.getValue("workDayOfMonth").toString()));
+
+
+ }
}
-
- //鑾峰彇姣忔湀澶╂暟
- int dayOfMonth = DateUtils.getMonthHasDays(DateUtils.parseDate(yearAndMonth));
- //鑾峰彇鏈湀鑺傚亣鏃�
- DataTableEntity dtHoliday=baseDao.listTable("product_sys_company_holiday", "date_holiday like ?", new Object[] {yearAndMonth+"%"});
- //鑾峰彇姣忔湀搴斾笂鐝ぉ鏁�
- int dayOfWork = 0;
- if (BaseUtil.dataTableIsEmpty(dtHoliday)) {
- dayOfWork=dayOfMonth;
- }else {
- dayOfWork=dayOfMonth-dtHoliday.getRows();
- }
-
- //workTimeMethod 0:涓婂崍涓婄彮锛屼笅鍗堜笅鐝� 1:涓�鍗� 2:鍥涘崱 3:涓婂崍涓婄彮锛屼笅鍗堜笂鐝�
- int workTimeMethod=0;
- if (StringUtils.isEmpty(fseCompanyPunch.getString("work_time_two")) && StringUtils.isEmpty(fseCompanyPunch.getString("work_time_three")) && StringUtils.isEmpty(fseCompanyPunch.getString("work_time_four"))) {
- workTimeMethod=1;
- } else if (!StringUtils.isEmpty(fseCompanyPunch.getString("work_time_two")) && !StringUtils.isEmpty(fseCompanyPunch.getString("work_time_three")) && !StringUtils.isEmpty(fseCompanyPunch.getString("work_time_four"))) {
- workTimeMethod=2;
- } else if (StringUtils.isEmpty(fseCompanyPunch.getString("work_time_two")) && StringUtils.isEmpty(fseCompanyPunch.getString("work_time_four"))) {
- workTimeMethod=3;
- }
-
- StringBuilder sb=new StringBuilder();
- List<Object>param=new ArrayList<>();
- param.add(yearAndMonth);
- param.add(yearAndMonth);
- param.add(yearAndMonth);
- sb.append(" SELECT ");
- sb.append(" (SELECT user_name FROM product_sys_users WHERE user_id=a.created_by)created_by, ");
- sb.append(" (SELECT org_level_name FROM product_sys_org_levels WHERE uuid=dept_uuid)dept_uuid, ");
- sb.append(" dayOfWork,workDayOfMonth,lateCome,leaveEarly,total_hours,casual_leave,medical_leave,marriage_leave,paid_leave,other_leave,(dayOfWork-workDayOfMonth)absenteeism ");
- sb.append(" FROM ( ");
- sb.append(" SELECT ");
- sb.append(" a.created_by,"+dayOfWork+" dayOfWork,COUNT(day_of_month)workDayOfMonth,a.dept_uuid, ");
-
- if (workTimeMethod==0) {
- sb.append(" COUNT(IF(result1='杩熷埌',TRUE,NULL)) lateCome, ");
- sb.append(" COUNT(IF(result4='鏃╅��',TRUE,NULL)) leaveEarly ");
- }else if (workTimeMethod==1) {
- sb.append(" COUNT(IF(result1='杩熷埌',TRUE,NULL)) lateCome, ");
- sb.append(" 0 leaveEarly ");
- }else if (workTimeMethod==2) {
- sb.append(" COUNT(IF(result1='杩熷埌',TRUE,NULL))+COUNT(IF(result3='杩熷埌',TRUE,NULL)) lateCome, ");
- sb.append(" COUNT(IF(result2='鏃╅��',TRUE,NULL))+COUNT(IF(result4='鏃╅��',TRUE,NULL)) leaveEarly ");
- }else if (workTimeMethod==3) {
- sb.append(" COUNT(IF(result1='杩熷埌',TRUE,NULL))+COUNT(IF(result3='杩熷埌',TRUE,NULL)) lateCome, ");
- sb.append(" 0 leaveEarly ");
- }
- /*
- if (workTimeMethod==1) {
- sb.append(" COUNT(IF(result1='杩熷埌',TRUE,NULL))+COUNT(IF(result3='杩熷埌',TRUE,NULL)) lateCome, ");
- sb.append(" COUNT(IF(result2='鏃╅��',TRUE,NULL))+COUNT(IF(result4='鏃╅��',TRUE,NULL)) leaveEarly ");
- } else if (workTimeMethod==2) {
- sb.append("");
- } else if (workTimeMethod==3) {
-
- } else {
- sb.append(" COUNT(IF(result1='杩熷埌',TRUE,NULL)) lateCome, ");
- sb.append(" COUNT(IF(result4='鏃╅��',TRUE,NULL)) leaveEarly ");
- }
- */
- sb.append(" FROM ( ");
- sb.append(" SELECT ");
- sb.append(" created_by,dept_uuid, ");
- sb.append(" DATE_FORMAT(created_utc_datetime,'%Y-%m-%d') day_of_month, ");
- sb.append(" punch_time_one,IF(punch_time_one IS TRUE,IF(DATE_FORMAT(punch_time_one,'%H:%i:%S')>'09:00:00','杩熷埌','姝ｅ父'),'鏈墦鍗�') result1 ");
-
-// sb.append(" punch_time_two,IF(punch_time_two IS TRUE,IF(DATE_FORMAT(punch_time_two,'%H:%i:%S')<'12:00:00','鏃╅��','姝ｅ父'),'鏈墦鍗�') result2, ");
-// sb.append(" punch_time_three,IF(punch_time_three IS TRUE,IF(DATE_FORMAT(punch_time_three,'%H:%i:%S')>'14:00:00','杩熷埌','姝ｅ父'),'鏈墦鍗�') result3, ");
-// sb.append(" punch_time_four,IF(punch_time_four IS TRUE,IF(DATE_FORMAT(punch_time_four,'%H:%i:%S')<'17:00:00','鏃╅��','姝ｅ父'),'鏈墦鍗�') result4 ");
- if (workTimeMethod==0) {
- sb.append(", punch_time_four,IF(punch_time_four IS TRUE,IF(DATE_FORMAT(punch_time_four,'%H:%i:%S')<'17:00:00','鏃╅��','姝ｅ父'),'鏈墦鍗�') result4 ");
- }else if (workTimeMethod==2) {
- sb.append(", punch_time_two,IF(punch_time_two IS TRUE,IF(DATE_FORMAT(punch_time_two,'%H:%i:%S')<'12:00:00','鏃╅��','姝ｅ父'),'鏈墦鍗�') result2 ");
- sb.append(", punch_time_three,IF(punch_time_three IS TRUE,IF(DATE_FORMAT(punch_time_three,'%H:%i:%S')>'14:00:00','杩熷埌','姝ｅ父'),'鏈墦鍗�') result3 ");
- sb.append(", punch_time_four,IF(punch_time_four IS TRUE,IF(DATE_FORMAT(punch_time_four,'%H:%i:%S')<'17:00:00','鏃╅��','姝ｅ父'),'鏈墦鍗�') result4 ");
- }else if (workTimeMethod==3) {
- sb.append(", punch_time_three,IF(punch_time_three IS TRUE,IF(DATE_FORMAT(punch_time_three,'%H:%i:%S')>'14:00:00','杩熷埌','姝ｅ父'),'鏈墦鍗�') result3 ");
- }
-
- sb.append(" FROM product_oa_punch_record ");
- sb.append(" WHERE DATE_FORMAT(created_utc_datetime,'%Y-%m')=? AND DATE_FORMAT(punch_time_one,'%Y-%m-%d') NOT IN(SELECT date_holiday FROM product_sys_company_holiday) ");
- sb.append(" )a ");
- sb.append(" GROUP BY a.created_by,a.dept_uuid ");
- sb.append(" )a ");
- sb.append(" LEFT JOIN (SELECT user_id,sum(total_hours)total_hours FROM product_oa_work_overtime WHERE flow_flag=2 AND DATE_FORMAT(start_time,'%Y-%m')=? GROUP BY user_id)b ");
- sb.append(" ON a.created_by=b.user_id ");
- sb.append(" LEFT JOIN ( ");
- sb.append(" SELECT ");
- sb.append(" created_by,sum(IF(leave_type=1,TRUE,0))casual_leave,sum(IF(leave_type=2,TRUE,0))medical_leave, ");
- sb.append(" sum(IF(leave_type=9,TRUE,0))marriage_leave,sum(IF(leave_type=4,TRUE,0))paid_leave, ");
- sb.append(" sum(IF(leave_type!=1 && leave_type!=2 && leave_type!=4 && leave_type!=9,TRUE,0))other_leave ");
- sb.append(" FROM product_oa_ask_for_leave ");
- sb.append(" WHERE DATE_FORMAT(start_time,'%Y-%m')=? ");
- sb.append(" GROUP BY created_by ");
- sb.append(" )c ");
- sb.append(" ON a.created_by=c.created_by ");
- sb.append(" ORDER BY dept_uuid,a.created_by ");
-
- return baseDao.listTable(sb.toString(), param.toArray());
+
+
+ return dataTableEntity1;
+
}
}
--
Gitblit v1.9.2