Browse Source

项目列表与导出新增字段

anderx 3 years ago
parent
commit
2028129868

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

@@ -742,7 +742,8 @@
 	o.buyer_id as buyerId, o.liquidation_status as liquidationStatus ,too.amount outsourceAmount, o.first_amount as signFirstPayment,
 	o.total_amount as signTotalAmount, date_format(o.create_time, '%Y-%m-%d %H:%i:%s') as createTime, too.company_name as outsourceName,
 	0 as companyId, d.name as departmentName, a.final_receivables finalReceivables ,a.invoice_amount invoiceAmount ,
-	date_format(a.`final_Receivables_time`, '%Y-%m-%d %H:%i:%s')finalReceivablesTime,a.order_receivables orderReceivables,a.order_arrears orderArrears
+    o.order_status orderStatus,a.project_type projectType,o.sales_type salesType,o.other ,o.delete_sign deleteSign,
+    date_format(a.`final_Receivables_time`, '%Y-%m-%d %H:%i:%s')finalReceivablesTime,a.order_receivables orderReceivables,a.order_arrears orderArrears
 	from t_order_new o left join department d on o.order_dep = d.id left join `user` u on o.buyer_id = u.id left join t_order_mid a on o.order_no=a.order_no
 	left join (select * from  t_order_outsource where type=0) too on o.order_no=too.order_no where delete_sign in(0,2) and approval in(0,1,2)
     and outsource=   #{o.outsource,jdbcType=INTEGER}
@@ -791,6 +792,12 @@
   		<if test="o.orderNo != null and o.orderNo != &quot;&quot;">
 	  	and o.order_no = #{o.orderNo,jdbcType=VARCHAR}
 	  	</if>
+        <if test="o.projectType != null and o.projectType != &quot;&quot;">
+          and a.project_type = #{o.projectType}
+        </if>
+        <if test="o.approval != null and o.approval != &quot;&quot;">
+          and o.approval = #{o.approval}
+        </if>
 	  	<if test="o.buyerName != null and o.buyerName != &quot;&quot;">
 	  	<bind name="n" value="'%' + o.buyerName + '%'" />
 	  	and u.nickname  like #{n,jdbcType=VARCHAR}
@@ -859,6 +866,12 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   		<if test="o.orderNo != null and o.orderNo != &quot;&quot;">
 	  	and o.order_no = #{o.orderNo,jdbcType=VARCHAR}
 	  	</if>
+    <if test="o.projectType != null and o.projectType != &quot;&quot;">
+      and a.project_type = #{o.projectType}
+    </if>
+    <if test="o.approval != null and o.approval != &quot;&quot;">
+      and o.approval = #{o.approval}
+    </if>
 	  	<if test="o.buyerName != null and o.buyerName != &quot;&quot;">
 	  	<bind name="n" value="'%' + o.buyerName + '%'" />
 	  	and u.nickname  like #{n,jdbcType=VARCHAR}

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

@@ -1142,7 +1142,7 @@
     e.approval,l.refund_status outsourceStatus,l.start_type outsourceType,ttm.certificates_count  alreadyNumber,f.nickname as userName,h.name as depName, l.company_name as outsourceName ,
     ifnull(k.hours,0) hours,a.split_status splitStatus,a.split_super splitSuper, a.split_id splitId,b.`type` projectType,ttm.cost_amount costAmount,tm.salesman_name salesmanName ,
     ttm.party_amount  partyAmount,a.commodity_price commodityPrice,a.outsource,date_format(a.task_end_time,'%Y-%m-%d') taskEndTime,date_format(e.sign_time,'%Y-%m-%d') signTime,
-    date_format(e.create_time ,'%Y-%m-%d')creteTime
+    date_format(e.create_time ,'%Y-%m-%d')creteTime,a.patent_type  patentType
     from t_order_task a left join business_project b on a.commodity_id=b.id left join business_category c on b.cid=c.id
     left join t_order_new e on a.order_no=e.order_no left join user f on e.buyer_id=f.id left join t_order_mid tm on a.order_no =tm.order_no
     left join department h on e.order_dep=h.id  left join task_hours_count k on a.id=k.tid and a.task_receiver=k.aid left join t_order_outsource l
@@ -1502,7 +1502,7 @@
     select  a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,a.project_status as projectStatus,e.contract_no contractNo,a.task_receiver taskReceiver,
             a.task_status as taskStatus,date_format(a.task_distribution_time,'%Y-%m-%d') as taskDate, a.commodity_quantity as commodityQuantity,e.approval,l.refund_status outsourceStatus,
             ifnull(i.alreadyNumber,0) as alreadyNumber,f.nickname as userName,h.name as depName, j.name as outsourceName ,ifnull(k.hours,0) hours,a.split_status splitStatus,
-            a.split_super splitSuper,date_format(a.split_time,'%Y-%m-%d %H:%i:%S') splitTimes,ad.name splitAname,a.split_id splitId
+            a.split_super splitSuper,date_format(a.split_time,'%Y-%m-%d %H:%i:%S') splitTimes,ad.name splitAname,a.split_id splitId,a.patent_type  patentType
     from t_order_task a left join business_project b on a.commodity_id=b.id left join business_category c on b.cid=c.id
                         left join admin d on a.task_receiver=d.id left join t_order_new e on a.order_no=e.order_no left join user f on e.buyer_id=f.id
                         left join department h on e.order_dep=h.id left join (select task_id , sum(already_number) as alreadyNumber from task_progress

+ 23 - 5
src/main/java/com/goafanti/order/bo/OrderListBo.java

@@ -52,8 +52,8 @@ public class OrderListBo {
 	private Integer approval;
 	/** 订单类型 **/
 	private Integer orderType;
-	/** 业务品类 **/
-	private String projectType;
+	@Excel(name="会员" ,readConverterExp = "0=否,1=是")
+	private Integer projectType;
 
 	/** 合同首付金额 **/
 	private BigDecimal signFirstPayment;
@@ -76,7 +76,7 @@ public class OrderListBo {
 	private Integer orderStage;
 	/** 项目阶段 **/
 	private Integer projectStage;
-	/** 删除、锁定 状态 **/
+	@Excel(name="状态" ,readConverterExp = "0=正常,1=作废,2=变更")
 	private Integer deleteSign;
 	/** 卖方 **/
 	private String buyerId;
@@ -116,8 +116,26 @@ public class OrderListBo {
 	/** 驳回位置*/
 	private Integer backStatus;
 
+	@Excel(name="销售类型" ,readConverterExp = "0=电话新开发,1=电话自带资源,2=网络,3=渠道,4=转介绍,5=其他,6=高新复购,7=其他复购")
+	private Integer salesType;
+	@Excel(name="销售说明")
+	private String other;
 
+	public Integer getSalesType() {
+		return salesType;
+	}
+
+	public void setSalesType(Integer salesType) {
+		this.salesType = salesType;
+	}
 
+	public String getOther() {
+		return other;
+	}
+
+	public void setOther(String other) {
+		this.other = other;
+	}
 
 	public BigDecimal getFinalReceivables() {
 		return finalReceivables;
@@ -149,10 +167,10 @@ public class OrderListBo {
 	public void setOrderType(Integer orderType) {
 		this.orderType = orderType;
 	}
-	public String getProjectType() {
+	public Integer getProjectType() {
 		return projectType;
 	}
-	public void setProjectType(String projectType) {
+	public void setProjectType(Integer projectType) {
 		this.projectType = projectType;
 	}
 	public String getCreateTime() {

+ 21 - 3
src/main/java/com/goafanti/order/bo/TOrderTaskListBo.java

@@ -4,10 +4,12 @@ import java.math.BigDecimal;
 import java.util.List;
 
 
+import com.goafanti.common.enums.OfficialPatentType;
 import com.goafanti.common.utils.excel.Excel;
 import com.goafanti.common.utils.excel.Excel.ColumnType;
 import com.goafanti.common.utils.excel.ExcelConstant;
 import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.patent.enums.PatentType;
 
 public class TOrderTaskListBo {
 	@Excel(name = "项目编号")
@@ -68,6 +70,22 @@ public class TOrderTaskListBo {
 	private BigDecimal costAmount;
 	@Excel(name = "已付(万元)",scale = 6)
 	private BigDecimal partyAmount;
+	@Excel(name = "专利分类",readConverterExp = "0=申请,1=变更,2=复审,3=优先权,4=恢复请求权,5=无效宣告请求费,6=强制许可请求费,7=强制许可使用裁决请求费,8=登录、印刷费、印花税")
+	private Integer patentType;
+
+	public Integer getPatentType() {
+		return patentType;
+	}
+
+	public String getPatentTypeName() {
+		if (patentType!=null) return OfficialPatentType.getValueByCode(this.patentType);
+		return "";
+	}
+
+	public void setPatentType(Integer patentType) {
+		this.patentType = patentType;
+	}
+
 	public String getSplitSuper() {
 		return splitSuper;
 	}
@@ -189,7 +207,7 @@ public class TOrderTaskListBo {
 	public void setOutsourceName(String outsourceName) {
 		this.outsourceName = outsourceName;
 	}
-	
+
 	public String getTaskEndTime() {
 		return taskEndTime;
 	}
@@ -280,6 +298,6 @@ public class TOrderTaskListBo {
 	public void setOutsourceType(Integer outsourceType) {
 		this.outsourceType = outsourceType;
 	}
-	
-	
+
+
 }