Antiloveg 8 yıl önce
ebeveyn
işleme
8e581fd504

+ 10 - 0
src/main/java/com/goafanti/cognizance/bo/CognizanceBo.java

@@ -46,6 +46,16 @@ public class CognizanceBo {
 	private String	founder;
 
 	private String	contractId;
+	
+	private Integer contractNumber;
+	
+	public Integer getContractNumber() {
+		return contractNumber;
+	}
+
+	public void setContractNumber(Integer contractNumber) {
+		this.contractNumber = contractNumber;
+	}
 
 	public String getContractId() {
 		return contractId;

+ 2 - 1
src/main/java/com/goafanti/common/mapper/CopyrightInfoMapper.xml

@@ -291,11 +291,12 @@
 	concat(oi.first_contacts,'  ', oi.first_mobile) as firstContact,
 	concat(oi.second_contacts,'  ', oi.second_mobile) as secondContact,
 	concat(oi.third_contacts,'  ', oi.third_mobile) as thirdContact,
-	a.name as principal, ad.name as founder
+	a.name as principal, ad.name as founder, c.serial_number as contractNumber
 	from copyright_info ci 
 	left join organization_identity oi on ci.uid = oi.uid
 	left join admin a on ci.principal = a.id
 	left join admin ad on ci.founder = ad.id
+	left join contract c on c.id = ci,contract_id
 	<if test="principal != null">
 	left join contract_log cl on ci.contract_id=cl.cid
 	</if>

+ 2 - 1
src/main/java/com/goafanti/common/mapper/OrgCognizanceMapper.xml

@@ -324,11 +324,12 @@
     CONCAT(i.first_contacts,'  ', i.first_mobile) as firstContacts,
     CONCAT(i.second_contacts,'  ', i.second_mobile) as secondContacts,
     CONCAT(i.third_contacts,'  ', i.third_mobile) as thirdContacts,
-    ad.name as founder
+    ad.name as founder, ct.serial_number as contractNumber
 	from org_cognizance c 
 	LEFT JOIN organization_identity i on c.uid = i.uid
 	LEFT JOIN admin a on c.consultant = a.id 
 	LEFT JOIN admin ad on c.founder = ad.id 
+	left join contract ct on ct.id = c.contract_id
 	<if test="principal != null">
 		left join contract_log l on c.contract_id=l.cid 
 	</if>

+ 2 - 1
src/main/java/com/goafanti/common/mapper/TechProjectMapper.xml

@@ -372,12 +372,13 @@
 		    p.serial_number as serialNumber, p.create_time as createTime, p.approved_date as approvedDate, 
 		    p.accept_date as acceptDate, a.name as consultant, p.contacts, ad.name as founder,
 		    p.project_name as projectName, p.project_catagory as projectCatagory, p.tech_field as techField, p.state, 
-        w.id as wid, w.website, w.account_number as accountNumber, w.department, w.password
+        w.id as wid, w.website, w.account_number as accountNumber, w.department, w.password, c.serial_number as contractNumber
 	  FROM  tech_project p
 		LEFT JOIN organization_identity i on i.uid = p.uid
 		LEFT JOIN admin a on p.consultant = a.id 
 		LEFT JOIN admin ad on p.founder = ad.id 
    	    LEFT JOIN tech_website w on p.department = w.id 
+   	    LEFT JOIN contract c on c.id = p.contract_id
     <if test="principal != null">
 		left join contract_log l on p.contract_id=l.cid
 	</if>

+ 8 - 0
src/main/java/com/goafanti/copyright/bo/CopyrightInfoSummary.java

@@ -95,7 +95,15 @@ public class CopyrightInfoSummary {
 	
 	private String founder;
 	
+	private Integer contractNumber;
 	
+	public Integer getContractNumber() {
+		return contractNumber;
+	}
+
+	public void setContractNumber(Integer contractNumber) {
+		this.contractNumber = contractNumber;
+	}
 
 	public String getFounder() {
 		return founder;

+ 10 - 0
src/main/java/com/goafanti/techproject/bo/TechProjectManageListBo.java

@@ -15,6 +15,16 @@ public class TechProjectManageListBo extends TechProjectClientListBo {
 	
 	private String contractId;
 	
+	private Integer contractNumber;
+	
+	public Integer getContractNumber() {
+		return contractNumber;
+	}
+
+	public void setContractNumber(Integer contractNumber) {
+		this.contractNumber = contractNumber;
+	}
+
 	public String getContractId() {
 		return contractId;
 	}