2024-08-01 .签证单管理选择项目界面，增加合同类型字段，按照合同类型进行排序显示

src/main/java/com/baosight/hggp/hg/cw/sql/HGCW002.xml

@@ -499,8 +499,12 @@
 	<select id="queryProjectComboBox" parameterClass="java.util.HashMap"
 			resultClass="java.util.HashMap">
 		SELECT DISTINCT
+		COMPANY_CODE	as "companyCode",  <!-- 公司编码 -->
+		COMPANY_NAME	as "companyName",  <!-- 公司名称 -->
 		PROJ_CODE	as "projCode",  <!-- 项目编码 -->
 		PROJ_NAME	as "projName",  <!-- 项目名称 -->
+		(SELECT ITEM_CNAME FROM ${platSchema}.tedcm01 WHERE CODESET_CODE = 'hggp.cw.contractType' AND ITEM_CODE = CONTRACT_TYPE) AS "contractType",
+		CONTRACT_TYPE,
 		CONTRACT_NUMBER	as "contractNumber",  <!-- 合同号 -->
 		CONTRACT_NAME	as "contractName",  <!-- 合同名称 -->
 		PARTY_A	as "partyA",  <!-- 甲方名称 -->
@@ -525,7 +529,7 @@
 		<isNotEmpty prepend=" AND " property="contractTyps">
 			CONTRACT_TYPE IN <iterate close=")" open="(" conjunction="," property="contractTyps">#contractTyps[]#</iterate>
 		</isNotEmpty>
-		ORDER BY CONTRACT_NUMBER
+		ORDER BY CONTRACT_TYPE asc, CONTRACT_NUMBER desc
 	</select>
 
 	<update id="updateBalanceStatus">

src/main/webapp/HG/CW/HGCW004.jsp

@@ -34,16 +34,17 @@
         <EF:EFGrid blockId="result" autoDraw="no" isFloat="true" autoBind="false">
             <EF:EFColumn ename="id" cname="主键" hidden="true"/>
             <EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="100" align="center"/>
+            <EF:EFColumn ename="companyCode" cname="所属公司" hidden="true"/>
             <EF:EFColumn ename="companyName" cname="所属公司" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFPopupColumn ename="projCode" cname="项目编号" width="200"
                              serviceName="HGCW002" methodName="projectComboBox"
                              resultId="projcet_combo_box" popupType="ServiceGrid"
                              valueField="projCode" textField="projCode"
-                             columnEnames="projCode,projName,contractNumber,contractName,partyA,partyB"
-                             columnCnames="项目编码,项目名称,合同号,合同名称,甲方名称,乙方名称"
-                             backFillColumnIds="projCode,projName,contractNumber,contractName,partyA,partyB"
-                             backFillFieldIds="projCode,projName,contractNumber,contractName,partyA,partyB"
-                             popupTitle="所属公司" popupWidth="800">
+                             columnEnames="companyCode,companyName,projCode,projName,contractType,contractNumber,contractName,partyA,partyB"
+                             columnCnames="公司编码,公司名称,项目编码,项目名称,合同类型,合同号,合同名称,甲方名称,乙方名称"
+                             backFillColumnIds="companyCode,companyName,projCode,projName,contractType,contractNumber,contractName,partyA,partyB"
+                             backFillFieldIds="companyCode,companyName,projCode,projName,contractType,contractNumber,contractName,partyA,partyB"
+                             popupTitle="所属公司" popupWidth="1200">
             </EF:EFPopupColumn>
             <EF:EFColumn ename="projName" cname="项目名称" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="contractNumber" cname="主合同号" width="120" enable="false" readonly="true" align="center"/>