Browse Source

合同变更

anderx 6 years ago
parent
commit
4c915187f2

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

@@ -641,11 +641,11 @@
   </select>
   <select id="financeOrderInvoiceList" resultType="com.goafanti.order.bo.TOrderInvoiceBo">
       select a.id,a.unit_name as unitName,a.order_no as orderNo,c.name,b.project_status as projectStatus,a.amount,
-     ifnull(d.sumAmount,0) as sumAmount, date_format(a.create_time,'%Y-%m-%d %H:%i:%S')as createTime ,a.status,
+     ifnull(d.sumAmount,0) as sumAmount, date_format(a.create_time,'%Y-%m-%d %H:%i:%S')as createTime ,a.status,b.process_status processStatus,
      b.settlement_amount as settlementAmount, (b.total_amount-b.settlement_amount) as notAmount from t_order_invoice a 
 	left join t_order_new b on a.order_no=b.order_no left join admin c on b.salesman_id=c.id
 	left join (select order_no,sum(amount)as  sumAmount from t_order_invoice where status =2 group by order_no) d
-	on a.order_no=d.order_no where a.status in (1,2) and a.approval in (0,2)
+	on a.order_no=d.order_no where a.status in (1,2) and a.approval in (0,2) 
 	<if test="type !=null">
 	and a.`type`= #{type,jdbcType=INTEGER} 
 	</if>
@@ -716,7 +716,7 @@
   </select>
   
   <select id="approvalOrderInvoiceList" resultType="com.goafanti.order.bo.TOrderInvoiceBo">
-      	select a.id,a.unit_name as unitName,a.order_no as orderNo,c.name,b.project_status as projectStatus,a.amount,
+      	select a.id,a.unit_name as unitName,a.order_no as orderNo,c.name,b.project_status as projectStatus,a.amount,b.process_status processStatus,
      ifnull(d.sumAmount,0) as sumAmount, date_format(a.create_time,'%Y-%m-%d %H:%i:%S')as createTime ,a.status, a.approval,
      b.settlement_amount as settlementAmount, (b.total_amount-b.settlement_amount) as notAmount from t_order_invoice a 
 	left join t_order_new b on a.order_no=b.order_no left join admin c on b.salesman_id=c.id

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

@@ -6,6 +6,7 @@ public class TOrderInvoiceBo {
 	private String orderno;
 	private String name;
 	private Integer projectStatus;
+	private Integer processStatus;
 	private String sumAmount;
 	private String amount;
 	private String createTime;
@@ -93,6 +94,12 @@ public class TOrderInvoiceBo {
 	public void setApproval(Integer approval) {
 		this.approval = approval;
 	}
+	public Integer getProcessStatus() {
+		return processStatus;
+	}
+	public void setProcessStatus(Integer processStatus) {
+		this.processStatus = processStatus;
+	}
 	
 	
 }

+ 3 - 0
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -146,6 +146,9 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				if (nb.getProcessState()==1) nb.setProcessState(7);
 				else if (nb.getProcessState()==7)nb.setProcessState(9);
 			}*/ //去掉第二条线
+			if(nb.getStatus()==3) {
+				nb.setStatus(1);//如果驳回数据则改为正常数据
+			}
 		}else {
 			nb.setProcessState(rejectState);
 			nb.setStatus(3);//订单变更设置为驳回

+ 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.17
+static.host=//sb.jishutao.com/1.1.18
 avatar.host=//sb.jishutao.com
 
 #连测试
 #avatar.host=//static.jishutao.com
-#static.host=//static.jishutao.com/1.1.17
+#static.host=//static.jishutao.com/1.1.18
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload