2024-09-18

1、项目甲方数据过滤修复
2、项目选择数据过滤修复

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

@@ -70,6 +70,8 @@ public class ServiceHGCW002A extends ServiceBase {
 			String contractCategory = inInfo.getString("contractCategory");
 			String partyA = inInfo.getString("partyA");
 			if (contractCategory.equals("1")) {
+				params.get(0).put("custCode",params.get(0).get("usercode"));
+				params.get(0).put("custName",params.get(0).get("username"));
 				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)) {

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

@@ -516,7 +516,22 @@
 			ACCOUNT_CODE = #accountCode#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="companyCode">
-			COMPANY_CODE = #companyCode#
+			COMPANY_CODE like concat('%',#companyCode#, '%')
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyName">
+			COMPANY_NAME like concat('%',#companyName#, '%')
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="projCode">
+			PROJ_CODE like concat('%',#projCode#, '%')
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="projName">
+			PROJ_NAME like concat('%',#projName#, '%')
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="contractNumber">
+			CONTRACT_NUMBER like concat('%',#contractNumber#, '%')
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="contractName">
+			CONTRACT_NAME like concat('%',#contractName#, '%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="companyCodes">
 			COMPANY_CODE IN <iterate close=")" open="(" conjunction="," property="companyCodes">#companyCodes[]#</iterate>
@@ -530,6 +545,12 @@
 		<isNotEmpty prepend=" AND " property="contractTyps">
 			CONTRACT_TYPE IN <iterate close=")" open="(" conjunction="," property="contractTyps">#contractTyps[]#</iterate>
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="partyA">
+			PARTY_A like concat('%',#partyA#, '%')
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="partyB">
+			PARTY_B like concat('%',#partyB#, '%')
+		</isNotEmpty>
 		ORDER BY CONTRACT_TYPE asc, CONTRACT_NUMBER desc
 	</select>
 
@@ -542,7 +563,22 @@
 			ACCOUNT_CODE = #accountCode#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="companyCode">
-			COMPANY_CODE = #companyCode#
+			COMPANY_CODE like concat('%',#companyCode#, '%')
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyName">
+			COMPANY_NAME like concat('%',#companyName#, '%')
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="projCode">
+			PROJ_CODE like concat('%',#projCode#, '%')
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="projName">
+			PROJ_NAME like concat('%',#projName#, '%')
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="contractNumber">
+			CONTRACT_NUMBER like concat('%',#contractNumber#, '%')
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="contractName">
+			CONTRACT_NAME like concat('%',#contractName#, '%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="companyCodes">
 			COMPANY_CODE IN <iterate close=")" open="(" conjunction="," property="companyCodes">#companyCodes[]#</iterate>
@@ -635,6 +671,18 @@
 				<iterate close=")" open="(" conjunction="," property="authDepCodes">#authDepCodes[]#</iterate>
 			</isNotEmpty>
 		</isNotEqual>
+		<isNotEmpty prepend=" AND " property="projCode">
+			a.PROJ_CODE like concat('%',#projCode#,'%')
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="projName">
+			a.PROJ_NAME like concat('%',#projName#,'%')
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="contractNumber">
+			a.CONTRACT_NUMBER like concat('%',#contractNumber#,'%')
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="contractName">
+			a.CONTRACT_NAME like concat('%',#contractName#,'%')
+		</isNotEmpty>
 		ORDER BY a.CONTRACT_NUMBER
 	</select>
 

src/main/java/com/baosight/hggp/hg/pz/sql/HGPZ002.xml

@@ -45,7 +45,7 @@
 			CUST_TYPE = #custType#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="custCode">
-			CUST_CODE = #custCode#
+			CUST_CODE LIKE CONCAT('%', #custCode#, '%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="custName">
 			CUST_NAME LIKE CONCAT('%', #custName#, '%')