Browse Source

订单项目统计列表修改

anderx 1 year ago
parent
commit
21e429862a

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

@@ -2519,8 +2519,8 @@
            b.finance_name as financeName,b.salesman_name as salesmanName, e.commodity_name as commodityName,ttm.service_year as serviceYear,
            ttm.service_life as serviceLife,ttm.year_sum as yearSum,e.task_distribution_time as taskDistributionTime ,e.commodity_quantity as commodityQuantity,
            e3.cost_amount as costAmount,e.project_status as  projectStatus,e.task_start_time as taskStartTime,e.task_end_time as taskEndTime,
-           e.receiver_name as receiverName ,'技术组',t1.cb restatement,a.order_status orderStatus,e.satisfaction_degree satisfactionDegree,
-      e.task_comment taskComment,'核算比例',a.order_status orderStatus,t1.counts changeType,t1.tdtk refundType,a3.name depName,a4.name as  province
+           e.receiver_name as receiverName ,'技术组' jsz,t1.cb restatement,a.order_status orderStatus,e.satisfaction_degree satisfactionDegree,
+      e.task_comment taskComment,'核算比例' hsbl,a.order_status orderStatus,t1.counts changeType,t1.tdtk refundType,a3.name depName,a4.name as  province
     from t_order_new a left join t_order_mid b on a.order_no =b.order_no
         left join admin a2 on a.salesman_id=a2.id left join department a3 on a2.department_id=a3.id
         left join district_glossory a4 on a3.province=a4.id left join user_mid b2 on a.buyer_id=b2.uid

+ 89 - 8
src/main/java/com/goafanti/order/bo/OutOrderProject.java

@@ -18,9 +18,9 @@ public class OutOrderProject {
     @Excel(name = "销售类型",readConverterExp = "1=电话自带资源,2=网络,3=渠道,4=转介绍,5=其他,6=高新复购,7=其他复购,8=私有/渠道")
     private Integer salesType;
     /**
-     * 服务类型
+     * 订单类型(服务类型
      */
-    @Excel(name = "服务类型")
+    @Excel(name = "订单类型")
     private String serviceType;
     /**
      * 清算状态(结算状态) 0-首付待付请,1-尾款待付清,2-已付请,3-部分退款,4-全部退款
@@ -89,9 +89,15 @@ public class OutOrderProject {
     @Excel(name = "签单金额",scale = 6)
     private BigDecimal totalAmount;
 
+    /**
+     * 合同收款比例
+     */
     @Excel(name = "合同收款比例")
     private String contractAmountProportion;
 
+    /**
+     * 应收款
+     */
     @Excel(name = "应收款",scale = 6)
     private BigDecimal orderReceivables;
 
@@ -101,16 +107,31 @@ public class OutOrderProject {
     @Excel(name = "已收款",scale = 6)
     private BigDecimal settlementAmount;
 
+    /**
+     * 欠款
+     */
     @Excel(name = "欠款",scale = 6)
     private BigDecimal arrearsAmount;
 
+    /**
+     * 已报销
+     */
     @Excel(name = "已报销")
     private BigDecimal expenseAmount;
 
+    /**
+     * 应公出
+     */
     @Excel(name = "应公出")
     private String shouldPublic;
+    /**
+     * 已公出
+     */
     @Excel(name = "已公出")
     private String alreadyPublic;
+    /**
+     * 超出
+     */
     @Excel(name = "超出")
     private String exceedPublic;
 
@@ -129,6 +150,9 @@ public class OutOrderProject {
      */
     @Excel(name = "已开票金额",scale = 6)
     private BigDecimal invicueAmount;
+    /**
+     * 退款金额
+     */
     @Excel(name = "退款金额",scale = 6)
     private BigDecimal refundAmount;
     /**
@@ -141,47 +165,104 @@ public class OutOrderProject {
      */
     @Excel(name = "营销负责人")
     private String salesmanName;
+    /**
+     * 项目名称
+     */
     @Excel(name = "项目名称")
     private String commodityName;
+    /**
+     * 本次年份
+     */
     @Excel(name = "本次年份")
     private String serviceYear;
+    /**
+     * 服务年限
+     */
     @Excel(name = "服务年限")
     private String serviceLife;
+    /**
+     * 服务年份
+     */
     @Excel(name = "服务年份")
     private Integer yearSum;
+    /**
+     * 项目转入时间
+     */
     @Excel(name = "项目转入时间")
     private String taskDistributionTime;
+    /**
+     * 是否重报
+     */
     @Excel(name = "是否重报")
     private String restatement;
     /**
-     * 订单类型 0认证项目 1科技项目 2 两化融化管理体系认证项目
+     * 是否科技项目(订单类型) 0认证项目 1科技项目 2 两化融化管理体系认证项目
      */
     @Excel(name = "是否科技项目")
     private String orderType;
+    /**
+     * 项目数
+     */
     @Excel(name = "项目数")
     private String commodityQuantity;
+    /**
+     * 项目成本
+     */
     @Excel(name = "项目成本")
     private String projectCostAmount;
+    /**
+     * 项目状态
+     */
     @Excel(name = "项目状态")
     private String projectStatus;
+    /**
+     * 项目启动时间
+     */
     @Excel(name = "项目启动时间")
     private String taskStartTime;
+    /**
+     * 项目完成时间
+     */
     @Excel(name = "项目完成时间")
     private String taskEndTime;
+    /**
+     * 技术组
+     */
     @Excel(name = "技术组")
-    private String 技术组;
+    private String jsz;
+    /**
+     * 项目负责人
+     */
     @Excel(name = "项目负责人")
     private String receiverName;
+    /**
+     * 满意度
+     */
     @Excel(name = "满意度",readConverterExp = "0=非常满意,1=满意,2=一般,3=不满意")
     private Integer satisfactionDegree;
+    /**
+     * 项目备注
+     */
     @Excel(name = "项目备注")
     private String taskComment;
+    /**
+     * 核算比例
+     */
     @Excel(name = "核算比例")
     private String hsbl;
+    /**
+     * 订单情况
+     */
     @Excel(name = "订单情况",readConverterExp = "0=待签单,1=签单待审,2=签单审核通过,3=签单审核拒绝,4=已结项,5=已驳回,6=已退单")
     private String orderStatus;
+    /**
+     * 变更情况
+     */
     @Excel(name = "变更情况")
     private String changeType;
+    /**
+     * 退单退款
+     */
     @Excel(name = "退单退款")
     private String refundType;
 
@@ -521,12 +602,12 @@ public class OutOrderProject {
         this.taskEndTime = taskEndTime;
     }
 
-    public String get技术组() {
-        return 技术组;
+    public String getJsz() {
+        return jsz;
     }
 
-    public void set技术组(String 技术组) {
-        this.技术组 = 技术组;
+    public void setJsz(String jsz) {
+        this.jsz = jsz;
     }
 
     public String getReceiverName() {