Merge remote-tracking branch 'origin/dev' into dev

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

@@ -61,6 +61,9 @@ public class HGCW017 extends DaoEPBase {
 	public static final String UPDATE = "HGCW017.update";
 	public static final String DELETE = "HGCW017.delete";
 
+	public static final String QUERY_NO_AUTH = "HGCW017.queryNoAuth";
+
+
 	private Long id = new Long(0);	
 	private Long mainId = new Long(0);	/* 主表ID*/
 	private String accountCode = " ";		/* 企业编码*/

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

@@ -239,14 +239,14 @@ public class ServiceHGCW002 extends ServiceBase {
 	public EiInfo projectComboBox(EiInfo inInfo){
 		Map<String, Object> map = new HashMap<>();
 		List<String> contractTypArray = new ArrayList<>();
-		if (StringUtils.isNotEmpty(inInfo.getString("reviewStatus"))) {
-			map.put("reviewStatus", inInfo.getString("reviewStatus"));
+		if (Objects.nonNull(inInfo.getAttr().get("reviewStatus"))) {
+			map.put("reviewStatus", inInfo.getAttr().get("reviewStatus"));
 		}
-		if (StringUtils.isNotEmpty(inInfo.getString("contractType"))) {
-			map.put("contractType", inInfo.getString("contractType"));
+		if (Objects.nonNull(inInfo.getAttr().get("contractType"))) {
+			map.put("contractType", inInfo.getAttr().get("contractType"));
 		}
-		if (StringUtils.isNotEmpty(inInfo.getString("contractTyps"))) {
-			String[] contractTyps = inInfo.getString("contractTyps").split(",");
+		if (Objects.nonNull(inInfo.getAttr().get("contractTypes"))) {
+			String[] contractTyps = inInfo.getAttr().get("contractTypes").toString().split(",");
 			for (String c : contractTyps) {
 				contractTypArray.add(c);
 			}

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

@@ -4,6 +4,7 @@ import com.baosight.bpm.util.StringUtil;
 import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hggp.core.security.UserSessionUtils;
 import com.baosight.hggp.hg.cg.domain.HGCG003;
+import com.baosight.hggp.hg.constant.HGConstant;
 import com.baosight.hggp.hg.cw.domain.*;
 import com.baosight.hggp.hg.xs.domain.Company;
 import com.baosight.hggp.util.DateUtils;
@@ -59,6 +60,7 @@ public class ServiceHGCW012A extends ServiceBase {
 			if (!signingDateTo.isEmpty()){
 				inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0,"signingDateTo", DateUtils.formatShort(signingDateTo));
 			}
+			inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0,HGCG003.FIELD_STATUS, HGConstant.CgReceiveStatus.S_5);
 			inInfo = super.query(inInfo, HGCG003.QUERY, new HGCG003());
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "查询失败");
@@ -79,6 +81,8 @@ public class ServiceHGCW012A extends ServiceBase {
 			}
 			inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0,HGCW002.FIELD_CONTRACT_TYPE, 2);
 			inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGCW006.FIELD_REMAINING_AMOUNT, 0);
+			inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0,HGCW002.FIELD_REVIEW_STATUS, 3);
+
 			inInfo = super.query(inInfo, HGCW012A.QUERY, new HGCW012A(),false,new HGCW012A().eiMetadata,EiConstant.queryBlock,"resultA","resultA");
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "查询失败");
@@ -98,6 +102,8 @@ public class ServiceHGCW012A extends ServiceBase {
 				inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0,"signingDateTo", DateUtils.formatShort(signingDateTo));
 			}
 			inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGCW006.FIELD_REMAINING_AMOUNT, 0);
+			inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0,HGCW006.FIELD_REVIEW_STATUS, 3);
+
 			inInfo = super.query(inInfo, HGCW006.QUERY, new HGCW006(), false, new HGCW006().eiMetadata, EiConstant.queryBlock, "resultB", "resultB");
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "查询失败");

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

@@ -46,7 +46,7 @@ public class ServiceHGCW016C extends ServiceBase {
 	@Override
 	public EiInfo query(EiInfo inInfo) {
 		try {
-			inInfo = super.query(inInfo, HGCW017.QUERY, new HGCW017());
+			inInfo = super.query(inInfo, HGCW017.QUERY_NO_AUTH, new HGCW017());
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "查询失败");
 		}

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

@@ -558,9 +558,14 @@
 		    LEFT JOIN ${hggpSchema}.HGSC001 b on a.PROJ_CODE = b.PROJ_CODE
 		WHERE 1=1
 		AND a.REVIEW_STATUS= 3
-		AND a.CONTRACT_TYPE IN (1,2,4)
 		AND b.approval_status = 2
 		AND b.proj_status = 0
+		<isNotEmpty prepend=" AND " property="contractType">
+			a.CONTRACT_TYPE	= #contractType#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="contractTyps">
+			a.CONTRACT_TYPE IN <iterate close=")" open="(" conjunction="," property="contractTyps">#contractTyps[]#</iterate>
+		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="accountCode">
 			a.ACCOUNT_CODE = #accountCode#
 		</isNotEmpty>

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

@@ -412,4 +412,14 @@
 		</dynamic>
 	</select>
 
+	<update id="updateDeductionAmount">
+		UPDATE ${hggpSchema}.HGCW012
+		SET
+		REMAINING_AMOUNT	= #remainingAmount#,   <!-- 剩余开票/收票金额 -->
+		UPDATED_BY	= #updatedBy#,   <!-- 记录修改者 -->
+		UPDATED_NAME	= #updatedName#,   <!-- 记录修改名称 -->
+		UPDATED_TIME	= #updatedTime#   <!-- 记录修改时间 -->
+		WHERE
+		ID = #id#
+	</update>
 </sqlMap>

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

@@ -197,6 +197,9 @@
 		<isNotEmpty prepend=" AND " property="supName">
 			B.PARTY_B like concat('%',#supName#,'%')
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="reviewStatus">
+			B.REVIEW_STATUS = #reviewStatus#
+		</isNotEmpty>
 	</sql>
 	<select id="query" parameterClass="java.util.HashMap"
 			resultClass="com.baosight.hggp.hg.cw.domain.HGCW008">
@@ -411,5 +414,7 @@
 		WHERE
 		ID = #id#
 	</update>
+
+
 </sqlMap>
 

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

@@ -22,8 +22,7 @@
 	-->
 <sqlMap namespace="HGCW017">
 
-	<sql id="condition">
-		<include refid="HGXSDataAuth.authCondition"/>
+	<sql id="condition_no_auth">
 		<isNotEmpty prepend=" AND " property="id">
 			ID = #id#
 		</isNotEmpty>
@@ -74,6 +73,11 @@
 		</isNotEmpty>
 	</sql>
 
+	<sql id="condition">
+		<include refid="HGXSDataAuth.authCondition"/>
+		<include refid="condition_no_auth"/>
+	</sql>
+
 	<select id="query" parameterClass="java.util.HashMap"
 			resultClass="com.baosight.hggp.hg.cw.domain.HGCW017">
 		SELECT
@@ -105,6 +109,37 @@
 
 	</select>
 
+	<select id="queryNoAuth" parameterClass="java.util.HashMap"
+	resultClass="com.baosight.hggp.hg.cw.domain.HGCW017">
+	SELECT
+	ID	as "id",
+	MAIN_ID	as "mainId",  <!-- 主表ID -->
+	ACCOUNT_CODE	as "accountCode",  <!-- 企业编码 -->
+	COMPANY_CODE	as "companyCode",  <!-- 公司编码 -->
+	COMPANY_NAME	as "companyName",  <!-- 公司名称 -->
+	CONTRACT_NUMBER	as "contractNumber",  <!-- 来源单号 -->
+	PARTY_A	as "partyA",  <!-- 供应商名称 -->
+	TOTAL_CONTRACT_PRICE_INCLUDING	as "totalContractPriceIncluding",  <!-- 收款总额 -->
+	CREATED_BY	as "createdBy",  <!-- 记录创建者 -->
+	CREATED_NAME	as "createdName",  <!-- 记录创建名称 -->
+	CREATED_TIME	as "createdTime",  <!-- 记录创建时间 -->
+	UPDATED_BY	as "updatedBy",  <!-- 记录修改者 -->
+	UPDATED_NAME	as "updatedName",  <!-- 记录修改名称 -->
+	UPDATED_TIME	as "updatedTime",  <!-- 记录修改时间 -->
+	DEP_CODE	as "depCode" <!-- 部门编码 -->
+	FROM ${hggpSchema}.HGCW017 WHERE 1=1
+	<include refid="condition_no_auth" />
+	<dynamic prepend="ORDER BY">
+		<isNotEmpty property="orderBy">
+			$orderBy$
+		</isNotEmpty>
+		<isEmpty property="orderBy">
+			ID asc
+		</isEmpty>
+	</dynamic>
+
+</select>
+
 	<select id="count" resultClass="int">
 		SELECT COUNT(*) FROM ${hggpSchema}.HGCW017 WHERE 1=1
     <include refid="condition" />

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

@@ -37,7 +37,7 @@ $(function() {
             query: function (container, params) {
                 var queryInfo = new EiInfo();
                 // info.set("reviewStatus","3")
-                queryInfo.set("contractType","1")
+                queryInfo.set("contractTypes","1,2")
                 return queryInfo;
             },
             init: function (e, options) {

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

@@ -12,7 +12,7 @@
         <div class="row">
             <EF:EFPopupInput ename="popupInputProjCode" cname="项目编号" colWidth="4"
                              serviceName="HGCW002" methodName="queryContractByType"
-                             resultId="contract_combo_box"
+                             resultId="result"
                              save="false" popupType="ServiceGrid"
                              valueField="projCode" textField="projCode"
                              columnEnames="projCode,projName,contractNumber,contractName,totalContractPriceExcluding"