Browse Source

版本更换

Signed-off-by: anderx <312518615@qq.com>
anderx 6 years ago
parent
commit
42ffc1cfad

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

@@ -411,7 +411,7 @@
   <if test="status != null">
   and  a.status= #{status}
   </if>
-  
+   order by project_type,dun_type 
   </select>
   <select id="selectAllOrderDun" resultType="com.goafanti.order.bo.OutNewOrderDunBo"> 
   select a.id, a.order_no orderNo, a.tid, a.project_type projectType, a.dun_type dunType, a.wait_day waitDay, 

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

@@ -1368,17 +1368,17 @@ where super_id is null ) e on e.order_no=a.order_no
 	if((a.money-b.settlement_amount) &lt; 1,0,(a.money-b.settlement_amount)) as uncollectedAmount,b.order_status as orderStatus,b.project_status as projectStatus,
 	date_format(a.start_time, '%Y-%m-%d') as startDate,dep.name as depName,date_format(b.sign_time,'%Y-%m-%d') as signDate,
 	<if test="newStatus == 0 ">
-	a.dun_subject as dunSubject
+	a.dun_subject as dunSubject,a.dun_status dunStatus
 	from t_order_dun a  
 	</if>
 	<if test="newStatus == 1 ">
-	a.project_type projectType,
+	a.project_type projectType,a.status dunStatus,
 	a.dun_type dunType 
 	from new_order_dun a 
 	</if>
 	left join t_order_new b on a.order_no=b.order_no left join `user` c on b.buyer_id=c.id 
 	left join admin d on b.salesman_id=d.id left join department dep on d.department_id=dep.id 
-	where a.start_time is not null and b.delete_sign != 1
+	where  b.delete_sign != 1
     <if test="name != null">
   	and c.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
   	</if>

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

@@ -41,6 +41,7 @@ public class TOrderNewBo extends TOrderNew{
 	private String oldSalesmanMobile;
 	private Integer projectType;
 	private Integer dunType;
+	private Integer dunStatus;
 	
 	public String getDunSubject() {
 		if(dunSubject!=null)return OrderDunSubject.getValueByCode(Integer.valueOf(dunSubject));
@@ -300,5 +301,11 @@ public class TOrderNewBo extends TOrderNew{
 	public void setDunType(Integer dunType) {
 		this.dunType = dunType;
 	}
+	public Integer getDunStatus() {
+		return dunStatus;
+	}
+	public void setDunStatus(Integer dunStatus) {
+		this.dunStatus = dunStatus;
+	}
 	
 }

+ 2 - 2
src/main/resources/props/config_local.properties

@@ -60,12 +60,12 @@ template.cacheable=false
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开发
-#static.host=//sb.jishutao.com/1.1.26
+#static.host=//sb.jishutao.com/1.1.27
 #avatar.host=//sb.jishutao.com
 
 #连测试
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.1.26
+static.host=//static.jishutao.com/1.1.27
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload