chb пре 7 година
родитељ
комит
8cd5a323a5

+ 6 - 0
ccb_fund_trusteeship/src/main/java/com/fuzamei/dao/CapitalTransferDao.java

@@ -32,4 +32,10 @@ public class CapitalTransferDao {
 	/*public List<User> selectByPersonName(Map<String, Object> map) {//临时测试的
 		return capitalTransferMapper.selectByPersonName(map);
 	}*/
+	public void insertCheckTransfer(Map<String, Object> map) {//将划转资金审核的意见插入导(划转资金审核表里)
+		capitalTransferMapper.insertCheckTransfer(map);
+	}
+	public void updatecapitaltransferStatus(Map<String, Object> map) {//将划转审核结果意见在插入划转资金表的同时,也将审核结果更新到划转资金表中去,根据基金id  
+		capitalTransferMapper.updatecapitaltransferStatus(map);
+	}
 }

+ 1 - 1
ccb_fund_trusteeship/src/main/java/com/fuzamei/mapper/BusinessDeclareMapper.xml

@@ -230,7 +230,7 @@
 			   #{task})
 	</insert>
 	
-	<!-- 将审核结果意见在插入审核表的同时,也将审核结果更新到业务申报表中去,根据业务id(business_id)定位到指定的业务 -->
+	<!-- 将审核结果意见在插入审核表的同时,也将审核结果更新到业务申报表中去,根据业务id(business_id)修改指定的业务 -->
 	<update id="updateBusinessDeclareStatus">
 		update 
 			business_declare

+ 12 - 4
ccb_fund_trusteeship/src/main/java/com/fuzamei/mapper/CapitalTransferMapper.xml

@@ -79,7 +79,7 @@
   </select> -->
   
 <!--*************************************  -->
-    <!--查看  查询划转资金审核记录表  框框 --> 
+    <!--查看  查询(划转资金审核记录表)  框框 --> 
 	<select id="selectCapitalTransferRecord" parameterType="java.util.Map" resultType="com.fuzamei.entity.CapitalTransferCheck">
      select  sj.fund_id,
              sj.check_department,
@@ -142,14 +142,14 @@
 			   #{hash})
 	</insert>
     <!--**************************************  -->
-    <!--将审核意见插入到划转资金审核表里  -->
+    <!--将审核意见插入到(划转资金审核表)里  -->
     <insert id="insertCheckTransfer">
 	    insert into capital_transfer_check( fund_id,
 			          check_department,
 						   check_person,
 						   check_opinion,
 						   check_time,
-						   check_resultrelation) 		
+						   check_result,relation) 		
 				values( #{fund_id},
 				       #{check_department},
 				       #{check_person},
@@ -158,7 +158,15 @@
 				       #{check_result},
 				       #{relation})
     </insert>
-    
+    <!-- 将划转审核结果意见在插入划转资金表的同时,也将审核结果更新到划转资金表中去,根据基金id  ->fund_id定位到指定的业务 -->
+	<update id="updatecapitaltransferStatus" parameterType="java.util.Map">
+		update 
+			capital_transfer
+		set
+			status_id=#{status_id}
+		where 
+			fund_id=#{fund_id}
+	</update>
    <!-- 资金划转*************///////////////////////////////////////////////////////// --> 
 
     

+ 2 - 2
ccb_fund_trusteeship/src/main/java/com/fuzamei/mapperInterface/CapitalTransferMapper.java

@@ -15,7 +15,7 @@ public interface CapitalTransferMapper {
 	public  List<CapitalTransferCheck> selectCapitalTransferRecord(Map<String, Object> map);//资金划转 里审核记录   查看详情
 	//public  List<User> selectByPersonName(Map<String, Object> map);//临时测试用的
    
-	
-	
+	public void insertCheckTransfer(Map<String, Object> map);//将划转资金审核的意见插入导(划转资金审核表里)
+	public void updatecapitaltransferStatus(Map<String, Object> map);//将划转审核结果意见在插入划转资金表的同时,也将审核结果更新到划转资金表中去,根据基金id  ->fund_id修改指定的业务
 	
 }

+ 3 - 0
ccb_fund_trusteeship/src/main/java/com/fuzamei/service/AccountOpenService.java

@@ -9,6 +9,7 @@ import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
 
 import com.fuzamei.dao.AccountOpenDao;
 import com.fuzamei.entity.AccountOpeningRecord;
@@ -38,6 +39,8 @@ public class AccountOpenService {
 				page = 1; // 数据解析异常page还是1
 			}
 		}
+		//StringUtils.isEmpty(map); //StringUtils  
+
 		if (!"".equals(map.get("customer_name")) && map.get("customer_name") != null) { // 等于空就直接取空值
 			customer_name = (String) map.get("customer_name");
 		}

+ 36 - 1
ccb_fund_trusteeship/src/main/java/com/fuzamei/service/CapitalTransferService.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import org.apache.poi.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
 import com.fuzamei.dao.CapitalTransferDao;
@@ -106,10 +107,44 @@ public class CapitalTransferService {
 		  List<CapitalTransferCheck> lis= capitalTransferDao.selectCapitalTransferRecord(mapToDao);
 		  //List<User> user=capitalTransferDao.selectByPersonName(mapToDao);
 		  Map<String, Object> map1=new LinkedHashMap<String, Object>();
-		  map1.put("CapitalTransfer", list);//管理人取不到值  稍做修改 persont_name
+		  map1.put("CapitalTransfer", list);//管理人persont_name取不到值  稍做修改 
 		  map1.put("CapitalTransferCheck", lis);
 		 // map1.put("user", user); 
 		return map1;
 	}
+	@Transactional
+	public void insertCheckTransfer(Map<String, Object> map) {
+		String check_department="";		//审核部门
+		String check_person="";			//审核人
+		Integer check_result=null;			//审核结果
+		String check_opinion="";			//审核意见
 	
+		Integer fund_id=null;			//划转资金的id号,要根据这个更新划转资金审核的状态的
+		Integer status_id=null;			//划转资金表的状态id号,这个要根据check_result审核结果来判断状态哦
+		
+		Integer operatorTypeId=null;     ////把操作类型id号-*放到操作记录表中去的
+		
+		if (!"".equals(map.get("check_department")) && map.get("check_department") != null) { 
+			check_department = (String)map.get("check_department");
+		}
+		if (!"".equals(map.get("check_person")) && map.get("check_person") != null) { 
+				check_person = (String)map.get("check_person");
+		}
+		if (!"".equals(map.get("check_result")) && map.get("check_result") != null) { 
+			check_result = Integer.parseInt((String)map.get("check_result"));
+	     
+		
+		}
+		if (!"".equals(map.get("check_opinion")) && map.get("check_opinion") != null) { 
+			check_opinion = (String)map.get("check_opinion");
+	    }
+		if (!"".equals(map.get("fund_id")) && map.get("fund_id") != null) { 
+			fund_id = Integer.parseInt((String)map.get("fund_id"));
+	    }
+		if (!"".equals(map.get("status_id")) && map.get("status_id") != null) { 
+			status_id = Integer.parseInt((String)map.get("status_id"));
+	    }
+		
+		
+	}
 }

+ 62 - 0
ccb_fund_trusteeship/src/main/java/com/fuzamei/utils/ArrayUtil.java

@@ -0,0 +1,62 @@
+/**
+ * FileName: ArrayUtil
+ * Author: wangtao
+ * Date: 2017/12/15 11:28
+ * Description:
+ */
+package com.fuzamei.utils;
+
+/**
+ *
+ *
+ * @author wangtao
+ * @create 2017/12/15
+ *
+ */
+
+public class ArrayUtil {
+
+    private ArrayUtil() {
+        throw new AssertionError("不能实例化 ArrayUtil");
+    }
+
+    // Empty checks
+    //-----------------------------------------------------------------------
+
+    public static boolean isEmpty(final Object[] array) {
+        return array == null || array.length == 0;
+    }
+
+    public static boolean isEmpty(final long[] array) {
+        return array == null || array.length == 0;
+    }
+
+    public static boolean isEmpty(final int[] array) {
+        return array == null || array.length == 0;
+    }
+
+    public static boolean isEmpty(final short[] array) {
+        return array == null || array.length == 0;
+    }
+
+    public static boolean isEmpty(final char[] array) {
+        return array == null || array.length == 0;
+    }
+
+    public static boolean isEmpty(final byte[] array) {
+        return array == null || array.length == 0;
+    }
+
+    public static boolean isEmpty(final double[] array) {
+        return array == null || array.length == 0;
+    }
+
+    public static boolean isEmpty(final float[] array) {
+        return array == null || array.length == 0;
+    }
+
+    public static boolean isEmpty(final boolean[] array) {
+        return array == null || array.length == 0;
+    }
+
+}

+ 174 - 0
ccb_fund_trusteeship/src/main/java/com/fuzamei/utils/StringUtil.java

@@ -0,0 +1,174 @@
+package com.fuzamei.utils;
+public final class StringUtil {
+
+	private StringUtil() {
+		throw new AssertionError("不能实例化 StringUtil");
+	}
+
+	// Empty checks
+	//-----------------------------------------------------------------------
+
+	/**
+	 * 检查CharSequence是否为empty ("")或null
+	 *
+	 * StringUtil.isEmpty(null)      = true
+	 * StringUtil.isEmpty("")        = true
+	 * StringUtil.isEmpty(" ")       = false
+	 * StringUtil.isEmpty("bob")     = false
+	 * StringUtil.isEmpty("  bob  ") = false
+	 *
+	 * @param cs 待测字符序列
+	 * @return 待测序列是否为empty或null
+	 */
+	public static boolean isEmpty(final CharSequence cs) {
+		return cs == null || cs.length() == 0;
+	}
+
+	/**
+	 * 检查CharSequence是否不为empty ("")或null
+	 *
+	 * StringUtil.isNotEmpty(null)      = false
+	 * StringUtil.isNotEmpty("")        = false
+	 * StringUtil.isNotEmpty(" ")       = true
+	 * StringUtil.isNotEmpty("bob")     = true
+	 * StringUtil.isNotEmpty("  bob  ") = true
+	 *
+	 * @param cs 待测字符序列
+	 * @return 待测序列是否不为empty或null
+	 */
+	public static boolean isNotEmpty(final CharSequence cs) {
+		return !isEmpty(cs);
+	}
+
+	/**
+	 * 检测CharSequence中是否有任意一个为empty ("")或null
+	 *
+	 * StringUtil.isAnyEmpty(null)             = true
+	 * StringUtil.isAnyEmpty(null, "foo")      = true
+	 * StringUtil.isAnyEmpty("", "bar")        = true
+	 * StringUtil.isAnyEmpty("bob", "")        = true
+	 * StringUtil.isAnyEmpty("  bob  ", null)  = true
+	 * StringUtil.isAnyEmpty(" ", "bar")       = false
+	 * StringUtil.isAnyEmpty("foo", "bar")     = false
+	 *
+	 * @param css 待测字符序列
+	 * @return 待测序列是否有任意一个为empty或null
+	 */
+	public static boolean isAnyEmpty(final CharSequence... css) {
+		if (ArrayUtil.isEmpty(css)) {
+			return true;
+		}
+		for (final CharSequence cs : css){
+			if (isEmpty(cs)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * 检测CharSequence中是否都不为empty ("")或null
+	 *
+	 * StringUtil.isNoneEmpty(null)             = false
+	 * StringUtil.isNoneEmpty(null, "foo")      = false
+	 * StringUtil.isNoneEmpty("", "bar")        = false
+	 * StringUtil.isNoneEmpty("bob", "")        = false
+	 * StringUtil.isNoneEmpty("  bob  ", null)  = false
+	 * StringUtil.isNoneEmpty(" ", "bar")       = true
+	 * StringUtil.isNoneEmpty("foo", "bar")     = true
+	 *
+	 * @param css 待测字符序列
+	 * @return 待测序列是否都不为empty或null
+	 */
+	public static boolean isNoneEmpty(final CharSequence... css) {
+		return !isAnyEmpty(css);
+	}
+
+	/**
+	 * 检测CharSequence中是否为whitespace空字符或empty ("")或null
+	 *
+	 * StringUtil.isBlank(null)      = true
+	 * StringUtil.isBlank("")        = true
+	 * StringUtil.isBlank(" ")       = true
+	 * StringUtil.isBlank("bob")     = false
+	 * StringUtil.isBlank("  bob  ") = false
+	 *
+	 * @param cs 待测字符序列
+	 * @return 待测序列是否为whitespace空字符或empty或null
+	 */
+	public static boolean isBlank(final CharSequence cs) {
+		int strLen;
+		if (cs == null || (strLen = cs.length()) == 0) {
+			return true;
+		}
+		for (int i = 0; i < strLen; i++) {
+			if (!Character.isWhitespace(cs.charAt(i))) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * 检测CharSequence中是否不为whitespace空字符或empty ("")或null
+	 *
+	 * StringUtil.isNotBlank(null)      = false
+	 * StringUtil.isNotBlank("")        = false
+	 * StringUtil.isNotBlank(" ")       = false
+	 * StringUtil.isNotBlank("bob")     = true
+	 * StringUtil.isNotBlank("  bob  ") = true
+	 *
+	 * @param cs 待测字符序列
+	 * @return 待测序列是否不为whitespace空字符或empty或null
+	 */
+	public static boolean isNotBlank(final CharSequence cs) {
+		return !isBlank(cs);
+	}
+
+	/**
+	 * 检测CharSequence中是否有任意一个为whitespace空字符或empty ("")或null
+	 *
+	 * StringUtil.isAnyBlank(null)             = true
+	 * StringUtil.isAnyBlank(null, "foo")      = true
+	 * StringUtil.isAnyBlank(null, null)       = true
+	 * StringUtil.isAnyBlank("", "bar")        = true
+	 * StringUtil.isAnyBlank("bob", "")        = true
+	 * StringUtil.isAnyBlank("  bob  ", null)  = true
+	 * StringUtil.isAnyBlank(" ", "bar")       = true
+	 * StringUtil.isAnyBlank("foo", "bar")     = false
+	 *
+	 * @param css 待测字符序列
+	 * @return 待测序列是否有任意一个为whitespace空字符或empty或null
+	 */
+	public static boolean isAnyBlank(final CharSequence... css) {
+		if (ArrayUtil.isEmpty(css)) {
+			return true;
+		}
+		for (final CharSequence cs : css){
+			if (isBlank(cs)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * 检测CharSequence中是否都不为whitespace空字符或empty ("")或null
+	 *
+	 * StringUtil.isNoneBlank(null)             = false
+	 * StringUtil.isNoneBlank(null, "foo")      = false
+	 * StringUtil.isNoneBlank(null, null)       = false
+	 * StringUtil.isNoneBlank("", "bar")        = false
+	 * StringUtil.isNoneBlank("bob", "")        = false
+	 * StringUtil.isNoneBlank("  bob  ", null)  = false
+	 * StringUtil.isNoneBlank(" ", "bar")       = false
+	 * StringUtil.isNoneBlank("foo", "bar")     = true
+	 *
+	 * @param css 待测字符序列
+	 * @return 待测序列是否都不为whitespace空字符或empty或null
+	 */
+	public static boolean isNoneBlank(final CharSequence... css) {
+		return !isAnyBlank(css);
+	}
+
+}