Browse Source

版本切换1.2.52

anderx 3 years ago
parent
commit
2454cf7c9d

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

@@ -935,7 +935,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   	a.contract_no as contractNo, b.nickname as userName ,a.process_status as processStatus,a.total_amount as totalAmount,
   	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
+    a.sales_type salesType, a.channel_id channelId ,a.other,a.examine_name examineName,c.stop_project stopProject
     <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>

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

@@ -55,10 +55,16 @@ public class TOrderNewBo extends TOrderNew{
 	 * 是否变更 0否 1是
 	 */
 	private Integer ischange;
+	private Integer stopProject;
 
 
+	public Integer getStopProject() {
+		return stopProject;
+	}
 
-
+	public void setStopProject(Integer stopProject) {
+		this.stopProject = stopProject;
+	}
 
 	public String getDunSubject() {
 		if(getDunType()!=null&&getProjectType()!=null)return NewOrderDunType.getValueByCode(Integer.valueOf(""+getProjectType()+getDunType()));