Browse Source

项目管理-项目详情列表新增合同编号

anderx 7 years ago
parent
commit
9770434160

+ 24 - 22
src/main/java/com/goafanti/common/mapper/TechProjectMapper.xml

@@ -687,28 +687,30 @@
   <select id="selectTechProjectDetail" resultType="com.goafanti.techproject.bo.ProjectDetailBo">
 	  <choose>
 	  	<when test="buyerType == 0">
-	  		 select
-				a.id,
-				a.serial_number as serialNumber,
-				date_format(a.sign_date,'%Y-%m-%d %H:%i:%S') as signDate,
-				a.sign_comment as signComment,
-				date_format(a.complete_date,'%Y-%m-%d %H:%i:%S') as completeDate,
-				a.complete_comment as completeComment,
-				a.uid,
-				a.status as projectStatus,
-				a.deleted_sign as deletedSign,
-				a.order_no as orderNo,
-				b.nickname as buyerName,
-				d.name as principalName,
-				f.name as buyerProvince,
-				g.cname as projectType
-			from
-				contract a left join user b on
-				a.uid = b.id left join admin d on
-				a.principal = d.id left join user_identity e on
-				a.uid = e.uid left join district_glossory f on
-				e.province  = f.id left join business_varieties g on
-				a.type = g.id
+	  		  select
+	a.id,
+	a.serial_number as serialNumber,
+	date_format( a.sign_date, '%Y-%m-%d %H:%i:%S' ) as signDate,
+	a.sign_comment as signComment,
+	date_format( a.complete_date, '%Y-%m-%d %H:%i:%S' ) as completeDate,
+	a.complete_comment as completeComment,
+	a.uid,
+	a.status as projectStatus,
+	a.deleted_sign as deletedSign,
+	a.order_no as orderNo,
+	b.nickname as buyerName,
+	d.name as principalName,
+	f.name as buyerProvince,
+	g.cname as projectType,
+	t.contract_no as contractNo
+from
+	contract a left join user b on
+	a.uid = b.id left join admin d on
+	a.principal = d.id left join user_identity e on
+	a.uid = e.uid left join district_glossory f on
+	e.province = f.id left join business_varieties g on
+	a.type = g.id left join t_order t on
+	a.order_no=t.order_no
 			where a.id = #{contractId,jdbcType=VARCHAR}
 	  	</when>
 	  		<when test="buyerType == 1">

+ 9 - 0
src/main/java/com/goafanti/techproject/bo/ProjectDetailBo.java

@@ -6,6 +6,7 @@ public class ProjectDetailBo extends ProjectListBo{
 	private String completeComment;
 	private String uid;
 	private String buyerProvince;
+	private String contractNo;
 	public String getSignComment() {
 		return signComment;
 	}
@@ -37,4 +38,12 @@ public class ProjectDetailBo extends ProjectListBo{
 	public void setBuyerProvince(String buyerProvince) {
 		this.buyerProvince = buyerProvince;
 	}
+
+	public String getContractNo() {
+		return contractNo;
+	}
+
+	public void setContractNo(String contractNo) {
+		this.contractNo = contractNo;
+	}
 }