Browse Source

根据数据库审核记录表增加一个task字段进行了代码修改

ylx 7 years ago
parent
commit
e862285787

+ 10 - 0
ccb_fund_trusteeship/src/main/java/com/fuzamei/entity/BusinessCheck.java

@@ -7,6 +7,16 @@ public class BusinessCheck {
 	private String check_opinion;			//审核意见
 	private Long check_time;				//审核时间
 	private String result;					//审核结果,需要关联状态表查询出状态的status_name------>varchar类型
+	
+	private String task;					//llx给添加的任务栏,审核记录表中多加一个任务栏,经办支行写成发起,其它都是审核状态【贼特么鸡肋的一个字段】
+	
+	
+	public String getTask() {
+		return task;
+	}
+	public void setTask(String task) {
+		this.task = task;
+	}
 	public String getCheck_department() {
 		return check_department;
 	}

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

@@ -178,21 +178,37 @@
 	
 	<!-- 查看审核记录的sql语句 -->
 	<select id="queryBusinessCheckInformation" resultType="com.fuzamei.entity.BusinessCheck">
-		select 
+		select
 			bc.check_department,
 			bc.check_person,
 			bc.check_business_id,
 			bc.check_opinion,
 			bc.check_time,
-			s.status_name as result
-		from 
-			business_check bc
+			bc.result,
+			s.status_name as task
+		from
+			(select 
+				bc.check_department,
+				bc.check_person,
+				bc.check_business_id,
+				bc.check_opinion,
+				bc.check_time,
+				s.status_name as result,
+				bc.task
+			from 
+				business_check bc
+			left join 
+				status s
+			on 
+				bc.check_result=s.status_id) bc
 		left join 
 			status s
-		on 
-			bc.check_result=s.status_id
+		on
+			bc.task=s.status_id
 		where 
 			bc.check_business_id=#{businessId}
+		order by 
+			bc.check_time desc
 	</select>
 	
 	<!-- 将审核意见插入业务审核表中去 -->
@@ -203,13 +219,15 @@
 						   check_business_id,
 						   check_opinion,
 						   check_time,
-						   check_result)
+						   check_result,
+						   task)
 		values(#{organizationName},
 			   #{checkPerson},
 			   #{businessId},
 			   #{checkOpinion},
 			   #{checkTime},
-			   #{checkResult})
+			   #{checkResult},
+			   #{task})
 	</insert>
 	
 	<!-- 将审核结果意见在插入审核表的同时,也将审核结果更新到业务申报表中去,根据业务id(business_id)定位到指定的业务 -->

+ 13 - 0
ccb_fund_trusteeship/src/main/java/com/fuzamei/service/BusinessDeclareService.java

@@ -236,6 +236,18 @@ public class BusinessDeclareService {
 		businessDeclareDao.insertAttachmentInformationToDaoByBranchBank(mapToDaoForAttachmentOfBasicData);	//将附件---【基础性资料】---申请的数据插入数据库
 		
 		
+		Map<String, Object> mapToDaoForBusinessCheck = new LinkedHashMap<String,Object>();		//这个map是将数据插入【审核记录】中的二级分行刚刚上传也要在审核记录中插入一条数据
+		mapToDaoForBusinessCheck.put("organizationName", "经办支行");								//经办支行提交写死审核部门为--经办支行--
+		mapToDaoForBusinessCheck.put("checkPerson", "张三");										//经办支行的某个人,先写死
+		mapToDaoForBusinessCheck.put("checkResult", 5);											//经办支行提交肯定通过
+		mapToDaoForBusinessCheck.put("checkOpinion", "--");										//审核意见空着
+		mapToDaoForBusinessCheck.put("businessId", businessId);									//业务id从前面获取
+		mapToDaoForBusinessCheck.put("checkTime", mapToDaoForBusinessDeclare.get("declareTime"));//获取的是当前时间
+		mapToDaoForBusinessCheck.put("task", 10);												//需要通过status表获取状态信息,10表示发起,经办支行刚开始一定是发起状态
+		//将封装到map的审核意见数据传入dao层中将结果导入【业务审核总表】中-------->insert操作
+		businessDeclareDao.businessDeclareCheckedBy(mapToDaoForBusinessCheck);
+		
+		
 		//此外,还要将业务申报的这个操作信息插入到操作记录表中【】
 		Map<String, Object> mapToOperationHistory = new LinkedHashMap<String,Object>();
 		mapToOperationHistory.put("operatorTypeId", 1001);								//刚刚创立业务申报,操作类型为业务申报
@@ -448,6 +460,7 @@ public class BusinessDeclareService {
 		mapToDaoOfBusinessCheck.put("checkOpinion", checkOpinion);
 		mapToDaoOfBusinessCheck.put("businessId", businessId);
 		mapToDaoOfBusinessCheck.put("checkTime", System.currentTimeMillis());
+		mapToDaoOfBusinessCheck.put("task", 11);								//这里必定写死,11在状态表中对应的是审核状态
 		//将封装到map的审核意见数据传入dao层中将结果导入【业务审核总表】中-------->insert操作
 		businessDeclareDao.businessDeclareCheckedBy(mapToDaoOfBusinessCheck);
 		

+ 9 - 2
ccb_fund_trusteeship/src/main/java/com/fuzamei/web/BusinessDeclareAction.java

@@ -164,6 +164,10 @@ public class BusinessDeclareAction {
 	* @Title: queryBusinessDeclareInformation
 	* @Description: TODO(审核记录的查询,当用户点击查看按钮后,不仅显示了业务申报的信息,还显示了审核记录的信息,这里业务申报的信息直接从前端获取,审核记录根据前端提供的业务id号business_id来进行查询)
 	* 这个信息要去业务审核总表中去查询
+	* 			前端传过来的json格式
+				{
+					"businessId":32323
+				}
 	* @param @param data
 	* @param @return    设定文件
 	* @return Map<String,Object>    返回类型
@@ -190,11 +194,14 @@ public class BusinessDeclareAction {
 	* @Title: businessDeclareCheckedBy
 	* @Description: TODO(审核意见的提交)
 	* @param @param data	
-	* 数据包含organizationName:二级分行或省分行
+	* 数据json包含
+	* 		{ 
+	* 		 organizationName:二级分行或省分行
 	* 		 checkPerson:审核人员
 	* 		 checkResult:结果放入check_result字段
 	* 		 checkOpinion:审核意见
 	* 		 businessId:业务id
+	* 		}
 	* @param @return    设定文件
 	* @return Map<String,Object>    返回类型
 	* @author ylx
@@ -214,7 +221,7 @@ public class BusinessDeclareAction {
 			
 			return JSONUtil.getJsonMap(200, true, "增加审核意见成功", null);
 		} catch (Exception e) {
-			return JSONUtil.getJsonMap(500, false, "增加审核意见失败", null);
+			return JSONUtil.getJsonMap(500, false, "增加审核意见失败"+e.getMessage(), null);
 		}
 	}