分模块

ccb_fund_trusteeship/src/main/java/com/fuzamei/constant/OperationTypeId.java

@@ -21,4 +21,14 @@ public class OperationTypeId {
 	public static final Integer UPLOAD_PROJECT_FILE =1011;					//上传项目文档
 	public static final Integer BUSINESS_FIRST_TRIAL_REJECTED =1012;		//业务初审拒绝
 	public static final Integer BUSINESS_REEXAMINE_AGREED =1013;			//业务复审通过
+	
+	public static final Integer CAPITAL_TRANSFER_REEXAMINE_REJECTED_NO =1014;          //资金划转终身拒绝
+	public static final Integer INSTRUCT_BUSINESS_ACCOUNTING =1015;      //待指令业务岗审核
+	public static final Integer INSTRUCT_BUSINESS_ACCOUNTING_NO =1016;    //指令业务岗审核不通过
+	public static final Integer CHECK_BUSINESS_ACCOUNTING =1017;        //待核算业务岗岗审核
+	public static final Integer CHECK_BUSINESS_ACCOUNTING_NO =1018;      //核算业务岗审核不通过
+	public static final Integer CHARGE_BUSINESS_ACCOUNTING =1019;        //待核算主管岗审核
+	public static final Integer CHARGE_BUSINESS_ACCOUNTING_YES =1020;     //核算主管岗通过
+	public static final Integer CHARGE_BUSINESS_ACCOUNTING_NO =1021;      //核算主管岗审核不通过
+	
 }

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

@@ -29,7 +29,9 @@ public class AccountMaintenanceDao {
 	public  int selectCountAccountMaintenancePage() {
 		return accountMaintenanceMapper.selectCountAccountMaintenancePage();
 	}
-	
+	public List<AccountOpeningRecord> selectAccountMaintenanceNoPage(Map<String, Object> map){
+		return accountMaintenanceMapper.selectAccountMaintenanceNoPage(map);
+	}
 	
 	
 	

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

@@ -32,10 +32,14 @@ public class CapitalTransferDao {
 	/*public List<User> selectByPersonName(Map<String, Object> map) {//临时测试的
 		return capitalTransferMapper.selectByPersonName(map);
 	}*/
-	public void insertCheckTransfer(Map<String, Object> map) {//将划转资金审核的意见插入导（划转资金审核表里）
+	public void insertCapitalTransfer(Map<String, Object> map) {//管理人  发起  划款资金
+		capitalTransferMapper.insertCapitalTransfer(map);
+	}
+	
+	public void insertCheckTransfer(Map<String, Object> map) {//将划转资金审核的意见插入到（划转资金审核表里）
 		capitalTransferMapper.insertCheckTransfer(map);
 	}
-	public void updatecapitaltransferStatus(Map<String, Object> map) {//将划转审核结果意见在插入划转资金表的同时，也将审核结果更新到划转资金表中去，根据基金id  
+	public void updatecapitaltransferStatus(Map<String, Object> map) {//将划转审核结果意见在插入划转资金表的同时，也将审核结果更新到划转资金表中去，根据基金id 在修改指定的业务 
 		capitalTransferMapper.updatecapitaltransferStatus(map);
 	}
 }

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

@@ -0,0 +1,36 @@
+package com.fuzamei.dao;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+
+import com.fuzamei.entity.PromptLetter;
+import com.fuzamei.mapperInterface.PromptLetterMapper;
+
+@Repository
+public class PromptLetterDao {
+	@Autowired
+	private PromptLetterMapper  promptLetterMapper;
+	public List<PromptLetter> selectPromptLetter(Map<String, Object> map){//查询风险提示函  管理人接收人
+		return promptLetterMapper.selectPromptLetter(map);
+	}
+	public List<PromptLetter> selectTishihan(Map<String, Object> map){//查询风险提示函3   发送人
+		return promptLetterMapper.selectTishihan(map);
+	}
+	public void insertIntoPromptLetterTable(Map<String, Object> map) {//数据往提示函插入
+		promptLetterMapper.insertIntoPromptLetterTable(map);
+	}
+	public void insertIntoAttachmentTable(Map<String, Object> map) {//提示函 在往附件表也插入数据
+		promptLetterMapper.insertIntoAttachmentTable(map);
+	}
+	public void insertOperationHistory(Map<String, Object> map) {//也插入一条数据到操作记录表   
+		promptLetterMapper.insertOperationHistory(map);
+	}
+	public  int  serchCountPage2(){//提示函 列返回总页数
+		return  promptLetterMapper.serchCountPage2();
+	}
+	
+	
+}

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

@@ -0,0 +1,22 @@
+package com.fuzamei.dao;
+
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+
+import com.fuzamei.mapperInterface.TrueFalseSelectMapper;
+
+@Repository
+public class TrueFalseSelectDao {
+	@Autowired
+	private TrueFalseSelectMapper trueFalseSelectMapper;
+	
+	public void insertTrueFalseSelect(Map<String, Object> map) {//真伪查询   记录插入到附件表
+		trueFalseSelectMapper.insertTrueFalseSelect(map);
+	}
+	public void insertOperationHistory(Map<String, Object> map) {// 真为查询 插入到操作记录表    
+		trueFalseSelectMapper.insertOperationHistory(map);
+	}
+	
+}

ccb_fund_trusteeship/src/main/java/com/fuzamei/entity/AccountOpeningRecord.java

@@ -9,12 +9,44 @@ public class AccountOpeningRecord {
 	private String customer_name;//客户名称
 	private String bank_account;//银行账号
 	private String letter_of_commitment_id;//账户承诺书id
+	private String letterUrl;//账户承诺书url
 	private String application_id;//开户申请书id
+	private String applicationUrl;//开户申请url
 	private String basic_data_id;//其他凭证id
+	private String basicUrl;//其他凭证url
 	private long update_time;//更新时间
 	private int  status_id;//状态id
+	private String status_name;//状态名称
 	private String hash;//哈希码
 	
+	
+	public String getLetterUrl() {
+		return letterUrl;
+	}
+	public void setLetterUrl(String letterUrl) {
+		this.letterUrl = letterUrl;
+	}
+	public String getApplicationUrl() {
+		return applicationUrl;
+	}
+	public void setApplicationUrl(String applicationUrl) {
+		this.applicationUrl = applicationUrl;
+	}
+	public String getBasicUrl() {
+		return basicUrl;
+	}
+	public void setBasicUrl(String basicUrl) {
+		this.basicUrl = basicUrl;
+	}
+	public String getStatus_name() {
+		return status_name;
+	}
+	public void setStatus_name(String status_name) {
+		this.status_name = status_name;
+	}
+	
+	
+	
 	public int getId() {
 		return id;
 	}

ccb_fund_trusteeship/src/main/java/com/fuzamei/entity/CapitalTransfer.java

@@ -12,19 +12,48 @@ public class CapitalTransfer {
 	//private String drawing_account;//划款账户  去掉 放到用户表里
 	private long apply_time;//申请时间
 	private long handle_time;//处理时间
-	private int status_id;//状态id
 	
-	//字段
-	private String  persont_name;//用户表   管理人写死的
+	private int  status_id;//状态id
+    private String status_name;//得显示状态得名称
+    
+	private String  person_name;//用户表   管理人写死的
 	private String  attachment_name;//附件表的 附件名称
 	private String url;        //划款依据的url
 	
+	private String drawing_account;// 用户表  账户余额
+	private double account_balance;// 用户表  划款账户
+
 	
-	public String getPersont_name() {
-		return persont_name;
+	public String getStatus_name() {
+		return status_name;
+	}
+	public void setStatus_name(String status_name) {
+		this.status_name = status_name;
+	}
+	public int getStatus_id() {
+		return status_id;
+	}
+	public void setStatus_id(int status_id) {
+		this.status_id = status_id;
+	}
+	public String getDrawing_account() {
+		return drawing_account;
+	}
+	public void setDrawing_account(String drawing_account) {
+		this.drawing_account = drawing_account;
+	}
+	public double getAccount_balance() {
+		return account_balance;
 	}
-	public void setPersont_name(String persont_name) {
-		this.persont_name = persont_name;
+	public void setAccount_balance(double account_balance) {
+		this.account_balance = account_balance;
+	}
+
+	public String getPerson_name() {
+		return person_name;
+	}
+	public void setPerson_name(String person_name) {
+		this.person_name = person_name;
 	}
 	public String getAttachment_name() {
 		return attachment_name;
@@ -86,12 +115,7 @@ public class CapitalTransfer {
 	public void setApply_time(long apply_time) {
 		this.apply_time = apply_time;
 	}
-	public int getStatus_id() {
-		return status_id;
-	}
-	public void setStatus_id(int status_id) {
-		this.status_id = status_id;
-	}
+
 	
 	
 	

ccb_fund_trusteeship/src/main/java/com/fuzamei/entity/CapitalTransferCheck.java

@@ -1,25 +1,33 @@
 package com.fuzamei.entity;
 
-import java.util.Date;
+
 //划转资金审核表
 public class CapitalTransferCheck {
 	private int id;//主键id
 	private int fund_id;//基金id
 	private String check_department;//审核部门
 	private String check_person;//审核人员
-	private String check_opinin;//审核意见
+	private String check_opinion;//审核意见
 	private long check_time;//审核时间
-	private String check_result;//结果
-	private  int relation;//发起or审核
-	public int getRelation() {
+	private String check_result;//结果       改String
+	private  String relation;//发起or审核   改 String
+	
+
+/*	public int getRelation() {
 		return relation;
 	}
 	public void setRelation(int relation) {
 		this.relation = relation;
-	}
+	}*/
 	public int getId() {
 		return id;
 	}
+	public String getRelation() {
+		return relation;
+	}
+	public void setRelation(String relation) {
+		this.relation = relation;
+	}
 	public void setId(int id) {
 		this.id = id;
 	}
@@ -41,11 +49,11 @@ public class CapitalTransferCheck {
 	public void setCheck_person(String check_person) {
 		this.check_person = check_person;
 	}
-	public String getCheck_opinin() {
-		return check_opinin;
+	public String getCheck_opinion() {
+		return check_opinion;
 	}
-	public void setCheck_opinin(String check_opinin) {
-		this.check_opinin = check_opinin;
+	public void setCheck_opinion(String check_opinion) {
+		this.check_opinion = check_opinion;
 	}
 	public long getCheck_time() {
 		return check_time;
@@ -53,6 +61,12 @@ public class CapitalTransferCheck {
 	public void setCheck_time(long check_time) {
 		this.check_time = check_time;
 	}
+/*	public int getCheck_result() {
+		return check_result;
+	}
+	public void setCheck_result(int check_result) {
+		this.check_result = check_result;
+	}*/
 	public String getCheck_result() {
 		return check_result;
 	}
@@ -62,4 +76,5 @@ public class CapitalTransferCheck {
 	
 	
 	
+	
 }

ccb_fund_trusteeship/src/main/java/com/fuzamei/entity/PromptLetter.java

@@ -13,9 +13,15 @@ public class PromptLetter {
 	private String hash;//哈希码
 	
 	private String attachment_name;/**附件表账号名称**/
+	private String url;
 	private String person_name;/**用户表管理人名字**/
 
-	
+	public String getUrl() {
+		return url;
+	}
+	public void setUrl(String url) {
+		this.url = url;
+	}
 	public String getPerson_name() {
 		return person_name;
 	}

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

@@ -3,14 +3,18 @@
 <mapper namespace="com.fuzamei.mapperInterface.AccountMaintenanceMapper"> 
     <!--查询账户开立信息维护   列表-->
 	<select id="selectAccountMaintenanceInfo" parameterType="java.util.Map" resultType="com.fuzamei.entity.AccountOpeningRecord">
-		select 
+	 select  DISTINCT
 			customer_id,
 			customer_name,
 			bank_account,
 			f.attachment_name as basic_data_id,
+			f.url as basicUrl,
 			f1.attachment_name as letter_of_commitment_id,
+			f1.url as letterUrl,
 			f2.attachment_name as application_id,
-			update_time,s.status_name 
+			f2.url  as applicationUrl,
+			update_time,
+			s.status_name 
 		from  
 			      account_opening_record a
 		LEFT JOIN  attachment f
@@ -21,7 +25,7 @@
 	  	LEFT JOIN attachment f2
 	  	on	a.application_id= f2.attachment_id 
 	  	LEFT JOIN status s
-	  	on a.status_id = s.status_id
+	  	on a.status_id = s.status_id	
 	 <where>
 		    <if test="customer_name!='' and customer_name!=null ">
 			  customer_name=#{customer_name}
@@ -42,7 +46,7 @@
 	  select count(*) from account_opening_record
 	</select>
 	
-	<!-- 添加上传账户维护信息表 -->
+	<!-- 添加上传账户维护信息表  添加到账户维护开立表 -->
     <insert id="insertIntoAccountMaintenanceInfo" parameterType="java.util.Map">
     	   insert into account_opening_record(
 	              customer_id,
@@ -63,13 +67,13 @@
 	            #{applicationAttachment_id},
 	            #{update_time},
 	            #{status_id},
-	            #{hash}
-	            )
+	            #{hash})
+	           
     </insert>
     
     <!-- 上传其他凭证，承诺书，开户申请书    经办支行添加创建账号和客户名称  上传到附件表--> 
 	<insert id="insertAccountMaintenanceInfoFuJianBiao" parameterType="java.util.Map">
-	     	   <!--  插入到附件表-->
+	       <!--  插入到附件表-->
 		   insert into attachment (
 		                attachment_id,
 		                attachment_name,
@@ -100,9 +104,30 @@
 				   #{operatorTime},
 				   #{hash})
 	</insert>
-
-
-
-
+    <!-- 账户开立下载页面 -->
+    <select id="selectAccountMaintenanceNoPage" parameterType="java.util.Map" resultType="com.fuzamei.entity.AccountOpeningRecord">
+	select   DISTINCT
+			customer_id,
+			customer_name,
+			bank_account,
+			f.attachment_name as basic_data_id,
+			f.url   as basicUrl,
+			f1.attachment_name as letter_of_commitment_id,
+			f1.url as letterUrl ,
+			f2.attachment_name as application_id,
+			f2.url  as applicationUrl,
+			update_time
+		
+		from  
+			account_opening_record a
+			left  join  attachment f
+			on a.basic_data_id=f.attachment_id 
+	     	left  join	attachment f1
+	    	on	a.letter_of_commitment_id = f1.attachment_id 
+	  	    left  join attachment f2
+	  	    on	a.application_id= f2.attachment_id 
+		 where  customer_id=#{customer_id}
+    </select>
+   
 
 </mapper>

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

@@ -1,33 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fuzamei.mapperInterface.AccountOpenMapper"> 
-	<!-- <select id="queryAllAccountOpening" parameterType="java.util.Map"  resultType="com.fuzamei.entity.AccountOpeningRecord">
-		select customer_id,customer_name,bank_account,basic_data_id,letter_of_commitment_id,application_id,update_time,s.status_name from status s,account_opening_record a where s.status_id=a.status_id      
-	</select> -->
-<!-- 	<select id="serchCountPage" resultType="int">
-	  select count(*)  from account_opening_record 
-	</select>
-   账户开立分页
-	<select id="queryAllAccountOpening" parameterType="java.util.Map" resultType="com.fuzamei.entity.AccountOpeningRecord">
-		select customer_id,customer_name,bank_account,basic_data_id,letter_of_commitment_id,application_id,update_time,s.status_name  from account_opening_record a left join status s on s.status_id=a.status_id      
-	<where>
-		<if test="customer_name!='' and customer_name!=null ">
-		   customer_name=#{customer_name}
-		</if>
-		<if test="bank_account!='' and bank_account!=null">
-		  and bank_account=#{bank_account}
-		</if>
-	   	<if test="startTime!='' and endTime != ''">
-		  and  between #{startTime} and #{endTime}
-		</if>
-	</where>
-	   order by update_time desc
-	   limit #{startNum},10 -->
 	<!--查询账户开立  返回总页数-->
 	<select id="serchCountPage" resultType="int">
 	  select count(*)  from account_opening_record  
 	</select>
-	<!--查询资金划转 返回总页数  -->
+	<!--查询提示函  返回总页数  -->
 	<select id="serchCountPage2" resultType="int">
 	  select count(*)  from prompt_letter
 	</select>
@@ -66,40 +44,26 @@
 	   limit #{startPage},#{rowNum}
 	</select> -->
 	<!-- ************************************************************************************************** -->
-	<!--提示函  管理人接收的 列表   没用左链接不可以话在改-->
+	<!--提示函  管理人接收的 列表  -->
 	<!-- select   t.prompt_letter_id,f.attachment_name,  t.receive_time ,f.url from  prompt_letter t left join attachment f on t.prompt_letter_id=f.attachment_id    order by receive_time desc -->
 	<select id="selectPromptLetter" parameterType="java.util.Map" resultType="com.fuzamei.entity.PromptLetter">
-	 select  
-	         t.prompt_letter_id,
-             f.attachment_name,
-			 t.receive_time,
-			 f.url
-       from  
-       		prompt_letter t,
-             attachment f 
-       where
-		    t.prompt_letter_id=f.attachment_id and receive_time between #{startTime} and #{endTime}
-		      order by receive_time desc
-	          limit #{startPage},#{rowNum}
+	   select   t.prompt_letter_id,
+	            f.attachment_name, 
+			    f.url,
+			    t.receive_time 
+		 from   prompt_letter t left join attachment f on t.prompt_letter_id=f.attachment_id  
+		 <where>
+		     receive_time between #{startTime} and #{endTime}
+		 </where>
+		     order by receive_time desc  limit #{startPage},#{rowNum}	
+		 
 	</select>
 	<!--*********************************************************************************************  -->
-	<!-- 提示函  插入管理人账号     -->
-	<insert id="insertTiShiHanOrUserOrOtherTable" parameterType="java.util.Map">
-	    <!--先注释有改动 -->
-	    <!--  insert into attachment (
-	                attachment_id,
-	                attachment_name,
-	                url,
-	                upload_person_id,
-	                create_time) 
-	          values(
-	               #{attachment_id},
-	               #{attachment_name},
-	               #{url},
-	               #{upload_person_id},
-	               #{create_time} ); -->
-	</insert>
+
+	<!-- <insert id="insertTiShiHanOrUserOrOtherTable" parameterType="java.util.Map">
+	     </insert> -->
 	<!--提示函上传 插入数据到提示函表  -->
+	<!-- *********************************************************************************************** -->
 	<insert id="insertIntoPromptLetterTable" parameterType="java.util.Map">
 		insert into 
 		prompt_letter(prompt_letter_id,
@@ -150,28 +114,14 @@
 			   #{operatorTime},
 			   #{hash})
 	</insert>
-	
-	<!--根据id查询出来   管理人 关系到附件表的id 上传的时候有插入到附件表和操作记录表-->
-	<select id="selectTishihanById" parameterType="java.util.Map" resultType="com.fuzamei.entity.User">
-		select  y.person_name from t_user y, attachment f where  y.user_id=f.attachment_id
-	</select>
 	<!--**********************************************************************************************  -->
 	<!--发送记录查询风险提示函 ，省分行托管中心风管岗   发送时间列biao-->
 	<select id="selectTishihan" parameterType="java.util.Map" resultType="com.fuzamei.entity.PromptLetter">
-	   select  
-	           t.prompt_letter_id , 
-	           y.person_name, 
-	           f.attachment_name,
-	           t.send_time 
-		from  
-		      prompt_letter t left join 
-              attachment f  
-          on  t.prompt_letter_id=f.attachment_id left join  t_user y
-		  on  t.send_person =user_id        
-	            
+	select  t.prompt_letter_id , y.person_name , f.attachment_name, t.send_time    
+	from prompt_letter t left  join  attachment f  on t.prompt_letter_id=f.attachment_id left  join t_user y on  t.send_person=f.attachment_id	     
 		<where>
 		    <if test="startTime!='' and endTime != ''">
-		    	and	send_time  between #{startTime} and #{endTime}
+		    		t.send_time  between #{startTime} and #{endTime}
 		   </if>
 		</where>
 		      order by send_time desc
@@ -179,7 +129,7 @@
 	</select>
 	
 	<!--***********************************************************************************************  -->
-	<!-- 真伪查询   上传服务器   附件表记录插入-->
+	<!-- 真伪查询   上传服务器  往 附件表记录插入-->
 	<insert id="insertTrueFalseSelect" parameterType="java.util.Map">
 		   insert into attachment (
 	                attachment_id,
@@ -236,7 +186,7 @@
 		               #{upload_person_id},
 		               #{create_time} )
 	</insert>
-<!-- *******************代替上面的,用左链接************************************************* -->
+<!-- *******************代替上面的账户开立,用左链接************************************************* -->
  <select id="queryAllAccountOpening" resultType="com.fuzamei.entity.AccountOpeningRecord">
 	select 
 			customer_id,

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

@@ -3,27 +3,24 @@
 <mapper namespace="com.fuzamei.mapperInterface.CapitalTransferMapper"><!-- 找接口 --> 
     <!--查询资金划转表  省分行托管中心指令业务岗 -->
 	<select id="selectCapitalTransferTable" parameterType="java.util.Map" resultType="com.fuzamei.entity.CapitalTransfer">
-	 select   z.fund_id,
-		       y.person_name,
-		       z.fund_name,
-		       z.account_balance,
-		       z.sum_of_money,
-		       f. attachment_name,
-		       z.drawing_account,
-		       z.apply_time,
-		       z.handle_time ,
-		       t.status_name 
-	    from  
-	            capital_transfer z , 
-	            status  t ,
-	             t_user y,
-	             attachment f 
-	   <where>
-	          z.status_id =t.status_id
-	        and 
-	           y.user_id=z.custodian
-	        and 
-	          f.attachment_id=z.basis_of_payment
+       select 	z.fund_id,
+                y.person_name,
+                z.fund_name,
+                y.account_balance,
+                z.sum_of_money,
+                f.attachment_name,
+                f.url,
+                y.drawing_account,
+                z.apply_time,
+                z.handle_time,
+                s.status_name 
+        from 
+              capital_transfer z left join 	t_user y  
+        on    z. custodian=y.user_id  
+      left  join   attachment f
+        on   z.basis_of_payment=f.attachment_id  
+      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}
 	      </if>
@@ -44,72 +41,71 @@
   <!--****************************************  -->  
   <!--查看  资金划转详情     根据前端给我返回的id   在把那一条数据查出来-->
   <select id="selectChaKanZiJinHuaZhuan" parameterType="java.util.Map" resultType="com.fuzamei.entity.CapitalTransfer">
-   	select   y.person_name,
+   	 	select   y.person_name,
   	        sj.fund_name, 
-  	        sj.account_balance, 
+						y.account_balance,
   	        sj.sum_of_money,
-  	         f.attachment_name,
-			f.url,
-  	        sj.drawing_account,
-  	        sj.apply_time  
-     from  capital_transfer sj , 
-             attachment f,
-             t_user y   
-    
-       <where>
-            sj.basis_of_payment=f.attachment_id
-       and    
-           y.user_id=sj.custodian 
+  	        f.attachment_name,
+			      f.url,
+  	        y.drawing_account,
+  	        sj.apply_time   
+       from  capital_transfer sj  left join t_user y on sj.custodian= y.user_id  left  join   attachment f on  sj.basis_of_payment=f.attachment_id  
+    <where>
         <if test="fund_id!='' and fund_id!=null">
-        and 
           fund_id=#{fund_id}
         </if>
-       </where>
+     </where> 
   </select>
-  <!--**********************************  -->
- <!--  详情 单独查看  资金划转 的管理人 -->
- <!--  <select id="selectByPersonName" parameterType="java.util.Map" resultType="com.fuzamei.entity.User">
-  		select person_name  from  t_user  
-  		<where>
-  		<if test="user_id!='' and user_id!=null">
-  	          user_id=#{user_id}
-  	          </if>
-  		</where>
-  		
-  </select> -->
-  
-<!--*************************************  -->
-    <!--查看  查询(划转资金审核记录表)  框框 --> 
+  <!--*************************************  -->
+    <!--查看  查询(划转资金审核记录表)  框框详情记录 --> 
 	<select id="selectCapitalTransferRecord" parameterType="java.util.Map" resultType="com.fuzamei.entity.CapitalTransferCheck">
-     select  sj.fund_id,
-             sj.check_department,
-             sj.check_person,
-             sj.check_opinion,
-             sj.check_time,
-             s.status_name  
-      from  (
-        select sj.fund_id,
+       select  sj.fund_id,
                sj.check_department,
                sj.check_person,
                sj.check_opinion,
-               sj.check_time,
-               sj.check_result,
-               s.status_name,
-               sj.relation 
-         from  capital_transfer_check sj  
-         left join 
-               status s
-          on   sj.check_result =s.status_id ) sj
-         left  join status s  on  s.status_id=sj.relation
-        <where>
-           <if test="fund_id!='' and fund_id!=null">
-      
+               sj.check_time, 
+               sj.check_result ,
+			   s. status_name as relation
+		from (
+		select  sj.fund_id,
+                sj.check_department,
+                sj.check_person,
+                sj.check_opinion,
+                sj.check_time, 
+				s.status_name as check_result,
+				sj.relation
+		from  
+		     capital_transfer_check sj  
+		left join  status s  on    sj.check_result =s.status_id )sj  
+		left join  status s   on s.status_id=sj.relation 
+       <where>
+        <if test="fund_id!='' and fund_id!=null">
           fund_id=#{fund_id}
-           </if>
-       </where>
-        
+        </if>
+     </where> 
 	</select>
-	
+	<!-- 管理人  发起  划转资金 插入到划转资金表*************///////////////////////////////////////////////////////// --> 
+	<insert id="insertCapitalTransfer">
+		insert  into  
+		capital_transfer(fund_id,
+                         custodian,
+                         fund_name,
+                         sum_of_money,
+                         basis_of_payment,
+                         apply_time,
+                         handle_time,
+                         status_id)
+                  values(#{fund_id},
+                         #{custodian},
+                         #{fund_name},
+                         #{sum_of_money},
+                         #{basis_of_payment},
+                         #{apply_time},
+                         #{handle_time},
+                         #{status_id})
+	</insert>
+    
+  <!--******************************************************************************************************************** -->
 	<!-- 将划转资金   上传     附件信息插入附件表中   可以公用此方法-->
 	<insert id="insertAttachmentInfo">
 		insert into 
@@ -168,12 +164,10 @@
 		where 
 			fund_id=#{fund_id}
 	</update>
-   <!-- 资金划转*************///////////////////////////////////////////////////////// --> 
 
     
     
     
-    
 
 
 </mapper>

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

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fuzamei.mapperInterface.PromptLetterMapper"> 
+	<!--提示函  管理人接收列表  -->
+	<select id="selectPromptLetter" parameterType="java.util.Map" resultType="com.fuzamei.entity.PromptLetter">
+	   select   t.prompt_letter_id,
+	            f.attachment_name, 
+			    f.url,
+			    t.receive_time 
+		 from   prompt_letter t left join attachment f on t.prompt_letter_id=f.attachment_id  
+		 <where>
+		     receive_time between #{startTime} and #{endTime}
+		 </where>
+		     order by receive_time desc  limit #{startPage},#{rowNum}	
+		 
+	</select>
+	
+	<!--提示函上传 插入数据到提示函表  -->
+	<insert id="insertIntoPromptLetterTable" parameterType="java.util.Map">
+		insert into 
+		prompt_letter(prompt_letter_id,
+						   prompt_letter_name,
+				    	   send_person,
+						   receive_person,
+						   send_time,
+						   receive_time,
+						   hash) 
+			values(
+					#{prompt_letter_id},
+					#{prompt_letter_name},
+					#{send_person},
+					#{receive_person},  
+					#{send_time},
+					#{receive_time},
+					#{hash}
+					)
+	</insert>
+	<!-- 提示函上传  往附件表也插入数据信息 -->
+	<insert id="insertIntoAttachmentTable">
+		insert into 
+				attachment(attachment_id,
+					   attachment_name,
+						 url,
+					   upload_person_id,
+					   create_time) 
+			values(#{attachmentId},
+				   #{attachmentName},
+				   #{url},
+				   #{upload_person_id},
+				   #{create_time})
+	</insert> 
+	<!-- 提示函上传  往操作记录表也插入数据信息 -->
+	<insert id="insertOperationHistory">
+		insert into 
+			operation_history(operator_type_id,
+							  operator_account,
+							  operator_role,
+							  operator_person,
+							  operator_time,
+							  hash)
+		values(#{operatorTypeId},
+			   #{operatorAccount},
+			   #{operatorRole},
+			   #{operatorPerson},
+			   #{operatorTime},
+			   #{hash})
+	</insert>
+    <!--发送记录查询风险提示函 ，省分行托管中心风管岗   发送时间列biao-->
+	<select id="selectTishihan" parameterType="java.util.Map" resultType="com.fuzamei.entity.PromptLetter">
+	    select  t.prompt_letter_id , 
+	            y.person_name , 
+	            f.attachment_name,
+	            f.url,
+	            t.send_time    
+	     from   prompt_letter t left  join  attachment f  on t.prompt_letter_id=f.attachment_id left  join t_user y on  t.send_person=f.attachment_id	     
+		<where>
+		    <if test="startTime!='' and endTime != ''">
+		    	t.send_time  between #{startTime} and #{endTime}
+		   </if>
+		</where>
+		      order by send_time desc
+	          limit #{startPage},#{rowNum}
+	</select>
+	<!--查询提示函  返回总页数  -->
+	<select id="serchCountPage2" resultType="int">
+	  select count(*)  from prompt_letter
+	</select>
+
+
+</mapper>

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

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fuzamei.mapperInterface.TrueFalseSelectMapper"> 
+	<!-- 真伪查询  往附件表插入数据 -->
+	<insert id="insertTrueFalseSelect" parameterType="java.util.Map">
+		   insert into attachment (
+	                attachment_id,
+	                attachment_name,
+	                url,
+	                upload_person_id,
+	                create_time) 
+	          values(
+	               #{attachment_id},
+	               #{attachment_name},
+	               #{url},
+	               #{upload_person_id},
+	               #{create_time} );
+	</insert>
+   <!--真伪查询往操作记录表插入一天信息  -->
+   <insert id="insertOperationHistory">
+		insert into 
+			operation_history(operator_type_id,
+							  operator_account,
+							  operator_role,
+							  operator_person,
+							  operator_time,
+							  hash)
+		values(#{operatorTypeId},
+			   #{operatorAccount},
+			   #{operatorRole},
+			   #{operatorPerson},
+			   #{operatorTime},
+			   #{hash})
+	</insert>
+
+</mapper>

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

@@ -11,5 +11,5 @@ public interface AccountMaintenanceMapper {
 	public  void  insertAccountMaintenanceInfoOperationHistory(Map<String, Object> map);//当经办支行进行账户开立维护上传文件的时候往（操作记录表)也插入一条数据
 	public List<AccountOpeningRecord> selectAccountMaintenanceInfo(Map<String, Object> map);//查询账户开立信息维护列表
 	public  int selectCountAccountMaintenancePage();//查询账户维护开立信息总页数  返回一个int类型
-	
+	public List<AccountOpeningRecord> selectAccountMaintenanceNoPage(Map<String, Object> map);//账户开立 通过点击查看  供应下载页面  
 }

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

@@ -12,10 +12,10 @@ public interface AccountOpenMapper {
 	public  int serchCountPage();//总页数
 	public  int serchCountPage2();//提示函总页数
 	public List<AccountOpeningRecord> selectAccountopenNoPage(Map<String, Object> map);//账户开立 通过点击查看  供应下载页面  
-	public List<PromptLetter> selectPromptLetter(Map<String, Object> map);//查询风险提示函列表
+	public List<PromptLetter> selectPromptLetter(Map<String, Object> map);//查询风险提示函     接收人列表
 	public void insertOperationHistory(Map<String, Object> map);//账户开立上传的时候也往操作记录表插入一条数据     多方法公用
 	public void insertTiShiHanOrUserOrOtherTable(Map<String, Object> map);//插入管理人账号 还要往附件表，提示函表，操作记录表里也要加数据
-	public List<PromptLetter> selectTishihan(Map<String, Object> map);//查询风险提示函3 ，省分行拓托管中心风管岗
+	public List<PromptLetter> selectTishihan(Map<String, Object> map);//查询风险提示函3 ，省分行拓托管中心风管岗    发送列表
 	public void insertTrueFalseSelect(Map<String, Object> map);//真伪查询   记录插入到附件表
 	public void insertAccountUploadFile(Map<String, Object> map);//<!-- 上传客户资料，承诺书，开户申请书    经办支行添加创建账号和客户名称 -->
 	public void insertAccountUploadFileFuJianBiao(Map<String, Object> map);//<!-- 上传客户资料，承诺书，开户申请书    经办支行添加创建账号和客户名称 -->上传到附件表

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

@@ -14,8 +14,9 @@ public interface CapitalTransferMapper {
 	public  List<CapitalTransfer> selectChaKanZiJinHuaZhuan(Map<String, Object> map);//资金划转    查看详情
 	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修改指定的业务
+    public void insertCapitalTransfer(Map<String, Object> map);//管理人发起划款资金
+    
+	public void insertCheckTransfer(Map<String, Object> map);//将划转资金审核的意见插入到（划转资金审核表里）
+	public void updatecapitaltransferStatus(Map<String, Object> map);//将划转审核结果意见在插入划转资金表的同时，也将审核结果更新到划转资金表中去，根据基金id 》fund_id修改指定的业务
 	
 }

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

@@ -0,0 +1,17 @@
+package com.fuzamei.mapperInterface;
+
+import java.util.List;
+import java.util.Map;
+
+import com.fuzamei.entity.PromptLetter;
+
+public interface PromptLetterMapper {
+	public List<PromptLetter> selectPromptLetter(Map<String, Object> map);//查询风险提示函     接收人列表
+	public List<PromptLetter> selectTishihan(Map<String, Object> map);//查询风险提示函 ，省分行拓托管中心风管岗    发送列表
+	public void insertIntoPromptLetterTable(Map<String, Object> map);//提示函插入数据信息
+	public void insertIntoAttachmentTable(Map<String, Object> map);//提示函数据在往附件表也插入
+	public void insertOperationHistory(Map<String, Object> map);//提示函也往操作记录表李插入
+	public  int serchCountPage2();//提示函列表返回总页数or带条件查询分页
+	
+	
+}

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

@@ -0,0 +1,8 @@
+package com.fuzamei.mapperInterface;
+
+import java.util.Map;
+
+public interface TrueFalseSelectMapper {
+	public void insertTrueFalseSelect(Map<String, Object> map);//真伪查询   记录插入到附件表
+	public void insertOperationHistory(Map<String, Object> map);//真伪查询  往操作记录表查询
+}

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

@@ -19,12 +19,17 @@ public class AccountMaintenanceService {
    @Autowired
    private AccountMaintenanceDao  accountMaintenanceDao;
    private static final int ROW_NUM = 10; // 分页每页显示数据的数量
-    @Transactional
+   
+   /**
+    * 添加  上传  账户维护信息
+    * @param map
+    */
+   @Transactional
 	public void insertIntoAccountINfo(Map<String, Object> map) {
-		String customer_id="";   //ID   暂时注释
+		String customer_id="";   //ID   
 		String customer_name="";//客户名称
 		String bank_account="";//银行账号
-		String hash="";//上传三个文件  应该产生几个hash值？？？？？？
+		String hash="";//上传三个文件  应该产生几个hash值？？？？？？操作hash？
 	
 		//省略几个直接put进去
 		String basicAttachment_id="";    //基本资料附件id
@@ -114,8 +119,8 @@ public class AccountMaintenanceService {
 			  mapToDao.put("letterAttachment_id", letterAttachment_id);//承诺书id    
 			  mapToDao.put("applicationAttachment_id", applicationAttachment_id);//申请书id
 			  mapToDao.put("update_time",  System.currentTimeMillis());//更新时间
-			  mapToDao.put("status_id",  9);//状态写的是死值    9状态代表已完成  刚注册的用户账号就能使用  
-			  mapToDao.put("hash","ccccccc");//哈希值暂时写的是个字符串死值
+			  mapToDao.put("status_id",  9);//状态写的是死值    9状态代表已完成   因为 刚注册开完户的用户账号就要能使用  
+			  mapToDao.put("hash","ccccccc");//哈希值暂时写的是个字符串死值   操作hash？？？？
 			      accountMaintenanceDao.insertIntoAccountMaintenanceInfo(mapToDao);
 	    
 			  
@@ -123,7 +128,7 @@ public class AccountMaintenanceService {
 				  mapToDaoBasic.put("attachment_id", basicAttachment_id);
 				  mapToDaoBasic.put("attachment_name", basicAttachment_name);
 				  mapToDaoBasic.put("url", basicUrl);  
-				  mapToDaoBasic.put("upload_person_id", 10085);//写的是死值  到时候在改    先将上传人的id号写死，到时候需要动态获取这个信息
+				  mapToDaoBasic.put("upload_person_id", 10085);//写的是死值  到时候在改    目前id号是写死，到时候需要动态获取这个信息
 				  mapToDaoBasic.put("create_time", mapToDao.get("update_time"));
 				  accountMaintenanceDao.insertAccountMaintenanceInfoFuJianBiao(mapToDaoBasic);//上传其他凭证      到附件表
 			
@@ -132,7 +137,7 @@ public class AccountMaintenanceService {
 				 mapToDaoLetter.put("attachment_id", letterAttachment_id);
 				 mapToDaoLetter.put("attachment_name", letterAttachment_name);
 				 mapToDaoLetter.put("url", letterUrl);
-				 mapToDaoLetter.put("upload_person_id", 10085);//写的是死值   到时候在改     待改动  先将上传人的id号写死，到时候需要动态获取这个信息
+				 mapToDaoLetter.put("upload_person_id", 10085);//写的是死值   到时候在改     待改动   目前id号是写死，到时候需要动态获取这个信息
 				 mapToDaoLetter.put("create_time", mapToDao.get("update_time"));
 				 accountMaintenanceDao.insertAccountMaintenanceInfoFuJianBiao(mapToDaoLetter);//上传承诺书的       到附件表
 			   
@@ -140,7 +145,7 @@ public class AccountMaintenanceService {
 				 mapToDaoApplication.put("attachment_id", applicationAttachment_id);
 				 mapToDaoApplication.put("attachment_name", applicationAttachment_name);
 				 mapToDaoApplication.put("url", applicationUrl);
-				 mapToDaoApplication.put("upload_person_id", 10085);//写的是死值    到时候在改  ？?    待改动  先将上传人的id号写死，到时候需要动态获取这个信息
+				 mapToDaoApplication.put("upload_person_id", 10085);//写的是死值    到时候在改  ？?    待改动  目前id号是写死，到时候需要动态获取这个信息
 				 mapToDaoApplication.put("create_time", mapToDao.get("update_time"));
 				 accountMaintenanceDao.insertAccountMaintenanceInfoFuJianBiao(mapToDaoApplication);//上传开户申请书的       到附件表
 			     
@@ -148,13 +153,17 @@ public class AccountMaintenanceService {
 			Map<String, Object> mapToOperationHistory = new LinkedHashMap<String,Object>();
 				mapToOperationHistory.put("operatorTypeId", 1001);						//
 				mapToOperationHistory.put("operatorAccount", 500000255);				//操作账号先定死
-				mapToOperationHistory.put("operatorRole", "经办支行");						//创建这个操作的角色只能是经办支行
+				mapToOperationHistory.put("operatorRole", "经办支行");						//创建这个操作的角色只能是经办支行/开户行
 				mapToOperationHistory.put("operatorPerson", "张五");						//操作人先写死
 				mapToOperationHistory.put("operatorTime", mapToDao.get("update_time")); //操作时间为当前操作时间
-				mapToOperationHistory.put("hash", "操作hash值");	                       //写的时死值
+				mapToOperationHistory.put("hash", "操作hash值2");	                       //写的时死值
 				accountMaintenanceDao.insertAccountMaintenanceInfoOperationHistory(mapToOperationHistory);           //将账户开立添加上传的操作记录信息插入到操作记录表中     
 	}
-    
+    /**
+     * 查看账户维护开立信息 列表
+     * @param map
+     * @return
+     */
     public  PageDTO selectAccountMaintenanceInfo(Map<String,Object> map) {
     	int page = 1; // 默认页是第一页
 		String customer_name = ""; // 
@@ -212,7 +221,24 @@ public class AccountMaintenanceService {
 		return pageDto;
 	
     }
-    
+	/**账户开立  查看详情 供应下载提示框
+	 * postman customer_id  200002
+	 * @param map
+	 * @return
+	 */
+	public Map<String, Object> selectAccountMaintenanceNoPage(Map<String, Object> map){
+			Integer customer_id=null;   //ID
+		    if(!"".equals(map.get("customer_id")) && null!=map.get("customer_id")){
+				customer_id = Integer.parseInt((String)map.get("customer_id"));
+			}
+			Map<String, Object> mapToDao = new LinkedHashMap<String, Object>();
+				 mapToDao.put("customer_id", customer_id);
+				 List<AccountOpeningRecord> AccountMaintenancelist=accountMaintenanceDao.selectAccountMaintenanceNoPage(mapToDao);
+				 Map<String, Object> AccountOpenAction = new LinkedHashMap<String, Object>();
+				 AccountOpenAction.put("customer_id", customer_id);
+				 AccountOpenAction.put("AccountMaintenancelist", AccountMaintenancelist);
+				 return AccountOpenAction;
+   }
     
     
     

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

@@ -1,10 +1,13 @@
 package com.fuzamei.service;
 
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -24,7 +27,7 @@ import com.fuzamei.utils.PageDTO;
 
 @Service
 public class AccountOpenService {
-	@Autowired
+   @Autowired
    private AccountOpenDao  accountOpenDao;
 
 	private static final int ROW_NUM = 10; // 分页每页显示数据的数量
@@ -114,7 +117,6 @@ public class AccountOpenService {
 				page = 1; // 数据解析异常page还是1
 			}
 		}
-	
 		if (!"".equals(map.get("startTime")) && map.get("startTime") != null) { // 等于空就直接取空值
 			try {
 				startTime = Long.parseLong((String) map.get("startTime"));
@@ -141,7 +143,6 @@ public class AccountOpenService {
 		}
 		mapToDao.put("rowNum", ROW_NUM); // 默认每页显示数据是10条，可根据需求修改分页数量
 
-
 		int count = accountOpenDao.serchCountPage2();
 		List<PromptLetter> list=accountOpenDao.selectPromptLetter(mapToDao);
 		pageDto.setTotal(count);
@@ -252,8 +253,8 @@ public class AccountOpenService {
 		 Map<String, Object> mapToDao2 = new LinkedHashMap<String, Object>();
 		  mapToDao2.put("prompt_letter_id", prompt_letter_id);//提示函 id
 		  mapToDao2.put("prompt_letter_name",attachmentName);//提示函名称    目前写的是文件名称   
-		  mapToDao2.put("send_person",666);//发送人暂时写死的  ??  是不是应该获取登陆人的id？？？？ 
-		  mapToDao2.put("receive_person",999);//接收人应该是？？ ？？？ 接收人写哪个  不是很清楚// 产品说写死 ，目前就往一个人那里发函上传文件
+		  mapToDao2.put("send_person",123456789);//发送人暂时写死的  ??  是不是应该获取登陆人的id？？？？ ////？？？？？？
+		  mapToDao2.put("receive_person",prompt_letter_id);//接收人应该是？？ ？？？ 接收人写哪个  不是很清楚// 产品说写死 ，目前就往一个人那里发函上传文件////暂时写的就是输入提示函的那个id
 		  mapToDao2.put("send_time",System.currentTimeMillis());//发送时间 
 		  mapToDao2.put("receive_time", System.currentTimeMillis());//接收时间
 		  mapToDao2.put("hash",hash);//hash值可以插入了
@@ -264,13 +265,13 @@ public class AccountOpenService {
 		  mapToDao.put("attachmentName",attachmentName );//附件名称  拿到了
 		  mapToDao.put("url", url);//附件url   后面有下载的   需要地址
 		  mapToDao.put("upload_person_id", 10121);//附件人上传的id这里写的是死值   待改动  先将上传人的id号写死，到时候需要动态获取这个信息   应该写谁这个附件上传人id
-		  mapToDao.put("create_time", (Long)mapToDao2.get("send_time") );//附件添加时间，这里应该写发送时间  目前写的是死值//System.currentTimeMillis()
+		  mapToDao.put("create_time", (Long)mapToDao2.get("send_time") );//附件添加时间，这里应该写发送时间       //System.currentTimeMillis()
 		  accountOpenDao.insertIntoAttachmentTable(mapToDao);//将数据添加到附件表数据库里
 		  
 		  Map<String, Object> mapToOperation = new LinkedHashMap<String,Object>();
 			mapToOperation.put("operatorTypeId", 1009);						//写死目前
-			mapToOperation.put("operatorAccount", 60000289);				//操作账号先定死
-			mapToOperation.put("operatorRole", "经办支行9");						//创建这个操作的角色  目前是写死
+			mapToOperation.put("operatorAccount", 60000289);				//操作账号先写的是死值
+			mapToOperation.put("operatorRole", "经办支行4");						//创建这个操作的角色  目前是写死
 			mapToOperation.put("operatorPerson", "操作人小王");						//操作人先写死
 			mapToOperation.put("operatorTime",(Long)mapToDao2.get("send_time")); //操作时间为当前操作时间
 			mapToOperation.put("hash", hash);//这里的哈希值和上面插入提示函的哈希值一样	                    //写的时死值
@@ -287,7 +288,7 @@ public class AccountOpenService {
 	    String attachment_name="";  //附件名称
 	    String url="";              //附件url
 	    String upload_person_id=""; //附件上传人的id
-	    long create_time=0;      //附件添加的时间
+	    long create_time=0;         //附件添加的时间
 	
 		if (!"".equals(map.get("attachment_id")) && map.get("attachment_id") != null) { 
 			attachment_id = (String) map.get("attachment_id");
@@ -305,6 +306,7 @@ public class AccountOpenService {
 			create_time = (Long) map.get("create_time");
 		}
 	    
+         
 		Map<String, Object> mapToDao = new LinkedHashMap<String, Object>();
 		  mapToDao.put("attachment_id", 123456);//附件id  目前写死
 		  mapToDao.put("attachment_name", attachment_name);//附件名称    暂时没写
@@ -324,9 +326,8 @@ public class AccountOpenService {
 			accountOpenDao.insertOperationHistory(mapToOperationHistory);           //将账户开立添加上传的操作记录信息插入到操作记录表中     
 	
 	}
-	
 	/**
-	 * 账户开立  上传
+	 * 账户开立 添加 上传 
 	 * @param map
 	 */
 	@Transactional
@@ -438,7 +439,7 @@ public class AccountOpenService {
 			  mapToDaoBasic.put("url", basicUrl);  
 			  mapToDaoBasic.put("upload_person_id", 10085);//写的是死值  到时候在改    先将上传人的id号写死，到时候需要动态获取这个信息
 			  mapToDaoBasic.put("create_time", mapToDao.get("update_time"));
-			  accountOpenDao.insertAccountUploadFileFuJianBiao(mapToDaoBasic);//上传基本资料的      到附件表
+			  accountOpenDao.insertAccountUploadFileFuJianBiao(mapToDaoBasic);//上传其他凭证     到附件表
 		
 		 
 		 Map<String, Object> mapToDaoLetter = new LinkedHashMap<String, Object>();  
@@ -447,7 +448,7 @@ public class AccountOpenService {
 			 mapToDaoLetter.put("url", letterUrl);
 			 mapToDaoLetter.put("upload_person_id", 10085);//写的是死值   到时候在改     待改动  先将上传人的id号写死，到时候需要动态获取这个信息
 			 mapToDaoLetter.put("create_time", mapToDao.get("update_time"));
-		     accountOpenDao.insertAccountUploadFileFuJianBiao(mapToDaoLetter);//上传承诺书的       到附件表
+		     accountOpenDao.insertAccountUploadFileFuJianBiao(mapToDaoLetter);//上传承诺书       到附件表
 		   
 		 Map<String, Object> mapToDaoApplication = new LinkedHashMap<String, Object>();  
 			 mapToDaoApplication.put("attachment_id", applicationAttachment_id);
@@ -455,7 +456,7 @@ public class AccountOpenService {
 			 mapToDaoApplication.put("url", applicationUrl);
 			 mapToDaoApplication.put("upload_person_id", 10085);//写的是死值    到时候在改  ？?    待改动  先将上传人的id号写死，到时候需要动态获取这个信息
 			 mapToDaoApplication.put("create_time", mapToDao.get("update_time"));
-		     accountOpenDao.insertAccountUploadFileFuJianBiao(mapToDaoApplication);//上传开户申请书的       到附件表
+		     accountOpenDao.insertAccountUploadFileFuJianBiao(mapToDaoApplication);//上传开户申请书       到附件表
 		     
 		//还要将账户开立添加上传的这个操作信息插入到操作记录表中
 		Map<String, Object> mapToOperationHistory = new LinkedHashMap<String,Object>();
@@ -469,7 +470,12 @@ public class AccountOpenService {
 		     
 		   
 	}
-	//账户开立  下载页面
+
+/**//**账户开立  下载页面
+	 * postman customer_id  200002
+	 * @param map
+	 * @return
+	 *//*
 	public Map<String, Object> selectAccountopenNoPage(Map<String, Object> map){
 			Integer customer_id=null;   //ID
 			
@@ -484,5 +490,5 @@ public class AccountOpenService {
 			 AccountOpenAction.put("AccountOpenlist", AccountOpenlist);
 	        
 			 return AccountOpenAction;
-   }
+   }*/
 }

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

@@ -22,7 +22,7 @@ public class CapitalTransferService {
     private   CapitalTransferDao  capitalTransferDao;
     private static final int ROW_NUM = 10; // 分页每页显示数据的数量
     /**  
-     *  查询资金划转表  省分行托管中心指令业务岗
+     *  查询资金划转列表  省分行托管中心指令业务岗
      * @param  
      * @param   
      * @throws Exception  
@@ -88,37 +88,73 @@ public class CapitalTransferService {
 		return pageDto;
 		
 	}
-	//资金划转   点击查看 详情
+
+	/**
+	 * 资金划转   点击查看 详情
+	 * 
+	 * @param map
+	 * @return
+	 */
 	public Map<String, Object>  selectChaKanZiJinHuaZhuan(Map<String, Object> map){
-		 int fund_id=0;
+		 int  fund_id=0;
 		 if (!"".equals(map.get("fund_id")) && map.get("fund_id") != null) { 
 			fund_id =  Integer.parseInt((String)map.get("fund_id"));
 		 }
 		 Map<String, Object> mapToDao = new LinkedHashMap<String, Object>();
-		  mapToDao.put("fund_id", fund_id);//附件名称    暂时没写
+		  mapToDao.put("fund_id", fund_id);
 		  List<CapitalTransfer> list=capitalTransferDao.selectChaKanZiJinHuaZhuan(mapToDao);
 		  List<CapitalTransferCheck> lis= capitalTransferDao.selectCapitalTransferRecord(mapToDao);
 		  Map<String, Object> map1=new LinkedHashMap<String, Object>();
-		  map1.put("CapitalTransfer", list);//管理人persont_name取不到值  稍做修改 
+		  map1.put("CapitalTransfer", list);
 		  map1.put("CapitalTransferCheck", lis);
 		return map1;
 	}
+	/**
+	 * 管理人发起划款  资金
+	 * @param map
+	 * @return
+	 */
+	@Transactional
+	public Map<String, Object>  insertCapitalTransfer(Map<String, Object> map){
+		String custodian="";//管理人
+		String fund_name="";//基金名称
+		double sum_of_money=0;//划款金额
+		Integer basis_of_payment=null;//划款依据
+		//账户余额
+		//划款账户
+		
+		if (!"".equals(map.get("custodian")) && map.get("custodian") != null) { 
+			custodian = (String)map.get("custodian");
+		}
+		if (!"".equals(map.get("fund_name")) && map.get("fund_name") != null) { 
+			fund_name = (String)map.get("fund_name");
+		}
+		if (!"".equals(map.get("sum_of_money")) && map.get("sum_of_money") != null) { 
+			sum_of_money = (double)map.get("sum_of_money");
+		}
+		Map<String, Object> mapToDao = new LinkedHashMap<String, Object>();
+		
+		
+		
+		
+		
+		return null;
+	}
 	
 	/**
-	 * 将审核意见插入到审核表
+	 * 将审核意见插入到审核表   暂没做
 	 * @param map
 	 */
 	@Transactional
 	public void insertCheckTransfer(Map<String, Object> map) {
 		String check_department="";		//审核部门
 		String check_person="";			//审核人
-		Integer check_result=null;			//审核结果
-		String check_opinion="";			//审核意见
-	
+		Integer check_result=null;	    //审核结果
+		String check_opinion="";		//审核意见
 		Integer fund_id=null;			//划转资金的id号，要根据这个更新划转资金审核的状态的
 		Integer status_id=null;			//划转资金表的状态id号，这个要根据check_result审核结果来判断状态哦
 		
-		Integer operatorTypeId=null;     ////把操作类型id号-*放到操作记录表中去的
+		Integer operatorTypeId=null;     //把操作类型id号-*放到操作记录表中去的
 		
 		if (!"".equals(map.get("check_department")) && map.get("check_department") != null) { 
 			check_department = (String)map.get("check_department");

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

@@ -0,0 +1,194 @@
+package com.fuzamei.service;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.fuzamei.dao.PromptLetterDao;
+import com.fuzamei.entity.PromptLetter;
+import com.fuzamei.utils.PageDTO;
+
+@Service
+public class PromptLetterService {
+	@Autowired
+	private PromptLetterDao promptLetterDao;
+	private static final int ROW_NUM = 10; // 分页每页显示数据的数量
+	/**
+	 * 提示函  管理人接收列表
+	 * @param map
+	 * @return
+	 */
+    public PageDTO selectPromptLetter(Map<String, Object> map){//查询风险提示函
+		int page = 1; // 默认页是第一页
+		
+		long startTime = 0; // 开始时间默认0
+		long endTime = Long.MAX_VALUE; // 结束时间默认Long最大值
+		
+		if (!"".equals(map.get("page")) && map.get("page") != null) { // 等于空就直接取第一页
+			try {
+				page = Integer.parseInt((String) map.get("page"));
+				if (page < 1) {
+					page = 1;
+				}
+			} catch (NumberFormatException e) {
+				page = 1; // 数据解析异常page还是1
+			}
+		}
+		if (!"".equals(map.get("startTime")) && map.get("startTime") != null) { // 等于空就直接取空值
+			try {
+				startTime = Long.parseLong((String) map.get("startTime"));
+			} catch (NumberFormatException e) {
+				startTime = 0; // 数据解析异常startTime还是0
+			}
+		}
+		if (!"".equals(map.get("endTime")) && map.get("endTime") != null) { // 等于空就直接取空值
+			try {
+				endTime = Long.parseLong((String) map.get("endTime"));
+			} catch (NumberFormatException e) {
+				endTime = Long.MAX_VALUE; // 数据解析异常endTime还是9223372036854775807L
+			}
+		}
+		PageDTO pageDto = new PageDTO(); // 创建分页对象
+		Map<String, Object> mapToDao = new LinkedHashMap<String, Object>();
+		mapToDao.put("startPage", (page - 1) * ROW_NUM);
+		if (startTime <= endTime) {
+			mapToDao.put("startTime", startTime);
+			mapToDao.put("endTime", endTime);
+		} else {
+			mapToDao.put("startTime", startTime);
+			mapToDao.put("endTime", Long.MAX_VALUE);
+		}
+		mapToDao.put("rowNum", ROW_NUM); // 默认每页显示数据是10条，可根据需求修改分页数量
+		int count = promptLetterDao.serchCountPage2();
+		List<PromptLetter> list=promptLetterDao.selectPromptLetter(mapToDao);
+		pageDto.setTotal(count);
+		pageDto.setRows(list);
+		return pageDto;
+	}
+    //////////////////////////////////////////////////////////////////////////////////////////////
+    /**
+     * 提示函  风管岗发送列表查询
+     * @param map
+     * @return
+     */
+ 	public PageDTO selectTishihan(Map<String, Object> map){//查询风险提示函
+ 		int page = 1; // 默认页是第一页
+ 		long startTime = 0; // 开始时间默认0
+ 		long endTime = Long.MAX_VALUE; // 结束时间默认Long最大值
+ 		if (!"".equals(map.get("page")) && map.get("page") != null) { // 等于空就直接取第一页
+ 			try {
+ 				page = Integer.parseInt((String) map.get("page"));
+ 				if (page < 1) {
+ 					page = 1;
+ 				}
+ 			} catch (NumberFormatException e) {
+ 				page = 1; // 数据解析异常page还是1
+ 			}
+ 		}
+ 		if (!"".equals(map.get("startTime")) && map.get("startTime") != null) { // 等于空就直接取空值
+ 			try {
+ 				startTime = Long.parseLong((String) map.get("startTime"));
+ 			} catch (NumberFormatException e) {
+ 				startTime = 0; // 数据解析异常startTime还是0
+ 			}
+ 		}
+ 		if (!"".equals(map.get("endTime")) && map.get("endTime") != null) { // 等于空就直接取空值
+ 			try {
+ 				endTime = Long.parseLong((String) map.get("endTime"));
+ 			} catch (NumberFormatException e) {
+ 				endTime = Long.MAX_VALUE; 
+ 			}
+ 		}
+ 		PageDTO pageDto = new PageDTO(); // 创建分页对象
+ 		Map<String, Object> mapToDao = new LinkedHashMap<String, Object>();
+ 		mapToDao.put("startPage", (page - 1) * ROW_NUM);
+ 		if (startTime <= endTime) {
+ 			mapToDao.put("startTime", startTime);
+ 			mapToDao.put("endTime", endTime);
+ 		} else {
+ 			mapToDao.put("startTime", startTime);
+ 			mapToDao.put("endTime", Long.MAX_VALUE);
+ 		}
+ 		mapToDao.put("rowNum", ROW_NUM); // 默认每页显示数据是10条，可根据需求修改分页数量
+ 		int count = promptLetterDao.serchCountPage2();
+ 		List<PromptLetter> list=promptLetterDao.selectTishihan(mapToDao);
+ 		pageDto.setTotal(count);
+ 		pageDto.setRows(list);
+ 		return pageDto;
+ 	}
+ 	///////////////////////////////////////////////////////////////////////////////////////////////////
+ 	 /**
+     * 提示函  发函  上传文件
+     * @param map
+     */
+	@Transactional
+	public void insertTiShiHanOrUserOrOtherTable(Map<String, Object> map) {
+	    Integer prompt_letter_id=null;
+	    String prompt_letter_name="";
+	    Integer  send_person=null;
+	    Integer receive_person=null;
+	    long send_time=0;
+	    long receive_time=0;
+	    String hash="";
+		String url="";					//url路径名称
+		String attachmentName="";		//附件名称
+		 if (!"".equals(map.get("url")) && map.get("url") != null) { 
+			 url = (String) map.get("url");
+			}
+	    if (!"".equals(map.get("attachmentName")) && map.get("attachmentName") != null) { 
+	    	attachmentName = (String) map.get("attachmentName");
+		}
+	    if (!"".equals(map.get("prompt_letter_id")) && map.get("prompt_letter_id") != null) { 
+	    	prompt_letter_id = Integer.parseInt((String) map.get("prompt_letter_id"));
+		}
+	    if (!"".equals(map.get("prompt_letter_name")) && map.get("prompt_letter_name") != null) { 
+	    	prompt_letter_name = (String) map.get("prompt_letter_name");
+		}
+	    if (!"".equals(map.get("send_person")) && map.get("send_person") != null) { 
+	    	send_person = Integer.parseInt((String) map.get("send_person"));
+		}
+	    if (!"".equals(map.get("receive_person")) && map.get("receive_person") != null) { 
+	    	receive_person = Integer.parseInt((String) map.get("receive_person"));
+		}
+	    if (!"".equals(map.get("receive_time")) && map.get("receive_time") != null) { 
+	    	receive_time = (Long) map.get("receive_time");
+		}
+	    if (!"".equals(map.get("send_time")) && map.get("send_time") != null) { 
+	    	send_time = (Long) map.get("send_time");
+		}
+	    if (!"".equals(map.get("hash")) && map.get("hash") != null) { 
+	    	hash = (String) map.get("hash");
+		}
+	    	//Math.round(Math.random()*8999+1000)随机数
+		 Map<String, Object> mapToDao2 = new LinkedHashMap<String, Object>();
+		  mapToDao2.put("prompt_letter_id", prompt_letter_id);//提示函 id
+		  mapToDao2.put("prompt_letter_name",attachmentName);//提示函名称    目前写的是文件名称   
+		  mapToDao2.put("send_person",123456789);//发送人暂时写死的  ??  是不是应该获取登陆人的id？？？？ ////？？？？？？
+		  mapToDao2.put("receive_person",prompt_letter_id);//接收人应该是？？ ？？？ 接收人写哪个  不是很清楚// 产品说写死 ，目前就往一个人那里发函上传文件////暂时写的就是输入提示函的那个id
+		  mapToDao2.put("send_time",System.currentTimeMillis());//发送时间 
+		  mapToDao2.put("receive_time", System.currentTimeMillis());//接收时间
+		  mapToDao2.put("hash",hash);//hash值可以插入了
+		  promptLetterDao.insertIntoPromptLetterTable(mapToDao2);//将账号插入提示函表
+		  
+		  Map<String, Object> mapToDao = new LinkedHashMap<String, Object>();
+		  mapToDao.put("attachmentId",prompt_letter_id);//附件id   目前写的是上面输入的管理人账号一样
+		  mapToDao.put("attachmentName",attachmentName );//附件名称  拿到了
+		  mapToDao.put("url", url);//附件url   后面有下载的   需要地址
+		  mapToDao.put("upload_person_id", 10121);//附件人上传的id这里写的是死值   待改动  先将上传人的id号写死，到时候需要动态获取这个信息   应该写谁这个附件上传人id
+		  mapToDao.put("create_time", (Long)mapToDao2.get("send_time") );//附件添加时间，这里应该写发送时间       //System.currentTimeMillis()
+		  promptLetterDao.insertIntoAttachmentTable(mapToDao);//将数据添加到附件表数据库里
+		  
+		  Map<String, Object> mapToOperation = new LinkedHashMap<String,Object>();
+			mapToOperation.put("operatorTypeId", 1009);						//写死目前
+			mapToOperation.put("operatorAccount", 60000289);				//操作账号先写的是死值
+			mapToOperation.put("operatorRole", "经办支行4");						//创建这个操作的角色  目前是写死
+			mapToOperation.put("operatorPerson", "操作人小王");						//操作人先写死
+			mapToOperation.put("operatorTime",(Long)mapToDao2.get("send_time")); //操作时间为当前操作时间
+			mapToOperation.put("hash", hash);//这里的哈希值和上面插入提示函的哈希值一样	                    //写的时死值
+			promptLetterDao.insertOperationHistory(mapToOperation);           //将提示函泛函添加上传的操作记录信息插入到操作记录表中     
+	}
+}

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

@@ -0,0 +1,69 @@
+package com.fuzamei.service;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.fuzamei.dao.TrueFalseSelectDao;
+
+@Service
+public class TrueFalseSelectService {
+
+	   @Autowired
+	   private TrueFalseSelectDao  trueFalseSelectDao;
+	   
+	   /**
+		 * 真伪查询
+		 * @param map
+		 */
+		@Transactional
+		public void insertTrueFalseSelect(Map<String, Object> map) {
+		    String attachment_id="";    //附件id
+		    String attachment_name="";  //附件名称
+		    String url="";              //附件url
+		    String upload_person_id=""; //附件上传人的id
+		    long create_time=0;         //附件添加的时间
+		  
+		    String fileName="";
+			if (!"".equals(map.get("attachment_id")) && map.get("attachment_id") != null) { 
+				attachment_id = (String) map.get("attachment_id");
+			}
+			if (!"".equals(map.get("attachment_name")) && map.get("attachment_name") != null) { 
+				attachment_name = (String) map.get("attachment_name");
+			}
+			if (!"".equals(map.get("url")) && map.get("url") != null) { 
+				url = (String) map.get("url");
+			}
+			if (!"".equals(map.get("upload_person_id")) && map.get("upload_person_id") != null) {   
+				upload_person_id = (String) map.get("upload_person_id");
+			}
+			if (!"".equals(map.get("create_time")) && map.get("create_time") != null) { 
+				create_time = (Long) map.get("create_time");
+			}
+		    
+	         
+			Map<String, Object> mapToDao = new LinkedHashMap<String, Object>();
+			  mapToDao.put("attachment_id",Math.round(Math.random()*8999+1000000));//附件id  目前写随机数
+			  mapToDao.put("attachment_name", attachment_name);//附件名称    
+			  mapToDao.put("url", url);//附件url   后面有下载的   需要地址
+			  mapToDao.put("upload_person_id", 223346);//附件人上传的id这里写的是死值   待修改
+			  mapToDao.put("create_time", System.currentTimeMillis());//附件添加时间，这里应该写添加得到的当前系统时间  
+			  trueFalseSelectDao.insertTrueFalseSelect(mapToDao);//把数据插入到 （附件表）里
+			  
+			//还要将真伪查询上传的这个操作信息插入到操作记录表中
+			Map<String, Object> mapToOperationHistory = new LinkedHashMap<String,Object>();
+				mapToOperationHistory.put("operatorTypeId", 1002);						//id应该是写死的目前
+				mapToOperationHistory.put("operatorAccount", 600000289);				//操作账号先定死，到时候再改
+				mapToOperationHistory.put("operatorRole", "经办支行8");					//创建这个操作的角色只能是经办支行
+				mapToOperationHistory.put("operatorPerson", "张八");						//操作人先写死
+				mapToOperationHistory.put("operatorTime", mapToDao.get("create_time")); //操作时间为当前操作时间
+				mapToOperationHistory.put("hash", "222aa5d8c8c7s8s7");	                //写的时死值
+				trueFalseSelectDao.insertOperationHistory(mapToOperationHistory);           //操作记录信息插入到操作记录表中     
+		
+		}
+	
+	
+}

ccb_fund_trusteeship/src/main/java/com/fuzamei/web/AccountMaintenanceAction.java

@@ -1,11 +1,18 @@
 package com.fuzamei.web;
 
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.net.URLEncoder;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -18,6 +25,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.fuzamei.service.AccountMaintenanceService;
+import com.fuzamei.service.AttachmentService;
+import com.fuzamei.service.UserAuthoricationService;
 import com.fuzamei.utils.HashXiZhiUtil;
 import com.fuzamei.utils.JSONUtil;
 import com.fuzamei.utils.PageDTO;
@@ -27,7 +36,8 @@ import com.fuzamei.utils.PageDTO;
 public class AccountMaintenanceAction {
 	@Autowired
 	private AccountMaintenanceService  accountMaintenanceService;//注入service
-
+	@Autowired
+	private AttachmentService attachmentService;//生成附件id随机数service
 	/**  
     *  账户开立 添加客户名称和银行账号  上传3份资料  分别插入  附件表  操作记录表，账户开立表
     *  需要完成【申请输】【账户承诺书】【其他凭证】3个文件的上传，插入账务开立表1条数据，插入附件表3条数据，还有插入操作历史1条数据)
@@ -44,20 +54,28 @@ public class AccountMaintenanceAction {
    	    @RequestParam("bank_account") String bank_account) throws IOException{
 	   try {
 		   String path = "D:\\tomcate\\apache-tomcat-8.5.24\\webapps"+request.getServletContext().getContextPath()+"\\testCeshi";  
-             File dir = new File(path);          
+		   //String path = request.getServletContext().getRealPath("");	   
+		   File dir = new File(path);          
              if(!dir.exists()){  
                  dir.mkdirs();   
              }  
              Map<String, Object> map = new LinkedHashMap<String, Object>();
              map.put("customer_name", customer_name);  
              map.put("bank_account", bank_account);//可以不要  不输入参数   直接在service里put进去   后台插入要求格式以622707开头
-		     //同时上传三个文件 应该对几个文件产生几个哈希值？？？？？？
+             
+           //一次性返回3个不同的id号，且不会和数据库中的重复
+ 			List<Integer> attachmentIds = attachmentService.generateMultiAttachmentIds(3);
+ 			Integer basicAttachment_id=attachmentIds.get(0);										//其他凭证的id号=====================================>>生成id号的机制要改TODO
+ 			Integer letterAttachment_id=attachmentIds.get(1);							            //账户承诺、书id号=====================================>>生成id号的机制要改TODO
+ 			Integer applicationAttachment_id=attachmentIds.get(2);									//开户申请书id号=====================================>>生成id号的机制要改TODO
+             
+		     //同时上传三个文件 应该产生几个哈希值？？？？？？
              //其他凭证 
              String fileName = file.getOriginalFilename();  
              String pathFile=path+"/"+fileName;
              File newfile = new File(pathFile); 
              file.transferTo(newfile);
-             map.put("basicAttachment_id", 1001);//附件id暂时写死
+             map.put("basicAttachment_id", basicAttachment_id);//附件id暂时写死
      		 map.put("basicAttachment_name", fileName);
      	     map.put("basicUrl","\\testCeshi"+fileName);
      	     
@@ -66,7 +84,7 @@ public class AccountMaintenanceAction {
              String pathFile2=path+"/"+fileName2;
              File newfile2 = new File(pathFile2); 
              file2.transferTo(newfile2);
-             map.put("letterAttachment_id", 1002);//附件id暂时写死
+             map.put("letterAttachment_id", letterAttachment_id);//附件id暂时写死
     		 map.put("letterAttachment_name", fileName2);
     	     map.put("letterUrl","\\testCeshi"+fileName2);
     	     //开户申请书
@@ -74,11 +92,10 @@ public class AccountMaintenanceAction {
              String pathFile3=path+"/"+fileName3;
              File newfile3 = new File(pathFile3); 
              file3.transferTo(newfile3);
-             map.put("applicationAttachment_id", 1003);//附件id暂时写死
+             map.put("applicationAttachment_id", applicationAttachment_id);//附件id暂时写死
      	     map.put("applicationAttachment_name", fileName3);
      	     map.put("applicationUrl","\\testCeshi"+fileName3);
      	     
-
      	    accountMaintenanceService.insertIntoAccountINfo(map);//将经办支行提交的所有数据信息通过map传入service层先进行校验
      	   return JSONUtil.getJsonMap(200, true, "上传成功",null); //返回给前端一个map进行前段提示
 	} catch (Exception e) {
@@ -104,8 +121,58 @@ public class AccountMaintenanceAction {
 		return mapResult;
 	}
 	
+    /**
+	 * 账户开立   点击查看详情  显示下载文件的提示框
+	 * @param data
+	 * @return
+	 */
+	@RequestMapping(value = "/selectAccountMaintenanceNoPage",method = RequestMethod.POST)
+	@ResponseBody
+	public Map<String, Object> selectAccountMaintenanceNoPage(@RequestBody String data){
+		
+		//System.out.println("账户开立查看 供应下载....");
+		Map<String, Object> map = JSONUtil.jsonToMap(data);	// 将前端传过来的json数据转化为map对象，并将map对象传入service层进行数据校验
+		Map<String, Object> mapFromService = accountMaintenanceService.selectAccountMaintenanceNoPage(map); //这里不要分页，只要service传过来一个map对象即可
+		
+		return JSONUtil.getJsonMap(200, true, "操作成功", mapFromService); //将从service返回回来的map对象通过map对象直接返回给前端
+	}
 	
-	
+	/**  
+	 * 账户开立下载 doc文档
+	 * @param request  
+	 * @param response  
+	 * @throws Exception  
+	 */  
+	@RequestMapping(value="/downloadAccountFile")  
+	@ResponseBody 
+	public Map<String,Object> downloadAccountFile(HttpServletRequest request,HttpServletResponse response,@RequestParam("url") String url) throws Exception{  
+	    try {
+	    	  //模拟文件，456.doc为需要下载的文件  
+	        String fileName = request.getSession().getServletContext().getRealPath("")+url;  
+	        //获取输入流  
+	        InputStream bis = new BufferedInputStream(new FileInputStream(new File(fileName))); 
+	        //截取文件名字
+	        String filename = url.substring(url.lastIndexOf("/")+1);
+	        //转码，免得文件名中文乱码  
+	        filename = URLEncoder.encode(filename,"UTF-8");  
+	        //设置文件下载头  
+	        response.addHeader("Content-Disposition", "attachment;filename=" + filename);    
+	        //1.设置文件ContentType类型，这样设置，会自动判断下载文件类型    
+	        response.setContentType("multipart/form-data");   
+	        BufferedOutputStream out = new BufferedOutputStream(response.getOutputStream());  
+	        int len = 0;  
+	        while((len = bis.read()) != -1){  
+	            out.write(len);  
+	            out.flush();  
+	        }  
+	        out.close(); 
+	        //返给前端map进行前端提示
+	    	return JSONUtil.getJsonMap(200, true, "下载成功",null); 
+			
+		} catch (Exception e) {
+			return JSONUtil.getJsonMap(500, false, "下载失败:"+e.getMessage(),null); 
+		}
+	} 
 	
 	
 	

ccb_fund_trusteeship/src/main/java/com/fuzamei/web/AccountOpenAction.java

@@ -63,12 +63,11 @@ public class AccountOpenAction {
 		Map<String, Object> map = JSONUtil.jsonToMap(data);
 		PageDTO pageDto=  accountService.selectPromptLetter(map);
 		mapResult = JSONUtil.getJsonMap(200, true, "操作成功", pageDto);
-
 		return mapResult;
 	}
 	
 	/**
-	 * 查询提示函 发送人的列表   还没做好
+	 * 查询提示函 发送人的列表   
 	 * @param data
 	 * @return
 	 */
@@ -83,23 +82,20 @@ public class AccountOpenAction {
 
 		return mapResult;
 	}
-	/**
+/*	*//**
 	 * 账户开立   点击查看  显示下载文件的提示框
 	 * @param data
 	 * @return
-	 */
+	 *//*
 	@RequestMapping(value = "/selectAccountopenNoPage",method = RequestMethod.POST)
 	@ResponseBody
 	public Map<String, Object> selectAccountopenNoPage(@RequestBody String data){
-		
 		//System.out.println("账户开立查看....");
 		Map<String, Object> map = JSONUtil.jsonToMap(data);	// 将前端传过来的json数据转化为map对象，并将map对象传入service层进行数据校验
-		
 		Map<String, Object> mapFromService = accountService.selectAccountopenNoPage(map); //这里不要分页，只要service传过来一个map对象即可
-		
 		return JSONUtil.getJsonMap(200, true, "操作成功", mapFromService); //将从service返回回来的map对象通过map对象直接返回给前端
 	}
-	
+	*/
 	
 	
 	

ccb_fund_trusteeship/src/main/java/com/fuzamei/web/CapitalTransferAction.java

@@ -1,17 +1,28 @@
 package com.fuzamei.web;
 
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.net.URLEncoder;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
+import org.junit.runners.Parameterized.Parameters;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.multipart.MultipartFile;
 
 import com.fuzamei.entity.CapitalTransfer;
 import com.fuzamei.service.CapitalTransferService;
@@ -23,7 +34,6 @@ import com.fuzamei.utils.PageDTO;
 public class CapitalTransferAction {
 	@Autowired	
 	private CapitalTransferService capitalTransferService;
-	
 	 /**  
      *  查询资金划转表  省分行托管中心指令业务岗
      * @param  
@@ -43,9 +53,9 @@ public class CapitalTransferAction {
 	}
 	
 	/**{ 
-	    "fund_id":"1005"   postman 传id
+	    "fund_id":"1002"   postman 传id
        }
-	 * 资金划转查看详情
+	 * 资金划转列表点击查看详情
 	 * @param data
 	 * @return
 	 */
@@ -54,10 +64,67 @@ public class CapitalTransferAction {
 	public Map<String,Object> selectChaKanZiJinHuaZhuan(@RequestBody String data){
 		//System.out.println("查看资金划转详情信息....");
 		Map<String, Object> map = JSONUtil.jsonToMap(data);		//将前端传过来的json数据转化为map对象，并将map对象传入service层进行数据校验
-		Map<String, Object> map1= capitalTransferService.selectChaKanZiJinHuaZhuan(map);
-		return JSONUtil.getJsonMap(200, true, "操作成功", map1);
+		Map<String, Object> map2= capitalTransferService.selectChaKanZiJinHuaZhuan(map);
+		return JSONUtil.getJsonMap(200, true, "操作成功", map2);
 		
 	}
+	/**  
+	 * 资金划转下载 doc文档
+	 * @param request  
+	 * @param response  
+	 * @throws Exception  
+	 */  
+	@RequestMapping(value="/downloadCapitalFile")  
+	@ResponseBody 
+	public Map<String,Object> downloadCapitalFile(HttpServletRequest request,HttpServletResponse response,@RequestParam("url") String url) throws Exception{  
+	    try {
+	    	  //模拟文件，456.doc为需要下载的文件  
+	        String fileName = request.getSession().getServletContext().getRealPath("")+url;  
+	        //获取输入流  
+	        InputStream bis = new BufferedInputStream(new FileInputStream(new File(fileName))); 
+	        //截取文件名字
+	        String filename = url.substring(url.lastIndexOf("/")+1);
+	        //转码，免得文件名中文乱码  
+	        filename = URLEncoder.encode(filename,"UTF-8");  
+	        //设置文件下载头  
+	        response.addHeader("Content-Disposition", "attachment;filename=" + filename);    
+	        //1.设置文件ContentType类型，这样设置，会自动判断下载文件类型    
+	        response.setContentType("multipart/form-data");   
+	        BufferedOutputStream out = new BufferedOutputStream(response.getOutputStream());  
+	        int len = 0;  
+	        while((len = bis.read()) != -1){  
+	            out.write(len);  
+	            out.flush();  
+	        }  
+	        out.close(); 
+	        //返给前端map进行前端提示
+	    	return JSONUtil.getJsonMap(200, true, "下载成功",null); 
+			
+		} catch (Exception e) {
+			return JSONUtil.getJsonMap(500, false, "下载失败:"+e.getMessage(),null); 
+		}
+	} 
+	/**
+	 * 由管理人发起划款资金
+	 * @param data
+	 * @return
+	 */
+	@PostMapping(value="/insertCapitalTransfer")
+	@ResponseBody
+	public Map<String,Object> insertCapitalTransfer(  ){
+
+		
+		
+		
+		
+		
+		
+		
+		return JSONUtil.getJsonMap(200, true, "划款成功", null);
+	}
+	
+	
+	
 	/**
 	 * 划转资金审核的意见提交
 	 * @param data
@@ -72,7 +139,6 @@ public class CapitalTransferAction {
 		try {
 			//System.out.println("添加到划转审核总表信息....");
 			Map<String, Object> map = JSONUtil.jsonToMap(data);		//将前端传过来的json数据转化为map对象，并将map对象传入service层进行数据校验
-			capitalTransferService.insertCheckTransfer(map);
 			
 			return JSONUtil.getJsonMap(200, true, "添加审核意见成功", null);
 		} catch (Exception e) {

ccb_fund_trusteeship/src/main/java/com/fuzamei/web/PromptLetterAction.java

@@ -23,10 +23,12 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 import com.fuzamei.service.AccountOpenService;
+import com.fuzamei.service.PromptLetterService;
 import com.fuzamei.theromus.utils.HexUtils;
 import com.fuzamei.utils.HashCodeUtil;
 import com.fuzamei.utils.HashXiZhiUtil;
 import com.fuzamei.utils.JSONUtil;
+import com.fuzamei.utils.PageDTO;
 /**  
  * 文件上传功能  
  * @param file  
@@ -37,51 +39,7 @@ import com.fuzamei.utils.JSONUtil;
 @RequestMapping(value = "/PromptLetter")
 public class PromptLetterAction {
 	@Autowired
-	private AccountOpenService  accountService;//注入service
-	
-  /*  @RequestMapping(value="/upload",method=RequestMethod.POST)  
-    @ResponseBody  
-    public Map<String,Object> upload(@RequestParam("file") MultipartFile file,HttpServletRequest request) throws IOException{  
-        String path = "D:\\tomcate\\apache-tomcat-8.5.24\\webapps"+request.getServletContext().getContextPath()+"\\UploadCeshi";  
-        String fileName = file.getOriginalFilename();    
-        File dir = new File(path+"/"+fileName);          
-        if(!dir.exists()){  
-            dir.mkdirs();  
-        }  
-        //MultipartFile自带的解析方法  
-        file.transferTo(dir);  
-    	Map<String, Object> mapResult=JSONUtil.getJsonMap(200, true, "上传成功", null);//将查询出来的结果封装成map数据返回
-         return mapResult ;
-         
-    }  */
-	   /**  
-     * 文件下载功能  
-     * @param request  
-     * @param response  
-     * @throws Exception  
-     */  
-/*    @RequestMapping("/down")  
-    public void down(HttpServletRequest request,HttpServletResponse response) throws Exception{  
-        //模拟文件，aa.txt为需要下载的文件  
-        String fileName = request.getSession().getServletContext().getRealPath("upload")+"/aa.txt";  
-        //获取输入流  
-        InputStream bis = new BufferedInputStream(new FileInputStream(new File(fileName)));  
-        //假如以中文名下载的话  
-        String filename = "下载文件.txt";  
-        //转码，免得文件名中文乱码  
-        filename = URLEncoder.encode(filename,"UTF-8");  
-        //设置文件下载头  
-        response.addHeader("Content-Disposition", "attachment;filename=" + filename);    
-        //1.设置文件ContentType类型，这样设置，会自动判断下载文件类型    
-        response.setContentType("multipart/form-data");   
-        BufferedOutputStream out = new BufferedOutputStream(response.getOutputStream());  
-        int len = 0;  
-        while((len = bis.read()) != -1){  
-            out.write(len);  
-            out.flush();  
-        }  
-        out.close();  
-    } */
+	private PromptLetterService  promptLetterService;//注入service
 		/**
 		 * 风险提示函发函  上传
 		 * @param file
@@ -113,7 +71,7 @@ public class PromptLetterAction {
 	    		//map.put("fileName", fileName);
 	    		map.put("url","/Content/"+fileName);
 				map.put("attachmentName", fileName);
-	            accountService.insertTiShiHanOrUserOrOtherTable(map);//在插入数据库
+				promptLetterService.insertTiShiHanOrUserOrOtherTable(map);//在插入数据库
 	    	    
 	            Map<String, Object>	mapResult=JSONUtil.getJsonMap(200, true, "上传提示函成功", null);
 				return mapResult;
@@ -123,85 +81,75 @@ public class PromptLetterAction {
 				return mapResult;
 			}
 	    }  
-	
-    /**  
-     * 账户开立下载 doc文档
-     * @param request  
-     * @param response  
-     * @throws Exception  
-     */  
-    @RequestMapping(value="/downloadFile")  
-    @ResponseBody 
-    public Map<String,Object> downloadFile(HttpServletRequest request,HttpServletResponse response,@RequestParam("url") String url) throws Exception{  
-        try {
-        	  //模拟文件，456.doc为需要下载的文件  
-            String fileName = request.getSession().getServletContext().getRealPath("")+url;  
-            //获取输入流  
-            InputStream bis = new BufferedInputStream(new FileInputStream(new File(fileName))); 
-            //截取文件名字
-            String filename = url.substring(url.lastIndexOf("/")+1);
-            //转码，免得文件名中文乱码  
-            filename = URLEncoder.encode(filename,"UTF-8");  
-            //设置文件下载头  
-            response.addHeader("Content-Disposition", "attachment;filename=" + filename);    
-            //1.设置文件ContentType类型，这样设置，会自动判断下载文件类型    
-            response.setContentType("multipart/form-data");   
-            BufferedOutputStream out = new BufferedOutputStream(response.getOutputStream());  
-            int len = 0;  
-            while((len = bis.read()) != -1){  
-                out.write(len);  
-                out.flush();  
-            }  
-            out.close(); 
-            //返给前端map进行前端提示
-        	return JSONUtil.getJsonMap(200, true, "下载成功",null); 
-			
-		} catch (Exception e) {
-			return JSONUtil.getJsonMap(500, false, "下载失败:"+e.getMessage(),null); 
+	    
+	    /**
+		 * 查询提示函   管理人接收列表
+		 * @param data
+		 * @return
+		 */
+		@RequestMapping(value = "/selectPromptLetter", method = RequestMethod.POST)
+		@ResponseBody
+		public Map<String, Object> selectPromptLetter(@RequestBody String data) {
+			//System.out.println("管理人查询风险提示函信息列表");
+			Map<String, Object> mapResult = new LinkedHashMap<String, Object>();
+			Map<String, Object> map = JSONUtil.jsonToMap(data);
+			PageDTO pageDto=  promptLetterService.selectPromptLetter(map);
+			mapResult = JSONUtil.getJsonMap(200, true, "操作成功", pageDto);
+			return mapResult;
 		}
+		
+		/**
+		 * 查询提示函 发送人的列表   
+		 * @param data
+		 * @return
+		 */
+		@RequestMapping(value = "/selectTishihan", method = RequestMethod.POST)
+		@ResponseBody
+		public Map<String, Object> selectTishihan(@RequestBody String data) {
+			//System.out.println("查询风险提示函信息列表3 ，省分行托管中心风管岗");
+			Map<String, Object> mapResult = new LinkedHashMap<String, Object>();
+			Map<String, Object> map = JSONUtil.jsonToMap(data);
+			PageDTO pageDto=  promptLetterService.selectTishihan(map);
+			mapResult = JSONUtil.getJsonMap(200, true, "操作成功", pageDto);
 	
-    	 
-    } 
-    
-    /**  
-     * 真伪查询 上传文件  产生一条哈希值
-     * @param  
-     * @param   
-     * @throws Exception  
-     */  
-    @RequestMapping(value="/trueFalseSelect",method=RequestMethod.POST)  
-    @ResponseBody  
-    public Map<String,Object> trueFalseSelect(@RequestParam("file") MultipartFile file,HttpServletRequest request) throws IOException{  
-       try {
-    	   String path = "D:\\tomcate\\apache-tomcat-8.5.24\\webapps"+request.getServletContext().getContextPath()+"\\Ceshi";  
-           File dir = new File(path);          
-           if(!dir.exists()){  
-               dir.mkdirs();  
-           }  
-           //MultipartFile自带的解析方法  
-           String fileName = file.getOriginalFilename();  
-           String pathFile=path+"/"+fileName;
-           File newfile = new File(pathFile); 
-           file.transferTo(newfile);
-           //MultipartFile自带的解析方法 
-   		   Map<String, Object> map = new LinkedHashMap<String, Object>();
-   		   map.put("fileName", fileName);
-   		   map.put("url",fileName);
-          accountService.insertTrueFalseSelect(map);
-           
-           //是上传文件之后才会产生一条哈希值的
-          // HashXiZhiUtil.getMd5("D:\\xiangnu\\123.doc");
-         String hash=HashXiZhiUtil.getMD5Checksum(pathFile);//调用方法 对（文件）产生一条哈希值
-        System.out.println( HashXiZhiUtil.getMD5Checksum(pathFile)+"--哈希值");//自己测试的
-       	Map<String, Object> mapResult=JSONUtil.getJsonMap(200, true, "上传成功", null);//将查询出来的结果封装成map数据返回
-            return mapResult ;
-		}
-       catch (Exception e) {
-			Map<String, Object> mapResult=JSONUtil.getJsonMap(500, true, "上传失败"+e.getMessage(), null);
-			return mapResult ;
+			return mapResult;
 		}
-    }  
+	
+		/**  
+		 * 提示函下载 doc文档
+		 * @param request  
+		 * @param response  
+		 * @throws Exception  
+		 */  
+		@RequestMapping(value="/downloadFile")  
+		@ResponseBody 
+		public Map<String,Object> downloadFile(HttpServletRequest request,HttpServletResponse response,@RequestParam("url") String url) throws Exception{  
+		    try {
+		    	  //模拟文件，456.doc为需要下载的文件  
+		        String fileName = request.getSession().getServletContext().getRealPath("")+url;  
+		        //获取输入流  
+		        InputStream bis = new BufferedInputStream(new FileInputStream(new File(fileName))); 
+		        //截取文件名字
+		        String filename = url.substring(url.lastIndexOf("/")+1);
+		        //转码，免得文件名中文乱码  
+		        filename = URLEncoder.encode(filename,"UTF-8");  
+		        //设置文件下载头  
+		        response.addHeader("Content-Disposition", "attachment;filename=" + filename);    
+		        //1.设置文件ContentType类型，这样设置，会自动判断下载文件类型    
+		        response.setContentType("multipart/form-data");   
+		        BufferedOutputStream out = new BufferedOutputStream(response.getOutputStream());  
+		        int len = 0;  
+		        while((len = bis.read()) != -1){  
+		            out.write(len);  
+		            out.flush();  
+		        }  
+		        out.close(); 
+		        //返给前端map进行前端提示
+		    	return JSONUtil.getJsonMap(200, true, "下载成功",null); 
+				
+			} catch (Exception e) {
+				return JSONUtil.getJsonMap(500, false, "下载失败:"+e.getMessage(),null); 
+			}
+		} 
     
-
- 
 }

ccb_fund_trusteeship/src/main/java/com/fuzamei/web/TrueFalseSelectAction.java

@@ -0,0 +1,73 @@
+package com.fuzamei.web;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.fuzamei.service.TrueFalseSelectService;
+import com.fuzamei.utils.HashXiZhiUtil;
+import com.fuzamei.utils.JSONUtil;
+
+@Controller
+@RequestMapping(value = "/TrueFalseSelect")
+public class TrueFalseSelectAction {
+	@Autowired
+	private TrueFalseSelectService trueFalseSelectService;
+	/**  
+     * 真伪查询 上传文件  产生一条哈希值
+     * @param  
+     * @param   
+     * @throws Exception  
+     */  
+    @RequestMapping(value="/trueFalseSelect",method=RequestMethod.POST)  
+    @ResponseBody  
+    public Map<String,Object> trueFalseSelect(@RequestParam("file") MultipartFile file,HttpServletRequest request) throws IOException{  
+       try {
+    	   String path = "D:\\tomcate\\apache-tomcat-8.5.24\\webapps"+request.getServletContext().getContextPath()+"\\Ceshi";  
+           File dir = new File(path);          
+           if(!dir.exists()){  
+               dir.mkdirs();  
+           }  
+           //MultipartFile自带的解析方法  
+           String fileName = file.getOriginalFilename();  
+           String pathFile=path+"/"+fileName;
+           File newfile = new File(pathFile); 
+           file.transferTo(newfile);
+           
+   		   Map<String, Object> map = new LinkedHashMap<String, Object>();
+   		   map.put("attachment_name", fileName);
+   		   map.put("url",fileName);
+   		   trueFalseSelectService.insertTrueFalseSelect(map);
+           
+           //是上传文件之后才会产生一条哈希值的  然后在对哈希值做操作
+          // HashXiZhiUtil.getMd5("D:\\xiangnu\\123.doc");
+         String hash=HashXiZhiUtil.getMD5Checksum(pathFile);//调用方法 对（文件）产生一条哈希值
+        
+        System.out.println( HashXiZhiUtil.getMD5Checksum(pathFile)+"--哈希值");//测试
+       	Map<String, Object> mapResult=JSONUtil.getJsonMap(200, true, "上传成功", null);//将查询出来的结果封装成map数据返回
+       	//mapResult.put("hash", hash);返回哈希值给前端
+       	 return mapResult ;
+		}
+       catch (Exception e) {
+			Map<String, Object> mapResult=JSONUtil.getJsonMap(500, true, "上传失败"+e.getMessage(), null);
+			return mapResult ;
+		}
+    }  
+	
+	
+	
+	
+	
+	
+}