Browse Source

订单项目统计开发

anderx 1 year ago
parent
commit
8b16ce569d

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

@@ -90,5 +90,5 @@ public interface TOrderTaskMapper {
 
     List<String> selectOrderNoAllByaid(String aid);
 
-    OutOrderProject selectStatisticsOrderProject(InputOrderProject in);
+    List<OutOrderProject> selectStatisticsOrderProject(InputOrderProject in);
 }

+ 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,e2.service_year as serviceYear,
            e2.service_life as serviceLife,e2.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,a.order_type orderType,
-           e.task_comment taskComment,'核算比例',a.order_status orderStatus,t1.counts,t1.tdtk
+           e.receiver_name as receiverName ,'技术组',t1.cb,a.order_status orderStatus,e.satisfaction_degree satisfactionDegree,
+      e.task_comment taskComment,'核算比例',a.order_status orderStatus,t1.counts,t1.tdtk
     from t_order_new a left join t_order_mid b on a.order_no =b.order_no
                        left join t_order_task c on a.order_no =c.order_no and c.main =1
                        left join business_project d on c.commodity_id =d.id left join business_category d2 on d.cid =d2.id

+ 584 - 0
src/main/java/com/goafanti/order/bo/OutOrderProject.java

@@ -1,4 +1,588 @@
 package com.goafanti.order.bo;
 
+import com.goafanti.common.utils.excel.Excel;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
 public class OutOrderProject {
+
+    /**
+     * 订单编号
+     */
+    private String orderNo;
+
+
+    /**
+     * 销售类型 0=电话新开发,1=电话自带资源,2=网络,3=渠道,4=转介绍,5=其他,6=高新复购,7=其他复购,8=私有/渠道
+     */
+    @Excel(name = "销售类型",readConverterExp = "1=电话自带资源,2=网络,3=渠道,4=转介绍,5=其他,6=高新复购,7=其他复购,8=私有/渠道")
+    private Integer salesType;
+    /**
+     * 服务类型
+     */
+    @Excel(name = "服务类型")
+    private Integer serviceType;
+    /**
+     * 清算状态(结算状态) 0-首付待付请,1-尾款待付清,2-已付请,3-部分退款,4-全部退款
+     */
+    @Excel(name = "结算状态",readConverterExp = "0=首付待付请,1=尾款待付清,2=已付请,3=部分退款,4=全部退款")
+    private Integer liquidationStatus;
+    /**
+     * 催款节点统计
+     */
+    @Excel(name = "催款节点")
+    private String dunNodeContent;
+    /**
+     * 是否会员
+     */
+    @Excel(name = "是否会员")
+    private Integer projectType;
+    /**
+     * 大客户
+     */
+    @Excel(name = "大客户")
+    private Integer bigUser;
+    /**
+     * 是否特批 0-非特批 ,1-负责人审核,2-负责人通过,3-负责人驳回 4董事长待审核 5董事长通过 6董事长驳回
+     */
+    @Excel(name = "是否特批",readConverterExp = "0=非特批,1=特批,2=特批,3=特批,4=特批,5=特批,6=特批")
+    private String approval;
+    /**
+     * 签单时间
+     */
+    @Excel(name = "签单时间")
+    private Date signTime;
+    /**
+     * 派单时间
+     */
+    @Excel(name = "营销负责人")
+    private String 派单时间;
+    /**
+     * 公司名称
+     */
+    @Excel(name = "公司名称")
+    private String buyerName;
+
+    /**
+     * 合同编号
+     */
+    @Excel(name = "合同编号")
+    private String contractNo;
+    /**
+     * 合同类型
+     */
+    @Excel(name = "合同类型")
+    private String htlx;
+    /**
+     * 省份
+     */
+    @Excel(name = "省份")
+    private String province;
+    /**
+     * 派单部门
+     */
+    @Excel(name = "派单部门")
+    private String depName;
+    /**
+     * 总金额
+     */
+    @Excel(name = "签单金额")
+    private BigDecimal totalAmount;
+
+    @Excel(name = "合同收款比例")
+    private String contractAmountProportion;
+
+    @Excel(name = "应收款")
+    private String shouldAmount;
+
+    /**
+     * 已收款
+     */
+    @Excel(name = "已收款")
+    private String settlementAmount;
+
+    @Excel(name = "欠款")
+    private String arrearsAmount;
+
+    @Excel(name = "已报销")
+    private String expenseAmount;
+
+    @Excel(name = "应公出")
+    private String shouldPublic;
+    @Excel(name = "已公出")
+    private String alreadyPublic;
+    @Excel(name = "超出")
+    private String exceedPublic;
+
+    /**
+     * 成本金额
+     */
+    @Excel(name = "总成本")
+    private String costAmount;
+    /**
+     * 成本实付
+     */
+    @Excel(name = "实付成本")
+    private String paymentAmount;
+    /**
+     * 开票金额
+     */
+    @Excel(name = "已开票金额")
+    private String invicueAmount;
+    @Excel(name = "退款金额")
+    private String refundAmount;
+    /**
+     * 财务负责人
+     */
+    @Excel(name = "财务负责人")
+    private String financeName;
+    /**
+     * 营销负责人
+     */
+    @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 cb;
+    /**
+     * 订单类型 0认证项目 1科技项目 2 两化融化管理体系认证项目
+     */
+    @Excel(name = "是否科技项目")
+    private Integer 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 技术组;
+    @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 = "订单情况")
+    private String orderStatus;
+    @Excel(name = "变更情况")
+    private String counts;
+    @Excel(name = "退单退款")
+    private String tdtk;
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public Integer getSalesType() {
+        return salesType;
+    }
+
+    public void setSalesType(Integer salesType) {
+        this.salesType = salesType;
+    }
+
+    public Integer getServiceType() {
+        return serviceType;
+    }
+
+    public void setServiceType(Integer serviceType) {
+        this.serviceType = serviceType;
+    }
+
+    public Integer getLiquidationStatus() {
+        return liquidationStatus;
+    }
+
+    public void setLiquidationStatus(Integer liquidationStatus) {
+        this.liquidationStatus = liquidationStatus;
+    }
+
+    public String getDunNodeContent() {
+        return dunNodeContent;
+    }
+
+    public void setDunNodeContent(String dunNodeContent) {
+        this.dunNodeContent = dunNodeContent;
+    }
+
+    public Integer getProjectType() {
+        return projectType;
+    }
+
+    public void setProjectType(Integer projectType) {
+        this.projectType = projectType;
+    }
+
+    public Integer getBigUser() {
+        return bigUser;
+    }
+
+    public void setBigUser(Integer bigUser) {
+        this.bigUser = bigUser;
+    }
+
+    public String getApproval() {
+        return approval;
+    }
+
+    public void setApproval(String approval) {
+        this.approval = approval;
+    }
+
+    public Date getSignTime() {
+        return signTime;
+    }
+
+    public void setSignTime(Date signTime) {
+        this.signTime = signTime;
+    }
+
+    public String get派单时间() {
+        return 派单时间;
+    }
+
+    public void set派单时间(String 派单时间) {
+        this.派单时间 = 派单时间;
+    }
+
+    public String getBuyerName() {
+        return buyerName;
+    }
+
+    public void setBuyerName(String buyerName) {
+        this.buyerName = buyerName;
+    }
+
+    public String getContractNo() {
+        return contractNo;
+    }
+
+    public void setContractNo(String contractNo) {
+        this.contractNo = contractNo;
+    }
+
+    public String getHtlx() {
+        return htlx;
+    }
+
+    public void setHtlx(String htlx) {
+        this.htlx = htlx;
+    }
+
+    public String getProvince() {
+        return province;
+    }
+
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
+    public String getDepName() {
+        return depName;
+    }
+
+    public void setDepName(String depName) {
+        this.depName = depName;
+    }
+
+    public BigDecimal getTotalAmount() {
+        return totalAmount;
+    }
+
+    public void setTotalAmount(BigDecimal totalAmount) {
+        this.totalAmount = totalAmount;
+    }
+
+    public String getContractAmountProportion() {
+        return contractAmountProportion;
+    }
+
+    public void setContractAmountProportion(String contractAmountProportion) {
+        this.contractAmountProportion = contractAmountProportion;
+    }
+
+    public String getShouldAmount() {
+        return shouldAmount;
+    }
+
+    public void setShouldAmount(String shouldAmount) {
+        this.shouldAmount = shouldAmount;
+    }
+
+    public String getSettlementAmount() {
+        return settlementAmount;
+    }
+
+    public void setSettlementAmount(String settlementAmount) {
+        this.settlementAmount = settlementAmount;
+    }
+
+    public String getArrearsAmount() {
+        return arrearsAmount;
+    }
+
+    public void setArrearsAmount(String arrearsAmount) {
+        this.arrearsAmount = arrearsAmount;
+    }
+
+    public String getExpenseAmount() {
+        return expenseAmount;
+    }
+
+    public void setExpenseAmount(String expenseAmount) {
+        this.expenseAmount = expenseAmount;
+    }
+
+    public String getShouldPublic() {
+        return shouldPublic;
+    }
+
+    public void setShouldPublic(String shouldPublic) {
+        this.shouldPublic = shouldPublic;
+    }
+
+    public String getAlreadyPublic() {
+        return alreadyPublic;
+    }
+
+    public void setAlreadyPublic(String alreadyPublic) {
+        this.alreadyPublic = alreadyPublic;
+    }
+
+    public String getExceedPublic() {
+        return exceedPublic;
+    }
+
+    public void setExceedPublic(String exceedPublic) {
+        this.exceedPublic = exceedPublic;
+    }
+
+    public String getCostAmount() {
+        return costAmount;
+    }
+
+    public void setCostAmount(String costAmount) {
+        this.costAmount = costAmount;
+    }
+
+    public String getPaymentAmount() {
+        return paymentAmount;
+    }
+
+    public void setPaymentAmount(String paymentAmount) {
+        this.paymentAmount = paymentAmount;
+    }
+
+    public String getInvicueAmount() {
+        return invicueAmount;
+    }
+
+    public void setInvicueAmount(String invicueAmount) {
+        this.invicueAmount = invicueAmount;
+    }
+
+    public String getRefundAmount() {
+        return refundAmount;
+    }
+
+    public void setRefundAmount(String refundAmount) {
+        this.refundAmount = refundAmount;
+    }
+
+    public String getFinanceName() {
+        return financeName;
+    }
+
+    public void setFinanceName(String financeName) {
+        this.financeName = financeName;
+    }
+
+    public String getSalesmanName() {
+        return salesmanName;
+    }
+
+    public void setSalesmanName(String salesmanName) {
+        this.salesmanName = salesmanName;
+    }
+
+    public String getCommodityName() {
+        return commodityName;
+    }
+
+    public void setCommodityName(String commodityName) {
+        this.commodityName = commodityName;
+    }
+
+    public String getServiceYear() {
+        return serviceYear;
+    }
+
+    public void setServiceYear(String serviceYear) {
+        this.serviceYear = serviceYear;
+    }
+
+    public String getServiceLife() {
+        return serviceLife;
+    }
+
+    public void setServiceLife(String serviceLife) {
+        this.serviceLife = serviceLife;
+    }
+
+    public Integer getYearSum() {
+        return yearSum;
+    }
+
+    public void setYearSum(Integer yearSum) {
+        this.yearSum = yearSum;
+    }
+
+    public String getTaskDistributionTime() {
+        return taskDistributionTime;
+    }
+
+    public void setTaskDistributionTime(String taskDistributionTime) {
+        this.taskDistributionTime = taskDistributionTime;
+    }
+
+    public String getCb() {
+        return cb;
+    }
+
+    public void setCb(String cb) {
+        this.cb = cb;
+    }
+
+    public Integer getOrderType() {
+        return orderType;
+    }
+
+    public void setOrderType(Integer orderType) {
+        this.orderType = orderType;
+    }
+
+    public String getCommodityQuantity() {
+        return commodityQuantity;
+    }
+
+    public void setCommodityQuantity(String commodityQuantity) {
+        this.commodityQuantity = commodityQuantity;
+    }
+
+    public String getProjectCostAmount() {
+        return projectCostAmount;
+    }
+
+    public void setProjectCostAmount(String projectCostAmount) {
+        this.projectCostAmount = projectCostAmount;
+    }
+
+    public String getProjectStatus() {
+        return projectStatus;
+    }
+
+    public void setProjectStatus(String projectStatus) {
+        this.projectStatus = projectStatus;
+    }
+
+    public String getTaskStartTime() {
+        return taskStartTime;
+    }
+
+    public void setTaskStartTime(String taskStartTime) {
+        this.taskStartTime = taskStartTime;
+    }
+
+    public String getTaskEndTime() {
+        return taskEndTime;
+    }
+
+    public void setTaskEndTime(String taskEndTime) {
+        this.taskEndTime = taskEndTime;
+    }
+
+    public String get技术组() {
+        return 技术组;
+    }
+
+    public void set技术组(String 技术组) {
+        this.技术组 = 技术组;
+    }
+
+    public String getReceiverName() {
+        return receiverName;
+    }
+
+    public void setReceiverName(String receiverName) {
+        this.receiverName = receiverName;
+    }
+
+    public Integer getSatisfactionDegree() {
+        return satisfactionDegree;
+    }
+
+    public void setSatisfactionDegree(Integer satisfactionDegree) {
+        this.satisfactionDegree = satisfactionDegree;
+    }
+
+    public String getTaskComment() {
+        return taskComment;
+    }
+
+    public void setTaskComment(String taskComment) {
+        this.taskComment = taskComment;
+    }
+
+    public String getHsbl() {
+        return hsbl;
+    }
+
+    public void setHsbl(String hsbl) {
+        this.hsbl = hsbl;
+    }
+
+    public String getOrderStatus() {
+        return orderStatus;
+    }
+
+    public void setOrderStatus(String orderStatus) {
+        this.orderStatus = orderStatus;
+    }
+
+    public String getCounts() {
+        return counts;
+    }
+
+    public void setCounts(String counts) {
+        this.counts = counts;
+    }
+
+    public String getTdtk() {
+        return tdtk;
+    }
+
+    public void setTdtk(String tdtk) {
+        this.tdtk = tdtk;
+    }
 }

+ 1 - 1
src/main/java/com/goafanti/order/service/impl/UserStatisticsServiceImpl.java

@@ -95,7 +95,7 @@ public class UserStatisticsServiceImpl extends BaseMybatisDao<UserMidMapper> imp
 
 	@Override
 	public Object orderProject(InputOrderProject in) {
-		tOrderTaskMapper.selectStatisticsOrderProject(in);
+		List<OutOrderProject> outOrderProject = tOrderTaskMapper.selectStatisticsOrderProject(in);
 		return null;
 	}
 }