diff --git a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values
index aa29f8a..9980e21 100644
Binary files a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values and b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values differ
diff --git a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s
index 95c255b..b0990d1 100644
--- a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s
+++ b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s
@@ -1 +1 @@
-yfijgThefiffq_`^_\a^]\_^b_`^__]edbjہ}{~|~y|{{zy{}|}{~X\X\WWPWZ[ZTUPYZY\V\VWQTU[[WddaXXYXTRWWUhփxyww|{zxy|{zzx{wuSZ\WYW]Y_Y[oqspoorvrnsnpmmsrpssuqyutttxw͐ˎ͏؏ЏĎǐٍՏ֑̐ՏʐސЎ؏ʒ˓ՏĎݎʎ̍АǓƑˑݐӐɎޏ֓ېޓ֏ڐڌ֎ЏǐӍƒԓÐˑʒŀwtzwxvywwxxxyvxuvvvxklmhjimfikjljim~}}}~~~~}ƀ}|}~|~~~~~~~}
\ No newline at end of file
+yfijgThefiffq_`^_\a^]\_^b_`^__]edbjہ}{~|~y|{{zy{}|}{~X\X\WWPWZ[ZTUPYZY\V\VWQTU[[WddaXXYXTRWWUhփxyww|{zxy|{zzx{wuSZ\WYW]Y_Y[oqspoorvrnsnpmmsrpssuqyutttxw͐ˎ͏؏ЏĎǐٍՏ֑̐ՏʐސЎ؏ʒ˓ՏĎݎʎ̍АǓƑˑݐӐɎޏ֓ېޓ֏ڐڌ֎ЏǐӍƒԓÐˑʒŀwtzwxvywwxxxyvxuvvvxklmhjimfikjljim~}}}~~~~}ƀ}|}~|~~~~~~~}bLLLMMMMMMNMMMMMMMMMKKKKKJJJKKKLKKKKKKKKJJJKKKKKKKKKLKKKJJJKKKKLKKKKKKKKJIKKKKKKKKKKLKKJIJKKKKKLKKKKKKKJJJKKKKK
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e9592e7..67a9f71 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,46 +10,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -688,7 +652,7 @@
-
+
diff --git a/src/com/engine/common/util/CommonUtil.java b/src/com/engine/common/util/CommonUtil.java
index 3e2c10d..88ab857 100644
--- a/src/com/engine/common/util/CommonUtil.java
+++ b/src/com/engine/common/util/CommonUtil.java
@@ -194,7 +194,7 @@ public class CommonUtil {
/**
- * 获得包含该人员的适用范围的模块的所有数据id，
+ * 获得包含该人员的适用范围的模块的所有数据id，给班次适用范围用
* @param resourceId
* @param modeId
* @param startDate
@@ -641,6 +641,36 @@ public class CommonUtil {
return rqlx;
}
+ /**
+ * 获得人员对应年份所属的日期类型集合
+ * @param userId
+ * @param year
+ * @return
+ */
+ public static List> getYearCalendarList(String userId,String year){
+ String modeId = Utils.getFormmodeIdMap().get("uf_jcl_kq_rlmc");
+ Set calendarSetIdsSets = CommonUtil.getDataIds(userId,modeId,DateUtil.getCurrentDate(),DateUtil.getCurrentDate());
+ log.info("getRqlx calendarSetIdsSets : [{}]",calendarSetIdsSets);
+ List> resultList = Lists.newArrayList();
+ if (calendarSetIdsSets.size() > 0){
+ String sql = "select rqlx from uf_jcl_kq_rlxx where rlmc=? and nd=?";
+ resultList = DbTools.getSqlToList(sql,calendarSetIdsSets.toArray()[0],year);
+ if (resultList.size() == 0){
+ sql = "select subcompanyid1 from hrmresource where id =?";
+ Map departMentMap = DbTools.getSqlToMap(sql,userId);
+ String subcompanyid1 = departMentMap.get("subcompanyid1").toString();
+ resultList = Utils.getDefaultDateList(subcompanyid1,year);
+ }
+ }else {
+ String sql = "select subcompanyid1 from hrmresource where id =?";
+ Map departMentMap = DbTools.getSqlToMap(sql,userId);
+ String subcompanyid1 = departMentMap.get("subcompanyid1").toString();
+ resultList = Utils.getDefaultDateList(subcompanyid1,year);
+
+ }
+ return resultList;
+ }
+
/**
* 获得该班次是否休息
* @param classId