20180104

ccb_fund_trusteeship/src/main/java/com/fuzamei/dao/CapitalTransferDao.java

@@ -20,8 +20,8 @@ public class CapitalTransferDao {
 	public List<CapitalTransfer> selectCapitalTransferTable(Map<String, Object> map){//查询资金划转列表
 		return capitalTransferMapper.selectCapitalTransferTable(map);
 	}
-	public int  selectCapitalTransferPage() {//查询资金划转表  总页数
-		return  capitalTransferMapper.selectCapitalTransferPage() ;
+	public int  selectCapitalTransferPage(Map<String, Object> map) {//查询资金划转表  总页数
+		return  capitalTransferMapper.selectCapitalTransferPage(map) ;
 	}
 	public  List<CapitalTransfer> selectChaKanZiJinHuaZhuan(Map<String, Object> map){//资金划转    查看详情
 		return capitalTransferMapper.selectChaKanZiJinHuaZhuan(map);

ccb_fund_trusteeship/src/main/java/com/fuzamei/mapper/AccountMaintenance.xml

@@ -33,7 +33,7 @@
 			<if test="bank_account!='' and bank_account!=null">
 			  and bank_account=#{bank_account}
 			</if>
-		   	<if test="startTime!='' and endTime != ''">
+		   	<if test="startTime!=null and endTime!=null">
 			  and a.update_time  between #{startTime} and #{endTime}
 			</if>
 	 </where>
@@ -51,7 +51,7 @@
 			<if test="bank_account!='' and bank_account!=null">
 			  and bank_account=#{bank_account}
 			</if>
-		   	<if test="startTime!='' and endTime != ''">
+		   	<if test="startTime!=null and endTime!=null">
 			  and update_time  between #{startTime} and #{endTime}
 			</if>
 	 </where>

ccb_fund_trusteeship/src/main/java/com/fuzamei/mapper/CapitalTransferMapper.xml

@@ -22,12 +22,12 @@
       left  join  status s  on z.status_id=s.status_id
        <where>
 	      <if test="fund_name!='' and fund_name!= null">
-	          and fund_name=#{fund_name}
+	           fund_name=#{fund_name}
 	      </if>
 	      <if test="status_name!='' and status_name!=null">
 	          and status_name=#{status_name}
 	      </if>
-	      <if test="startTime!='' and endTime != ''">
+	      <if test="startTime!=null and endTime!=null">
 		     and apply_time  between #{startTime} and #{endTime}
 		  </if>
 	   </where>
@@ -38,21 +38,24 @@
     <select id="selectCapitalTransferPage" resultType="int">
     	 select count(*)  from capital_transfer
     	 <where>
-    	   <include refid="query_accountopen_where"></include>
+    	  <!--  <include refid="query_accountopen_where"></include> -->
+	    	<if test="fund_name != null and fund_name!=''">
+	    		  fund_name=#{fund_name}
+	    	</if>
+	    	<if test="status_name != null and status_name''">
+	    		and  status_name=#{status_name}
+	    	</if>
+	    	<if test="startTime!=null and endTime!=null">
+				and apply_time between #{startTime} and #{endTime}
+		    </if>
+	
     	 </where>
     </select>
     <!--动态sql  上面引用 -->
-    <sql id="query_accountopen_where">
-    	<if test="fund_name != null and fund_name!=''">
-    		and  fund_name=#{fund_name}
-    	</if>
-    	<if test="status_name != null and status_name''">
-    		and  status_name=#{status_name}
-    	</if>
-    	<if test="startTime!=null and endTime!=null">
-			and apply_time between #{startTime} and #{endTime}
-	    </if>
-    </sql>
+    
+       
+    
+    
   <!--************************************************************************************************  -->  
   <!--查看  资金划转详情     根据前端给我返回的id   在把那一条数据查出来-->
   <select id="selectChaKanZiJinHuaZhuan" parameterType="java.util.Map" resultType="com.fuzamei.entity.CapitalTransfer">

ccb_fund_trusteeship/src/main/java/com/fuzamei/mapperInterface/CapitalTransferMapper.java

@@ -10,7 +10,7 @@ import com.fuzamei.entity.User;
 public interface CapitalTransferMapper {
 
 	public List<CapitalTransfer> selectCapitalTransferTable(Map<String, Object> map);//查询资金划转列表
-    public int  selectCapitalTransferPage();//查询资金划转表     总页数
+    public int  selectCapitalTransferPage(Map<String, Object> map);//查询资金划转表     总页数
 	public  List<CapitalTransfer> selectChaKanZiJinHuaZhuan(Map<String, Object> map);//资金划转    查看详情
 	public  List<CapitalTransferCheck> selectCapitalTransferRecord(Map<String, Object> map);//资金划转 里审核记录   查看详情
 	//public  List<User> selectByPersonName(Map<String, Object> map);//临时测试用的

ccb_fund_trusteeship/src/main/java/com/fuzamei/service/AccountMaintenanceService.java

@@ -168,7 +168,7 @@ public class AccountMaintenanceService {
     	int page = 1; // 默认页是第一页
 		String customer_name = ""; // 
 		String bank_account = ""; // 
-		long startTime = 0; // 开始时间默认0
+		long startTime = 0L; // 开始时间默认0
 		long endTime = Long.MAX_VALUE; // 结束时间默认Long最大值
 		if (!"".equals(map.get("page")) && map.get("page") != null) { // 等于空就直接取第一页
 			try {
@@ -190,7 +190,7 @@ public class AccountMaintenanceService {
 			try {
 				startTime = Long.parseLong((String) map.get("startTime"));
 			} catch (NumberFormatException e) {
-				startTime = 0; // 数据解析异常startTime还是0
+				startTime = 0L; // 数据解析异常startTime还是0
 			}
 		}
 		if (!"".equals(map.get("endTime")) && map.get("endTime") != null) { // 等于空就直接取空值

ccb_fund_trusteeship/src/main/java/com/fuzamei/service/CapitalTransferService.java

@@ -81,7 +81,7 @@ public class CapitalTransferService {
 		}
 		
 		mapToDao.put("rowNum", ROW_NUM); // 默认每页显示数据是10条，可根据需求修改分页数量
-		int  countPage=capitalTransferDao.selectCapitalTransferPage();//资金划转表  总得信息数量页数
+		int  countPage=capitalTransferDao.selectCapitalTransferPage(mapToDao);//资金划转表  总得信息数量页数
 		List<CapitalTransfer> CapitalTransferList=capitalTransferDao.selectCapitalTransferTable(mapToDao);
 		pageDto.setTotal(countPage);
 		pageDto.setRows(CapitalTransferList);
@@ -118,7 +118,7 @@ public class CapitalTransferService {
 	public Map<String, Object>  insertCapitalTransfer(Map<String, Object> map){
 		String custodian="";//管理人
 		String fund_name="";//基金名称
-		double sum_of_money=0;//划款金额
+		Double sum_of_money=null;//划款金额
 		Integer basis_of_payment=null;//划款依据
 		//账户余额
 		//划款账户