From 1bce00f5b3614ca12b683dfe8a3cf733e1ed68b6 Mon Sep 17 00:00:00 2001
From: EricsHu <hrr145632>
Date: 星期五, 26 五月 2023 16:25:22 +0800
Subject: [PATCH] 11
---
src/main/java/com/qxueyou/scc/school/service/impl/SchoolTermService.java | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/school/service/impl/SchoolTermService.java b/src/main/java/com/qxueyou/scc/school/service/impl/SchoolTermService.java
index d15a6c5..5a50d17 100644
--- a/src/main/java/com/qxueyou/scc/school/service/impl/SchoolTermService.java
+++ b/src/main/java/com/qxueyou/scc/school/service/impl/SchoolTermService.java
@@ -23,7 +23,7 @@
@Override
public Result insertSchoolTerm(SchTerm schTerm,String schoolDayId) {
- // 验证
+ // 楠岃瘉
Result resultFlag = judgeTime(schTerm);
if(StringUtils.isNotBlank(resultFlag.getMsg())){
return resultFlag;
@@ -65,22 +65,22 @@
}
/**
- * 判断选择的时间不能包含已添加学年的开始时间至结束时间
+ * 鍒ゆ柇閫夋嫨鐨勬椂闂翠笉鑳藉寘鍚凡娣诲姞瀛﹀勾鐨勫紑濮嬫椂闂磋嚦缁撴潫鏃堕棿
* time
* @return
*/
public Result judgeTime( SchTerm schTerm) {
- // 返回结果
+ // 杩斿洖缁撴灉
Result resultFlag = new Result(true);
List<SchTerm> schTermLst = setPublic(schTerm.getTermId(),schTerm.getSchoolYearId());
- // 验证
+ // 楠岃瘉
for (int i = 0; i < schTermLst.size(); i++) {
boolean flagStart = schTermLst.get(i).getStartTime().before(schTerm.getStartTime());
boolean flagend = schTermLst.get(i).getEndTime().before(schTerm.getEndTime());
- if(flagStart == false && flagend == true){ // 选择的时间包含开始时间和结束时间
- resultFlag = new Result(true,"选择的学期时间不能包含已添加的学期时间");
+ if(flagStart == false && flagend == true){ // 閫夋嫨鐨勬椂闂村寘鍚紑濮嬫椂闂村拰缁撴潫鏃堕棿
+ resultFlag = new Result(true,"閫夋嫨鐨勫鏈熸椂闂翠笉鑳藉寘鍚凡娣诲姞鐨勫鏈熸椂闂�");
break;
}
}
@@ -89,8 +89,8 @@
}
/**
- * 开始时间的回调函数
- * schSchoolYear ：startTime
+ * 寮�濮嬫椂闂寸殑鍥炶皟鍑芥暟
+ * schSchoolYear 锛歴tartTime
* @return
*/
@Override
@@ -100,8 +100,8 @@
}
/**
- * 结束时间的回调函数
- * schSchoolYear ：endTime
+ * 缁撴潫鏃堕棿鐨勫洖璋冨嚱鏁�
+ * schSchoolYear 锛歟ndTime
* @return
*/
@Override
@@ -111,13 +111,13 @@
}
/**
- * 判断选择的时间不能在已添加学年的开始时间和结束时间之间
+ * 鍒ゆ柇閫夋嫨鐨勬椂闂翠笉鑳藉湪宸叉坊鍔犲骞寸殑寮�濮嬫椂闂村拰缁撴潫鏃堕棿涔嬮棿
* time
* @return
*/
public Result callback(String schTermId, String startEndTime,String schShoolYearId) {
- SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");//小写的mm表示的是分钟
+ SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");//灏忓啓鐨刴m琛ㄧず鐨勬槸鍒嗛挓
Date time = null;
try {
time = sdf.parse(startEndTime);
@@ -125,7 +125,7 @@
e.printStackTrace();
}
- // 返回结果
+ // 杩斿洖缁撴灉
Result resultFlag = new Result(true);
List<SchTerm> schTermLst = setPublic(schTermId,schShoolYearId);
@@ -137,8 +137,8 @@
boolean flagStart = schTermLst.get(i).getStartTime().before(time);
boolean flagEnd = schTermLst.get(i).getEndTime().before(time);
- if(flagStart == true && flagEnd == false){ // 选择的时间在开始时间之后结束时间之前
- resultFlag = new Result(true,"当前学年已设置该时间的学期");
+ if(flagStart == true && flagEnd == false){ // 閫夋嫨鐨勬椂闂村湪寮�濮嬫椂闂翠箣鍚庣粨鏉熸椂闂翠箣鍓�
+ resultFlag = new Result(true,"褰撳墠瀛﹀勾宸茶缃鏃堕棿鐨勫鏈�");
break;
}
}
@@ -148,11 +148,11 @@
public List<SchTerm> setPublic(String schTermId,String schShoolYearId) {
- // 获取当前学年的所有学期
+ // 鑾峰彇褰撳墠瀛﹀勾鐨勬墍鏈夊鏈�
String hql = "from SchTerm where deleteFlag is false and schoolYearId = ? order by endTime desc";
List<SchTerm> schTermList = find(hql, CollectionUtils.newList(schShoolYearId), SchTerm.class);
- // 编辑页面过滤当前学年
+ // 缂栬緫椤甸潰杩囨护褰撳墠瀛﹀勾
List<SchTerm> schTermLst = new ArrayList<SchTerm>();
if(StringUtils.isNotBlank(schTermId)){
for (SchTerm schTerm : schTermList) {
--
Gitblit v1.8.0