2024-09-12 签证单选择项目修复，销售合同的甲方筛选问题，翻页问题

src/main/java/com/baosight/hggp/hg/cw/domain/HGCW002.java

@@ -155,6 +155,7 @@ public class HGCW002 extends DaoEPBase {
 	private String updatedTime = " ";		/* 记录修改时间*/
 	private String depCode = " ";		/* 部门编码*/
 	private BigDecimal remainingAmount = new BigDecimal("0");		/* 剩余开票/收票金额*/
+	private String contractTypeStr = "";	/* 合同类型;1销售合同2劳务合同3补充协议4合同外用工*/
 
 	/**
 	 * initialize the metadata.
@@ -338,6 +339,10 @@ public class HGCW002 extends DaoEPBase {
 		eiColumn.setFieldLength(15);
 		eiColumn.setDescName("剩余开票/收票金额");
 		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn("contractTypeStr");
+		eiColumn.setDescName("合同类型");
+		eiMetadata.addMeta(eiColumn);
 	}
 
 	/**
@@ -996,6 +1001,14 @@ public class HGCW002 extends DaoEPBase {
 		this.remainingAmount = remainingAmount;
 	}
 
+	public String getContractTypeStr() {
+		return contractTypeStr;
+	}
+
+	public void setContractTypeStr(String contractTypeStr) {
+		this.contractTypeStr = contractTypeStr;
+	}
+
 	/**
 	 * get the value from Map.
 	 *
@@ -1045,6 +1058,7 @@ public class HGCW002 extends DaoEPBase {
 		setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_TIME)), updatedTime));
 		setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEP_CODE)), depCode));
 		setRemainingAmount(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_REMAINING_AMOUNT)), remainingAmount));
+		setContractTypeStr(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("contractTypeStr")), contractTypeStr));
 	}
 
 	/**
@@ -1095,6 +1109,7 @@ public class HGCW002 extends DaoEPBase {
 		map.put(FIELD_UPDATED_TIME, StringUtils.toString(updatedTime, eiMetadata.getMeta(FIELD_UPDATED_TIME)));
 		map.put(FIELD_DEP_CODE, StringUtils.toString(depCode, eiMetadata.getMeta(FIELD_DEP_CODE)));
 		map.put(FIELD_REMAINING_AMOUNT, StringUtils.toString(remainingAmount, eiMetadata.getMeta(FIELD_REMAINING_AMOUNT)));
+		map.put("contractTypeStr", StringUtils.toString(contractTypeStr, eiMetadata.getMeta("contractTypeStr")));
 
 		return map;
 	}

src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW002A.java

@@ -19,6 +19,7 @@ import com.baosight.hggp.hg.xs.tools.HGXSTools;
 import com.baosight.hggp.util.*;
 import com.baosight.hggp.util.contants.ACConstants;
 import com.baosight.iplat4j.core.ei.EiBlock;
+import com.baosight.iplat4j.core.ei.EiBlockMeta;
 import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.exception.PlatException;
@@ -69,7 +70,8 @@ public class ServiceHGCW002A extends ServiceBase {
 			String contractCategory = inInfo.getString("contractCategory");
 			String partyA = inInfo.getString("partyA");
 			if (contractCategory.equals("1")) {
-				List<HGPZ002> hgpz002List = MapUtils.toDaoEPBases(super.query(inInfo,HGPZ002.QUERY, new HGPZ002()).getBlock(EiConstant.resultBlock).getRows(), HGPZ002.class);
+				inInfo = super.query(inInfo,HGPZ002.QUERY, new HGPZ002(),false,new HGPZ002().eiMetadata,EiConstant.queryBlock, "partyAResult", "partyAResult");
+				List<HGPZ002> hgpz002List = MapUtils.toDaoEPBases(inInfo.getBlock("partyAResult").getRows(), HGPZ002.class);
 				if (CollectionUtils.isNotEmpty(hgpz002List)) {
 					if(params.size()>0){
 						Map<String,String> params1 = params.get(0);
@@ -152,8 +154,8 @@ public class ServiceHGCW002A extends ServiceBase {
 					userVOList.add(userVO);
 					}
 				}
-
-			inInfo.addBlock("partyAResult").addRows(userVOList);
+			//inInfo.getBlock("partyAResult").set(EiConstant.countStr, userVOList.size());
+			inInfo.getBlock("partyAResult").setRows(userVOList);
 		} catch (PlatException e) {
 			LogUtils.setDetailMsg(inInfo, e, "甲方名称查询失败");
 		}
@@ -213,7 +215,8 @@ public class ServiceHGCW002A extends ServiceBase {
 				}
 			}
 			else if (contractCategory.equals("2")) {
-				List<HGPZ003> hgpz003List = MapUtils.toDaoEPBases(super.query(inInfo,HGPZ003.QUERY, new HGPZ003()).getBlock(EiConstant.resultBlock).getRows(), HGPZ003.class);
+				inInfo = super.query(inInfo,HGPZ003.QUERY, new HGPZ003(),false,new HGPZ003().eiMetadata,EiConstant.queryBlock, "partyAResult", "partyAResult");
+				List<HGPZ003> hgpz003List = MapUtils.toDaoEPBases(inInfo.getBlock("partyAResult").getRows(), HGPZ003.class);
 				if (CollectionUtils.isNotEmpty(hgpz003List)) {
 					if(params.size()>0){
 						Map<String,String> params1 = params.get(0);
@@ -256,7 +259,8 @@ public class ServiceHGCW002A extends ServiceBase {
 					});
 				}
 			}
-			inInfo.addBlock("partyAResult").addRows(userVOList);
+			//inInfo.getBlock("partyAResult").set(EiConstant.countStr, userVOList.size());
+			inInfo.getBlock("partyAResult").setRows(userVOList);
 		} catch (PlatException e) {
 			LogUtils.setDetailMsg(inInfo, e, "乙方名称查询失败");
 		}

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

@@ -503,7 +503,7 @@
 		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",
+		(SELECT ITEM_CNAME FROM ${platSchema}.tedcm01 WHERE CODESET_CODE = 'hggp.cw.contractType' AND ITEM_CODE = CONTRACT_TYPE) AS "contractTypeStr",
 		CONTRACT_TYPE,
 		CONTRACT_NUMBER	as "contractNumber",  <!-- 合同号 -->
 		CONTRACT_NAME	as "contractName",  <!-- 合同名称 -->
@@ -532,6 +532,31 @@
 		ORDER BY CONTRACT_TYPE asc, CONTRACT_NUMBER desc
 	</select>
 
+	<select id="queryProjectCount" resultClass="int">
+		SELECT
+		count(*)
+		FROM ${hggpSchema}.HGCW002
+		WHERE 1=1
+		<isNotEmpty prepend=" AND " property="accountCode">
+			ACCOUNT_CODE = #accountCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyCode">
+			COMPANY_CODE = #companyCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyCodes">
+			COMPANY_CODE IN <iterate close=")" open="(" conjunction="," property="companyCodes">#companyCodes[]#</iterate>
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="reviewStatus">
+			REVIEW_STATUS = #reviewStatus#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="contractType">
+			CONTRACT_TYPE	= #contractType#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="contractTyps">
+			CONTRACT_TYPE IN <iterate close=")" open="(" conjunction="," property="contractTyps">#contractTyps[]#</iterate>
+		</isNotEmpty>
+	</select>
+
 	<update id="updateBalanceStatus">
 		UPDATE ${hggpSchema}.HGCW002
 		SET

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

@@ -40,10 +40,10 @@
                              serviceName="HGCW002" methodName="projectComboBox"
                              resultId="projcet_combo_box" popupType="ServiceGrid"
                              valueField="projCode" textField="projCode"
-                             columnEnames="companyCode,companyName,projCode,projName,contractType,contractNumber,contractName,partyA,partyB"
+                             columnEnames="companyCode,companyName,projCode,projName,contractTypeStr,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"
+                             backFillColumnIds="companyCode,companyName,projCode,projName,contractTypeStr,contractNumber,contractName,partyA,partyB"
+                             backFillFieldIds="companyCode,companyName,projCode,projName,contractTypeStr,contractNumber,contractName,partyA,partyB"
                              popupTitle="所属公司" popupWidth="1200">
             </EF:EFPopupColumn>
             <EF:EFColumn ename="projName" cname="项目名称" width="120" enable="false" readonly="true" align="center"/>