Browse Source

项目会员修改开发

anderx 3 years ago
parent
commit
4f8716cac2

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

@@ -1762,9 +1762,11 @@
     c.salesman_name salesmanName,c.finance_name financeName,a.commodity_name projectName,a.member_type memberType,
     b.delete_sign deleteSign ,b.total_amount totalAmount ,b.sales_type salesType ,b.other,
     a.process_status status,a.commodity_id commodityId,a.commodity_name commodityName,
-    a.commodity_quantity commodityQuantity,a.task_comment taskComment,a.picture_url pictureUrl
+    a.commodity_quantity commodityQuantity,a.task_comment taskComment,a.picture_url pictureUrl,
+    d.service_life serviceLife ,d.service_year serviceYear,d.year_sum yearSum
     from t_order_task a left join t_order_new b on a.order_no =b.order_no
     left join t_order_mid c on a.order_no =c.order_no
+    left join t_task_member d on a.id=d.tid
     <if test="shiroType ==2">
       left join department d on b.order_dep =d.id
     </if>

+ 30 - 0
src/main/java/com/goafanti/order/bo/OutMemberList.java

@@ -46,6 +46,36 @@ public class OutMemberList {
     private String salesTypeName;
 
     private String pictureUrl;
+    @Excel(name = "服务年份",cellType = Excel.ColumnType.STRING)
+    private String serviceLife;
+    @Excel(name = "本次年份")
+    private String serviceYear;
+    @Excel(name = "服务年数",width = MINWIDTH)
+    private Integer yearSum;
+
+    public String getServiceLife() {
+        return serviceLife;
+    }
+
+    public void setServiceLife(String serviceLife) {
+        this.serviceLife = serviceLife;
+    }
+
+    public String getServiceYear() {
+        return serviceYear;
+    }
+
+    public void setServiceYear(String serviceYear) {
+        this.serviceYear = serviceYear;
+    }
+
+    public Integer getYearSum() {
+        return yearSum;
+    }
+
+    public void setYearSum(Integer yearSum) {
+        this.yearSum = yearSum;
+    }
 
     public String getPictureUrl() {
         return pictureUrl;