ylx 7 years ago
parent
commit
2f136cd694

+ 8 - 2
ccb_fund_trusteeship/src/main/java/com/fuzamei/entity/ContractRecord.java

@@ -10,7 +10,8 @@ public class ContractRecord {
 	private String upload_department;	//上传部门
 	private String upload_person;		//上传人
 	private String modify_opinion;		//修改意见
-	private String unconfirm_department;//未确认部门(初始状态肯定是三个部门--->省分行业务部门&管理人&省分行法律部门)
+	private String unconfirm_department;//待确认部门(初始状态肯定是三个部门--->省分行业务部门&管理人&省分行法律部门)
+	private Integer statusId;			//
 	private Long commit_time;			//更新时间,提交时间
 	public Integer getId() {
 		return id;
@@ -78,5 +79,10 @@ public class ContractRecord {
 	public void setCommit_time(Long commit_time) {
 		this.commit_time = commit_time;
 	}
-	
+	public Integer getStatusId() {
+		return statusId;
+	}
+	public void setStatusId(Integer statusId) {
+		this.statusId = statusId;
+	}
 }

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

@@ -55,7 +55,7 @@
 	</select>
 	
 	<!-- 根据条件查询所有符合条件的合同记录表(contract_record)表信息 -->
-	<select id="queryContractRecord" resultType="">
+	<select id="queryContractRecord" resultType="com.fuzamei.entity.ContractRecord">
 		
 	</select>
 	

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

@@ -309,7 +309,7 @@ public class BusinessDeclareService {
 		//将合同信息封装到mapToContractStatusTracking
 		Map<String, Object> mapToContractStatusTracking=new LinkedHashMap<String, Object>();
 		mapToContractStatusTracking.put("businessId", businessId);
-		mapToContractStatusTracking.put("contractName", contractName);
+		mapToContractStatusTracking.put("contractId", contractId);								//这里对数据库的表进行了修改,原来的是contractName,现在改成附件id号比较妥当
 		mapToContractStatusTracking.put("contractParty", contractParty);
 		mapToContractStatusTracking.put("updateTime", currentTime);
 		mapToContractStatusTracking.put("statusId", StatusId.MODIFYING);						//省分行刚上传合同状态肯定是将状态变成修订中(7)