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/SchoolYearService.java | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/school/service/impl/SchoolYearService.java b/src/main/java/com/qxueyou/scc/school/service/impl/SchoolYearService.java
index 0adc84b..e228eed 100644
--- a/src/main/java/com/qxueyou/scc/school/service/impl/SchoolYearService.java
+++ b/src/main/java/com/qxueyou/scc/school/service/impl/SchoolYearService.java
@@ -21,14 +21,14 @@
@Override
public Result insertSchoolYear(SchSchoolYear schSchoolYear) {
- // 验证
+ // 楠岃瘉
Result resultFlag = judgeTime(schSchoolYear);
if(StringUtils.isNotBlank(resultFlag.getMsg())){
return resultFlag;
}
SchSchoolYear schoolYear = null;
- if(StringUtils.isNotBlank(schSchoolYear.getSchoolYearId())){// 修改
+ if(StringUtils.isNotBlank(schSchoolYear.getSchoolYearId())){// 淇敼
schoolYear = read(SchSchoolYear.class, schSchoolYear.getSchoolYearId());
TraceUtils.setUpdateTrace(schoolYear);
@@ -38,7 +38,7 @@
schoolYear.setName(schSchoolYear.getName());
this.save(schoolYear);
- }else{ // 新增
+ }else{ // 鏂板
schoolYear = new SchSchoolYear();
TraceUtils.setCreateTrace(schoolYear);
schoolYear.setOrgId(ClientUtils.getOrgId());
@@ -52,22 +52,22 @@
}
/**
- * 判断选择的时间不能包含已添加学年的开始时间至结束时间
+ * 鍒ゆ柇閫夋嫨鐨勬椂闂翠笉鑳藉寘鍚凡娣诲姞瀛﹀勾鐨勫紑濮嬫椂闂磋嚦缁撴潫鏃堕棿
* time
* @return
*/
public Result judgeTime( SchSchoolYear schSchoolYear) {
- // 返回结果
+ // 杩斿洖缁撴灉
Result resultFlag = new Result(true);
List<SchSchoolYear> schoolYearLst = setPublic(schSchoolYear.getSchoolYearId());
- // 验证
+ // 楠岃瘉
for (int i = 0; i < schoolYearLst.size(); i++) {
boolean flagStart = schoolYearLst.get(i).getStartTime().before(schSchoolYear.getStartTime());
boolean flagend = schoolYearLst.get(i).getEndTime().before(schSchoolYear.getEndTime());
- if(flagStart == false && flagend == true){ // 选择的时间包含开始时间和结束时间
- resultFlag = new Result(true,"选择的学年时间不能包含已添加的学年时间");
+ if(flagStart == false && flagend == true){ // 閫夋嫨鐨勬椂闂村寘鍚紑濮嬫椂闂村拰缁撴潫鏃堕棿
+ resultFlag = new Result(true,"閫夋嫨鐨勫骞存椂闂翠笉鑳藉寘鍚凡娣诲姞鐨勫骞存椂闂�");
break;
}
}
@@ -76,8 +76,8 @@
}
/**
- * 开始时间的回调函数
- * schSchoolYear ：startTime
+ * 寮�濮嬫椂闂寸殑鍥炶皟鍑芥暟
+ * schSchoolYear 锛歴tartTime
* @return
*/
@Override
@@ -87,8 +87,8 @@
}
/**
- * 结束时间的回调函数
- * schSchoolYear ：endTime
+ * 缁撴潫鏃堕棿鐨勫洖璋冨嚱鏁�
+ * schSchoolYear 锛歟ndTime
* @return
*/
@Override
@@ -98,13 +98,13 @@
}
/**
- * 判断选择的时间不能在已添加学年的开始时间和结束时间之间
+ * 鍒ゆ柇閫夋嫨鐨勬椂闂翠笉鑳藉湪宸叉坊鍔犲骞寸殑寮�濮嬫椂闂村拰缁撴潫鏃堕棿涔嬮棿
* time
* @return
*/
public Result callback( Date time,String schSchoolYearId) {
- // 返回结果
+ // 杩斿洖缁撴灉
Result resultFlag = new Result(true);
List<SchSchoolYear> schoolYearLst = setPublic(schSchoolYearId);
@@ -116,8 +116,8 @@
boolean flagStart = schoolYearLst.get(i).getStartTime().before(time);
boolean flagend = schoolYearLst.get(i).getEndTime().before(time);
- if(flagStart == true && flagend == false){ // 选择的时间在开始时间之后结束时间之前
- resultFlag = new Result(true,"当前机构已设置该时间的学年");
+ if(flagStart == true && flagend == false){ // 閫夋嫨鐨勬椂闂村湪寮�濮嬫椂闂翠箣鍚庣粨鏉熸椂闂翠箣鍓�
+ resultFlag = new Result(true,"褰撳墠鏈烘瀯宸茶缃鏃堕棿鐨勫骞�");
break;
}
}
@@ -127,11 +127,11 @@
public List<SchSchoolYear> setPublic( String schSchoolYearId) {
- // 获取当前机构所有学年
+ // 鑾峰彇褰撳墠鏈烘瀯鎵�鏈夊骞�
String hql = "from SchSchoolYear where deleteFlag is false and orgId = ? order by endTime desc";
List<SchSchoolYear> schoolYearList = find(hql, CollectionUtils.newList(ClientUtils.getOrgId()), SchSchoolYear.class);
- // 编辑页面过滤当前学年
+ // 缂栬緫椤甸潰杩囨护褰撳墠瀛﹀勾
List<SchSchoolYear> schoolYearLst = new ArrayList<SchSchoolYear>();
if(StringUtils.isNotBlank(schSchoolYearId)){
for (SchSchoolYear schoolYear : schoolYearList) {
--
Gitblit v1.8.0