Преглед на файлове

开票选择银行信息功能修复

user5 преди 3 години
родител
ревизия
b5e8af1538

+ 2 - 1
src/main/java/com/jeeplus/modules/workclientinfo/dao/WorkClientBankDao.java

@@ -6,6 +6,7 @@ package com.jeeplus.modules.workclientinfo.dao;
 import com.jeeplus.common.persistence.CrudDao;
 import com.jeeplus.common.persistence.annotation.MyBatisDao;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientBank;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -22,5 +23,5 @@ public interface WorkClientBankDao extends CrudDao<WorkClientBank> {
     List<WorkClientBank> getLinkBank(WorkClientBank workClientBank);
 
     //根据名称查询开户行信息名称
-    WorkClientBank getByBankName(String bankName);
+    WorkClientBank getByBankName(@Param("bankName") String bankName,@Param("clientId") String clientId);
 }

+ 2 - 2
src/main/java/com/jeeplus/modules/workclientinfo/service/WorkClientInfoService.java

@@ -175,8 +175,8 @@ public class WorkClientInfoService extends CrudService<WorkClientInfoDao, WorkCl
      * @param bankName
      * @return
      */
-    public WorkClientBank getBankInfo(String bankName)  {
-        return workClientBankDao.getByBankName(bankName);
+    public WorkClientBank getBankInfo(String bankName,String clientId)  {
+        return workClientBankDao.getByBankName(bankName,clientId);
     }
 
     /**

+ 2 - 2
src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceTwoController.java

@@ -1026,9 +1026,9 @@ public class WorkInvoiceTwoController extends BaseController {
 	 */
 	@RequestMapping(value = "getBankInfo")
 	@ResponseBody
-	public String getBankInfo(String bankName) {
+	public String getBankInfo(String bankName,String clientId) {
 		HashMap<Object, Object> map = Maps.newHashMap();
-		WorkClientBank bankInfo = workClientInfoService.getBankInfo(bankName);
+		WorkClientBank bankInfo = workClientInfoService.getBankInfo(bankName,clientId);
 		map.put("data",bankInfo);
 		return JsonMapper.toJsonString(map);
 	}

+ 1 - 0
src/main/resources/mappings/modules/workclientinfo/WorkClientBankDao.xml

@@ -170,5 +170,6 @@
 		FROM work_client_bank a
 		<include refid="workClientBankJoins"/>
 		WHERE a.our_bank = #{bankName}
+		and a.client_id = #{clientId}
 	</select>
 </mapper>

+ 6 - 6
src/main/webapp/WEB-INF/tags/sys/reimburtreeselectUser.tag

@@ -26,7 +26,7 @@
 	<div class="input-group">
 		<input id="${id}Name"placeholder="请选择${title}" name="${labelName}" ${allowInput?'':'readonly="readonly"'}  type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
 		class="${cssClass}" style="background-color: #ffffff; ${cssStyle} "/>
-       		
+
     </div>
 	 <label id="${id}Name-error" class="error" for="${id}Name" style="display:none"></label>
 <script type="text/javascript">
@@ -35,9 +35,9 @@
 		if ($("#${id}Button").hasClass("disabled")){
 			return true;
 		}
-		// 正常打开	
+		// 正常打开
 		top.layer.open({
-		    type: 2, 
+		    type: 2,
 		    area: ['300px', '420px'],
 		    title:"选择${title}",
 		    ajaxData:{selectIds: $("#${id}Id").val()},
@@ -95,7 +95,7 @@
     	cancel: function(index){ //或者使用btn2
     	           //按钮【按钮二】的回调
     	       }
-		}); 
-	
+		});
+
 	});
-</script>
+</script>

+ 2 - 1
src/main/webapp/webpage/modules/workinvoice/workInvoiceAllForm.jsp

@@ -188,10 +188,11 @@
 						$('#bankNumber').val("");
 						$('#bankRemarks').html('');
 					}else{
+						var clientId = $("#clientId").val();
 						$.ajax({
 							type:"post",
 							url:'${ctx}/workinvoiceTwo/workinvoiceTwo/getBankInfo',
-							data:{"bankName":d.value},
+							data:{"bankName":d.value,"clientId":clientId},
 							dataType:"json",
 							async: false,
 							success:function(data){

+ 2 - 1
src/main/webapp/webpage/modules/workinvoice/workInvoiceAllTwoForm.jsp

@@ -188,10 +188,11 @@
 						$('#bankNumber').val("");
 						$('#bankRemarks').html('');
 					}else{
+						var clientId = $("#clientId").val();
 						$.ajax({
 							type:"post",
 							url:'${ctx}/workinvoiceTwo/workinvoiceTwo/getBankInfo',
-							data:{"bankName":d.value},
+							data:{"bankName":d.value,"clientId":clientId},
 							dataType:"json",
 							async: false,
 							success:function(data){

+ 2 - 1
src/main/webapp/webpage/modules/workinvoice/workInvoiceModify.jsp

@@ -140,10 +140,11 @@
 						$('#bankNumber').val("");
 						$('#bankRemarks').html('');
 					}else{
+						var clientId = $("#clientId").val();
 						$.ajax({
 							type:"post",
 							url:'${ctx}/workinvoiceTwo/workinvoiceTwo/getBankInfo',
-							data:{"bankName":d.value},
+							data:{"bankName":d.value,"clientId":clientId},
 							dataType:"json",
 							async: false,
 							success:function(data){

+ 2 - 1
src/main/webapp/webpage/modules/workinvoice/workInvoiceTwoForm.jsp

@@ -187,10 +187,11 @@
 						$('#bankNumber').val("");
 						$('#bankRemarks').html('');
 					}else{
+						var clientId = $("#clientId").val();
 						$.ajax({
 							type:"post",
 							url:'${ctx}/workinvoiceTwo/workinvoiceTwo/getBankInfo',
-							data:{"bankName":d.value},
+							data:{"bankName":d.value,"clientId":clientId},
 							dataType:"json",
 							async: false,
 							success:function(data){

+ 2 - 1
src/main/webapp/webpage/modules/workinvoice/workInvoiceTwoModify.jsp

@@ -136,10 +136,11 @@
 						$('#bankNumber').val("");
 						$('#bankRemarks').html('');
 					}else{
+						var clientId = $("#clientId").val();
 						$.ajax({
 							type:"post",
 							url:'${ctx}/workinvoiceTwo/workinvoiceTwo/getBankInfo',
-							data:{"bankName":d.value},
+							data:{"bankName":d.value,"clientId":clientId},
 							dataType:"json",
 							async: false,
 							success:function(data){