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

新增无限制公出订单列表

anderx 1 год назад
Родитель
Сommit
51cba35ab3

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

@@ -990,10 +990,14 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   <select id="selectOrderNewListByPage" resultType="com.goafanti.order.bo.TOrderNewBo">
   	select a.order_no as orderNo,a.create_time as createTime, date_format(a.sign_time,'%Y-%m-%d' ) as signDate,a.delete_sign deleteSign,
   	a.contract_no as contractNo, b.nickname as userName ,a.process_status as processStatus,a.total_amount as totalAmount,a.tag,
-  	a.contract_picture_url contractPictureUrl,toprc.max_status as maxStatus,toprc.actual_duration as actualDuration,
+  	a.contract_picture_url contractPictureUrl,
   	a.order_status as orderStatus, a.liquidation_status as liquidationStatus,a.approval,c.salesman_name as salesmanName,c.project_type projectType,
   	dep.name as depName,c.finance_name as financeName,c.invoice_amount invoiceAmount,a.settlement_amount settlementAmount,
     a.sales_type salesType, a.channel_id channelId ,a.other,a.examine_name examineName,c.stop_project stopProject,toa.type,toa.type_explain typeExplain
+    <if test="specially == 0 or specially == 12 ">
+      ,toprc.max_status as maxStatus,toprc.actual_duration as actualDuration,toprc.max_type as maxType,
+      toprc.max_duration as maxDuration
+    </if>
     <if test="specially == 2">
   	,f.name as initiateName ,e.reason ,date_format(e.create_time,'%Y-%m-%d' ) as backDate,e.id as backId
   	</if>

+ 18 - 0
src/main/java/com/goafanti/order/bo/TOrderNewBo.java

@@ -103,6 +103,24 @@ public class TOrderNewBo extends TOrderNew{
 
 	private String type;
 
+	private Integer maxType;
+	private Double maxDuration;
+
+	public Double getMaxDuration() {
+		return maxDuration;
+	}
+
+	public void setMaxDuration(Double maxDuration) {
+		this.maxDuration = maxDuration;
+	}
+
+	public Integer getMaxType() {
+		return maxType;
+	}
+
+	public void setMaxType(Integer maxType) {
+		this.maxType = maxType;
+	}
 
 	public Integer getMaxStatus() {
 		return maxStatus;