anderx лет назад: 3
Родитель
Сommit
8cacf96312

+ 12 - 10
src/main/java/com/goafanti/order/bo/OutProjectStatistics.java

@@ -1,5 +1,7 @@
 package com.goafanti.order.bo;
 package com.goafanti.order.bo;
 
 
+import com.goafanti.common.utils.excel.Excel;
+
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 
 
 
 
@@ -61,8 +63,8 @@ public class OutProjectStatistics {
 
 
 	//会员
 	//会员
 	private String serviceLife;
 	private String serviceLife;
-	private String serviceyear;
-	private String yearsum;
+	private String serviceYear;
+	private Integer yearSum;
 	private String contractTerm;
 	private String contractTerm;
 
 
 	public String getServiceLife() {
 	public String getServiceLife() {
@@ -73,20 +75,20 @@ public class OutProjectStatistics {
 		this.serviceLife = serviceLife;
 		this.serviceLife = serviceLife;
 	}
 	}
 
 
-	public String getServiceyear() {
-		return serviceyear;
+	public String getServiceYear() {
+		return serviceYear;
 	}
 	}
 
 
-	public void setServiceyear(String serviceyear) {
-		this.serviceyear = serviceyear;
+	public void setServiceYear(String serviceYear) {
+		this.serviceYear = serviceYear;
 	}
 	}
 
 
-	public String getYearsum() {
-		return yearsum;
+	public Integer getYearSum() {
+		return yearSum;
 	}
 	}
 
 
-	public void setYearsum(String yearsum) {
-		this.yearsum = yearsum;
+	public void setYearSum(Integer yearSum) {
+		this.yearSum = yearSum;
 	}
 	}
 
 
 	public String getContractTerm() {
 	public String getContractTerm() {

+ 12 - 0
src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsHighTech.java

@@ -47,6 +47,8 @@ public class OutProjectStatisticsHighTech extends OutProjectStatistics {
     private String  legalPersonTel;
     private String  legalPersonTel;
     @Excel(name = "证书编号")
     @Excel(name = "证书编号")
     private String  certificateNumber;
     private String  certificateNumber;
+    @Excel(name = "申报年份")
+    private String serviceYear;
     @Excel(name = "申请批次")
     @Excel(name = "申请批次")
     private String  declarationBatch;
     private String  declarationBatch;
     @Excel(name = "项目金额")
     @Excel(name = "项目金额")
@@ -75,6 +77,16 @@ public class OutProjectStatisticsHighTech extends OutProjectStatistics {
 
 
     private Integer	certificatesCount;
     private Integer	certificatesCount;
 
 
+    @Override
+    public String getServiceYear() {
+        return serviceYear;
+    }
+
+    @Override
+    public void setServiceYear(String serviceYear) {
+        this.serviceYear = serviceYear;
+    }
+
     public String getOrderRemarks() {
     public String getOrderRemarks() {
         return orderRemarks;
         return orderRemarks;
     }
     }

+ 336 - 0
src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsMember.java

@@ -0,0 +1,336 @@
+package com.goafanti.order.bo.outStatistics;
+
+import com.goafanti.common.utils.excel.Excel;
+import com.goafanti.order.bo.OutProjectStatistics;
+
+import java.math.BigDecimal;
+
+public class OutProjectStatisticsMember extends OutProjectStatistics {
+    private Integer id;
+    @Excel(name = "派单时间")
+    private String distributionTime;
+    @Excel(name = "派单省份")
+    private String province;
+    @Excel(name = "订单部门")
+    private String depName;
+    @Excel(name = "营销员")
+    private String salesmanName;
+    @Excel(name = "合同编号")
+    private String contractNo;
+    @Excel(name = "订单编号")
+    private String orderNo;
+    @Excel(name = "客户名称")
+    private String  userName;
+    @Excel(name = "项目类型")
+    private String cname;
+    @Excel(name = "项目名称")
+    private String  pname;
+    @Excel(name = "数量")
+    private Integer  commodityQuantity;
+    @Excel(name = "负责部门")
+    private String techDepName;
+    @Excel(name = "咨询师/咨询师经理")
+    private String techName;
+    @Excel(name = "项目状态" ,enumsName = "com.goafanti.order.enums.NewProjectStatus")
+    private Integer projectStatus;
+    @Excel(name = "项目金额",scale = 6)
+    private BigDecimal  commodityPrice;
+    @Excel(name = "特别说明")
+    private String	specialComment;
+    @Excel(name = "项目说明")
+    private String	taskComment;
+    @Excel(name = "订单说明")
+    private String orderRemarks;
+
+    private Integer  setUpStatus;
+    private String setUpTime;
+    private Integer  spotCheckStatus;
+    private String  contactMobile;
+    private String  legalPersonTel;
+    private String  certificateNumber;
+    private String  declarationBatch;
+    private String	licenceTime;
+    private Integer	ifMaterial;
+    private Integer	urgentDay;
+    private BigDecimal	costAmount;
+    private BigDecimal	profit;
+    private Integer  highTechstatus;
+    private Integer	rejectCount;
+    private String	patentNo;
+    private String	patentName;
+    private String	acceptTime;
+
+
+
+    private Integer	certificatesCount;
+    @Excel(name = "服务年限")
+    private String serviceLife;
+    @Excel(name = "本次年份")
+    private String serviceYear;
+    @Excel(name = "服务年数")
+    private Integer yearSum;
+    @Excel(name = "合同期")
+    private String contractTerm;
+
+    @Override
+    public String getServiceLife() {
+        return serviceLife;
+    }
+
+    @Override
+    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;
+    }
+
+    @Override
+    public String getContractTerm() {
+        return contractTerm;
+    }
+
+    @Override
+    public void setContractTerm(String contractTerm) {
+        this.contractTerm = contractTerm;
+    }
+
+    public String getOrderRemarks() {
+        return orderRemarks;
+    }
+
+    public void setOrderRemarks(String orderRemarks) {
+        this.orderRemarks = orderRemarks;
+    }
+
+    public Integer getSetUpStatus() {
+        return setUpStatus;
+    }
+    public void setSetUpStatus(Integer setUpStatus) {
+        this.setUpStatus = setUpStatus;
+    }
+    public String getSetUpTime() {
+        return setUpTime;
+    }
+    public void setSetUpTime(String setUpTime) {
+        this.setUpTime = setUpTime;
+    }
+    public Integer getSpotCheckStatus() {
+        return spotCheckStatus;
+    }
+    public void setSpotCheckStatus(Integer spotCheckStatus) {
+        this.spotCheckStatus = spotCheckStatus;
+    }
+    public String getContactMobile() {
+        return contactMobile;
+    }
+    public void setContactMobile(String contactMobile) {
+        this.contactMobile = contactMobile;
+    }
+    public String getLegalPersonTel() {
+        return legalPersonTel;
+    }
+    public void setLegalPersonTel(String legalPersonTel) {
+        this.legalPersonTel = legalPersonTel;
+    }
+    public String getCertificateNumber() {
+        return certificateNumber;
+    }
+    public void setCertificateNumber(String certificateNumber) {
+        this.certificateNumber = certificateNumber;
+    }
+    public String getDeclarationBatch() {
+        return declarationBatch;
+    }
+    public void setDeclarationBatch(String declarationBatch) {
+        this.declarationBatch = declarationBatch;
+    }
+    public Integer getCommodityQuantity() {
+        return commodityQuantity;
+    }
+    public void setCommodityQuantity(Integer commodityQuantity) {
+        this.commodityQuantity = commodityQuantity;
+    }
+    public BigDecimal getCommodityPrice() {
+        return commodityPrice;
+    }
+    public void setCommodityPrice(BigDecimal commodityPrice) {
+        this.commodityPrice = commodityPrice;
+    }
+
+
+
+    public String getDistributionTime() {
+        return distributionTime;
+    }
+    public void setDistributionTime(String distributionTime) {
+        this.distributionTime = distributionTime;
+    }
+    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 String getSalesmanName() {
+        return salesmanName;
+    }
+    public void setSalesmanName(String salesmanName) {
+        this.salesmanName = salesmanName;
+    }
+    public String getContractNo() {
+        return contractNo;
+    }
+    public void setContractNo(String contractNo) {
+        this.contractNo = contractNo;
+    }
+    public String getOrderNo() {
+        return orderNo;
+    }
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+    public String getUserName() {
+        return userName;
+    }
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+    public String getCname() {
+        return cname;
+    }
+    public void setCname(String cname) {
+        this.cname = cname;
+    }
+    public String getPname() {
+        return pname;
+    }
+    public void setPname(String pname) {
+        this.pname = pname;
+    }
+    public String getTechName() {
+        return techName;
+    }
+    public void setTechName(String techName) {
+        this.techName = techName;
+    }
+    public String getTechDepName() {
+        return techDepName;
+    }
+    public void setTechDepName(String techDepName) {
+        this.techDepName = techDepName;
+    }
+    public Integer getProjectStatus() {
+        return projectStatus;
+    }
+    public void setProjectStatus(Integer projectStatus) {
+        this.projectStatus = projectStatus;
+    }
+    public String getLicenceTime() {
+        return licenceTime;
+    }
+    public void setLicenceTime(String licenceTime) {
+        this.licenceTime = licenceTime;
+    }
+    public String getTaskComment() {
+        return taskComment;
+    }
+    public void setTaskComment(String taskComment) {
+        this.taskComment = taskComment;
+    }
+    public Integer getCertificatesCount() {
+        return certificatesCount;
+    }
+    public void setCertificatesCount(Integer certificatesCount) {
+        this.certificatesCount = certificatesCount;
+    }
+    public Integer getUrgentDay() {
+        return urgentDay;
+    }
+    public void setUrgentDay(Integer urgentDay) {
+        this.urgentDay = urgentDay;
+    }
+    public Integer getIfMaterial() {
+        return ifMaterial;
+    }
+    public void setIfMaterial(Integer ifMaterial) {
+        this.ifMaterial = ifMaterial;
+    }
+    public BigDecimal getCostAmount() {
+        return costAmount;
+    }
+    public void setCostAmount(BigDecimal costAmount) {
+        this.costAmount = costAmount;
+    }
+    public BigDecimal getProfit() {
+        if (profit==null&&commodityPrice!=null&&costAmount!=null) {
+            return  commodityPrice.subtract(costAmount);
+        }
+        return profit;
+    }
+    public void setProfit(BigDecimal profit) {
+        this.profit = profit;
+    }
+    public Integer getRejectCount() {
+        return rejectCount;
+    }
+    public void setRejectCount(Integer rejectCount) {
+        this.rejectCount = rejectCount;
+    }
+    public String getPatentName() {
+        return patentName;
+    }
+    public void setPatentName(String patentName) {
+        this.patentName = patentName;
+    }
+    public String getAcceptTime() {
+        return acceptTime;
+    }
+    public void setAcceptTime(String acceptTime) {
+        this.acceptTime = acceptTime;
+    }
+    public Integer getHighTechstatus() {
+        return highTechstatus;
+    }
+    public void setHighTechstatus(Integer highTechstatus) {
+        this.highTechstatus = highTechstatus;
+    }
+    public Integer getId() {
+        return id;
+    }
+    public void setId(Integer id) {
+        this.id = id;
+    }
+    public String getSpecialComment() {
+        return specialComment;
+    }
+    public void setSpecialComment(String specialComment) {
+        this.specialComment = specialComment;
+    }
+    public String getPatentNo() {
+        return patentNo;
+    }
+    public void setPatentNo(String patentNo) {
+        this.patentNo = patentNo;
+    }
+
+}

+ 2 - 0
src/main/java/com/goafanti/order/controller/StatisticsApiController.java

@@ -7,6 +7,7 @@ import java.util.List;
 
 
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.goafanti.common.utils.excel.NewExcelUtil;
 import com.goafanti.common.utils.excel.NewExcelUtil;
 import com.goafanti.order.bo.*;
 import com.goafanti.order.bo.*;
 import com.goafanti.order.service.OrderStatisticsService;
 import com.goafanti.order.service.OrderStatisticsService;
@@ -163,4 +164,5 @@ public class StatisticsApiController extends CertifyApiController {
 		res.data(userStaticticsService.signStatisticsOrderList(in));
 		res.data(userStaticticsService.signStatisticsOrderList(in));
 		return res;
 		return res;
 	}
 	}
+
 }
 }

+ 26 - 0
src/main/java/com/goafanti/order/service/impl/ProjectStatisticsServiceImpl.java

@@ -10,11 +10,16 @@ import java.util.*;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponseWrapper;
 import javax.servlet.http.HttpServletResponseWrapper;
 
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.goafanti.admin.service.DepartmentService;
 import com.goafanti.admin.service.DepartmentService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.utils.excel.NewExcelUtil;
 import com.goafanti.common.utils.excel.NewExcelUtil;
 import com.goafanti.order.bo.*;
 import com.goafanti.order.bo.*;
 import com.goafanti.order.bo.outStatistics.*;
 import com.goafanti.order.bo.outStatistics.*;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
 import groovy.util.logging.Log4j;
 import groovy.util.logging.Log4j;
 import org.apache.commons.collections4.map.HashedMap;
 import org.apache.commons.collections4.map.HashedMap;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -153,11 +158,32 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
 				}
 				}
 				NewExcelUtil<OutProjectStatisticsPatent> excelUtil=new NewExcelUtil<>(OutProjectStatisticsPatent.class);
 				NewExcelUtil<OutProjectStatisticsPatent> excelUtil=new NewExcelUtil<>(OutProjectStatisticsPatent.class);
 				res=excelUtil.exportExcel(tl,"项目汇总表(专利)",downloadPath);
 				res=excelUtil.exportExcel(tl,"项目汇总表(专利)",downloadPath);
+			}else if (ib.getStatus()==5){//会员
+				List<OutProjectStatisticsMember> tl=new ArrayList<>();
+				for (OutProjectStatistics o : list) {
+					OutProjectStatisticsMember member = new OutProjectStatisticsMember();
+					BeanUtils.copyProperties(o,member);
+					if (member.getServiceLife()!=null){
+						JSONArray jsonArray = JSONArray.parseArray(member.getServiceLife());
+						Object[] object=jsonArray.stream().toArray();
+						member.setServiceLife(StringUtils.join(object,","));
+					}
+					if (member.getContractTerm()!=null){
+						JSONArray jsonArray = JSONArray.parseArray(member.getContractTerm());
+						Object[] object=jsonArray.stream().toArray();
+						member.setContractTerm(StringUtils.join(object,"~"));
+					}
+					tl.add(member);
+				}
+				NewExcelUtil<OutProjectStatisticsMember> excelUtil=new NewExcelUtil<>(OutProjectStatisticsMember.class);
+				res=excelUtil.exportExcel(tl,"项目汇总表(会员)",downloadPath);
 			}
 			}
 			return  res;
 			return  res;
 	}
 	}
 
 
 
 
+
+
 	/**
 	/**
 	 * 处理搜索条件
 	 * 处理搜索条件
 	 * @param ib
 	 * @param ib