收付款增加合计，调整展示，导出数据增加列

adm/src/main/java/com/minpay/db/table/own/mapper/PaymentManageMapper.java

@@ -40,6 +40,6 @@ public interface PaymentManageMapper extends  IMINMybatisEntityMapper<ImUser, St
 	 * @param map
 	 * @return
 	 */
-	String queryCollectionSummary(Map<String, String> map);
+	List<Map<String, String>> queryCollectionSummary(Map<String, String> map);
     
 }

adm/src/main/java/com/minpay/guomao/contractmanage/action/FinaceExcelShouFu.java

@@ -11,91 +11,90 @@ public class FinaceExcelShouFu {
 	private String bankName;         //开户行
 	private String createTime;       //创建时间
 	private String termsPayment; 	//付款期限
-
+	private String id;				//收付款编号
+	private String aopAllWeight;	//重量
+	private String aopRemarks;		//备注
 	public String getTypeDesc() {
 		return typeDesc;
 	}
-
 	public void setTypeDesc(String typeDesc) {
 		this.typeDesc = typeDesc;
 	}
-
 	public String getPriceTypeDesc() {
 		return priceTypeDesc;
 	}
-
 	public void setPriceTypeDesc(String priceTypeDesc) {
 		this.priceTypeDesc = priceTypeDesc;
 	}
-
 	public String getBuyer() {
 		return buyer;
 	}
-
 	public void setBuyer(String buyer) {
 		this.buyer = buyer;
 	}
-
 	public String getSeller() {
 		return seller;
 	}
-
 	public void setSeller(String seller) {
 		this.seller = seller;
 	}
-
 	public String getTotalMoney() {
 		return totalMoney;
 	}
-
 	public void setTotalMoney(String totalMoney) {
 		this.totalMoney = totalMoney;
 	}
-
 	public String getTotalMoneys() {
 		return totalMoneys;
 	}
-
 	public void setTotalMoneys(String totalMoneys) {
 		this.totalMoneys = totalMoneys;
 	}
-
 	public String getBankNum() {
 		return bankNum;
 	}
-
 	public void setBankNum(String bankNum) {
 		this.bankNum = bankNum;
 	}
-
 	public String getBankName() {
 		return bankName;
 	}
-
 	public void setBankName(String bankName) {
 		this.bankName = bankName;
 	}
-
 	public String getCreateTime() {
 		return createTime;
 	}
-
 	public void setCreateTime(String createTime) {
 		this.createTime = createTime;
 	}
-	
-	
 	public String getTermsPayment() {
 		return termsPayment;
 	}
-
 	public void setTermsPayment(String termsPayment) {
 		this.termsPayment = termsPayment;
 	}
-
-	
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public String getAopAllWeight() {
+		return aopAllWeight;
+	}
+	public void setAopAllWeight(String aopAllWeight) {
+		this.aopAllWeight = aopAllWeight;
+	}
+	public String getAopRemarks() {
+		return aopRemarks;
+	}
+	public void setAopRemarks(String aopRemarks) {
+		this.aopRemarks = aopRemarks;
+	}
 	public FinaceExcelShouFu(String typeDesc, String priceTypeDesc, String buyer, String seller, String totalMoney,
-			String totalMoneys, String bankNum, String bankName, String createTime, String termsPayment) {
+			String totalMoneys, String bankNum, String bankName, String createTime, String termsPayment, String id,
+			String aopAllWeight, String aopRemarks) {
 		super();
 		this.typeDesc = typeDesc;
 		this.priceTypeDesc = priceTypeDesc;
@@ -107,19 +106,21 @@ public class FinaceExcelShouFu {
 		this.bankName = bankName;
 		this.createTime = createTime;
 		this.termsPayment = termsPayment;
+		this.id = id;
+		this.aopAllWeight = aopAllWeight;
+		this.aopRemarks = aopRemarks;
 	}
-
 	public FinaceExcelShouFu() {
 		super();
 	}
-
 	@Override
 	public String toString() {
 		return "FinaceExcelShouFu [typeDesc=" + typeDesc + ", priceTypeDesc=" + priceTypeDesc + ", buyer=" + buyer
 				+ ", seller=" + seller + ", totalMoney=" + totalMoney + ", totalMoneys=" + totalMoneys + ", bankNum="
 				+ bankNum + ", bankName=" + bankName + ", createTime=" + createTime + ", termsPayment=" + termsPayment
-				+ "]";
+				+ ", id=" + id + ", aopAllWeight=" + aopAllWeight + ", aopRemarks=" + aopRemarks + "]";
 	}
 	
 	
+	
 }

adm/src/main/java/com/minpay/guomao/contractmanage/action/FinanceToExecl.java

@@ -530,7 +530,7 @@ public class FinanceToExecl implements IMINAction{
 		//当前时间
 		String date = DateUtil.getCurrentDateString();
 		//获取表头信息
-		String exportExcel = "付款期限#termsPayment,收付类型#typeDesc,费用类型#priceTypeDesc,付款单位#buyer,收款单位#seller,预估收付款金额#totalMoney,实际收付款金额#totalMoneys,收款账号#bankNum,开户行#bankName,创建时间#createTime";
+		String exportExcel = "收付款编号#id,付款期限#termsPayment,重量#aopAllWeight,预估收付款金额#totalMoney,实际收付款金额#totalMoneys,备注#aopRemarks,收付类型#typeDesc,费用类型#priceTypeDesc,付款单位#buyer,收款单位#seller,收款账号#bankNum,开户行#bankName,创建时间#createTime";
 		String[] excelHeader = exportExcel.split(",");
 		//获取表格数据
 		List<FinaceExcelShouFu> pro = new ArrayList<FinaceExcelShouFu>();
@@ -558,6 +558,9 @@ public class FinanceToExecl implements IMINAction{
 		for (int i = 0; i < list.size(); i++) {
 			Map<String,String> map = list.get(i);
 			FinaceExcelShouFu shoufu = new FinaceExcelShouFu();
+			shoufu.setId(CommonUtil.objToString(map.get("id")));							  //收付款编号
+			shoufu.setAopAllWeight(CommonUtil.objToString(map.get("aopAllWeight")));		  //重量
+			shoufu.setAopRemarks(CommonUtil.objToString(map.get("aopRemarks"))); 			  //备注
 			shoufu.setTypeDesc(CommonUtil.objToString(map.get("typeDesc")));                  //收付类型
 			shoufu.setPriceTypeDesc(CommonUtil.objToString(map.get("priceTypeDesc")));        //费用类型
 			shoufu.setBuyer(CommonUtil.objToString(map.get("buyer")));                        //付款单位

adm/src/main/java/com/minpay/guomao/paymentmanage/action/PaymentManageAction.java

@@ -150,9 +150,15 @@ public class PaymentManageAction implements IMINAction {
 			String allMoney = prepaidList.get(0).get("yuPay");
 			//实际付款汇总
 			String allMoneys = prepaidList.get(0).get("realPay");
+			//付款重量
+			String payWeight = prepaidList.get(0).get("payWeight");
 			//查询收款汇总信息
-			String  allsjMoneys = Service.lookup(IMINDataBaseService.class).getMybatisMapper(PaymentManageMapper.class)
+			List<Map<String, String>> collectInfo = Service.lookup(IMINDataBaseService.class).getMybatisMapper(PaymentManageMapper.class)
 											.queryCollectionSummary(map);
+			//收款金额
+			String allsjMoneys = collectInfo.get(0).get("realCollection");
+			//收款重量
+			String collectWeight = collectInfo.get(0).get("collectWeight");
 			// 格式化数据
 			list = Service.lookup(IFormatService.class).formatDateTime(list, "createTime", "modifyTime");
 			list = Service.lookup(IFormatService.class).formatDate(list, "termsPayment");
@@ -163,6 +169,8 @@ public class PaymentManageAction implements IMINAction {
 			res.set("allMoney",allMoney);
 			res.set("allMoneys",allMoneys);
 			res.set("allsjMoneys",allsjMoneys);
+			res.set("collectWeight",collectWeight);
+			res.set("payWeight",payWeight);
 			res.set(IMINBusinessConstant.F_PAGING_COUNT, rows.getCount());
 			return res;
 	}

adm/src/main/resources/com/minpay/db/table/own/mapper/PaymentManageMapper.xml

@@ -208,7 +208,8 @@
 	<select id="prepaidInformation" resultType="hashmap" parameterType="java.util.Map">
 		select
 				CAST(ROUND(IFNULL(SUM(a.AOP_PAY_PRICE),0),2) AS CHAR)	'realPay',
-				CAST(ROUND(IFNULL(SUM(a.AOP_YU_PRICE),0),2) AS CHAR)	'yuPay'
+				CAST(ROUND(IFNULL(SUM(a.AOP_YU_PRICE),0),2) AS CHAR)	'yuPay',
+				CAST(ROUND(IFNULL(SUM(a.AOP_ALL_WEIGHT),0),4) AS CHAR)	'payWeight'
 		FROM ap_order_payment a
 			LEFT JOIN ap_contract_inf e
 				ON a.AOP_CONTRACT_ID = e.ACI_ID
@@ -237,6 +238,9 @@
 		<if test="contractId != null and contractId != ''">
 			and b.AOI_CONTRACT_ID = #{contractId,jdbcType=VARCHAR}
 		</if>
+		<if test="remarks != null and remarks != ''">
+			and a.AOP_REMARKS  like concat('%',#{remarks,jdbcType=VARCHAR},'%')
+		</if>
 		<if test="orderId != null and orderId != ''">
 			and a.AOP_ORDER_ID = #{orderId,jdbcType=VARCHAR}
 		</if>
@@ -260,9 +264,10 @@
 			and substr((#{dates,jdbcType=VARCHAR}),12,19)
 		</if>
 	</select>
-	<select id="queryCollectionSummary" resultType="java.lang.String" parameterType="java.util.Map">
+	<select id="queryCollectionSummary" resultType="hashmap" parameterType="java.util.Map">
 		select
-				CAST(ROUND(IFNULL(SUM(a.AOP_PAY_PRICE),0),2) AS CHAR)	'realCollection'
+				CAST(ROUND(IFNULL(SUM(a.AOP_PAY_PRICE),0),2) AS CHAR)	'realCollection',
+				CAST(ROUND(IFNULL(SUM(a.AOP_ALL_WEIGHT),0),4) AS CHAR)	'collectWeight'
 		FROM ap_order_payment a
 			LEFT JOIN ap_contract_inf e
 				ON a.AOP_CONTRACT_ID = e.ACI_ID
@@ -291,6 +296,9 @@
 		<if test="contractId != null and contractId != ''">
 			and b.AOI_CONTRACT_ID = #{contractId,jdbcType=VARCHAR}
 		</if>
+		<if test="remarks != null and remarks != ''">
+			and a.AOP_REMARKS  like concat('%',#{remarks,jdbcType=VARCHAR},'%')
+		</if>
 		<if test="orderId != null and orderId != ''">
 			and a.AOP_ORDER_ID = #{orderId,jdbcType=VARCHAR}
 		</if>

adm/src/main/webapp/admin/paymentManage/paymentManage.html

@@ -69,6 +69,18 @@
 					<input type="text" class="layui-input" id="allsjMoneys" name="allsjMoneys" style="border:none;color: red" disabled="disabled" class="search-select">
 				</div>
 			</div>						
+			<div class="layui-inline" id="allStockDiv">
+				<label class="f12-gray4">收款重量合计:</label>
+				<div class="layui-input-inline">
+					<input type="text" class="layui-input" id="collectWeight" name="collectWeight" style="border:none;color: red" disabled="disabled" class="search-select">
+				</div>
+			</div>						
+			<div class="layui-inline" id="allStockDiv">
+				<label class="f12-gray4">付款重量合计:</label>
+				<div class="layui-input-inline">
+					<input type="text" class="layui-input" id="payWeight" name="payWeight" style="border:none;color: red" disabled="disabled" class="search-select">
+				</div>
+			</div>						
 	</div>
 </div>
 <div class="shadow-content">
@@ -137,16 +149,16 @@
 		    ,page: true //开启分页
 		    ,cols: [[ //表头
 		       {type:'numbers',title: '序号',width:"5%", fixed:"left"}
-		       ,{field: 'id', title: '收付款编号', width:"10%", }
+		      ,{field: 'id', title: '收付款编号', width:"10%", }
 		      ,{field: 'termsPayment', title: '付款期限',width:"10%",style:'background-color: #C1FFC1; color: #333;'}
-		       ,{field: 'typeDesc', title: '收付类型', width:"10%", }
-		       ,{field: 'priceTypeDesc', title: '费用类型', width:"10%", }
-		       ,{field: 'totalMoneys', title: '实际收付款金额', width:"15%",edit: 'text',style:'background-color: #C1FFC1; color: #333;'}
-		      ,{field: 'aopAllWeight', title: '重量', width:"13%", }
+		      ,{field: 'aopAllWeight', title: '重量', width:"13%", } 
+		      ,{field: 'totalMoney', title: '预估收付款金额', width:"15%",edit: 'text',style:'background-color: #C1FFC1; color: #333;'}
+		      ,{field: 'totalMoneys', title: '实际收付款金额', width:"15%",edit: 'text',style:'background-color: #C1FFC1; color: #333;'}
 		      ,{field: 'aopRemarks', title: '备注', width:"13%",edit: 'text',style:'background-color: #C1FFC1; color: #333;'}
+		      ,{field: 'typeDesc', title: '收付类型', width:"10%", }
+		      ,{field: 'priceTypeDesc', title: '费用类型', width:"10%", }
 		      ,{field: 'buyer', title: '付款单位', width:"13%", }
 		      ,{field: 'seller', title: '收款单位', width:"13%"}
-		      ,{field: 'totalMoney', title: '预估收付款金额', width:"15%",edit: 'text',style:'background-color: #C1FFC1; color: #333;'}
 		      ,{field: 'bankNum', title: '收款账号', width:"10%"}
 		      ,{field: 'bankName', title: '开户行', width:"10%"}
 		      ,{field: 'createTime', title: '创建时间',width:"14%"}
@@ -156,6 +168,9 @@
 		        $("#allMoney").val(fomatFloat(res.allMoney));
 		        $("#allMoneys").val(fomatFloat(res.allMoneys));
 		        $("#allsjMoneys").val(fomatFloat(res.allsjMoneys));
+		        $("#allsjMoneys").val(fomatFloat(res.allsjMoneys));
+		        $("#payWeight").val(fomatFloat(res.payWeight));
+		        $("#collectWeight").val(fomatFloat(res.collectWeight));
 		        
 		    	var termsPaymentId = 0;
 		        $('td[data-field="termsPayment"]').each(function(i) {