Antiloveg 8 years ago
parent
commit
e3f8b6dfea

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

@@ -198,7 +198,8 @@
   		do.id, do.serial_number as serialNumber, do.demand_id as demandId,
   		do.create_time as createTime, do.enclosure_url as enclosureUrl, do.status,
   		do.intention_money as intentionMoney, do.contract_money as contractMoney, do.commission,
-  		do.service_money as serviceMoney, d.name, d.serial_number as demandSerialNumber
+  		do.service_money as serviceMoney, d.name, d.serial_number as demandSerialNumber,
+  		d.deleted_sign as deletedSign, d.audit_status as auditStatus
   	from demand_order do
   	left join demand d on d.id = do.demand_id
   	where do.deleted_sign = 0 

+ 32 - 6
src/main/java/com/goafanti/demand/bo/DemandOrderListBo.java

@@ -21,7 +21,6 @@ public class DemandOrderListBo {
 	 */
 	private String	demandId;
 
-
 	/**
 	 * 接单时间
 	 */
@@ -56,17 +55,44 @@ public class DemandOrderListBo {
 	 * 服务金
 	 */
 	private Integer	serviceMoney;
-	
+
 	/**
 	 * 科技需求名称
 	 */
-	private String name;
-	
+	private String	name;
+
 	/**
 	 * 科技需求编号
 	 */
-	private Integer demandSerialNumber;
+	private Integer	demandSerialNumber;
+
+	/**
+	 * 科技需求删除标记
+	 */
+	private Integer	deletedSign;
+
+	/**
+	 * 科技需求审核状态
+	 */
+	private Integer	auditStatus;
+
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getDeletedSign() {
+		return deletedSign;
+	}
+
+	public void setDeletedSign(Integer deletedSign) {
+		this.deletedSign = deletedSign;
+	}
 	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getAuditStatus() {
+		return auditStatus;
+	}
+
+	public void setAuditStatus(Integer auditStatus) {
+		this.auditStatus = auditStatus;
+	}
 
 	public String getName() {
 		return name;
@@ -123,7 +149,7 @@ public class DemandOrderListBo {
 	public void setEnclosureUrl(String enclosureUrl) {
 		this.enclosureUrl = enclosureUrl;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getStatus() {
 		return status;