anderx дней назад: 3
Родитель
Сommit
35b2ee737c

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

@@ -947,17 +947,21 @@
         b.main_name mainName,b.assist,b.assistant_aid assistantAid, b.assistant_name assistantName,f.contract_no contractNo,
         uai.customer_demand customerDemand,uai.early_communication earlyCommunication,uai.interview_ideas interviewIdeas,
         uai.interview_purpose interviewPurpose,uai.interview_feedback interviewFeedback,uai.follow_up_plan followUpPlan,
-        uai.interview_recommend interviewRecommend,
+        uai.interview_recommend interviewRecommend,pad.type assistType,pad.content_type assistContentType,pad.content assistContent,
         e.name sname,f.total_amount  totalAmout,d.sign_bills signBills,date_format(d.sign_time,'%Y-%m-%d')signTime
         from public_release_details a left join public_release b on a.prid =b.id
         left join admin c on b.aid =c.id
         left join t_order_new f on b.order_no =f.order_no
         left join `user` d on a.uid =d.id  left join admin e on d.aid=e.id
         left join user_archives_interview uai on a.id=uai.prdid
+        left join public_assist_details pad on b.id=pad.prid
         where 1=1
         <if test="publicType != null">
             and b.type= #{publicType}
         </if>
+          <if test="assistType!=null">
+            and pad.type= #{assistType}
+        </if>
         <if test="aid != null">
             and b.aid= #{aid}
         </if>
@@ -1004,10 +1008,16 @@
         <if test="contractNo !=null">
             left join t_order_new f on b.order_no =f.order_no
         </if>
+        <if test="assistType!=null">
+            left join public_assist_details pad on b.id=pad.prid
+        </if>
         where 1=1
         <if test="publicType != null">
             and b.type= #{publicType}
         </if>
+        <if test="assistType!=null">
+            and pad.type= #{assistType}
+        </if>
         <if test="aid != null">
             and b.aid= #{aid}
         </if>

+ 14 - 1
src/main/java/com/goafanti/weChat/bo/InputPublicDtails.java

@@ -24,12 +24,25 @@ public class InputPublicDtails {
 	private String sid;
 	private String deps;
 	/**
-	 * 0业务 1技术 2行政 3协单
+	 * 0=业务公出 1=技术公出 2=行政公出 3=技术协单 4=协单助手,5=非公出协单(营销),6=非公出协单(技术)
 	 */
 	private Integer publicType;
+
+	/**
+	 * 协单项目 分类 0=其他,1=高企认定,2=会员服务,3=科技项目,4=研动力系统,5=知识产权,6=军工,7=涉密,8=技术合同登记,9=第三方认证项目
+	 */
+	private Integer assistType;
 	private Integer pageSize;
 	private Integer pageNo;
 
+	public Integer getAssistType() {
+		return assistType;
+	}
+
+	public void setAssistType(Integer assistType) {
+		this.assistType = assistType;
+	}
+
 	public Integer getStatusType() {
 		return statusType;
 	}

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

@@ -113,6 +113,16 @@ public class OutPublicDtails  {
 	private String contractNo;
 	@Excel(name = "订单总金额" ,scale = 6)
 	private BigDecimal totalAmout;
+	@Excel(name = "协单类型",readConverterExp = "0=其他,1=高企认定,2=会员服务,3=科技项目,4=研动力系统,5=知识产权,6=军工,7=涉密,8=技术合同登记,9=第三方认证项目")
+	private Integer assistType;
+
+	public Integer getAssistType() {
+		return assistType;
+	}
+
+	public void setAssistType(Integer assistType) {
+		this.assistType = assistType;
+	}
 
 	public String getInterviewProject() {
 		return interviewProject;