Antiloveg 8 years ago
parent
commit
d31855b6cf

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

@@ -1079,7 +1079,7 @@
   		a.bargaining_mode as bargainingMode, a.technical_scene as technicalScene, a.breakthrough,
   		a.patent_case as patentCase, a.awards, a.team_des as teamDes, 
   		a.parameter, a.tech_plan_url as techPlanUrl, a.business_plan_url as businessPlanUrl,
-  		ai.id as achievementInterestId
+  		ai.id as achievementInterestId, 
   	from achievement a
   	left join user_identity ui on ui.uid = a.owner_id
   	left join organization_identity oi on oi.uid = a.owner_id

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

@@ -972,7 +972,8 @@
   		d.picture_url as pictureUrl, d.text_file_url as textFileUrl, d.video_url as videoUrl,
   		d.fixed_cycle as fixedCycle, d.people_number as peopleNumber, d.fixed_scheme as fixedScheme,
   		d.cost_escrow as costEscrow, d.validity_period as validityPeriod, ui.username,
-  		oi.unit_name as unitName, di.id as demandInterestId, do.id as demandOrderId
+  		oi.unit_name as unitName, di.id as demandInterestId, do.id as demandOrderId, 
+  		do.status as orderStatus
   	from demand d
   	left join user_identity ui on ui.uid = d.employer_id
   	left join organization_identity oi on oi.uid = d.employer_id

+ 17 - 0
src/main/java/com/goafanti/portal/bo/DemandSearchDetailBo.java

@@ -5,6 +5,8 @@ import java.util.Date;
 
 import org.apache.commons.lang3.time.DateFormatUtils;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.goafanti.common.constant.AFTConstants;
 
 public class DemandSearchDetailBo extends DemandSearchListBo{
@@ -63,6 +65,21 @@ public class DemandSearchDetailBo extends DemandSearchListBo{
 	 */
 	private String demandOrderId;
 	
+	/**
+	 * 订单状态
+	 */
+	private Integer orderStatus;
+	
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getOrderStatus() {
+		return orderStatus;
+	}
+
+	public void setOrderStatus(Integer orderStatus) {
+		this.orderStatus = orderStatus;
+	}
+
 	public String getDemandOrderId() {
 		return demandOrderId;
 	}