Browse Source

所有项目汇总新增评分时间

anderx 1 year ago
parent
commit
b9daf8a764

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

@@ -2089,11 +2089,12 @@
         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
+        toa.type,toa.type_explain typeExplain,b.approval,a.score_status scoreStatus ,a.score_number scoreNumber,ts.create_time scoreTime
         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
         left join t_task_mid ttm on a.id=ttm.tid left join admin ta on a.task_receiver =ta.id left join department td on ta.department_id =td.id
+        left join task_score ts on a.id=ts.tid
         left join (select order_no ,GROUP_CONCAT(`type`)`type` ,GROUP_CONCAT(type_explain)type_explain
         from t_order_approval group by order_no) toa on b.order_no=toa.order_no
         <if test="screen ==6">

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

@@ -1,6 +1,9 @@
 package com.goafanti.order.bo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.math.BigDecimal;
+import java.util.Date;
 
 
 public class OutProjectStatistics {
@@ -83,6 +86,16 @@ public class OutProjectStatistics {
 
 	private Integer scoreStatus;
 	private Integer scoreNumber;
+	private Date scoreTime;
+
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	public Date getScoreTime() {
+		return scoreTime;
+	}
+
+	public void setScoreTime(Date scoreTime) {
+		this.scoreTime = scoreTime;
+	}
 
 	public Integer getcSort() {
 		return cSort;

+ 13 - 0
src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsCommon.java

@@ -4,6 +4,7 @@ import com.goafanti.common.utils.excel.Excel;
 import com.goafanti.order.bo.OutProjectStatistics;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 public class OutProjectStatisticsCommon extends OutProjectStatistics {
     private Integer id;
@@ -56,6 +57,18 @@ public class OutProjectStatisticsCommon extends OutProjectStatistics {
     private String typeExplain;
     @Excel(name="评分")
     private Integer scoreNumber;
+    @Excel(name="评分时间")
+    private Date scoreTime;
+
+    @Override
+    public Date getScoreTime() {
+        return scoreTime;
+    }
+
+    @Override
+    public void setScoreTime(Date scoreTime) {
+        this.scoreTime = scoreTime;
+    }
 
     @Override
     public Integer getScoreNumber() {