Просмотр исходного кода

合同管理--流转logs接口

Antiloveg лет назад: 8
Родитель
Сommit
afea863d2f

+ 6 - 1
schema/2017-05-09.sql

@@ -1,2 +1,7 @@
 alter table `contract` 
-add column `contacts` int(1) null comment '联系人' after `uid`;
+add column `contacts` int(1) null comment '联系人' after `uid`; 
+
+alter table `tech_project`
+modify column `project_des` varchar(600) null comment '项目简介';
+
+alter table `contract` change `describe` `depict` varchar(128) null comment '合同描述';

+ 14 - 0
src/main/java/com/goafanti/admin/controller/AdminContractApiController.java

@@ -161,6 +161,20 @@ public class AdminContractApiController extends CertifyApiController {
 		res.setData(contractService.selectContractDetail(id));
 		return res;
 	}
+	
+	/**
+	 * 合同流转日志
+	 */
+	@RequestMapping(value = "/log", method = RequestMethod.GET)
+	public Result log(String cid){
+		Result res = new Result();
+		if (StringUtils.isBlank(cid)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到合同ID", "合同ID"));
+			return res;
+		}
+		res.setData(contractLogService.selectContractLogByCid(cid));
+		return res;
+	}
 
 	/**
 	 * 流转分发

+ 2 - 0
src/main/java/com/goafanti/common/dao/ContractLogMapper.java

@@ -18,4 +18,6 @@ public interface ContractLogMapper {
     int updateByPrimaryKey(ContractLog record);
 
 	void insertBatch(List<ContractLog> logs);
+
+	List<ContractLog> selectContractLogByCid(String cid);
 }

+ 1 - 1
src/main/java/com/goafanti/common/enums/ContractFields.java

@@ -6,7 +6,7 @@ import java.util.Map;
 public enum ContractFields {
 	UID("uid", "用户id"),
 	TYPE("type", "合同类型"),
-	DESCRIBE("describe", "合同描述"),
+	DEPICT("depict", "合同描述"),
 	PATENTNUM("patentNum", "专利数量"),
 	COPYRIGHTNUM("copyrightNum", "软著数量"),
 	COGNIZANCEYEAR("cognizanceYear", "高企认定申请年份"),

+ 9 - 0
src/main/java/com/goafanti/common/mapper/ContractLogMapper.xml

@@ -126,4 +126,13 @@
       )
     </foreach>
   </insert>
+  
+  <select id="selectContractLogByCid" parameterType="java.lang.String" resultMap="BaseResultMap">
+    	select cl.id, cl.cid, cl.comment, cl.record_time, 
+    	cl.status, aa.name as operator, a.name as principal
+		FROM contract_log cl 
+		LEFT JOIN admin aa on aa.id = cl.operator
+		LEFT JOIN admin a on a.id = cl.principal
+		where cl.cid = #{cid,jdbcType=VARCHAR}
+    </select>
 </mapper>

+ 15 - 14
src/main/java/com/goafanti/common/mapper/ContractMapper.xml

@@ -9,7 +9,7 @@
     <result column="type" property="type" jdbcType="INTEGER" />
     <result column="sign_date" property="signDate" jdbcType="TIMESTAMP" />
     <result column="founder" property="founder" jdbcType="VARCHAR" />
-    <result column="describe" property="describe" jdbcType="VARCHAR" />
+    <result column="depict" property="depict" jdbcType="VARCHAR" />
     <result column="status" property="status" jdbcType="INTEGER" />
     <result column="patent_num" property="patentNum" jdbcType="INTEGER" />
     <result column="patent_status" property="patentStatus" jdbcType="INTEGER" />
@@ -26,7 +26,7 @@
     <result column="contacts" property="contacts" jdbcType="INTEGER" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, uid, serial_number, name, type, sign_date, founder, describe, status, patent_num, 
+    id, uid, serial_number, name, type, sign_date, founder, depict, status, patent_num, 
     patent_status, copyright_num, copyright_status, cognizance_year, cognizance_status, 
     tech_project_num, tech_project_status, comment, create_time, complete_date, deleted_sign,
     contacts
@@ -44,15 +44,16 @@
   <insert id="insert" parameterType="com.goafanti.common.model.Contract" >
     insert into contract (id, uid, serial_number, 
       name, type, sign_date, 
-      founder, describe, status, 
+      founder, depict, status, 
       patent_num, patent_status, copyright_num, 
       copyright_status, cognizance_year, cognizance_status, 
       tech_project_num, tech_project_status, comment, 
       create_time, complete_date, deleted_sign, contacts
       )
-    values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{serialNumber,jdbcType=INTEGER}, 
+    values (
+      #{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{serialNumber,jdbcType=INTEGER}, 
       #{name,jdbcType=VARCHAR}, #{type,jdbcType=INTEGER}, #{signDate,jdbcType=TIMESTAMP}, 
-      #{founder,jdbcType=VARCHAR}, #{describe,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
+      #{founder,jdbcType=VARCHAR}, #{depict,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
       #{patentNum,jdbcType=INTEGER}, #{patentStatus,jdbcType=INTEGER}, #{copyrightNum,jdbcType=INTEGER}, 
       #{copyrightStatus,jdbcType=INTEGER}, #{cognizanceYear,jdbcType=INTEGER}, #{cognizanceStatus,jdbcType=INTEGER}, 
       #{techProjectNum,jdbcType=INTEGER}, #{techProjectStatus,jdbcType=INTEGER}, #{comment,jdbcType=VARCHAR}, 
@@ -84,8 +85,8 @@
       <if test="founder != null" >
         founder,
       </if>
-      <if test="describe != null" >
-        describe,
+      <if test="depict != null" >
+        depict,
       </if>
       <if test="status != null" >
         status,
@@ -152,8 +153,8 @@
       <if test="founder != null" >
         #{founder,jdbcType=VARCHAR},
       </if>
-      <if test="describe != null" >
-        #{describe,jdbcType=VARCHAR},
+      <if test="depict != null" >
+        #{depict,jdbcType=VARCHAR},
       </if>
       <if test="status != null" >
         #{status,jdbcType=INTEGER},
@@ -220,8 +221,8 @@
       <if test="founder != null" >
         founder = #{founder,jdbcType=VARCHAR},
       </if>
-      <if test="describe != null" >
-        describe = #{describe,jdbcType=VARCHAR},
+      <if test="depict != null" >
+        depict = #{depict,jdbcType=VARCHAR},
       </if>
       <if test="status != null" >
         status = #{status,jdbcType=INTEGER},
@@ -276,7 +277,7 @@
       type = #{type,jdbcType=INTEGER},
       sign_date = #{signDate,jdbcType=TIMESTAMP},
       founder = #{founder,jdbcType=VARCHAR},
-      describe = #{describe,jdbcType=VARCHAR},
+      depict = #{depict,jdbcType=VARCHAR},
       status = #{status,jdbcType=INTEGER},
       patent_num = #{patentNum,jdbcType=INTEGER},
       patent_status = #{patentStatus,jdbcType=INTEGER},
@@ -298,7 +299,7 @@
    select c.id, c.uid, oi.unit_name as unitName, 
    		  oi.licence_province as province, c.serial_number as serialNumber, c.type,
    		  c.sign_date as signDate, a.name as founder, 
-   		  c.describe, c.status, c.complete_date as completeDate, c.contacts
+   		  c.depict, c.status, c.complete_date as completeDate, c.contacts
    from contract c 
 		LEFT JOIN organization_identity oi on oi.uid = c.uid
 		LEFT JOIN admin a on a.id = c.founder
@@ -389,7 +390,7 @@
 			c.id, c.uid, c.serial_number as serialNumber,  
 			oi.unit_name as unitName, oi.org_code as orgCode, oi.postal_address as address,
 			c.type, c.sign_date as signDate, a.name as founder, 
-			c.describe, c.status, c.patent_num as patentNum, 
+			c.depict, c.status, c.patent_num as patentNum, 
 			c.patent_status as patentStatus, c.copyright_num as copyrightNum, c.copyright_status as copyrightStatus, 
 			c.cognizance_year as cognizanceYear, c.cognizance_status as cognizanceStatus, c.tech_project_num as techProjectNum, 
 			c.tech_project_status as techProjectStatus, c.comment, c.complete_date as completeDate,

+ 288 - 284
src/main/java/com/goafanti/common/model/Contract.java

@@ -10,122 +10,125 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.goafanti.common.constant.AFTConstants;
 
 public class Contract {
-    private String id;
-
-    private String uid;
-    
-    private Integer contacts;
-
-    /**
-    * 合同编号
-    */
-    private Integer serialNumber;
-
-    /**
-    * 合同名称(预留字段)
-    */
-    private String name;
-
-    /**
-    * 合同类型(1-专利类型合同,2-软著类型合同,3-高企认定类型合同,4-科技项目类型合同)
-    */
-    private Integer type;
-
-    /**
-    * 合同签订时间
-    */
-    private Date signDate;
-
-    /**
-    * 合同记录创建人
-    */
-    private String founder;
-
-    /**
-    * 合同描述
-    */
-    private String describe;
-
-    /**
-    * 合同状态(0-草稿,1-签订,2-分发流转,3-完成(已结款))
-    */
-    private Integer status;
-
-    /**
-    * 专利数量
-    */
-    private Integer patentNum;
-
-    /**
-    * 专利创建状态(0-未创建,1-已创建)
-    */
-    private Integer patentStatus;
-
-    /**
-    * 软著数量
-    */
-    private Integer copyrightNum;
-
-    /**
-    * 软著创建状态(0-未创建,1-已创建)
-    */
-    private Integer copyrightStatus;
-
-    /**
-    * 高企申请年份
-    */
-    private Integer cognizanceYear;
-
-    /**
-    * 高企认定创建状态(1-未创建,1-已创建)
-    */
-    private Integer cognizanceStatus;
-
-    /**
-    * 科技项目数量
-    */
-    private Integer techProjectNum;
-
-    /**
-    * 科技项目创建状态(0-未创建,1-已创建)
-    */
-    private Integer techProjectStatus;
-
-    /**
-    * 合同创建备注
-    */
-    private String comment;
-
-    /**
-    * 记录创建时间
-    */
-    private Date createTime;
-
-    /**
-    * 合同完成(结款)日期
-    */
-    private Date completeDate;
-
-    private Integer deletedSign;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getUid() {
-        return uid;
-    }
-
-    public void setUid(String uid) {
-        this.uid = uid;
-    }
-    
-    @JsonFormat(shape = Shape.STRING)
-    public Integer getContacts() {
+	private String	id;
+
+	private String	uid;
+
+	/**
+	 * 联系人
+	 */
+	private Integer	contacts;
+
+	/**
+	 * 合同编号
+	 */
+	private Integer	serialNumber;
+
+	/**
+	 * 合同名称(预留字段)
+	 */
+	private String	name;
+
+	/**
+	 * 合同类型(1-专利类型合同,2-软著类型合同,3-高企认定类型合同,4-科技项目类型合同)
+	 */
+	private Integer	type;
+
+	/**
+	 * 合同签订时间
+	 */
+	private Date	signDate;
+
+	/**
+	 * 合同记录创建人
+	 */
+	private String	founder;
+
+	/**
+	 * 合同描述
+	 */
+	private String	depict;
+
+	/**
+	 * 合同状态(0-草稿,1-签订,2-分发流转,3-完成(已结款))
+	 */
+	private Integer	status;
+
+	/**
+	 * 专利数量
+	 */
+	private Integer	patentNum;
+
+	/**
+	 * 专利创建状态(0-未创建,1-已创建)
+	 */
+	private Integer	patentStatus;
+
+	/**
+	 * 软著数量
+	 */
+	private Integer	copyrightNum;
+
+	/**
+	 * 软著创建状态(0-未创建,1-已创建)
+	 */
+	private Integer	copyrightStatus;
+
+	/**
+	 * 高企申请年份
+	 */
+	private Integer	cognizanceYear;
+
+	/**
+	 * 高企认定创建状态(1-未创建,1-已创建)
+	 */
+	private Integer	cognizanceStatus;
+
+	/**
+	 * 科技项目数量
+	 */
+	private Integer	techProjectNum;
+
+	/**
+	 * 科技项目创建状态(0-未创建,1-已创建)
+	 */
+	private Integer	techProjectStatus;
+
+	/**
+	 * 合同创建备注
+	 */
+	private String	comment;
+
+	/**
+	 * 记录创建时间
+	 */
+	private Date	createTime;
+
+	/**
+	 * 合同完成(结款)日期
+	 */
+	private Date	completeDate;
+
+	private Integer	deletedSign;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getUid() {
+		return uid;
+	}
+
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
+
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getContacts() {
 		return contacts;
 	}
 
@@ -134,165 +137,166 @@ public class Contract {
 	}
 
 	public Integer getSerialNumber() {
-        return serialNumber;
-    }
-
-    public void setSerialNumber(Integer serialNumber) {
-        this.serialNumber = serialNumber;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-    
-    @JsonFormat(shape = Shape.STRING)
-    public Integer getType() {
-        return type;
-    }
-
-    public void setType(Integer type) {
-        this.type = type;
-    }
-
-    public Date getSignDate() {
-        return signDate;
-    }
-
-    public void setSignDate(Date signDate) {
-        this.signDate = signDate;
-    }
-
-    public String getFounder() {
-        return founder;
-    }
-
-    public void setFounder(String founder) {
-        this.founder = founder;
-    }
-
-    public String getDescribe() {
-        return describe;
-    }
-
-    public void setDescribe(String describe) {
-        this.describe = describe;
-    }
-    
-    @JsonFormat(shape = Shape.STRING)
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public Integer getPatentNum() {
-        return patentNum;
-    }
-
-    public void setPatentNum(Integer patentNum) {
-        this.patentNum = patentNum;
-    }
-
-    @JsonFormat(shape = Shape.STRING)
-    public Integer getPatentStatus() {
-        return patentStatus;
-    }
-
-    public void setPatentStatus(Integer patentStatus) {
-        this.patentStatus = patentStatus;
-    }
-
-    public Integer getCopyrightNum() {
-        return copyrightNum;
-    }
-
-    public void setCopyrightNum(Integer copyrightNum) {
-        this.copyrightNum = copyrightNum;
-    }
-    
-    @JsonFormat(shape = Shape.STRING)
-    public Integer getCopyrightStatus() {
-        return copyrightStatus;
-    }
-
-    public void setCopyrightStatus(Integer copyrightStatus) {
-        this.copyrightStatus = copyrightStatus;
-    }
-
-    public Integer getCognizanceYear() {
-        return cognizanceYear;
-    }
-
-    public void setCognizanceYear(Integer cognizanceYear) {
-        this.cognizanceYear = cognizanceYear;
-    }
-    
-    @JsonFormat(shape = Shape.STRING)
-    public Integer getCognizanceStatus() {
-        return cognizanceStatus;
-    }
-
-    public void setCognizanceStatus(Integer cognizanceStatus) {
-        this.cognizanceStatus = cognizanceStatus;
-    }
-
-    public Integer getTechProjectNum() {
-        return techProjectNum;
-    }
-
-    public void setTechProjectNum(Integer techProjectNum) {
-        this.techProjectNum = techProjectNum;
-    }
-    
-    @JsonFormat(shape = Shape.STRING)
-    public Integer getTechProjectStatus() {
-        return techProjectStatus;
-    }
-
-    public void setTechProjectStatus(Integer techProjectStatus) {
-        this.techProjectStatus = techProjectStatus;
-    }
-
-    public String getComment() {
-        return comment;
-    }
-
-    public void setComment(String comment) {
-        this.comment = comment;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getCompleteDate() {
-        return completeDate;
-    }
-
-    public void setCompleteDate(Date completeDate) {
-        this.completeDate = completeDate;
-    }
-    
-    @JsonIgnore
-    public Integer getDeletedSign() {
-        return deletedSign;
-    }
-
-    public void setDeletedSign(Integer deletedSign) {
-        this.deletedSign = deletedSign;
-    }
-    
-    public String getSignDateFormattedDate() {
+		return serialNumber;
+	}
+
+	public void setSerialNumber(Integer serialNumber) {
+		this.serialNumber = serialNumber;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getType() {
+		return type;
+	}
+
+	public void setType(Integer type) {
+		this.type = type;
+	}
+
+	public Date getSignDate() {
+		return signDate;
+	}
+
+	public void setSignDate(Date signDate) {
+		this.signDate = signDate;
+	}
+
+	public String getFounder() {
+		return founder;
+	}
+
+	public void setFounder(String founder) {
+		this.founder = founder;
+	}
+
+
+	public String getDepict() {
+		return depict;
+	}
+
+	public void setDepict(String depict) {
+		this.depict = depict;
+	}
+
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getStatus() {
+		return status;
+	}
+
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+
+	public Integer getPatentNum() {
+		return patentNum;
+	}
+
+	public void setPatentNum(Integer patentNum) {
+		this.patentNum = patentNum;
+	}
+
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getPatentStatus() {
+		return patentStatus;
+	}
+
+	public void setPatentStatus(Integer patentStatus) {
+		this.patentStatus = patentStatus;
+	}
+
+	public Integer getCopyrightNum() {
+		return copyrightNum;
+	}
+
+	public void setCopyrightNum(Integer copyrightNum) {
+		this.copyrightNum = copyrightNum;
+	}
+
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getCopyrightStatus() {
+		return copyrightStatus;
+	}
+
+	public void setCopyrightStatus(Integer copyrightStatus) {
+		this.copyrightStatus = copyrightStatus;
+	}
+
+	public Integer getCognizanceYear() {
+		return cognizanceYear;
+	}
+
+	public void setCognizanceYear(Integer cognizanceYear) {
+		this.cognizanceYear = cognizanceYear;
+	}
+
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getCognizanceStatus() {
+		return cognizanceStatus;
+	}
+
+	public void setCognizanceStatus(Integer cognizanceStatus) {
+		this.cognizanceStatus = cognizanceStatus;
+	}
+
+	public Integer getTechProjectNum() {
+		return techProjectNum;
+	}
+
+	public void setTechProjectNum(Integer techProjectNum) {
+		this.techProjectNum = techProjectNum;
+	}
+
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getTechProjectStatus() {
+		return techProjectStatus;
+	}
+
+	public void setTechProjectStatus(Integer techProjectStatus) {
+		this.techProjectStatus = techProjectStatus;
+	}
+
+	public String getComment() {
+		return comment;
+	}
+
+	public void setComment(String comment) {
+		this.comment = comment;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public Date getCompleteDate() {
+		return completeDate;
+	}
+
+	public void setCompleteDate(Date completeDate) {
+		this.completeDate = completeDate;
+	}
+
+	@JsonIgnore
+	public Integer getDeletedSign() {
+		return deletedSign;
+	}
+
+	public void setDeletedSign(Integer deletedSign) {
+		this.deletedSign = deletedSign;
+	}
+
+	public String getSignDateFormattedDate() {
 		if (this.signDate == null) {
 			return null;
 		} else {
@@ -303,16 +307,16 @@ public class Contract {
 	public void setSignDateFormattedDate(String signDateFormattedDate) {
 
 	}
-	
-	 public String getCompleteDateFormattedDate() {
-			if (this.completeDate == null) {
-				return null;
-			} else {
-				return DateFormatUtils.format(this.getCompleteDate(), AFTConstants.YYYYMMDDHHMMSS);
-			}
+
+	public String getCompleteDateFormattedDate() {
+		if (this.completeDate == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getCompleteDate(), AFTConstants.YYYYMMDDHHMMSS);
 		}
+	}
 
-		public void setCompleteDateFormattedDate(String completeDateFormattedDate) {
+	public void setCompleteDateFormattedDate(String completeDateFormattedDate) {
 
-		}
+	}
 }

+ 18 - 22
src/main/java/com/goafanti/contract/bo/ContractManageListBo.java

@@ -12,20 +12,18 @@ public class ContractManageListBo {
 	private String	id;
 
 	private String	uid;
-	
-	private Integer contacts;
-	
-	private String province;
-	
-	private String unitName;
 
+	private Integer	contacts;
+
+	private String	province;
+
+	private String	unitName;
 
 	/**
 	 * 合同编号
 	 */
 	private Integer	serialNumber;
 
-
 	/**
 	 * 合同类型(1-专利类型合同,2-软著类型合同,3-高企认定类型合同,4-科技项目类型合同)
 	 */
@@ -44,17 +42,17 @@ public class ContractManageListBo {
 	/**
 	 * 合同描述
 	 */
-	private String	describe;
+	private String	depict;
 
 	/**
 	 * 合同状态(0-草稿,1-签订,2-分发流转,3-完成(已结款))
 	 */
 	private Integer	status;
-	
+
 	/**
 	 * 合同完成时间
 	 */
-	private Date completeDate;
+	private Date	completeDate;
 
 	public String getId() {
 		return id;
@@ -71,7 +69,7 @@ public class ContractManageListBo {
 	public void setUid(String uid) {
 		this.uid = uid;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getContacts() {
 		return contacts;
@@ -105,7 +103,6 @@ public class ContractManageListBo {
 		this.serialNumber = serialNumber;
 	}
 
-	
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getType() {
 		return type;
@@ -131,14 +128,15 @@ public class ContractManageListBo {
 		this.founder = founder;
 	}
 
-	public String getDescribe() {
-		return describe;
+
+	public String getDepict() {
+		return depict;
 	}
 
-	public void setDescribe(String describe) {
-		this.describe = describe;
+	public void setDepict(String depict) {
+		this.depict = depict;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getStatus() {
 		return status;
@@ -147,8 +145,7 @@ public class ContractManageListBo {
 	public void setStatus(Integer status) {
 		this.status = status;
 	}
-	
-	
+
 	public Date getCompleteDate() {
 		return completeDate;
 	}
@@ -168,7 +165,7 @@ public class ContractManageListBo {
 	public void setSignDateFormattedDate(String signDateFormattedDate) {
 
 	}
-	
+
 	public String getCompleteDateFormattedDate() {
 		if (this.completeDate == null) {
 			return null;
@@ -180,6 +177,5 @@ public class ContractManageListBo {
 	public void setCompleteDateFormattedDate(String completeDateFormattedDate) {
 
 	}
-	
-	
+
 }

+ 6 - 5
src/main/java/com/goafanti/contract/bo/InputContract.java

@@ -18,7 +18,7 @@ public class InputContract {
 	private Integer	type;
 
 	@Size(min = 0, max = 128, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String	describe;
+	private String	depict;
 	
 	@Max(value = 99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
@@ -59,12 +59,13 @@ public class InputContract {
 		this.type = type;
 	}
 
-	public String getDescribe() {
-		return describe;
+
+	public String getDepict() {
+		return depict;
 	}
 
-	public void setDescribe(String describe) {
-		this.describe = describe;
+	public void setDepict(String depict) {
+		this.depict = depict;
 	}
 
 	public Integer getPatentNum() {

+ 6 - 5
src/main/java/com/goafanti/contract/bo/InputSaveContract.java

@@ -27,7 +27,7 @@ public class InputSaveContract {
 
 
 	@Size(min = 0, max = 128, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String	describe;
+	private String	depict;
 
 	@Max(value = 3, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
@@ -98,12 +98,13 @@ public class InputSaveContract {
 		this.type = type;
 	}
 
-	public String getDescribe() {
-		return describe;
+
+	public String getDepict() {
+		return depict;
 	}
 
-	public void setDescribe(String describe) {
-		this.describe = describe;
+	public void setDepict(String depict) {
+		this.depict = depict;
 	}
 
 	public Integer getStatus() {

+ 5 - 0
src/main/java/com/goafanti/contract/service/ContractLogService.java

@@ -1,9 +1,14 @@
 package com.goafanti.contract.service;
 
+import java.util.List;
+
+import com.goafanti.common.model.ContractLog;
 import com.goafanti.contract.bo.InputContactLog;
 
 public interface ContractLogService {
 
 	void insertCirculation(InputContactLog cl, String[] principals);
 
+	List<ContractLog> selectContractLogByCid(String cid);
+
 }

+ 7 - 0
src/main/java/com/goafanti/contract/service/impl/ContractLogServiceImpl.java

@@ -34,6 +34,11 @@ public class ContractLogServiceImpl implements ContractLogService {
 	private NoticeMapper		noticeMapper;
 	@Autowired
 	private UserMapper			userMapper;
+	
+	@Override
+	public List<ContractLog> selectContractLogByCid(String cid) {
+		return contractLogMapper.selectContractLogByCid(cid);
+	}
 
 	@Override
 	public void insertCirculation(InputContactLog icl, String[] principals) {
@@ -84,4 +89,6 @@ public class ContractLogServiceImpl implements ContractLogService {
 		n.setYear(info.getCognizanceYear());
 		return n;
 	}
+
+	
 }

+ 1 - 1
src/main/java/com/goafanti/techproject/bo/InputTechProject.java

@@ -34,7 +34,7 @@ public class InputTechProject {
 	@Size(min = 0, max = 45, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		techField;
 
-	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 600, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		projectDes;
 
 	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")