Merge branch 'master' of http://47.92.104.23:3000/LiuYing/aibeike

metadata/com/kingdee/eas/custom/dormitorysystem/application/CheckInApplication.bizunit

@@ -96,9 +96,9 @@
             <lang locale="zh_TW" value="com.kingdee.eas.custom.dormitorysystem.application.client.CheckInApplicationListUI" />
         </rs>
         <rs key="bizUnit[com.kingdee.eas.custom.dormitorysystem.application.CheckInApplication].extendedProperty.maxFieldIndex">
-            <lang locale="en_US" value="7" />
-            <lang locale="zh_CN" value="7" />
-            <lang locale="zh_TW" value="7" />
+            <lang locale="en_US" value="8" />
+            <lang locale="zh_CN" value="8" />
+            <lang locale="zh_TW" value="8" />
         </rs>
         <rs key="bizUnit[com.kingdee.eas.custom.dormitorysystem.application.CheckInApplication].extendedProperty.userDefined">
             <lang locale="en_US" value="true" />

metadata/com/kingdee/eas/custom/dormitorysystem/application/app/CT_APP_CheckInApplication.table

@@ -471,9 +471,9 @@
         </rs>
         <rs key="dataTable[com.kingdee.eas.custom.dormitorysystem.application.app.CT_APP_CheckInApplication].columns.column[FAdminOrgUnitId].alias">
             <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="null" />
-            <lang locale="zh_HK" value="null" />
-            <lang locale="zh_TW" value="null" />
+            <lang locale="zh_CN" value="行政组织" />
+            <lang locale="zh_HK" value="行政組織" />
+            <lang locale="zh_TW" value="行政組織" />
         </rs>
         <rs key="dataTable[com.kingdee.eas.custom.dormitorysystem.application.app.CT_APP_CheckInApplication].columns.column[FAdminOrgUnitId].description">
             <lang locale="en_US" value="null" />
@@ -589,14 +589,13 @@
         </rs>
         <rs key="dataTable[com.kingdee.eas.custom.dormitorysystem.application.app.CT_APP_CheckInApplication].columns.column[FHROrgUnitID].alias">
             <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="null" />
-            <lang locale="zh_HK" value="null" />
-            <lang locale="zh_TW" value="null" />
+            <lang locale="zh_CN" value="HR组织" />
+            <lang locale="zh_HK" value="HR組織" />
+            <lang locale="zh_TW" value="HR組織" />
         </rs>
         <rs key="dataTable[com.kingdee.eas.custom.dormitorysystem.application.app.CT_APP_CheckInApplication].columns.column[FHROrgUnitID].description">
             <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="null" />
-            <lang locale="zh_HK" value="null" />
+            <lang locale="zh_CN" value="" />
             <lang locale="zh_TW" value="null" />
         </rs>
         <rs key="dataTable[com.kingdee.eas.custom.dormitorysystem.application.app.CT_APP_CheckInApplication].columns.column[FHandlerID].alias">

metadata/com/kingdee/eas/custom/dormitorysystem/application/app/CT_APP_CheckInApplicationEntry.table

@@ -119,6 +119,20 @@
             <scale>0</scale>
             <precision>44</precision>
         </column>
+        <column>
+            <name>CFCheckInDate</name>
+            <alias>dataTable[com.kingdee.eas.custom.dormitorysystem.application.app.CT_APP_CheckInApplicationEntry].columns.column[CFCheckInDate].alias</alias>
+            <description>dataTable[com.kingdee.eas.custom.dormitorysystem.application.app.CT_APP_CheckInApplicationEntry].columns.column[CFCheckInDate].description</description>
+            <userDefined>true</userDefined>
+            <isMultilingual>false</isMultilingual>
+            <isEncoded>false</isEncoded>
+            <isNullable>true</isNullable>
+            <defaultValue />
+            <sqlType>DATETIME</sqlType>
+            <length>8</length>
+            <scale>0</scale>
+            <precision>0</precision>
+        </column>
     </columns>
     <primaryKey>
         <name>PK_CheckInApplicat</name>
@@ -249,6 +263,18 @@
             <lang locale="zh_HK" value="所在部門" />
             <lang locale="zh_TW" value="所在部門" />
         </rs>
+        <rs key="dataTable[com.kingdee.eas.custom.dormitorysystem.application.app.CT_APP_CheckInApplicationEntry].columns.column[CFCheckInDate].alias">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="入住日期" />
+            <lang locale="zh_HK" value="入住日期" />
+            <lang locale="zh_TW" value="入住日期" />
+        </rs>
+        <rs key="dataTable[com.kingdee.eas.custom.dormitorysystem.application.app.CT_APP_CheckInApplicationEntry].columns.column[CFCheckInDate].description">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="入住日期" />
+            <lang locale="zh_HK" value="入住日期" />
+            <lang locale="zh_TW" value="入住日期" />
+        </rs>
         <rs key="dataTable[com.kingdee.eas.custom.dormitorysystem.application.app.CT_APP_CheckInApplicationEntry].columns.column[CFCheckInRoomID].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="入住房间" />

metadata/com/kingdee/eas/custom/dormitorysystem/application/app/CheckInApplication.entity

@@ -201,7 +201,7 @@
             <isNullable>false</isNullable>
             <formula />
             <length>1</length>
-            <precision>0</precision>
+            <precision>1</precision>
             <decimalDigits>0</decimalDigits>
             <defaultValue>entityObject[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplication].properties.ownProperty[Fivouchered].defaultValue</defaultValue>
             <displayFormat />
@@ -221,7 +221,7 @@
             <isNullable>false</isNullable>
             <formula />
             <length>2000</length>
-            <precision>0</precision>
+            <precision>2000</precision>
             <decimalDigits>0</decimalDigits>
             <defaultValue>entityObject[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplication].properties.ownProperty[managementNotes].defaultValue</defaultValue>
             <displayFormat />

metadata/com/kingdee/eas/custom/dormitorysystem/application/app/CheckInApplicationEntry.entity

@@ -260,7 +260,7 @@
             <isNullable>false</isNullable>
             <formula />
             <length>2000</length>
-            <precision>0</precision>
+            <precision>2000</precision>
             <decimalDigits>0</decimalDigits>
             <defaultValue>entityObject[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationEntry].properties.ownProperty[notes].defaultValue</defaultValue>
             <displayFormat />
@@ -268,6 +268,26 @@
                 <key name="name" value="CFNotes" />
             </mappingField>
         </ownProperty>
+        <ownProperty>
+            <name>checkInDate</name>
+            <alias>entityObject[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationEntry].properties.ownProperty[checkInDate].alias</alias>
+            <description>entityObject[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationEntry].properties.ownProperty[checkInDate].description</description>
+            <userDefined>true</userDefined>
+            <configured>false</configured>
+            <dataType>Date</dataType>
+            <metadataRef />
+            <isMultilingual>false</isMultilingual>
+            <isNullable>false</isNullable>
+            <formula />
+            <length>8</length>
+            <precision>0</precision>
+            <decimalDigits>0</decimalDigits>
+            <defaultValue>entityObject[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationEntry].properties.ownProperty[checkInDate].defaultValue</defaultValue>
+            <displayFormat />
+            <mappingField>
+                <key name="name" value="CFCheckInDate" />
+            </mappingField>
+        </ownProperty>
     </properties>
     <logicalKey>
         <name>id</name>
@@ -625,6 +645,69 @@
             <lang locale="zh_CN" value="true" />
             <lang locale="zh_TW" value="true" />
         </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationEntry].properties.ownProperty[checkInDate].alias">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="入住日期" />
+            <lang locale="zh_HK" value="入住日期" />
+            <lang locale="zh_TW" value="入住日期" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationEntry].properties.ownProperty[checkInDate].defaultValue">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="null" />
+            <lang locale="zh_HK" value="null" />
+            <lang locale="zh_TW" value="null" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationEntry].properties.ownProperty[checkInDate].description">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="入住日期" />
+            <lang locale="zh_HK" value="入住日期" />
+            <lang locale="zh_TW" value="入住日期" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationEntry].properties.ownProperty[checkInDate].extendedProperty.ColWidthInKDTable">
+            <lang locale="en_US" value="50" />
+            <lang locale="zh_CN" value="50" />
+            <lang locale="zh_TW" value="50" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationEntry].properties.ownProperty[checkInDate].extendedProperty.bizDataType">
+            <lang locale="en_US" value="DATE" />
+            <lang locale="zh_CN" value="DATE" />
+            <lang locale="zh_TW" value="DATE" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationEntry].properties.ownProperty[checkInDate].extendedProperty.enableFieldPermission">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationEntry].properties.ownProperty[checkInDate].extendedProperty.isForGrouping">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationEntry].properties.ownProperty[checkInDate].extendedProperty.isForMapping">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationEntry].properties.ownProperty[checkInDate].extendedProperty.isForMatching">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationEntry].properties.ownProperty[checkInDate].extendedProperty.isForWrittenBack">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationEntry].properties.ownProperty[checkInDate].extendedProperty.isInCode">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationEntry].properties.ownProperty[checkInDate].extendedProperty.isVisibleForKDTable">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
         <rs key="entityObject[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationEntry].properties.ownProperty[notes].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="注意事项" />

metadata/com/kingdee/eas/custom/dormitorysystem/application/app/CheckInApplicationQuery.query

@@ -1412,6 +1412,37 @@
                 <key name="name" value="CheckInApplicationQuery" />
             </query>
         </queryField>
+        <queryField>
+            <name>entrys.checkInDate</name>
+            <userDefined>true</userDefined>
+            <formulaString>#0</formulaString>
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationQuery].units.queryField[entrys.checkInDate].displayName</displayName>
+            <groupType />
+            <isSelector>true</isSelector>
+            <isFilter>true</isFilter>
+            <isSorter>true</isSorter>
+            <isParameter>false</isParameter>
+            <returnType>Date</returnType>
+            <propertyRefs>
+                <propertyRef>
+                    <key>51268355-8d45-48f1-83af-c8d354f7dd3f</key>
+                    <parentUnit>
+                        <key name="name" value="entrys.checkInDate" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="entrys" />
+                    </subEntity>
+                    <refProperty>
+                        <key name="name" value="checkInDate" />
+                    </refProperty>
+                </propertyRef>
+            </propertyRefs>
+            <query>
+                <key name="package" value="com.kingdee.eas.custom.dormitorysystem.application.app" />
+                <key name="name" value="CheckInApplicationQuery" />
+            </query>
+        </queryField>
     </units>
     <defaultFilter>
         <name>defaultFilter</name>
@@ -2046,6 +2077,22 @@
             <lang locale="zh_CN" value="true" />
             <lang locale="zh_TW" value="true" />
         </rs>
+        <rs key="joinQuery[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationQuery].units.queryField[entrys.checkInDate].displayName">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="入住日期" />
+            <lang locale="zh_HK" value="入住日期" />
+            <lang locale="zh_TW" value="入住日期" />
+        </rs>
+        <rs key="joinQuery[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationQuery].units.queryField[entrys.checkInDate].extendedProperty.isCommonQueryFilter">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
+        <rs key="joinQuery[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationQuery].units.queryField[entrys.checkInDate].extendedProperty.isCommonQuerySorter">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
         <rs key="joinQuery[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationQuery].units.queryField[entrys.checkInRoom.RoomNumber].displayName">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="入住房间" />

metadata/com/kingdee/eas/custom/dormitorysystem/application/web/CheckInApplicationEditUI.webui

@@ -248,7 +248,7 @@
             <classType>com.kingdee.bos.ctrl.web.EditDataGrid</classType>
             <isContainer>true</isContainer>
             <constraints>x=5;y=94;width=997;height=604;autoSize=15</constraints>
-            <tabIndex>16</tabIndex>
+            <tabIndex>21</tabIndex>
             <herited>false</herited>
             <bimUIObjectPK />
             <layoutInfo>
@@ -1023,6 +1023,54 @@
                 </propertyBinding>
             </propertyBindings>
         </component>
+        <component>
+            <name>checkInDateColumn</name>
+            <alias>webUIObject[com.kingdee.eas.custom.dormitorysystem.application.web.CheckInApplicationEditUI].components.component[checkInDateColumn].alias</alias>
+            <userDefined>true</userDefined>
+            <classType>com.kingdee.bos.ctrl.web.EditableColumn</classType>
+            <isContainer>true</isContainer>
+            <constraints>width=170;height=19;newLine=false</constraints>
+            <tabIndex>0</tabIndex>
+            <herited>false</herited>
+            <bimUIObjectPK />
+            <layoutInfo>
+                <name>checkInDateWebLayout</name>
+                <type>WebLayout</type>
+                <value>0,1,false</value>
+            </layoutInfo>
+            <properties>
+                <property>
+                    <name>header</name>
+                    <type>java.lang.String</type>
+                    <value>webUIObject[com.kingdee.eas.custom.dormitorysystem.application.web.CheckInApplicationEditUI].components.component[checkInDateColumn].properties.property[header].value</value>
+                    <isMultiLan>true</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+                <property>
+                    <name>width</name>
+                    <type>int</type>
+                    <value>webUIObject[com.kingdee.eas.custom.dormitorysystem.application.web.CheckInApplicationEditUI].components.component[checkInDateColumn].properties.property[width].value</value>
+                    <isMultiLan>false</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+            </properties>
+            <parent>
+                <key name="name" value="dataGrid" />
+            </parent>
+            <propertyBindings>
+                <propertyBinding>
+                    <propertyName>value</propertyName>
+                    <propertyType>java.lang.Object</propertyType>
+                    <bindingObject>editData</bindingObject>
+                    <bindingField>entrys.checkInDate</bindingField>
+                    <fieldType>java.util.Date</fieldType>
+                    <accessType>2</accessType>
+                    <autoMode>false</autoMode>
+                    <herited>false</herited>
+                    <userDefined>true</userDefined>
+                </propertyBinding>
+            </propertyBindings>
+        </component>
         <component>
             <name>personEditor</name>
             <alias>webUIObject[com.kingdee.eas.custom.dormitorysystem.application.web.CheckInApplicationEditUI].components.component[personEditor].alias</alias>
@@ -1241,6 +1289,29 @@
                 <key name="name" value="notesColumn" />
             </parent>
         </component>
+        <component>
+            <name>checkInDateEditor</name>
+            <alias>webUIObject[com.kingdee.eas.custom.dormitorysystem.application.web.CheckInApplicationEditUI].components.component[checkInDateEditor].alias</alias>
+            <userDefined>true</userDefined>
+            <classType>com.kingdee.bos.ctrl.web.DateField</classType>
+            <isContainer>false</isContainer>
+            <constraints>width=170;height=19;newLine=false</constraints>
+            <tabIndex>0</tabIndex>
+            <herited>false</herited>
+            <bimUIObjectPK />
+            <properties>
+                <property>
+                    <name>castType</name>
+                    <type>java.lang.String</type>
+                    <value>webUIObject[com.kingdee.eas.custom.dormitorysystem.application.web.CheckInApplicationEditUI].components.component[checkInDateEditor].properties.property[castType].value</value>
+                    <isMultiLan>false</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+            </properties>
+            <parent>
+                <key name="name" value="checkInDateColumn" />
+            </parent>
+        </component>
         <component>
             <name>txtmanagementNotes</name>
             <alias>webUIObject[com.kingdee.eas.custom.dormitorysystem.application.web.CheckInApplicationEditUI].components.component[txtmanagementNotes].alias</alias>
@@ -1444,6 +1515,36 @@
             <lang locale="zh_HK" value="提交" />
             <lang locale="zh_TW" value="提交" />
         </rs>
+        <rs key="webUIObject[com.kingdee.eas.custom.dormitorysystem.application.web.CheckInApplicationEditUI].components.component[checkInDateColumn].alias">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="null" />
+            <lang locale="zh_HK" value="null" />
+            <lang locale="zh_TW" value="null" />
+        </rs>
+        <rs key="webUIObject[com.kingdee.eas.custom.dormitorysystem.application.web.CheckInApplicationEditUI].components.component[checkInDateColumn].properties.property[header].value">
+            <lang locale="en_US" value="入住日期" />
+            <lang locale="zh_CN" value="入住日期" />
+            <lang locale="zh_HK" value="入住日期" />
+            <lang locale="zh_TW" value="入住日期" />
+        </rs>
+        <rs key="webUIObject[com.kingdee.eas.custom.dormitorysystem.application.web.CheckInApplicationEditUI].components.component[checkInDateColumn].properties.property[width].value">
+            <lang locale="en_US" value="100" />
+            <lang locale="zh_CN" value="100" />
+            <lang locale="zh_HK" value="100" />
+            <lang locale="zh_TW" value="100" />
+        </rs>
+        <rs key="webUIObject[com.kingdee.eas.custom.dormitorysystem.application.web.CheckInApplicationEditUI].components.component[checkInDateEditor].alias">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="null" />
+            <lang locale="zh_HK" value="null" />
+            <lang locale="zh_TW" value="null" />
+        </rs>
+        <rs key="webUIObject[com.kingdee.eas.custom.dormitorysystem.application.web.CheckInApplicationEditUI].components.component[checkInDateEditor].properties.property[castType].value">
+            <lang locale="en_US" value="java.sql.Date" />
+            <lang locale="zh_CN" value="java.sql.Date" />
+            <lang locale="zh_HK" value="java.sql.Date" />
+            <lang locale="zh_TW" value="java.sql.Date" />
+        </rs>
         <rs key="webUIObject[com.kingdee.eas.custom.dormitorysystem.application.web.CheckInApplicationEditUI].components.component[checkInRoomColumn].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="null" />

metadata/com/kingdee/eas/custom/dormitorysystem/application/web/CheckInApplicationListUI.webui

@@ -859,6 +859,49 @@
                 </propertyBinding>
             </propertyBindings>
         </component>
+        <component>
+            <name>entrys_checkInDateColumn</name>
+            <alias>webUIObject[com.kingdee.eas.custom.dormitorysystem.application.web.CheckInApplicationListUI].components.component[entrys_checkInDateColumn].alias</alias>
+            <userDefined>true</userDefined>
+            <classType>com.kingdee.bos.ctrl.web.Column</classType>
+            <isContainer>false</isContainer>
+            <constraints>width=170;height=19;newLine=false</constraints>
+            <tabIndex>0</tabIndex>
+            <herited>false</herited>
+            <bimUIObjectPK />
+            <properties>
+                <property>
+                    <name>header</name>
+                    <type>java.lang.String</type>
+                    <value>webUIObject[com.kingdee.eas.custom.dormitorysystem.application.web.CheckInApplicationListUI].components.component[entrys_checkInDateColumn].properties.property[header].value</value>
+                    <isMultiLan>true</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+                <property>
+                    <name>width</name>
+                    <type>int</type>
+                    <value>webUIObject[com.kingdee.eas.custom.dormitorysystem.application.web.CheckInApplicationListUI].components.component[entrys_checkInDateColumn].properties.property[width].value</value>
+                    <isMultiLan>false</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+            </properties>
+            <parent>
+                <key name="name" value="listDataGrid" />
+            </parent>
+            <propertyBindings>
+                <propertyBinding>
+                    <propertyName>value</propertyName>
+                    <propertyType>java.lang.Object</propertyType>
+                    <bindingObject>mainQuery</bindingObject>
+                    <bindingField>entrys.checkInDate</bindingField>
+                    <fieldType>java.lang.String</fieldType>
+                    <accessType>2</accessType>
+                    <autoMode>false</autoMode>
+                    <herited>false</herited>
+                    <userDefined>true</userDefined>
+                </propertyBinding>
+            </propertyBindings>
+        </component>
         <component>
             <name>btnAddNew</name>
             <alias>webUIObject[com.kingdee.eas.custom.dormitorysystem.application.web.CheckInApplicationListUI].components.component[btnAddNew].alias</alias>
@@ -1320,6 +1363,24 @@
             <lang locale="zh_HK" value="100" />
             <lang locale="zh_TW" value="100" />
         </rs>
+        <rs key="webUIObject[com.kingdee.eas.custom.dormitorysystem.application.web.CheckInApplicationListUI].components.component[entrys_checkInDateColumn].alias">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="null" />
+            <lang locale="zh_HK" value="null" />
+            <lang locale="zh_TW" value="null" />
+        </rs>
+        <rs key="webUIObject[com.kingdee.eas.custom.dormitorysystem.application.web.CheckInApplicationListUI].components.component[entrys_checkInDateColumn].properties.property[header].value">
+            <lang locale="en_US" value="入住日期" />
+            <lang locale="zh_CN" value="入住日期" />
+            <lang locale="zh_HK" value="入住日期" />
+            <lang locale="zh_TW" value="入住日期" />
+        </rs>
+        <rs key="webUIObject[com.kingdee.eas.custom.dormitorysystem.application.web.CheckInApplicationListUI].components.component[entrys_checkInDateColumn].properties.property[width].value">
+            <lang locale="en_US" value="100" />
+            <lang locale="zh_CN" value="100" />
+            <lang locale="zh_HK" value="100" />
+            <lang locale="zh_TW" value="100" />
+        </rs>
         <rs key="webUIObject[com.kingdee.eas.custom.dormitorysystem.application.web.CheckInApplicationListUI].components.component[entrys_checkInRoom_RoomNumberColumn].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="null" />

src/com/kingdee/eas/custom/dormitorysystem/application/AbstractCheckInApplicationEntryInfo.java

@@ -83,6 +83,17 @@ public class AbstractCheckInApplicationEntryInfo extends com.kingdee.eas.hr.base
     {
         setString("notes", item);
     }
+    /**
+     * Object:·Ö¼'s ÈëסÈÕÆÚproperty 
+     */
+    public java.util.Date getCheckInDate()
+    {
+        return getDate("checkInDate");
+    }
+    public void setCheckInDate(java.util.Date item)
+    {
+        setDate("checkInDate", item);
+    }
     public BOSObjectType getBOSType()
     {
         return new BOSObjectType("D6514C12");

src/com/kingdee/eas/custom/dormitorysystem/application/app/CheckInApplicationControllerBean.java

@@ -4,18 +4,25 @@ import com.kingdee.bos.BOSException;
 import com.kingdee.bos.Context;
 import com.kingdee.bos.dao.IObjectPK;
 import com.kingdee.bos.dao.ormapping.ObjectUuidPK;
+import com.kingdee.bos.metadata.entity.SelectorItemCollection;
 import com.kingdee.bos.util.BOSUuid;
 import com.kingdee.eas.base.log.LogUtil;
+import com.kingdee.eas.basedata.person.IPerson;
+import com.kingdee.eas.basedata.person.PersonFacadeFactory;
+import com.kingdee.eas.basedata.person.PersonFactory;
+import com.kingdee.eas.basedata.person.PersonInfo;
 import com.kingdee.eas.common.EASBizException;
+import com.kingdee.eas.custom.dormitorysystem.application.CheckInApplicationEntryCollection;
+import com.kingdee.eas.custom.dormitorysystem.application.CheckInApplicationEntryInfo;
 import com.kingdee.eas.custom.dormitorysystem.application.CheckInApplicationInfo;
+import com.kingdee.eas.custom.dormitorysystem.occupants.OccupantsInfo;
 import com.kingdee.eas.framework.CoreBaseInfo;
-import com.kingdee.eas.hr.ats.AtsLeaveBillInfo;
-import com.kingdee.eas.hr.ats.holidayLimit.CancelHolidayLimit.CancelBillOperateLimitEntrance;
-import com.kingdee.eas.hr.base.ApproveTypeEnum;
-import com.kingdee.eas.hr.base.HRBillBaseInfo;
-import com.kingdee.eas.hr.base.HRBillStateEnum;
+import com.kingdee.shr.base.syssetting.BasicItemStateEnum;
+import com.kingdee.util.DateTimeUtils;
 import org.apache.log4j.Logger;
 
+import java.util.Date;
+
 public class CheckInApplicationControllerBean extends AbstractCheckInApplicationControllerBean {
     private static Logger logger = Logger.getLogger(CheckInApplicationControllerBean.class);
 
@@ -35,8 +42,48 @@ public class CheckInApplicationControllerBean extends AbstractCheckInApplication
     ) throws BOSException, EASBizException {
         IObjectPK iObjectPK = super._submitEffect(ctx, model);
         CheckInApplicationInfo info = (CheckInApplicationInfo) model;
-        //生成入住人员信息
-        //校验时间是否存在交叉
+        //Date date = DateTimeUtils.parseDate("2199-12-31", "yyyy-MM-dd");
+        CheckInApplicationEntryCollection entrys = info.getEntrys();
+        for (int i = 0; i < entrys.size(); i++) {
+            CheckInApplicationEntryInfo entryInfo = entrys.get(i);
+            PersonInfo personInfo = entryInfo.getPerson();
+            String personId = personInfo.getId().toString();
+            //校验员工用工关系状态
+            IPerson iPerson = PersonFactory.getLocalInstance(ctx);
+            SelectorItemCollection sic = new SelectorItemCollection();
+            sic.add("");
+            sic.add("");
+            sic.add("");
+            sic.add("");
+            sic.add("");
+
+            personInfo = iPerson.getPersonInfo(new ObjectUuidPK(personId), sic);
+            boolean isInCount = personInfo.getEmployeeType().isIsInCount();
+            if (!isInCount) {
+                //员工用工关系状态
+
+                //
+
+            }
+            //生成入住人员信息
+            //校验时间是否存在交叉
+            //生成入住人员信息
+            OccupantsInfo occupantsInfo = new OccupantsInfo();
+            //入住人员
+            occupantsInfo.setPerson(personInfo);
+            //入住日期
+            occupantsInfo.setCheckInDate(entryInfo.getCheckInDate());
+            //退宿日期
+            //occupantsInfo.setCheckOutDate(date);
+            //入住房间
+            occupantsInfo.setDormitory(entryInfo.getCheckInRoom());
+            //人员宿舍分类
+            //occupantsInfo.setPersonDormitoryType();
+            //状态:启用
+            //occupantsInfo.setState(BasicItemStateEnum.ENABLE);
+        }
+
+
         return iObjectPK;
     }