From 032ab98c53cd1448f81d1e8be04423d6b46c4fa1 Mon Sep 17 00:00:00 2001
From: zm <2369059705qq.com>
Date: 星期二, 15 十月 2024 17:37:40 +0800
Subject: [PATCH] 请假申请，请假看板调整
---
src/main/java/com/product/administration/service/LeaveRequestService.java | 28 ++++++++++++++
src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java | 12 ++++--
src/main/java/com/product/administration/controller/LeaveRequestController.java | 35 +++++++++++++++++
3 files changed, 71 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/product/administration/controller/LeaveRequestController.java b/src/main/java/com/product/administration/controller/LeaveRequestController.java
index 0636551..ccbf671 100644
--- a/src/main/java/com/product/administration/controller/LeaveRequestController.java
+++ b/src/main/java/com/product/administration/controller/LeaveRequestController.java
@@ -157,6 +157,41 @@
}
}
/**
+ * 璁＄畻璇峰亣澶╂暟
+ * @return
+ * @throws BaseException
+ */
+ @RequestMapping(value = "/getDay/{version}", method = RequestMethod.POST)
+ public String getDay(HttpServletRequest request) {
+ try {
+ //鑾峰彇鍙傛暟
+ FieldSetEntity fse=null;
+ Object bean=request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
+ if(bean != null) {
+ RequestParameterEntity reqp=(RequestParameterEntity)bean;
+ fse = reqp.getFormData();
+ }
+ //鍒ゆ柇鍙傛暟鏄惁涓虹┖
+ if(bean == null || fse == null) {
+ SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
+ return this.error(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
+ }
+ //鍒ゆ柇琛ㄥ悕鏄惁姝ｅ父
+ if (!CmnConst.PRODUCT_SYS_ASK_FOR_LEAVE.equals(fse.getTableName())) {
+ SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
+ return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
+ }
+ FieldSetEntity fs = leaveRequestService.getDay(fse);
+ return OK_List(fs);
+ }catch(BaseException e) {
+ SpringMVCContextHolder.getSystemLogger().error(e);
+ return this.error(e);
+ }catch (Exception e) {
+ SpringMVCContextHolder.getSystemLogger().error(e);
+ return this.error(SystemCode.SYSTEM_GET_LEAVE_REQUEST_INFO_FAIL.getValue(),SystemCode.SYSTEM_GET_LEAVE_REQUEST_INFO_FAIL.getText());
+ }
+ }
+ /**
* @Date: 2020-03-30 16:13
* @Author: ZhouJie
* @Description: 鍒犻櫎璇峰亣鐢宠
diff --git a/src/main/java/com/product/administration/service/LeaveRequestService.java b/src/main/java/com/product/administration/service/LeaveRequestService.java
index 3eb4b21..6e5a63e 100644
--- a/src/main/java/com/product/administration/service/LeaveRequestService.java
+++ b/src/main/java/com/product/administration/service/LeaveRequestService.java
@@ -9,6 +9,9 @@
import com.product.core.service.support.AbstractBaseService;
import com.product.core.service.support.QueryFilterService;
import com.product.core.spring.context.SpringMVCContextHolder;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
import java.util.Date;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -80,6 +83,31 @@
}
}
+
+ /**
+ * 璁＄畻璇峰亣澶╂暟
+ * @param fs
+ * @return
+ * @throws BaseException
+ */
+ public FieldSetEntity getDay(FieldSetEntity fs) throws BaseException {
+ DataTableEntity dt = baseDao.listTable(com.product.org.admin.config.CmnConst.PRODUCT_SYS_COMPANY_HOLIDAY, "date_holiday >=? and date_holiday<=?", new String[]{fs.getString("start_time"), fs.getString("end_time")});
+ String dateStr1 = fs.getString("start_time");
+ String dateStr2 = fs.getString("end_time");
+
+ // 浣跨敤DateTimeFormatter瑙ｆ瀽鏃ユ湡瀛楃涓�
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+ // 灏嗗瓧绗︿覆瑙ｆ瀽涓篖ocalDate瀵硅薄
+ LocalDate date1 = LocalDate.parse(dateStr1, formatter);
+ LocalDate date2 = LocalDate.parse(dateStr2, formatter);
+
+ // 璁＄畻涓や釜鏃ユ湡涔嬮棿鐨勫ぉ鏁板樊
+ long daysBetween = java.time.Duration.between(date1.atStartOfDay(), date2.atStartOfDay()).toDays()+1;
+ fs.setValue("day",daysBetween-dt.getRows());
+
+ return fs;
+ }
/**
* @Date: 2020-03-30 16:43
* @Author: ZhouJie
diff --git a/src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java b/src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java
index 0a7fe28..26ccf68 100644
--- a/src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java
+++ b/src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java
@@ -158,7 +158,7 @@
sb.append(" ,',',if(d.punch_range_two is not null and d.punch_range_two>f.distance,'瓒呭嚭鎵撳崱鑼冨洿',0) ");
sb.append(" ,',',if(d.punch_time_three is not null and d.punch_time_three>f.distance,'瓒呭嚭鎵撳崱鑼冨洿',0) ");
sb.append(" ,',',if(d.punch_range_four is not null and d.punch_range_four>f.distance,'瓒呭嚭鎵撳崱鑼冨洿',0)) dkfw, ");
- sb.append(" CASE WHEN b.uuid is not null THEN c.dict_label ELSE ");
+ sb.append(" CASE WHEN b.uuid is not null THEN '璇峰亣' ELSE ");
sb.append(" CASE WHEN d.uuid is not null THEN ");
sb.append(" CONCAT(IF(d.punch_time_one IS TRUE, IF ( DATE_FORMAT(d.punch_time_one, '%H:%i:%S' )>DATE_FORMAT(f.morning_work, '%H:%i:%S'), CONCAT('涓婂崍杩熷埌',TIMESTAMPDIFF(MINUTE, DATE_FORMAT(CONCAT(a.punch_date,' ',DATE_FORMAT(f.morning_work, '%H:%i:%S')),'%Y-%m-%d %H:%i:%S'),d.punch_time_one),'鍒嗛挓'), 0 ), '涓婂崍涓婄彮鏈墦鍗�' ) ");
sb.append(" ,',',IF(d.punch_time_two IS TRUE, IF ( DATE_FORMAT(d.punch_time_two, '%H:%i:%S' )<DATE_FORMAT(f.morning_work_off, '%H:%i:%S') and f.morning_work_off is not null, CONCAT('涓婂崍鏃╅��',TIMESTAMPDIFF(MINUTE,d.punch_time_two,DATE_FORMAT(CONCAT(a.punch_date,' ',DATE_FORMAT(f.morning_work_off, '%H:%i:%S')),'%Y-%m-%d %H:%i:%S')),'鍒嗛挓'), 0 ), '涓婂崍涓嬬彮鏈墦鍗�' ) ");
@@ -179,7 +179,6 @@
sb.append(" LEFT JOIN (SELECT * FROM product_oa_ask_for_leave WHERE user_id=? and flow_flag=2) b ");
param.add(user_id);
sb.append(" on DATE_FORMAT( a.punch_date, '%Y-%m-%d' )>= DATE_FORMAT( b.start_time, '%Y-%m-%d' ) and DATE_FORMAT( a.punch_date, '%Y-%m-%d' )<= DATE_FORMAT( b.end_time, '%Y-%m-%d' ) ");
- sb.append(" LEFT JOIN (SELECT * FROM product_sys_dict where dict_name='Leave_Type') c on b.leave_type =c.dict_value ");
sb.append(" LEFT JOIN product_oa_punch_record d on a.punch_date=DATE_FORMAT( d.punch_time_one, '%Y-%m-%d' ) ");
sb.append(" LEFT JOIN (SELECT applicant,DATE_FORMAT( replenish_date, '%Y-%m-%d') replenish_date,max(replacement_card_type) bk FROM product_oa_replenish_punch ");
sb.append(" where applicant=? and flow_flag=2 GROUP BY applicant,DATE_FORMAT( replenish_date, '%Y-%m-%d')) e on a.punch_date=e.replenish_date ");
@@ -191,7 +190,7 @@
FieldSetEntity fs = dt.getFieldSetEntity(i);
//褰撳ぉ鎵撳崱澶勭悊
if (fs.getString("punch_date").equals(day)){
- if (fs.getString("reidis").equals("鍏ㄥぉ鏈墦鍗�")){
+ if (null!=fs.getString("reidis")&&fs.getString("reidis").equals("鍏ㄥぉ鏈墦鍗�")){
fs.setValue("reidis",null);
fs.setValue("dkfw",null);
}else {
@@ -201,7 +200,12 @@
reidis[j]="0";
}
}
- String string = Arrays.toString(reidis);
+ String string="";
+ if(reidis.length!=1){
+ string = Arrays.toString(reidis);
+ }else {
+ string=fs.getString("reidis");
+ }
fs.setValue("reidis",string);
}
}
--
Gitblit v1.9.2