Quellcode durchsuchen

公出汇总新增合同等字段

anderx vor 3 Jahren
Ursprung
Commit
ee960753f7

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

@@ -744,9 +744,11 @@
     date_format(a.create_time ,'%Y-%m-%d %H:%i:%S') createTimes,a.audit_info auditInfo,date_format(a.audit_time ,'%Y-%m-%d %H:%i:%S') auditTimes,
     d.name sname, date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,date_format(a.release_end ,'%Y-%m-%d %H:%i:%S') releaseEnds,
     a.plan ,a.next_plan nextPlan ,a.expected_effect expectedEffect,a.update_status updateStatus,a.assist_aid_name assistAidName,
-    a.main_name mainName,a.assist,a.assistant_aid assistantAid, a.assistant_name assistantName
+    a.main_name mainName,a.assist,a.assistant_aid assistantAid, a.assistant_name assistantName,e.contract_no contractNo,
+    e.total_amount  totalAmout,tom.service_type serviceType ,tom.service_project serviceProject
     from public_release a left join `user` b on a.uid=b.id left join admin c on a.aid =c.id
-    left join admin d on b.aid=d.id where 1=1
+    left join admin d on b.aid=d.id left join t_order_new e on a.order_no =e.order_no left join t_order_mid tom on a.order_no =tom.order_no
+    where 1=1
     <if test="publicType != null">
       and a.type= #{publicType}
     </if>

+ 42 - 0
src/main/java/com/goafanti/weChat/bo/OutPublicDtails.java

@@ -2,6 +2,8 @@ package com.goafanti.weChat.bo;
 
 import com.goafanti.common.utils.excel.Excel;
 
+import java.math.BigDecimal;
+
 public class OutPublicDtails  {
 
 	private Integer id;
@@ -56,6 +58,46 @@ public class OutPublicDtails  {
 	@Excel(name = "协单助手" )
 	private String assistantName;
 	private Integer assist;
+	@Excel(name = "合同编号" )
+	private String contractNo;
+	@Excel(name = "订单总金额" )
+	private BigDecimal totalAmout;
+	@Excel(name = "服务类型" )
+	private String serviceType;
+	@Excel(name = "服务项目" )
+	private String serviceProject;
+
+	public String getContractNo() {
+		return contractNo;
+	}
+
+	public void setContractNo(String contractNo) {
+		this.contractNo = contractNo;
+	}
+
+	public BigDecimal getTotalAmout() {
+		return totalAmout;
+	}
+
+	public void setTotalAmout(BigDecimal totalAmout) {
+		this.totalAmout = totalAmout;
+	}
+
+	public String getServiceType() {
+		return serviceType;
+	}
+
+	public void setServiceType(String serviceType) {
+		this.serviceType = serviceType;
+	}
+
+	public String getServiceProject() {
+		return serviceProject;
+	}
+
+	public void setServiceProject(String serviceProject) {
+		this.serviceProject = serviceProject;
+	}
 
 	public String getAuditTimes() {
 		return auditTimes;

+ 4 - 0
src/main/resources/props/config_test.properties

@@ -42,6 +42,10 @@ user.private.max=1000
 user_remind_days=15
 #\u63D0\u524D\u63D0\u9192\u5929\u6570
 user_channel_days=90
+#\u5BA2\u6237\u9650\u5236
+yxzj_max=800
+yxy_max=100
+yxjl_max=100
 
 static.host=//static.jishutao.com/1.2.43
 portal.host=//static.jishutao.com/portal/2.0.6