anderx 1 год назад
Родитель
Сommit
b201ac38ba

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

@@ -1642,7 +1642,7 @@ unilateral_service = values(unilateral_service)
         i.price,a.certificate_number as certificateNumber, a.commodity_id as commodityId,a.manager_id managerId,
         a.consultant_id consultantId,a.project_status as projectStatus,a.set_up_amount setUpAmount,j.contract_term contractTerm,
         a.task_comment as taskComment ,a.commodity_price as commodityPrice, a.task_status as taskStatus,ttm.stop_type stopType,ttm.stop_status stopStatus,
-        a.task_receiver as taskReceiver ,a.if_certification_fee ifCertificationFee , a.split_status splitStatus,
+        a.task_receiver as taskReceiver ,a.if_certification_fee ifCertificationFee , a.split_status splitStatus,i.project_type as projectType,
         a.cost_reduction costReduction,a.official_cost officialCost,i.`type` ,d.name ,a.declaration_batch declarationBatch,
         a.patent_type patentType,a.picture_url pictureUrl,j.service_life serviceLife ,j.service_year serviceYear,j.year_sum yearSum,ttm.change,
         ttm.last_year lastYear,ttm.last_year_capital lastYearCapital,ttm.last_year_income lastYearIncome,ttm.stop_status projectStopStatus,

+ 8 - 0
src/main/java/com/goafanti/order/bo/TOrderTaskBo.java

@@ -53,12 +53,20 @@ public class TOrderTaskBo extends TOrderTask{
 	private Integer	stopType;
 	private Integer	projectStopStatus;
 	private Integer	change;
+	private Integer	projectType;
 
 	private String lastYear;
 	private BigDecimal lastYearCapital;
 	private BigDecimal lastYearIncome;
 
 
+	public Integer getProjectType() {
+		return projectType;
+	}
+
+	public void setProjectType(Integer projectType) {
+		this.projectType = projectType;
+	}
 
 	public Integer getChange() {
 		return change;