From 068fc7f2e81178e55fa191a13709af64b1a163f6 Mon Sep 17 00:00:00 2001
From: EricsHu <hrr145632>
Date: 星期一, 05 十二月 2022 14:27:43 +0800
Subject: [PATCH] 处理编码
---
src/main/java/com/qxueyou/scc/school/service/impl/SchoolDayService.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/school/service/impl/SchoolDayService.java b/src/main/java/com/qxueyou/scc/school/service/impl/SchoolDayService.java
index 4b74de8..a042cc9 100644
--- a/src/main/java/com/qxueyou/scc/school/service/impl/SchoolDayService.java
+++ b/src/main/java/com/qxueyou/scc/school/service/impl/SchoolDayService.java
@@ -45,7 +45,7 @@
@Override
public Result insertSchoolDayItem(SchSchoolDayItem schSchoolDayItem) {
- // 验证
+ // 楠岃瘉
Result resultFlag = judgeTime(schSchoolDayItem);
if(StringUtils.isNotBlank(resultFlag.getMsg())){
return resultFlag;
@@ -69,22 +69,22 @@
}
/**
- * 判断选择的时间不能包含已添加学年的开始时间至结束时间
+ * 鍒ゆ柇閫夋嫨鐨勬椂闂翠笉鑳藉寘鍚凡娣诲姞瀛﹀勾鐨勫紑濮嬫椂闂磋嚦缁撴潫鏃堕棿
* time
* @return
*/
public Result judgeTime( SchSchoolDayItem schSchoolDayItem) {
- // 返回结果
+ // 杩斿洖缁撴灉
Result resultFlag = new Result(true);
List<SchSchoolDayItem> dayItemLst = setPublic(schSchoolDayItem.getDayItemId(),schSchoolDayItem.getSchoolDayId());
- // 验证
+ // 楠岃瘉
for (int i = 0; i < dayItemLst.size(); i++) {
boolean flagStart = dayItemLst.get(i).getStartTime().before(schSchoolDayItem.getStartTime());
boolean flagend = dayItemLst.get(i).getEndTime().before(schSchoolDayItem.getEndTime());
- if(flagStart == false && flagend == true){ // 选择的时间包含开始时间和结束时间
- resultFlag = new Result(true,"选择的作息时间不能包含已添加的作息时间");
+ if(flagStart == false && flagend == true){ // 閫夋嫨鐨勬椂闂村寘鍚紑濮嬫椂闂村拰缁撴潫鏃堕棿
+ resultFlag = new Result(true,"閫夋嫨鐨勪綔鎭椂闂翠笉鑳藉寘鍚凡娣诲姞鐨勪綔鎭椂闂�");
break;
}
}
@@ -93,8 +93,8 @@
}
/**
- * 开始时间的回调函数
- * schSchoolYear ：startTime
+ * 寮�濮嬫椂闂寸殑鍥炶皟鍑芥暟
+ * schSchoolYear 锛歴tartTime
* @return
*/
@Override
@@ -104,8 +104,8 @@
}
/**
- * 结束时间的回调函数
- * schSchoolYear ：endTime
+ * 缁撴潫鏃堕棿鐨勫洖璋冨嚱鏁�
+ * schSchoolYear 锛歟ndTime
* @return
*/
@Override
@@ -115,13 +115,13 @@
}
/**
- * 判断选择的时间不能在已添加学年的开始时间和结束时间之间
+ * 鍒ゆ柇閫夋嫨鐨勬椂闂翠笉鑳藉湪宸叉坊鍔犲骞寸殑寮�濮嬫椂闂村拰缁撴潫鏃堕棿涔嬮棿
* time
* @return
*/
public Result callback( Date time,String dayItemId,String schoolDayId) {
- // 返回结果
+ // 杩斿洖缁撴灉
Result resultFlag = new Result(true);
List<SchSchoolDayItem> dayItemLst = setPublic(dayItemId,schoolDayId);
@@ -133,8 +133,8 @@
boolean flagStart = dayItemLst.get(i).getStartTime().before(time);
boolean flagEnd = dayItemLst.get(i).getEndTime().before(time);
- if(flagStart == true && flagEnd == false){ // 选择的时间在开始时间之后结束时间之前
- resultFlag = new Result(true,"已经设置过当前的作息时间");
+ if(flagStart == true && flagEnd == false){ // 閫夋嫨鐨勬椂闂村湪寮�濮嬫椂闂翠箣鍚庣粨鏉熸椂闂翠箣鍓�
+ resultFlag = new Result(true,"宸茬粡璁剧疆杩囧綋鍓嶇殑浣滄伅鏃堕棿");
break;
}
}
@@ -144,11 +144,11 @@
public List<SchSchoolDayItem> setPublic(String dayItemId,String schoolDayId) {
- // 获取当前作息时间的所有明细
+ // 鑾峰彇褰撳墠浣滄伅鏃堕棿鐨勬墍鏈夋槑缁�
String hql = "from SchSchoolDayItem where deleteFlag is false and schoolDayId = ? order by endTime desc";
List<SchSchoolDayItem> dayItemList = find(hql, CollectionUtils.newList(schoolDayId), SchSchoolDayItem.class);
- // 编辑页面过滤当前学年
+ // 缂栬緫椤甸潰杩囨护褰撳墠瀛﹀勾
List<SchSchoolDayItem> dayItemLst = new ArrayList<SchSchoolDayItem>();
if(StringUtils.isNotBlank(dayItemId)){
for (SchSchoolDayItem dayItem : dayItemList) {
--
Gitblit v1.8.0