Browse Source

项目汇总列表新增筛选与列表字段

anderx 4 weeks ago
parent
commit
974ee70eeb

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

@@ -2246,7 +2246,8 @@
         tm.service_life serviceLife,tm.service_year serviceyear, tm.year_sum yearsum,tm.contract_term contractTerm, a.commodity_price commodityPrice ,
         a.special_comment specialComment,a.task_comment taskComment,ttm.last_year lastYear,ttm.last_year_capital lastYearCapital,ttm.last_year_income lastYearIncome,
         e.service_type serviceType,e.service_project serviceProject, a.form_retrieve formRetrieve  ,a.satisfaction_degree satisfactionDegree,
-        toa.type,toa.type_explain typeExplain,b.approval,a.score_status scoreStatus ,a.score_number scoreNumber,ts.create_time scoreTime
+        toa.type,toa.type_explain typeExplain,b.approval,a.score_status scoreStatus ,a.score_number scoreNumber,ts.create_time scoreTime,
+        b.nda ,b.nda_url ndaUrl,b.breach_clause breachClause , b.breach_clause_url breachClauseUrl
         from t_order_task a left join t_order_new b on a.order_no =b.order_no left join department c on b.order_dep =c.id
         left join district_glossory d on c.province=d.id left join task_progress tp  on a.id=tp.task_id left join t_task_member tm on a.id=tm.tid
         left join t_order_mid e on b.order_no =e.order_no left join business_project bp on a.commodity_id =bp.id left join business_category bc on bp.cid =bc.id

+ 24 - 0
src/main/java/com/goafanti/order/bo/InputProjectStatistics.java

@@ -40,6 +40,30 @@ public class InputProjectStatistics {
 	 * 0未发放 1已发放 2已回收(非常满意) 3已回收(满意) 4已回收(一般) 5已回收(不满意)
 	 */
 	private Integer sdStatus;
+	/**
+	 * 是否签订保密协议:0=无,1=有
+	 */
+	private Integer nda;
+	/**
+	 * 是否有违约条件:0=无,1=有,有限责任违约条款、与技术服务有关,2=有,有限责任违约条款、与技术服务无有关,3=有,无限责任违约条款、与技术服务无有关,4=有,无限责任违约条款、与技术服务有关
+	 */
+	private Integer breachClause;
+
+	public Integer getNda() {
+		return nda;
+	}
+
+	public void setNda(Integer nda) {
+		this.nda = nda;
+	}
+
+	public Integer getBreachClause() {
+		return breachClause;
+	}
+
+	public void setBreachClause(Integer breachClause) {
+		this.breachClause = breachClause;
+	}
 
 	public String getType() {
 		return type;

+ 37 - 0
src/main/java/com/goafanti/order/bo/OutProjectStatistics.java

@@ -88,6 +88,43 @@ public class OutProjectStatistics {
 	private Integer scoreNumber;
 	private Date scoreTime;
 
+	private Integer nda;
+	private String ndaUrl;
+	private Integer breachClause;
+	private String breachClauseUrl;
+
+	public Integer getNda() {
+		return nda;
+	}
+
+	public void setNda(Integer nda) {
+		this.nda = nda;
+	}
+
+	public String getNdaUrl() {
+		return ndaUrl;
+	}
+
+	public void setNdaUrl(String ndaUrl) {
+		this.ndaUrl = ndaUrl;
+	}
+
+	public Integer getBreachClause() {
+		return breachClause;
+	}
+
+	public void setBreachClause(Integer breachClause) {
+		this.breachClause = breachClause;
+	}
+
+	public String getBreachClauseUrl() {
+		return breachClauseUrl;
+	}
+
+	public void setBreachClauseUrl(String breachClauseUrl) {
+		this.breachClauseUrl = breachClauseUrl;
+	}
+
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	public Date getScoreTime() {
 		return scoreTime;