|
|
@@ -22,7 +22,6 @@ import com.kingdee.eas.custom.dormitorysystem.occupants.OccupantsFactory;
|
|
|
import com.kingdee.eas.custom.dormitorysystem.occupants.OccupantsInfo;
|
|
|
import com.kingdee.eas.custom.dormitorysystem.otherbasicdata.PersonDormitoryTypeInfo;
|
|
|
import com.kingdee.eas.hr.ats.AtsUtil;
|
|
|
-import com.kingdee.shr.base.syssetting.exception.ShrWebBizException;
|
|
|
import com.kingdee.util.DateTimeUtils;
|
|
|
import com.kingdee.util.StringUtils;
|
|
|
import org.apache.log4j.Logger;
|
|
|
@@ -116,7 +115,6 @@ public class GetOptionalRoomIdsService implements IHRMsfService {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- return AtsUtil.convertSetToString(dormitoryIdSet);
|
|
|
} catch (Exception e) {
|
|
|
logger.error(e);
|
|
|
errorMsg.append(e.getMessage()).append(System.lineSeparator());
|
|
|
@@ -162,7 +160,7 @@ public class GetOptionalRoomIdsService implements IHRMsfService {
|
|
|
//入住日期在申请入住日期和申请退宿日期之间
|
|
|
filterItems.add(new FilterItemInfo("checkInDate", checkInDate, CompareType.GREATER_EQUALS));
|
|
|
filterItems.add(new FilterItemInfo("checkInDate", checkoutDate, CompareType.LESS_EQUALS));
|
|
|
- //单据状态等于审批
|
|
|
+ //单据状态等于未审批、审批中
|
|
|
filterItems.add(new FilterItemInfo("parent.billState", "1,2", CompareType.INCLUDE));
|
|
|
filterInfo.setMaskString("#0 and ((#1 and #2) or (#3 and #4)) and #5");
|
|
|
SelectorItemCollection sic = new SelectorItemCollection();
|
|
|
@@ -235,10 +233,7 @@ public class GetOptionalRoomIdsService implements IHRMsfService {
|
|
|
filterItems.add(new FilterItemInfo("checkInDate", checkoutDate, CompareType.LESS_EQUALS));
|
|
|
//单据状态为 未审批、审批中
|
|
|
filterItems.add(new FilterItemInfo("parent.billState", "1,2", CompareType.INCLUDE));
|
|
|
- //单据状态等于审批中
|
|
|
- //filterItems.add(new FilterItemInfo("parent.billState", "3"));
|
|
|
filterInfo.setMaskString("#0 and ((#1 and #2) or (#3 and #4)) and #5 ");
|
|
|
- //filterInfo.setMaskString("#0 and ((#1 and #2) or (#3 and #4)) and #5 ");
|
|
|
SelectorItemCollection sic = new SelectorItemCollection();
|
|
|
sic.add("checkInRoom.id");
|
|
|
sic.add("person.personType.id");
|
Heyuan