Browse Source

我的项目任务列表修改

anderx 9 months ago
parent
commit
9b062393e3

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

@@ -1716,7 +1716,8 @@ progress_tid = values(progress_tid)
         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,a.patent_type  patentType,tmer.service_year serviceYear,toa.type,toa.type_explain typeExplain
+        date_format(e.create_time ,'%Y-%m-%d')creteTime,a.patent_type  patentType,tmer.service_year serviceYear,toa.type,toa.type_explain typeExplain,
+        a.ht_member as htMember,a.additional_deduction additionalDeduction,a.rd_awardsubsidy rdAwardsubsidy,b.project_type as memberProjectType
         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

+ 9 - 0
src/main/java/com/goafanti/order/bo/TOrderTaskListBo.java

@@ -113,6 +113,15 @@ public class TOrderTaskListBo {
 	private Integer htMember;
 	private Integer additionalDeduction;
 	private Integer rdAwardsubsidy;
+	private Integer memberProjectType;
+
+	public Integer getMemberProjectType() {
+		return memberProjectType;
+	}
+
+	public void setMemberProjectType(Integer memberProjectType) {
+		this.memberProjectType = memberProjectType;
+	}
 
 	public Integer getHtMember() {
 		return htMember;