Parcourir la source

入住申请单元数据更新

Heyuan il y a 7 mois
Parent
commit
4a3d818169

+ 851 - 0
metadata/com/kingdee/eas/custom/dormitorysystem/application/app/CheckInApplicationQuery.query

@@ -1443,6 +1443,719 @@
                 <key name="name" value="CheckInApplicationQuery" />
             </query>
         </queryField>
+        <queryField>
+            <name>entrys_person.id</name>
+            <userDefined>true</userDefined>
+            <formulaString />
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationQuery].units.queryField[entrys_person.id].displayName</displayName>
+            <groupType />
+            <isSelector>true</isSelector>
+            <isFilter>true</isFilter>
+            <isSorter>false</isSorter>
+            <isParameter>false</isParameter>
+            <returnType>String</returnType>
+            <propertyRefs>
+                <propertyRef>
+                    <key>2f4015da-1814-46c4-b959-43f11d815fea</key>
+                    <parentUnit>
+                        <key name="name" value="entrys_person.id" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="entrys_person" />
+                    </subEntity>
+                    <refProperty>
+                        <key name="name" value="id" />
+                    </refProperty>
+                </propertyRef>
+            </propertyRefs>
+            <query>
+                <key name="package" value="com.kingdee.eas.custom.dormitorysystem.application.app" />
+                <key name="name" value="CheckInApplicationQuery" />
+            </query>
+        </queryField>
+        <queryField>
+            <name>entrys_person.number</name>
+            <userDefined>true</userDefined>
+            <formulaString />
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationQuery].units.queryField[entrys_person.number].displayName</displayName>
+            <groupType />
+            <isSelector>true</isSelector>
+            <isFilter>true</isFilter>
+            <isSorter>false</isSorter>
+            <isParameter>false</isParameter>
+            <returnType>String</returnType>
+            <propertyRefs>
+                <propertyRef>
+                    <key>89165817-161b-496a-b786-3024d6ba11e1</key>
+                    <parentUnit>
+                        <key name="name" value="entrys_person.number" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="entrys_person" />
+                    </subEntity>
+                    <refProperty>
+                        <key name="name" value="number" />
+                    </refProperty>
+                </propertyRef>
+            </propertyRefs>
+            <query>
+                <key name="package" value="com.kingdee.eas.custom.dormitorysystem.application.app" />
+                <key name="name" value="CheckInApplicationQuery" />
+            </query>
+        </queryField>
+        <queryField>
+            <name>entrys_adminOrg.id</name>
+            <userDefined>true</userDefined>
+            <formulaString />
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationQuery].units.queryField[entrys_adminOrg.id].displayName</displayName>
+            <groupType />
+            <isSelector>true</isSelector>
+            <isFilter>true</isFilter>
+            <isSorter>false</isSorter>
+            <isParameter>false</isParameter>
+            <returnType>String</returnType>
+            <propertyRefs>
+                <propertyRef>
+                    <key>32b1b888-9461-4051-8787-db353dadebfc</key>
+                    <parentUnit>
+                        <key name="name" value="entrys_adminOrg.id" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="entrys_adminOrg" />
+                    </subEntity>
+                    <refProperty>
+                        <key name="name" value="id" />
+                    </refProperty>
+                </propertyRef>
+            </propertyRefs>
+            <query>
+                <key name="package" value="com.kingdee.eas.custom.dormitorysystem.application.app" />
+                <key name="name" value="CheckInApplicationQuery" />
+            </query>
+        </queryField>
+        <queryField>
+            <name>entrys_adminOrg.number</name>
+            <userDefined>true</userDefined>
+            <formulaString />
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationQuery].units.queryField[entrys_adminOrg.number].displayName</displayName>
+            <groupType />
+            <isSelector>true</isSelector>
+            <isFilter>true</isFilter>
+            <isSorter>false</isSorter>
+            <isParameter>false</isParameter>
+            <returnType>String</returnType>
+            <propertyRefs>
+                <propertyRef>
+                    <key>32fb56e3-a55a-45cb-bfbd-8ed972f4ae63</key>
+                    <parentUnit>
+                        <key name="name" value="entrys_adminOrg.number" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="entrys_adminOrg" />
+                    </subEntity>
+                    <refProperty>
+                        <key name="name" value="number" />
+                    </refProperty>
+                </propertyRef>
+            </propertyRefs>
+            <query>
+                <key name="package" value="com.kingdee.eas.custom.dormitorysystem.application.app" />
+                <key name="name" value="CheckInApplicationQuery" />
+            </query>
+        </queryField>
+        <queryField>
+            <name>entrys_adminOrg.longNumber</name>
+            <userDefined>true</userDefined>
+            <formulaString />
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationQuery].units.queryField[entrys_adminOrg.longNumber].displayName</displayName>
+            <groupType />
+            <isSelector>true</isSelector>
+            <isFilter>true</isFilter>
+            <isSorter>false</isSorter>
+            <isParameter>false</isParameter>
+            <returnType>String</returnType>
+            <propertyRefs>
+                <propertyRef>
+                    <key>d696ce7e-31ad-4873-bfb4-dd45d283e6f6</key>
+                    <parentUnit>
+                        <key name="name" value="entrys_adminOrg.longNumber" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="entrys_adminOrg" />
+                    </subEntity>
+                    <refProperty>
+                        <key name="name" value="longNumber" />
+                    </refProperty>
+                </propertyRef>
+            </propertyRefs>
+            <query>
+                <key name="package" value="com.kingdee.eas.custom.dormitorysystem.application.app" />
+                <key name="name" value="CheckInApplicationQuery" />
+            </query>
+        </queryField>
+        <queryField>
+            <name>entrys_adminOrg.displayName</name>
+            <userDefined>true</userDefined>
+            <formulaString />
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationQuery].units.queryField[entrys_adminOrg.displayName].displayName</displayName>
+            <groupType />
+            <isSelector>true</isSelector>
+            <isFilter>true</isFilter>
+            <isSorter>false</isSorter>
+            <isParameter>false</isParameter>
+            <returnType>String</returnType>
+            <propertyRefs>
+                <propertyRef>
+                    <key>5c88085e-edb5-46f2-b784-a587c75438db</key>
+                    <parentUnit>
+                        <key name="name" value="entrys_adminOrg.displayName" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="entrys_adminOrg" />
+                    </subEntity>
+                    <refProperty>
+                        <key name="name" value="displayName" />
+                    </refProperty>
+                </propertyRef>
+            </propertyRefs>
+            <query>
+                <key name="package" value="com.kingdee.eas.custom.dormitorysystem.application.app" />
+                <key name="name" value="CheckInApplicationQuery" />
+            </query>
+        </queryField>
+        <queryField>
+            <name>entrys_position.id</name>
+            <userDefined>true</userDefined>
+            <formulaString />
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationQuery].units.queryField[entrys_position.id].displayName</displayName>
+            <groupType />
+            <isSelector>true</isSelector>
+            <isFilter>true</isFilter>
+            <isSorter>false</isSorter>
+            <isParameter>false</isParameter>
+            <returnType>String</returnType>
+            <propertyRefs>
+                <propertyRef>
+                    <key>70ee1249-a3f6-4585-a526-6f84e5f42eac</key>
+                    <parentUnit>
+                        <key name="name" value="entrys_position.id" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="entrys_position" />
+                    </subEntity>
+                    <refProperty>
+                        <key name="name" value="id" />
+                    </refProperty>
+                </propertyRef>
+            </propertyRefs>
+            <query>
+                <key name="package" value="com.kingdee.eas.custom.dormitorysystem.application.app" />
+                <key name="name" value="CheckInApplicationQuery" />
+            </query>
+        </queryField>
+        <queryField>
+            <name>entrys_position.name</name>
+            <userDefined>true</userDefined>
+            <formulaString />
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationQuery].units.queryField[entrys_position.name].displayName</displayName>
+            <groupType />
+            <isSelector>true</isSelector>
+            <isFilter>true</isFilter>
+            <isSorter>false</isSorter>
+            <isParameter>false</isParameter>
+            <returnType>String</returnType>
+            <propertyRefs>
+                <propertyRef>
+                    <key>6e7e5d8e-dce1-4f7c-bb50-dfa3abecc1e9</key>
+                    <parentUnit>
+                        <key name="name" value="entrys_position.name" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="entrys_position" />
+                    </subEntity>
+                    <refProperty>
+                        <key name="name" value="name" />
+                    </refProperty>
+                </propertyRef>
+            </propertyRefs>
+            <query>
+                <key name="package" value="com.kingdee.eas.custom.dormitorysystem.application.app" />
+                <key name="name" value="CheckInApplicationQuery" />
+            </query>
+        </queryField>
+        <queryField>
+            <name>entrys_position.number</name>
+            <userDefined>true</userDefined>
+            <formulaString />
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationQuery].units.queryField[entrys_position.number].displayName</displayName>
+            <groupType />
+            <isSelector>true</isSelector>
+            <isFilter>true</isFilter>
+            <isSorter>false</isSorter>
+            <isParameter>false</isParameter>
+            <returnType>String</returnType>
+            <propertyRefs>
+                <propertyRef>
+                    <key>89013c69-0f22-492a-bf16-d071107e046b</key>
+                    <parentUnit>
+                        <key name="name" value="entrys_position.number" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="entrys_position" />
+                    </subEntity>
+                    <refProperty>
+                        <key name="name" value="number" />
+                    </refProperty>
+                </propertyRef>
+            </propertyRefs>
+            <query>
+                <key name="package" value="com.kingdee.eas.custom.dormitorysystem.application.app" />
+                <key name="name" value="CheckInApplicationQuery" />
+            </query>
+        </queryField>
+        <queryField>
+            <name>entrys_checkInRoom.RoomNumber</name>
+            <userDefined>true</userDefined>
+            <formulaString />
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationQuery].units.queryField[entrys_checkInRoom.RoomNumber].displayName</displayName>
+            <groupType />
+            <isSelector>true</isSelector>
+            <isFilter>true</isFilter>
+            <isSorter>false</isSorter>
+            <isParameter>false</isParameter>
+            <returnType>String</returnType>
+            <propertyRefs>
+                <propertyRef>
+                    <key>182587c1-6bcb-4313-a5e4-4b3ba0695561</key>
+                    <parentUnit>
+                        <key name="name" value="entrys_checkInRoom.RoomNumber" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="entrys_checkInRoom" />
+                    </subEntity>
+                    <refProperty>
+                        <key name="name" value="RoomNumber" />
+                    </refProperty>
+                </propertyRef>
+            </propertyRefs>
+            <query>
+                <key name="package" value="com.kingdee.eas.custom.dormitorysystem.application.app" />
+                <key name="name" value="CheckInApplicationQuery" />
+            </query>
+        </queryField>
+        <queryField>
+            <name>entrys_checkInRoom.RoomClassification</name>
+            <userDefined>true</userDefined>
+            <formulaString />
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationQuery].units.queryField[entrys_checkInRoom.RoomClassification].displayName</displayName>
+            <groupType />
+            <isSelector>true</isSelector>
+            <isFilter>true</isFilter>
+            <isSorter>false</isSorter>
+            <isParameter>false</isParameter>
+            <returnType>String</returnType>
+            <propertyRefs>
+                <propertyRef>
+                    <key>4425780e-2c2e-4205-864b-7e7031f37ef7</key>
+                    <parentUnit>
+                        <key name="name" value="entrys_checkInRoom.RoomClassification" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="entrys_checkInRoom" />
+                    </subEntity>
+                    <refProperty>
+                        <key name="name" value="RoomClassification" />
+                    </refProperty>
+                </propertyRef>
+            </propertyRefs>
+            <query>
+                <key name="package" value="com.kingdee.eas.custom.dormitorysystem.application.app" />
+                <key name="name" value="CheckInApplicationQuery" />
+            </query>
+        </queryField>
+        <queryField>
+            <name>entrys_checkInRoom.OccupantsNumber</name>
+            <userDefined>true</userDefined>
+            <formulaString />
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationQuery].units.queryField[entrys_checkInRoom.OccupantsNumber].displayName</displayName>
+            <groupType />
+            <isSelector>true</isSelector>
+            <isFilter>true</isFilter>
+            <isSorter>false</isSorter>
+            <isParameter>false</isParameter>
+            <returnType>Int</returnType>
+            <propertyRefs>
+                <propertyRef>
+                    <key>60b1e393-2d19-43dc-bfb4-7c6e8f2f45a0</key>
+                    <parentUnit>
+                        <key name="name" value="entrys_checkInRoom.OccupantsNumber" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="entrys_checkInRoom" />
+                    </subEntity>
+                    <refProperty>
+                        <key name="name" value="OccupantsNumber" />
+                    </refProperty>
+                </propertyRef>
+            </propertyRefs>
+            <query>
+                <key name="package" value="com.kingdee.eas.custom.dormitorysystem.application.app" />
+                <key name="name" value="CheckInApplicationQuery" />
+            </query>
+        </queryField>
+        <queryField>
+            <name>entrys_checkInRoom.OccupancyCapacity</name>
+            <userDefined>true</userDefined>
+            <formulaString />
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationQuery].units.queryField[entrys_checkInRoom.OccupancyCapacity].displayName</displayName>
+            <groupType />
+            <isSelector>true</isSelector>
+            <isFilter>true</isFilter>
+            <isSorter>false</isSorter>
+            <isParameter>false</isParameter>
+            <returnType>Int</returnType>
+            <propertyRefs>
+                <propertyRef>
+                    <key>87b67fd2-8d1a-4983-a82c-17264dfdb421</key>
+                    <parentUnit>
+                        <key name="name" value="entrys_checkInRoom.OccupancyCapacity" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="entrys_checkInRoom" />
+                    </subEntity>
+                    <refProperty>
+                        <key name="name" value="OccupancyCapacity" />
+                    </refProperty>
+                </propertyRef>
+            </propertyRefs>
+            <query>
+                <key name="package" value="com.kingdee.eas.custom.dormitorysystem.application.app" />
+                <key name="name" value="CheckInApplicationQuery" />
+            </query>
+        </queryField>
+        <queryField>
+            <name>entrys_checkInRoom.IsFull</name>
+            <userDefined>true</userDefined>
+            <formulaString />
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationQuery].units.queryField[entrys_checkInRoom.IsFull].displayName</displayName>
+            <groupType />
+            <isSelector>true</isSelector>
+            <isFilter>true</isFilter>
+            <isSorter>false</isSorter>
+            <isParameter>false</isParameter>
+            <returnType>Boolean</returnType>
+            <propertyRefs>
+                <propertyRef>
+                    <key>c3d81678-a1cd-4244-a868-9fe67bb94599</key>
+                    <parentUnit>
+                        <key name="name" value="entrys_checkInRoom.IsFull" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="entrys_checkInRoom" />
+                    </subEntity>
+                    <refProperty>
+                        <key name="name" value="IsFull" />
+                    </refProperty>
+                </propertyRef>
+            </propertyRefs>
+            <query>
+                <key name="package" value="com.kingdee.eas.custom.dormitorysystem.application.app" />
+                <key name="name" value="CheckInApplicationQuery" />
+            </query>
+        </queryField>
+        <queryField>
+            <name>entrys_checkInRoom.state</name>
+            <userDefined>true</userDefined>
+            <formulaString />
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationQuery].units.queryField[entrys_checkInRoom.state].displayName</displayName>
+            <groupType />
+            <isSelector>true</isSelector>
+            <isFilter>true</isFilter>
+            <isSorter>false</isSorter>
+            <isParameter>false</isParameter>
+            <returnType>Int</returnType>
+            <propertyRefs>
+                <propertyRef>
+                    <key>183f3c9a-1206-4767-a617-ed22043e371a</key>
+                    <parentUnit>
+                        <key name="name" value="entrys_checkInRoom.state" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="entrys_checkInRoom" />
+                    </subEntity>
+                    <refProperty>
+                        <key name="name" value="state" />
+                    </refProperty>
+                </propertyRef>
+            </propertyRefs>
+            <query>
+                <key name="package" value="com.kingdee.eas.custom.dormitorysystem.application.app" />
+                <key name="name" value="CheckInApplicationQuery" />
+            </query>
+        </queryField>
+        <queryField>
+            <name>entrys_checkInRoom.isSealUp</name>
+            <userDefined>true</userDefined>
+            <formulaString />
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationQuery].units.queryField[entrys_checkInRoom.isSealUp].displayName</displayName>
+            <groupType />
+            <isSelector>true</isSelector>
+            <isFilter>true</isFilter>
+            <isSorter>false</isSorter>
+            <isParameter>false</isParameter>
+            <returnType>Boolean</returnType>
+            <propertyRefs>
+                <propertyRef>
+                    <key>3f2f96d7-3fbe-44ca-9b93-e2e6f49d595e</key>
+                    <parentUnit>
+                        <key name="name" value="entrys_checkInRoom.isSealUp" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="entrys_checkInRoom" />
+                    </subEntity>
+                    <refProperty>
+                        <key name="name" value="isSealUp" />
+                    </refProperty>
+                </propertyRef>
+            </propertyRefs>
+            <query>
+                <key name="package" value="com.kingdee.eas.custom.dormitorysystem.application.app" />
+                <key name="name" value="CheckInApplicationQuery" />
+            </query>
+        </queryField>
+        <queryField>
+            <name>entrys_checkInRoom.longNumber</name>
+            <userDefined>true</userDefined>
+            <formulaString />
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationQuery].units.queryField[entrys_checkInRoom.longNumber].displayName</displayName>
+            <groupType />
+            <isSelector>true</isSelector>
+            <isFilter>true</isFilter>
+            <isSorter>false</isSorter>
+            <isParameter>false</isParameter>
+            <returnType>String</returnType>
+            <propertyRefs>
+                <propertyRef>
+                    <key>c02ba050-1a53-47a4-89c3-5607a9f3f1d1</key>
+                    <parentUnit>
+                        <key name="name" value="entrys_checkInRoom.longNumber" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="entrys_checkInRoom" />
+                    </subEntity>
+                    <refProperty>
+                        <key name="name" value="longNumber" />
+                    </refProperty>
+                </propertyRef>
+            </propertyRefs>
+            <query>
+                <key name="package" value="com.kingdee.eas.custom.dormitorysystem.application.app" />
+                <key name="name" value="CheckInApplicationQuery" />
+            </query>
+        </queryField>
+        <queryField>
+            <name>entrys_checkInRoom.displayName</name>
+            <userDefined>true</userDefined>
+            <formulaString />
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationQuery].units.queryField[entrys_checkInRoom.displayName].displayName</displayName>
+            <groupType />
+            <isSelector>true</isSelector>
+            <isFilter>true</isFilter>
+            <isSorter>false</isSorter>
+            <isParameter>false</isParameter>
+            <returnType>String</returnType>
+            <propertyRefs>
+                <propertyRef>
+                    <key>6a041bdf-2262-47d0-aa03-a3242cd949bf</key>
+                    <parentUnit>
+                        <key name="name" value="entrys_checkInRoom.displayName" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="entrys_checkInRoom" />
+                    </subEntity>
+                    <refProperty>
+                        <key name="name" value="displayName" />
+                    </refProperty>
+                </propertyRef>
+            </propertyRefs>
+            <query>
+                <key name="package" value="com.kingdee.eas.custom.dormitorysystem.application.app" />
+                <key name="name" value="CheckInApplicationQuery" />
+            </query>
+        </queryField>
+        <queryField>
+            <name>entrys_checkInRoom.number</name>
+            <userDefined>true</userDefined>
+            <formulaString />
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationQuery].units.queryField[entrys_checkInRoom.number].displayName</displayName>
+            <groupType />
+            <isSelector>true</isSelector>
+            <isFilter>true</isFilter>
+            <isSorter>false</isSorter>
+            <isParameter>false</isParameter>
+            <returnType>String</returnType>
+            <propertyRefs>
+                <propertyRef>
+                    <key>a9505cbd-d985-4998-8c24-3219d487e559</key>
+                    <parentUnit>
+                        <key name="name" value="entrys_checkInRoom.number" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="entrys_checkInRoom" />
+                    </subEntity>
+                    <refProperty>
+                        <key name="name" value="number" />
+                    </refProperty>
+                </propertyRef>
+            </propertyRefs>
+            <query>
+                <key name="package" value="com.kingdee.eas.custom.dormitorysystem.application.app" />
+                <key name="name" value="CheckInApplicationQuery" />
+            </query>
+        </queryField>
+        <queryField>
+            <name>entrys_checkInRoom.id</name>
+            <userDefined>true</userDefined>
+            <formulaString />
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationQuery].units.queryField[entrys_checkInRoom.id].displayName</displayName>
+            <groupType />
+            <isSelector>true</isSelector>
+            <isFilter>true</isFilter>
+            <isSorter>false</isSorter>
+            <isParameter>false</isParameter>
+            <returnType>String</returnType>
+            <propertyRefs>
+                <propertyRef>
+                    <key>4a1a9864-9a8d-43e9-b25f-1f66f9f68898</key>
+                    <parentUnit>
+                        <key name="name" value="entrys_checkInRoom.id" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="entrys_checkInRoom" />
+                    </subEntity>
+                    <refProperty>
+                        <key name="name" value="id" />
+                    </refProperty>
+                </propertyRef>
+            </propertyRefs>
+            <query>
+                <key name="package" value="com.kingdee.eas.custom.dormitorysystem.application.app" />
+                <key name="name" value="CheckInApplicationQuery" />
+            </query>
+        </queryField>
+        <queryField>
+            <name>billState</name>
+            <userDefined>true</userDefined>
+            <formulaString />
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationQuery].units.queryField[billState].displayName</displayName>
+            <groupType />
+            <isSelector>true</isSelector>
+            <isFilter>true</isFilter>
+            <isSorter>false</isSorter>
+            <isParameter>false</isParameter>
+            <returnType>Int</returnType>
+            <propertyRefs>
+                <propertyRef>
+                    <key>0e883b68-36d7-4019-aec9-6c1dd7922937</key>
+                    <parentUnit>
+                        <key name="name" value="billState" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="CheckInApplication" />
+                    </subEntity>
+                    <refProperty>
+                        <key name="name" value="billState" />
+                    </refProperty>
+                </propertyRef>
+            </propertyRefs>
+            <query>
+                <key name="package" value="com.kingdee.eas.custom.dormitorysystem.application.app" />
+                <key name="name" value="CheckInApplicationQuery" />
+            </query>
+        </queryField>
+        <queryField>
+            <name>sourceFunction</name>
+            <userDefined>true</userDefined>
+            <formulaString />
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationQuery].units.queryField[sourceFunction].displayName</displayName>
+            <groupType />
+            <isSelector>true</isSelector>
+            <isFilter>true</isFilter>
+            <isSorter>false</isSorter>
+            <isParameter>false</isParameter>
+            <returnType>String</returnType>
+            <propertyRefs>
+                <propertyRef>
+                    <key>ac3d31a6-fe30-41c4-ab17-b9b2f7b81d53</key>
+                    <parentUnit>
+                        <key name="name" value="sourceFunction" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="CheckInApplication" />
+                    </subEntity>
+                    <refProperty>
+                        <key name="name" value="sourceFunction" />
+                    </refProperty>
+                </propertyRef>
+            </propertyRefs>
+            <query>
+                <key name="package" value="com.kingdee.eas.custom.dormitorysystem.application.app" />
+                <key name="name" value="CheckInApplicationQuery" />
+            </query>
+        </queryField>
+        <queryField>
+            <name>entrys_checkInRoom.name</name>
+            <userDefined>true</userDefined>
+            <formulaString />
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationQuery].units.queryField[entrys_checkInRoom.name].displayName</displayName>
+            <groupType />
+            <isSelector>true</isSelector>
+            <isFilter>true</isFilter>
+            <isSorter>false</isSorter>
+            <isParameter>false</isParameter>
+            <returnType>String</returnType>
+            <propertyRefs>
+                <propertyRef>
+                    <key>15bfa96c-1b79-477c-8871-6e53d2cd2722</key>
+                    <parentUnit>
+                        <key name="name" value="entrys_checkInRoom.name" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="entrys_checkInRoom" />
+                    </subEntity>
+                    <refProperty>
+                        <key name="name" value="name" />
+                    </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>
@@ -1996,6 +2709,12 @@
             <lang locale="zh_HK" value="用戶名" />
             <lang locale="zh_TW" value="用戶名" />
         </rs>
+        <rs key="joinQuery[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationQuery].units.queryField[billState].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[bizDate].displayName">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="业务日期" />
@@ -2194,6 +2913,132 @@
             <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_adminOrg.displayName].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_adminOrg.id].displayName">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="ID" />
+            <lang locale="zh_HK" value="ID" />
+            <lang locale="zh_TW" value="ID" />
+        </rs>
+        <rs key="joinQuery[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationQuery].units.queryField[entrys_adminOrg.longNumber].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_adminOrg.number].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_checkInRoom.IsFull].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_checkInRoom.OccupancyCapacity].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_checkInRoom.OccupantsNumber].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_checkInRoom.RoomClassification].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_checkInRoom.RoomNumber].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_checkInRoom.displayName].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_checkInRoom.id].displayName">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="ID" />
+            <lang locale="zh_HK" value="ID" />
+            <lang locale="zh_TW" value="ID" />
+        </rs>
+        <rs key="joinQuery[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationQuery].units.queryField[entrys_checkInRoom.isSealUp].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_checkInRoom.longNumber].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_checkInRoom.name].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_checkInRoom.number].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_checkInRoom.state].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_person.id].displayName">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="ID" />
+            <lang locale="zh_HK" value="ID" />
+            <lang locale="zh_TW" value="ID" />
+        </rs>
+        <rs key="joinQuery[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationQuery].units.queryField[entrys_person.number].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_position.id].displayName">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="ID" />
+            <lang locale="zh_HK" value="ID" />
+            <lang locale="zh_TW" value="ID" />
+        </rs>
+        <rs key="joinQuery[com.kingdee.eas.custom.dormitorysystem.application.app.CheckInApplicationQuery].units.queryField[entrys_position.name].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_position.number].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[handler.name].displayName">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="别名" />
@@ -2272,5 +3117,11 @@
             <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[sourceFunction].displayName">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="来源功能" />
+            <lang locale="zh_HK" value="來源功能" />
+            <lang locale="zh_TW" value="來源功能" />
+        </rs>
     </resource>
 </joinQuery>

+ 10 - 3
src/com/kingdee/eas/custom/dormitorysystem/application/app/CheckInApplicationControllerBean.java

@@ -2,6 +2,7 @@ package com.kingdee.eas.custom.dormitorysystem.application.app;
 
 import com.kingdee.bos.BOSException;
 import com.kingdee.bos.Context;
+import com.kingdee.bos.dao.IObjectCollection;
 import com.kingdee.bos.dao.IObjectPK;
 import com.kingdee.bos.dao.ormapping.ObjectUuidPK;
 import com.kingdee.bos.metadata.entity.SelectorItemCollection;
@@ -15,6 +16,8 @@ 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.IOccupants;
+import com.kingdee.eas.custom.dormitorysystem.occupants.OccupantsFactory;
 import com.kingdee.eas.custom.dormitorysystem.occupants.OccupantsInfo;
 import com.kingdee.eas.framework.CoreBaseInfo;
 import com.kingdee.shr.base.syssetting.BasicItemStateEnum;
@@ -44,6 +47,7 @@ public class CheckInApplicationControllerBean extends AbstractCheckInApplication
         CheckInApplicationInfo info = (CheckInApplicationInfo) model;
         //Date date = DateTimeUtils.parseDate("2199-12-31", "yyyy-MM-dd");
         CheckInApplicationEntryCollection entrys = info.getEntrys();
+        IOccupants iOccupants = OccupantsFactory.getLocalInstance(ctx);
         for (int i = 0; i < entrys.size(); i++) {
             CheckInApplicationEntryInfo entryInfo = entrys.get(i);
             PersonInfo personInfo = entryInfo.getPerson();
@@ -54,8 +58,7 @@ public class CheckInApplicationControllerBean extends AbstractCheckInApplication
             sic.add("");
             sic.add("");
             sic.add("");
-            sic.add("");
-            sic.add("");
+
 
             personInfo = iPerson.getPersonInfo(new ObjectUuidPK(personId), sic);
             boolean isInCount = personInfo.getEmployeeType().isIsInCount();
@@ -67,6 +70,7 @@ public class CheckInApplicationControllerBean extends AbstractCheckInApplication
             }
             //生成入住人员信息
             //校验时间是否存在交叉
+
             //生成入住人员信息
             OccupantsInfo occupantsInfo = new OccupantsInfo();
             //入住人员
@@ -74,13 +78,14 @@ public class CheckInApplicationControllerBean extends AbstractCheckInApplication
             //入住日期
             occupantsInfo.setCheckInDate(entryInfo.getCheckInDate());
             //退宿日期
-            //occupantsInfo.setCheckOutDate(date);
+           // occupantsInfo.setCheckOutDate(date);
             //入住房间
             occupantsInfo.setDormitory(entryInfo.getCheckInRoom());
             //人员宿舍分类
             //occupantsInfo.setPersonDormitoryType();
             //状态:启用
             //occupantsInfo.setState(BasicItemStateEnum.ENABLE);
+            iOccupants.addnew(occupantsInfo);
         }
 
 
@@ -100,6 +105,8 @@ public class CheckInApplicationControllerBean extends AbstractCheckInApplication
             Context ctx,
             String billId
     ) throws BOSException, EASBizException {
+        //没有水电明细的可以反审批
+        CheckInApplicationInfo info = getCheckInApplicationInfo(ctx, new ObjectUuidPK(billId));
         super._untiCheckBizBill(ctx, billId);
     }
 }