20180108

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

@@ -26,6 +26,11 @@ public class OperationTypeId {
 	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_PASS =1024;               //核算业务岗通过
+	public static final Integer CHECK_BUSINESS_ACCOUNTING_REJECT =1025;             //核算业务岗拒绝
+	public static final Integer CHECK_BUSINESS_ACCOUNTING_MAIN_REJECT =1026;        //核算主管岗拒绝
+	public static final Integer ADMIN_LAUNCHING=1027;                               //管理人   发起
+	public static final Integer CHECK_BUSINESS_ACCOUNTING_REJECT_MAIN =1028;        //指令业务岗拒绝  
 	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;     			//核算主管岗通过

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

@@ -25,7 +25,7 @@ public class Role {
 	public static final String ACCOUNT_MANAGE_POS_OF_PBBTBC = "省分行托管分中心账户管理岗";
 	public static final String BUSINESS_TRAN_POS_OF_PBBTBC = "省分行托管中心指令业务岗";
 	public static final String BUSINESS_CHECK_POS_OF_PBBTBC = "省分行托管分中心核算业务岗";
-	public static final String BUSINESS_CHIEF_POS_OF_PBBTBC = "省分行托管分中心核算主管岗";
+	public static final String BUSINESS_CHIEF_POS_OF_PBBTBC = "省分行托管中心核算主管岗";
 	//TBC is abbreviation of trusteeship branch center
 	public static final String ACCOUNTING_POS_OF_TBC = "托管分中心核算岗";
 	public static final String ARCHIVE_KEEPING_POS_OF_PBBTBC = "省分行托管分中心档案保管岗";

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

@@ -53,7 +53,7 @@ public class CapitalTransferDao {
 		capitalTransferMapper.insertCheckTransfer(map);
 	}
 	public void updatecapitaltransferStatus(Map<String, Object> map) {//将划转审核结果意见在插入划转资金表的同时，也将审核结果更新到划转资金表中去，根据基金id 在修改指定的业务 
-		capitalTransferMapper.updatecapitaltransferStatus(map);
+		capitalTransferMapper.updateCapitaltransferStatus(map);
 	}
 	public List<CapitalTransferCheck> queryCapitalTransferCheckInformation(Map<String, Object> map){// 根据资金划转id查询资金审核状态id值 
 		return capitalTransferMapper.queryCapitalTransferCheckInformation(map);
@@ -63,6 +63,12 @@ public class CapitalTransferDao {
 		return capitalTransferMapper.getStatusIdByCapitalId(fund_id);
 		
 	}
-	
+	public void updateCapitaltransferStatus(Map<String, Object> map) {
+		capitalTransferMapper.updateCapitaltransferStatus(map);
+	}
+	public void insertOperationHistory(Map<String, Object> map) {//往操作记录表插入
+		capitalTransferMapper.insertOperationHistory(map);
+	}	
+		
 	
 }

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

@@ -10,24 +10,19 @@ public class CapitalTransferCheck {
 	private String check_opinion;//审核意见
 	private long check_time;//审核时间
 	private String check_result;//结果       改String
-	private  String relation;//发起or审核   改 String
+	private  String relation;//发起or审核//llx给添加的任务栏，审核记录表中多加一个任务栏，管理人写成发起，其它都是审核状态
 	
 
-/*	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 int getId() {
+		return id;
+	}
 	public void setId(int id) {
 		this.id = id;
 	}

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

@@ -188,32 +188,44 @@
   <!--*************************************************************************************************************  -->
     <!-- 点击查看 (划转资金审核记录表)  框框详情记录 --> 
 	<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, 
-               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, 
+        
+ 	select
+	    bc.fund_id,
+			bc.check_department,
+			bc.check_person,
+			bc.check_opinion,
+			bc.check_time,
+			bc.check_result ,
+			s.status_name as relation
+		from
+			(select 
+				bc.check_department,
+				bc.check_person,
+				bc.fund_id,
+				bc.check_opinion,
+				bc.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>
+				bc.relation
+			from 
+				capital_transfer_check bc
+			left join 
+				status s
+			on 
+				bc.check_result=s.status_id) bc
+		left join 
+			status s
+		on
+			bc.relation=s.status_id
+    
+         where fund_id=#{fund_id}
+         order by 
+		  bc.check_time desc
+			
+  <!--      <where>
         <if test="fund_id!='' and fund_id!=null">
           fund_id=#{fund_id}
         </if>
-     </where> 
+     </where>  -->
 	</select>
 	<!--////////////////////  -->
 	<!-- 根据资金划转id查询状态id值  -->
@@ -299,8 +311,8 @@
        </where>
     </select>
     <!--*************************************************************************************************  -->
-    <!--将审核意见插入到(划转资金审核表)里  -->
-    <insert id="insertCheckTransfer">
+    <!--将审核意见插入到(划转资金审核记录表)里  -->
+    <insert id="insertCheckTransfer" parameterType="java.util.Map">
 	    insert into capital_transfer_check(fund_id,
 			          check_department,
 						   check_person,
@@ -316,7 +328,7 @@
 				       #{check_result},
 				       #{relation})
     </insert>
-    <!--审核意见 查询审核记录表  -->
+    <!--审核意见 查询审核记录表    暂没用上-->
     <select id="">
     	select  s.fund_id,
     	        s.check_department,
@@ -339,9 +351,9 @@
 		update 
 			capital_transfer
 		set
-			status_id=#{status_id}
+			status_id=#{statusId}
 		where 
-			fund_id=#{fund_id}
+			fund_id=#{fund_id}  
 	</update>
 
     

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

@@ -21,9 +21,9 @@ public interface CapitalTransferMapper {
     public void insertCapitalTransfer(Map<String, Object> map);//管理人发起划款资金
     
 	public void insertCheckTransfer(Map<String, Object> map);//将划转资金审核的意见插入到（划转资金审核表里）
-	public void updatecapitaltransferStatus(Map<String, Object> map);//将划转审核结果意见在插入划转资金表的同时，也将审核结果更新到划转资金表中去，根据基金id 》fund_id修改指定的业务
+	public void updateCapitaltransferStatus(Map<String, Object> map);//将划转审核结果意见在插入划转资金表的同时，也将审核结果更新到划转资金表中去，根据基金id 》fund_id修改指定的业务
 	
 	public List<CapitalTransferCheck> queryCapitalTransferCheckInformation(Map<String, Object> map); //<!-- 根据资金划转id查询划转审核状态id值 -->
 	public Integer getStatusIdByCapitalId(Integer fund_id);
-	
+    public void insertOperationHistory(Map<String, Object> map);//往操作记录表插入
 }

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

@@ -9,7 +9,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
+import com.fuzamei.constant.OperationTypeId;
 import com.fuzamei.constant.Role;
+import com.fuzamei.constant.StatusId;
 import com.fuzamei.dao.CapitalTransferDao;
 import com.fuzamei.entity.BusinessCheck;
 import com.fuzamei.entity.BusinessDeclare;
@@ -117,30 +119,34 @@ public class CapitalTransferService {
 		
 	}
     /**
-     *  资金划转审核记录的查询，当用户点击查看按钮后，不仅显示了资金划转的信息，还显示了资金划转审核记录的信息，这里资金划转的信息直接从前端获取，审核记录根据前端提供的id号>fund_id来进行查询
+     *  资金划转审核记录的查询,当用户点击查看按钮后,不仅显示了资金划转的信息，还显示了资金划转审核记录的信息，这里资金划转的信息直接从前端获取，审核记录根据前端提供的id号>fund_id来进行查询
      */
 	public List<CapitalTransferCheck> queryCapitalTransferCheckInformation(Map<String, Object> map) {
 		UserDetail userDetail = (UserDetail) map.get("userDetail");
-		List<String> roleList = userDetail.getRole_name();
+		List<String> roleList = userDetail.getRole_name();//角色名称
 		Integer fund_id = (Integer) map.get("fund_id");
-		Integer statusId = capitalTransferDao.getStatusIdByCapitalId(fund_id);
-		//
-		if(roleList.contains(Role.BUSINESS_TRAN_POS_OF_PBBTBC)){//业务岗
+		Integer statusId = capitalTransferDao.getStatusIdByCapitalId(fund_id);//根据资金id 查询状态id值
+		if(roleList.contains(Role.BUSINESS_TRAN_POS_OF_PBBTBC)){//指令业务岗
+			if(statusId==12) {//如果管理人发起划转资金后   状态不是（待指令业务岗审核 ） 直接返回空
+				return null;
+			}
 			return capitalTransferDao.selectCapitalTransferRecord(map);
 		}
-		if(roleList.contains(Role.BUSINESS_CHECK_POS_OF_PBBTBC)){//核算岗
-			if(statusId==12||statusId==13){//如果状态是指令业务岗不通过或者是在待审核时  直接返回空
+		if(roleList.contains(Role.BUSINESS_CHECK_POS_OF_PBBTBC)){//如果是  省分行托管分中心（核算业务岗）
+			if(statusId==12||statusId==13){//对于核算主管岗  如果状态是指令业务岗不通过或者是在待审核时  直接返回空
 				return null;
 			}
 			return capitalTransferDao.selectCapitalTransferRecord(map);
 		}
-		if(roleList.contains(Role.BUSINESS_CHIEF_POS_OF_PBBTBC)) {//主管岗
-			if(statusId==12||statusId==13 ||statusId==14||statusId==15){//如果状态是指令业务岗不通过或者是在待审核时     在或者核算岗是在待审核或者审核不通过时    直接返回空
+		else if(roleList.contains(Role.BUSINESS_CHIEF_POS_OF_PBBTBC)) {//省分行托管分中心（核算主管岗）
+			if(statusId==12||statusId==13 ||statusId==14||statusId==15){//如果状态是指令业务岗不通过或者是在业务岗待审核时     再或者核算岗是在待审核或者核算岗审核不通过时    直接返回空
 				return null;
 			}
 			return capitalTransferDao.selectCapitalTransferRecord(map);
+		}else {
+			return capitalTransferDao.selectCapitalTransferRecord(map);//所有人都能查看
 		}
-		throw new RuntimeException("无权操作");
+		//throw new RuntimeException("无权操作");
 	}
 
 	/**
@@ -149,7 +155,7 @@ public class CapitalTransferService {
 	 * @param map
 	 * @return
 	 */
-	public Map<String, Object>  selectChaKanZiJinHuaZhuan(Map<String, Object> map){
+/*	public Map<String, Object>  selectChaKanZiJinHuaZhuan(Map<String, Object> map){
 		 int  fund_id=0;
 		 if (!"".equals(map.get("fund_id")) && map.get("fund_id") != null) { 
 			fund_id =  Integer.parseInt((String)map.get("fund_id"));
@@ -163,80 +169,125 @@ public class CapitalTransferService {
 		  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=null;//划款金额
-		Integer basis_of_payment=null;//划款依据
-		//账户余额
-		//划款账户
+	@Transactional(rollbackFor=Exception.class)
+	public void insertCheckTransfer(Map<String, Object> map) {
+		long currentTime = System.currentTimeMillis();//获取系统时间
+		UserDetail userDetail = (UserDetail) map.get("userDetail");//userDetail从controller层获取到
+		List<String> roleList = userDetail.getRole_name();////在get角色名称
+		String check_department=userDetail.getOrganization_name();	//机构名称——————————————————>//审核部门   审核部门的名称
+		String check_person=userDetail.getPerson_name();									//审核人
+		Integer check_result=(Integer) map.get("check_result");								//审核结果(5表示同意,6表示不同意)
+		String check_opinion=(String) map.get("check_opinion");								//审核意见
+		Integer fund_id=(Integer) map.get("fund_id");									    //资金划转的id号，要根据这个更新资金划转表的状态的
+		Integer statusId=capitalTransferDao.getStatusIdByCapitalId(fund_id);		        //根据业务id号获取当前的状态id值
+		Integer operatorTypeId=null;														//操作类型id号------>放到操作记录表中去的
 		
-		if (!"".equals(map.get("custodian")) && map.get("custodian") != null) { 
-			custodian = (String)map.get("custodian");
+		if(roleList.contains(Role.ADMIN)) {//角色是（管理人）发起划款资金
+			if(check_result==StatusId.AGREE) {//审核结果等于状态也是通过的话 
+				statusId=StatusId.INSTRUCT_BUSINESS_ACCOUNTING;//发起后状态  设置为（待指令业务岗审核）
+				operatorTypeId=OperationTypeId.ADMIN_LAUNCHING;//管理人发起后任务类型必须是1027 为 发起（10）
+			}else if(check_result==StatusId.REJECTED) {//如果审核结果不通过
+				statusId=StatusId.INSTRUCT_BUSINESS_ACCOUNTING_NO;//显示>为指令业务岗审核不通过
+				operatorTypeId=OperationTypeId.CHECK_BUSINESS_ACCOUNTING_REJECT_MAIN;//指令业务岗拒绝
+			}else {
+				throw new RuntimeException("审核结果参数非法123");
+			}
 		}
-		if (!"".equals(map.get("fund_name")) && map.get("fund_name") != null) { 
-			fund_name = (String)map.get("fund_name");
+		else if(roleList.contains(Role.BUSINESS_TRAN_POS_OF_PBBTBC) && statusId==StatusId.INSTRUCT_BUSINESS_ACCOUNTING){//省分行托管中心/状态待指令业务岗审核
+			if(check_result==StatusId.AGREE) {//如果审核结果通过
+				statusId=StatusId.CHECK_BUSINESS_ACCOUNTING; //通过后 状态显示为待核算业务岗审核    
+				operatorTypeId=OperationTypeId.CHECK_BUSINESS_ACCOUNTING_PASS;//操作类型为指令业务岗通过
+			}else if(check_result==StatusId.REJECTED) {//如果审核结果不通过
+				statusId=StatusId.INSTRUCT_BUSINESS_ACCOUNTING_NO;//显示>为指令业务岗审核不通过
+				operatorTypeId=OperationTypeId.CHECK_BUSINESS_ACCOUNTING_REJECT_MAIN;//指令业务岗拒绝
+			}else {
+				throw new RuntimeException("审核结果参数非法1");
+			}
 		}
-		if (!"".equals(map.get("sum_of_money")) && map.get("sum_of_money") != null) { 
-			sum_of_money = (Double)map.get("sum_of_money");
+		else if(roleList.contains(Role.BUSINESS_CHECK_POS_OF_PBBTBC)&&statusId==StatusId.CHECK_BUSINESS_ACCOUNTING){	//如果是待核算业务岗操作，且当前状态id必须是14
+			if(check_result==StatusId.AGREE){//审核结果时通过
+				statusId=StatusId.CHARGE_BUSINESS_ACCOUNTING;                  //如果通过  状态显示为待核算主管岗审核
+				operatorTypeId=OperationTypeId.CHECK_BUSINESS_ACCOUNTING_PASS; //操作类型核算业务岗通过
+			}else if(check_result==StatusId.REJECTED){//不通过
+				statusId=StatusId.CHECK_BUSINESS_ACCOUNTING_NO;             //显示核算业务岗不通过
+				operatorTypeId=OperationTypeId.CHECK_BUSINESS_ACCOUNTING_REJECT;//核算业务岗拒绝
+			}else{
+				throw new RuntimeException("审核结果参数非法2");
+			}
+		}else if(roleList.contains(Role.BUSINESS_CHIEF_POS_OF_PBBTBC)&&statusId==StatusId.CHARGE_BUSINESS_ACCOUNTING){//如果是待核算主管岗,且当前状态id必须是16
+			
+			if(check_result==StatusId.AGREE){//如果审核结果通过
+				statusId=StatusId.AGREE;
+				operatorTypeId=OperationTypeId.CHARGE_BUSINESS_ACCOUNTING_YES;//核算主管岗通过
+			}else if(check_result==StatusId.REJECTED){//如果审核结果不通过
+				statusId=StatusId.CHARGE_BUSINESS_ACCOUNTING_NO;//核算主管岗审核不通过 
+				operatorTypeId=OperationTypeId.CAPITAL_TRANSFER_REEXAMINE_REJECTED_NO;// //（划转资金）核算主管岗终审拒绝
+			}else{
+				throw new RuntimeException("审核结果参数非法3");
+			}
+		}else{
+			throw new RuntimeException("无权操作222");
 		}
-		Map<String, Object> mapToDao = new LinkedHashMap<String, Object>();
-		
+		//将审核已将数据封装到map中
+		Map<String, Object> mapToDaoOfBusinessCheck=new LinkedHashMap<String, Object>();
+		mapToDaoOfBusinessCheck.put("check_department", check_department);
+		mapToDaoOfBusinessCheck.put("check_person", check_person);
+		mapToDaoOfBusinessCheck.put("check_result", check_result);
+		mapToDaoOfBusinessCheck.put("check_opinion", check_opinion);
+		mapToDaoOfBusinessCheck.put("fund_id", fund_id);
+		mapToDaoOfBusinessCheck.put("check_time", currentTime);
+		mapToDaoOfBusinessCheck.put("relation", StatusId.CHECKING);								//这里必定写死，11在状态表中对应的是审核状态
+		//将封装到map的审核意见数据传入dao层中将结果导入【资金划转审核记录表】中-------->insert操作
+		capitalTransferDao.insertCheckTransfer(mapToDaoOfBusinessCheck);
 		
+		//将审核的结果封装到map中
+		Map<String, Object> mapToDaoOfBusinessDeclare=new LinkedHashMap<String, Object>();
+		mapToDaoOfBusinessDeclare.put("fund_id", fund_id);
+		mapToDaoOfBusinessDeclare.put("statusId", statusId);
+		//将审核结果更新到【资金划转】这个fund_id的【资金划转结果字段】中去-------->update操作
+		capitalTransferDao.updateCapitaltransferStatus(mapToDaoOfBusinessDeclare);
 		
+		//还要将审核的这个操作信息插入到操作记录表中
+		Map<String, Object> mapToOperationHistory = new LinkedHashMap<String,Object>();
+		mapToOperationHistory.put("operator_type_id", operatorTypeId);							//operatorTypeId根据前面的判断决定
+		mapToOperationHistory.put("operator_role", check_department);							//创建这个操作的角色根据前面的organizationName决定
+		mapToOperationHistory.put("operator_account", userDetail.getAccount());					//操作账号写活
+		mapToOperationHistory.put("operator_person", userDetail.getPerson_name());				//操作人先写活
+		mapToOperationHistory.put("operator_time", currentTime);							 //操作时间为当前操作时间
+		mapToOperationHistory.put("hash", "5555555555555555555");					//如何计算操作的hash值？？？？写死的这里
+		capitalTransferDao.insertOperationHistory(mapToOperationHistory);//将操作记录信息插入到操作记录表中
 		
 		
-		return null;
 	}
 	
+	
+	///////////////////////////////////////以下////////////////////////////////////////////////////////////////////____
 	/**
-	 * 将审核意见插入到审核表   暂没做
+	 * 管理人发起划款  资金
 	 * @param map
+	 * @return
 	 */
 	@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"));
-	    }
+	public Map<String, Object>  insertCapitalTransfer(Map<String, Object> map){
+		String custodian="";//管理人
+		String fund_name="";//基金名称
+		Double sum_of_money=null;//划款金额
+		Integer basis_of_payment=null;//划款依据
+		//账户余额
+		//划款账户
+
 		
 		
+		return null;
 	}
+	
+	
+	
 }

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

@@ -24,12 +24,14 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 
+import com.fuzamei.constant.HintMSG;
 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;
+import com.fuzamei.utils.ValidationUtil;
 
 @Controller
 @RequestMapping(value = "/AccountMaintenance")
@@ -38,6 +40,8 @@ public class AccountMaintenanceAction {
 	private AccountMaintenanceService  accountMaintenanceService;//注入service
 	@Autowired
 	private AttachmentService attachmentService;//生成附件id随机数service
+	@Autowired
+	private UserAuthoricationService userAuthoricationService;
 	/**  
     *  账户开立 添加客户名称和银行账号  上传3份资料  分别插入  附件表  操作记录表，账户开立表
     *  需要完成【申请输】【账户承诺书】【其他凭证】3个文件的上传，插入账务开立表1条数据，插入附件表3条数据，还有插入操作历史1条数据)
@@ -143,12 +147,21 @@ public class AccountMaintenanceAction {
 	 * @param response  
 	 * @throws Exception  
 	 */  
-	@RequestMapping(value="/downloadAccountFile")  
+	@RequestMapping(value="/downloadAccountlFile")  
 	@ResponseBody 
-	public Map<String,Object> downloadAccountFile(HttpServletRequest request,HttpServletResponse response,@RequestParam("url") String url) throws Exception{  
+	public Map<String,Object> downloadAccountlFile(HttpServletRequest request,HttpServletResponse response,
+			                                      @RequestParam("url") String url,
+												  @RequestParam("userId") Object uId){  
 	    try {
+	    	int userId=ValidationUtil.checkAndAssignInt(uId);
+	    	userAuthoricationService.checkUserAuthority(userId);//都给所有权限
+	    	url=ValidationUtil.checkBlankAndAssignString(url);							//对传过来的url进行非空校验
+			String fileName = request.getServletContext().getRealPath("")+url; 		
 	    	  //模拟文件，456.doc为需要下载的文件  
-	        String fileName = request.getSession().getServletContext().getRealPath("")+url;  
+			//如果文件不存在直接抛出异常
+			if(!new File(fileName).exists()){
+				throw new RuntimeException(HintMSG.FILE_NOT_FOUND);
+			}
 	        //获取输入流  
 	        InputStream bis = new BufferedInputStream(new FileInputStream(new File(fileName))); 
 	        //截取文件名字
@@ -165,11 +178,10 @@ public class AccountMaintenanceAction {
 	            out.write(len);  
 	            out.flush();  
 	        }  
-	        out.close(); 
+	        out.close();
 	        bis.close();
 	        //返给前端map进行前端提示
 	    	return JSONUtil.getJsonMap(200, true, "下载成功",null); 
-			
 		} catch (Exception e) {
 			return JSONUtil.getJsonMap(500, false, "下载失败:"+e.getMessage(),null); 
 		}
@@ -183,5 +195,4 @@ public class AccountMaintenanceAction {
 	
 	
 	
-	
 }

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

@@ -62,9 +62,18 @@ public class CapitalTransferAction {
 		return mapResult;
 	}*/
 	/**
-	 * 各个岗位查看资金划转记录列表
+	 * 各个岗位查看资金划转记录  列表
 	 * @param data
 	 * @return
+	 * {
+			
+			"userId":"7000",
+			"page":"1",
+			"status_name":"",
+			"fund_name":"",
+			"startTime":"",
+			"endTime":""
+        }
 	 */
 	@RequestMapping(value = "/selectCapitalTransfer", method = RequestMethod.POST)
 	@ResponseBody
@@ -73,8 +82,9 @@ public class CapitalTransferAction {
 		try {
 			@SuppressWarnings("unchecked")
 			Map<String, Object> map = JSON.parseObject(data,Map.class);//将前端传过来的json数据转化为map对象，并将map对象传入service层进行数据校验
-			int userId=ValidationUtil.checkAndAssignInt("userId");//首先校验用户权限问题
-			UserDetail userDetail = userAuthoricationService.checkUserAuthority(userId,Role.BUSINESS_CHIEF_POS_OF_PBBTBC,Role.BUSINESS_CHECK_POS_OF_PBBTBC,Role.BUSINESS_TRAN_POS_OF_PBBTBC);
+			int userId=ValidationUtil.checkAndAssignInt(map.get("userId"));//首先校验用户权限问题
+			//UserDetail userDetail = userAuthoricationService.checkUserAuthority(userId,Role.BUSINESS_CHIEF_POS_OF_PBBTBC,Role.BUSINESS_CHECK_POS_OF_PBBTBC,Role.BUSINESS_TRAN_POS_OF_PBBTBC);
+			UserDetail userDetail = userAuthoricationService.checkUserAuthority(userId);//暂时只传个userId   先给所有权限
 			int page = ValidationUtil.checkMinAndAssignInt(map.get("page"), 1); 
 			String fund_name=ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("fund_name"));
 			String status_name=ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("status_name"));
@@ -105,8 +115,8 @@ public class CapitalTransferAction {
 	 * @param data
 	 * @return
 	 *         {
-				"fund_id":"1012",
-				"userId":"xxx"
+				"fund_id":"1014",
+				"userId":"7000"
 				}
 	 */
 	@RequestMapping(value="/queryCapitalTransferCheckInformation",method=RequestMethod.POST)
@@ -115,20 +125,62 @@ public class CapitalTransferAction {
 		try {
 			@SuppressWarnings("unchecked")
 			Map<String, Object> map = JSON.parseObject(data, Map.class);		//将前端传过来的json数据转化为map对象，并将map对象传入service层进行数据校验
-			//首先校验用户权限问题
+			//先校验用户权限问题
 			int userId=ValidationUtil.checkAndAssignInt(map.get("userId"));
 			//查看用户非空和权限(只有【指令业务岗,核算岗和主管岗】有这个权限操作)
-			UserDetail userDetail = userAuthoricationService.checkUserAuthority(userId,Role.BUSINESS_CHIEF_POS_OF_PBBTBC,Role.BUSINESS_CHECK_POS_OF_PBBTBC,Role.BUSINESS_TRAN_POS_OF_PBBTBC);
+			//UserDetail userDetail = userAuthoricationService.checkUserAuthority(userId,Role.BUSINESS_CHIEF_POS_OF_PBBTBC,Role.BUSINESS_CHECK_POS_OF_PBBTBC,Role.BUSINESS_TRAN_POS_OF_PBBTBC);
+			UserDetail userDetail = userAuthoricationService.checkUserAuthority(userId);//所有人都能
 			Integer fund_id =ValidationUtil.checkAndAssignInt(map.get("fund_id"));		//被审核的业务id号需要先被进行校验
 			Map<String, Object> mapToService = new LinkedHashMap<String, Object>();
 			mapToService.put("userDetail", userDetail);
-			mapToService.put("fund_id", fund_id);                        //待待
+			mapToService.put("fund_id", fund_id);                                     
 			List<CapitalTransferCheck> capitalTransferCheckList =capitalTransferService.queryCapitalTransferCheckInformation(mapToService);
 			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, capitalTransferCheckList);
 		} catch (Exception e) {
 			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);
 		}
 	}
+	/**
+	 * 审核划转资金
+	 * 审批流程审批意见
+	 * @param data
+	 * @return
+	 */
+	@RequestMapping(value="/approvalCheckedByCapitaTtransfercheck",method=RequestMethod.POST)
+	@ResponseBody
+	private Map<String,Object> approvalCheckedByCapitaTtransfercheck(@RequestBody String data){
+		try {
+			System.out.println("添加到资金划转审核记录表信息....");
+			@SuppressWarnings("unchecked")
+			Map<String, Object> map = JSON.parseObject(data, Map.class);//将前端传过来的json数据转化为map对象，并将map对象传入service层进行数据校验
+			//首先校验用户权限问题
+			int userId=ValidationUtil.checkAndAssignInt(map.get("userId"));//拿到用户id 来校验
+			//查看用户非空和权限(只有{省分行托管中心指令业务岗和省分行托管分中心核算岗和省分行托管中心主管岗}有这个权限操作)
+			//UserDetail userDetail = userAuthoricationService.checkUserAuthority(userId,Role.BUSINESS_TRAN_POS_OF_PBBTBC,Role.BUSINESS_CHECK_POS_OF_PBBTBC,Role.BUSINESS_CHIEF_POS_OF_PBBTBC);
+			UserDetail userDetail = userAuthoricationService.checkUserAuthority(userId);//————》 待改动
+			//审核结果进行校验并赋值
+			Integer check_result = ValidationUtil.checkAndAssignInt(map.get("check_result"));
+			if(!(check_result==5||check_result==6)){//通过or不通过
+				throw new RuntimeException("资金审核结果参数非法");
+			}
+			//审核意见进行校验并赋值
+			String check_opinion = ValidationUtil.checkBlankAndAssignString(map.get("check_opinion"));
+			//被审核的资金id号需要先被进行校验
+			Integer fund_id=ValidationUtil.checkAndAssignInt(map.get("fund_id"));		
+			Map<String, Object> mapToService = new LinkedHashMap<String, Object>();
+			mapToService.put("userDetail", userDetail);
+			mapToService.put("fund_id", fund_id);
+			mapToService.put("check_result", check_result);
+			mapToService.put("check_opinion", check_opinion);
+			capitalTransferService.insertCheckTransfer(mapToService);
+			
+			return JSONUtil.getJsonMap(200, true, HintMSG.OPERATION_SUCCESS, null);
+		} catch (Exception e) {
+			return JSONUtil.getJsonMap(500, false, HintMSG.OPERATION_FAIL+":"+e.getMessage(), null);
+		}
+	}
+	
+	
 	/**{ 
 	    "fund_id":"1002"   postman 传id
        }   暂不用上面代替了
@@ -136,7 +188,7 @@ public class CapitalTransferAction {
 	 * @param data
 	 * @return
 	 */
-	@RequestMapping(value="/selectChaKanZiJinHuaZhuan",method=RequestMethod.POST)
+/*	@RequestMapping(value="/selectChaKanZiJinHuaZhuan",method=RequestMethod.POST)
 	@ResponseBody
 	public Map<String,Object> selectChaKanZiJinHuaZhuan(@RequestBody String data){
 		//System.out.println("查看资金划转详情信息....");
@@ -144,19 +196,32 @@ public class CapitalTransferAction {
 		Map<String, Object> map2= capitalTransferService.selectChaKanZiJinHuaZhuan(map);
 		return JSONUtil.getJsonMap(200, true, "操作成功", map2);
 		
-	}
+	}*/
 	/**  
 	 * 资金划转下载 doc文档
 	 * @param request  
 	 * @param response  
-	 * @throws Exception  
+	 * @throws Exception 
+	 * 资金划转》实现所有上传的文件的下载功能
+	 * 前端以【表单】的形式传过来一组数据：
+	 * url:下载地址
+	 * userId:用户id号 
 	 */  
 	@RequestMapping(value="/downloadCapitalFile")  
 	@ResponseBody 
-	public Map<String,Object> downloadCapitalFile(HttpServletRequest request,HttpServletResponse response,@RequestParam("url") String url) throws Exception{  
+	public Map<String,Object> downloadCapitalFile(HttpServletRequest request,HttpServletResponse response,
+			                                      @RequestParam("url") String url,
+												  @RequestParam("userId") Object uId){  
 	    try {
+	    	int userId=ValidationUtil.checkAndAssignInt(uId);
+	    	userAuthoricationService.checkUserAuthority(userId);//都给所有权限
+	    	url=ValidationUtil.checkBlankAndAssignString(url);							//对传过来的url进行非空校验
+			String fileName = request.getServletContext().getRealPath("")+url; 		
 	    	  //模拟文件，456.doc为需要下载的文件  
-	        String fileName = request.getSession().getServletContext().getRealPath("")+url;  
+			//如果文件不存在直接抛出异常
+			if(!new File(fileName).exists()){
+				throw new RuntimeException(HintMSG.FILE_NOT_FOUND);
+			}
 	        //获取输入流  
 	        InputStream bis = new BufferedInputStream(new FileInputStream(new File(fileName))); 
 	        //截取文件名字
@@ -177,7 +242,6 @@ public class CapitalTransferAction {
 	        bis.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/PromptLetterAction.java

@@ -1,4 +1,4 @@
-package com.fuzamei.web;
+ package com.fuzamei.web;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;