Browse Source

项目汇总列表修改

anderx 3 years ago
parent
commit
48398facf3

+ 1 - 1
src/main/java/com/goafanti/order/bo/InputProjectStatistics.java

@@ -17,7 +17,7 @@ public class InputProjectStatistics {
 	private Integer pageNo;
 	private Integer pageSize;
 
-	// 0通用 1高新 2双软 3软著 4专利 5审计
+	// 0通用 1高新 2双软 3软著 4专利 5会员 6审计
 	private Integer status;
 	private String depName;
 	private String thchDepName;

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

@@ -60,6 +60,8 @@ public class OutProjectStatistics {
 	private String	specialComment;
 
 	private String orderRemarks;
+	private String serviceType;
+	private String serviceProject;
 
 	//会员
 	private String serviceLife;
@@ -72,6 +74,22 @@ public class OutProjectStatistics {
 	private BigDecimal lastYearCapital;
 	private BigDecimal lastYearIncome;
 
+	public String getServiceType() {
+		return serviceType;
+	}
+
+	public void setServiceType(String serviceType) {
+		this.serviceType = serviceType;
+	}
+
+	public String getServiceProject() {
+		return serviceProject;
+	}
+
+	public void setServiceProject(String serviceProject) {
+		this.serviceProject = serviceProject;
+	}
+
 	public String getLastYear() {
 		return lastYear;
 	}

+ 353 - 0
src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsAudit.java

@@ -0,0 +1,353 @@
+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 OutProjectStatisticsAudit 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 serviceType;
+    @Excel(name = "服务项目")
+    private String serviceProject;
+    @Excel(name = "上年度年份")
+    private String lastYear;
+    @Excel(name = "上年度总资产(万元)")
+    private BigDecimal lastYearCapital;
+    @Excel(name = "上年度总收入(万元)")
+    private BigDecimal lastYearIncome;
+    @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;
+
+
+    @Override
+    public String getServiceType() {
+        return serviceType;
+    }
+
+    @Override
+    public void setServiceType(String serviceType) {
+        this.serviceType = serviceType;
+    }
+
+    @Override
+    public String getServiceProject() {
+        return serviceProject;
+    }
+
+    @Override
+    public void setServiceProject(String serviceProject) {
+        this.serviceProject = serviceProject;
+    }
+
+    @Override
+    public String getLastYear() {
+        return lastYear;
+    }
+
+    @Override
+    public void setLastYear(String lastYear) {
+        this.lastYear = lastYear;
+    }
+
+    @Override
+    public BigDecimal getLastYearCapital() {
+        return lastYearCapital;
+    }
+
+    @Override
+    public void setLastYearCapital(BigDecimal lastYearCapital) {
+        this.lastYearCapital = lastYearCapital;
+    }
+
+    @Override
+    public BigDecimal getLastYearIncome() {
+        return lastYearIncome;
+    }
+
+    @Override
+    public void setLastYearIncome(BigDecimal lastYearIncome) {
+        this.lastYearIncome = lastYearIncome;
+    }
+
+    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;
+    }
+
+}

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

@@ -27,6 +27,10 @@ public class OutProjectStatisticsCommon extends OutProjectStatistics {
     private String  pname;
     @Excel(name = "数量")
     private Integer  commodityQuantity;
+    @Excel(name = "服务类型")
+    private String serviceType;
+    @Excel(name = "服务项目")
+    private String serviceProject;
     @Excel(name = "负责部门")
     private String techDepName;
     @Excel(name = "咨询师/咨询师经理")
@@ -65,6 +69,28 @@ public class OutProjectStatisticsCommon extends OutProjectStatistics {
     private Integer	certificatesCount;
 
 
+    @Override
+    public String getServiceType() {
+        return serviceType;
+    }
+
+    @Override
+    public void setServiceType(String serviceType) {
+        this.serviceType = serviceType;
+    }
+
+    @Override
+    public String getServiceProject() {
+        return serviceProject;
+    }
+
+    @Override
+    public void setServiceProject(String serviceProject) {
+        this.serviceProject = serviceProject;
+    }
+
+
+
     public String getOrderRemarks() {
         return orderRemarks;
     }

+ 23 - 0
src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsDoubleSoft.java

@@ -27,6 +27,10 @@ public class OutProjectStatisticsDoubleSoft extends OutProjectStatistics {
     private String  pname;
     @Excel(name = "数量")
     private Integer  commodityQuantity;
+    @Excel(name = "服务类型")
+    private String serviceType;
+    @Excel(name = "服务项目")
+    private String serviceProject;
     @Excel(name = "负责部门")
     private String techDepName;
     @Excel(name = "咨询师/咨询师经理")
@@ -67,6 +71,25 @@ public class OutProjectStatisticsDoubleSoft extends OutProjectStatistics {
 
     private Integer	certificatesCount;
 
+    @Override
+    public String getServiceType() {
+        return serviceType;
+    }
+
+    @Override
+    public void setServiceType(String serviceType) {
+        this.serviceType = serviceType;
+    }
+
+    @Override
+    public String getServiceProject() {
+        return serviceProject;
+    }
+
+    @Override
+    public void setServiceProject(String serviceProject) {
+        this.serviceProject = serviceProject;
+    }
 
     public String getOrderRemarks() {
         return orderRemarks;

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

@@ -27,6 +27,10 @@ public class OutProjectStatisticsHighTech extends OutProjectStatistics {
     private String  pname;
     @Excel(name = "数量")
     private Integer  commodityQuantity;
+    @Excel(name = "服务类型")
+    private String serviceType;
+    @Excel(name = "服务项目")
+    private String serviceProject;
     @Excel(name = "负责部门")
     private String techDepName;
     @Excel(name = "咨询师/咨询师经理")
@@ -78,6 +82,26 @@ public class OutProjectStatisticsHighTech extends OutProjectStatistics {
     private Integer	certificatesCount;
 
     @Override
+    public String getServiceType() {
+        return serviceType;
+    }
+
+    @Override
+    public void setServiceType(String serviceType) {
+        this.serviceType = serviceType;
+    }
+
+    @Override
+    public String getServiceProject() {
+        return serviceProject;
+    }
+
+    @Override
+    public void setServiceProject(String serviceProject) {
+        this.serviceProject = serviceProject;
+    }
+
+    @Override
     public String getServiceYear() {
         return serviceYear;
     }

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

@@ -27,6 +27,10 @@ public class OutProjectStatisticsMember extends OutProjectStatistics {
     private String  pname;
     @Excel(name = "数量")
     private Integer  commodityQuantity;
+    @Excel(name = "服务类型")
+    private String serviceType;
+    @Excel(name = "服务项目")
+    private String serviceProject;
     @Excel(name = "负责部门")
     private String techDepName;
     @Excel(name = "咨询师/咨询师经理")
@@ -73,6 +77,26 @@ public class OutProjectStatisticsMember extends OutProjectStatistics {
     private String contractTerm;
 
     @Override
+    public String getServiceType() {
+        return serviceType;
+    }
+
+    @Override
+    public void setServiceType(String serviceType) {
+        this.serviceType = serviceType;
+    }
+
+    @Override
+    public String getServiceProject() {
+        return serviceProject;
+    }
+
+    @Override
+    public void setServiceProject(String serviceProject) {
+        this.serviceProject = serviceProject;
+    }
+
+    @Override
     public String getServiceLife() {
         return serviceLife;
     }

+ 24 - 0
src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsPatent.java

@@ -27,6 +27,10 @@ public class OutProjectStatisticsPatent extends OutProjectStatistics {
     private String  pname;
     @Excel(name = "数量")
     private Integer  commodityQuantity;
+    @Excel(name = "服务类型")
+    private String serviceType;
+    @Excel(name = "服务项目")
+    private String serviceProject;
     @Excel(name = "负责部门")
     private String techDepName;
     @Excel(name = "咨询师/咨询师经理")
@@ -71,6 +75,26 @@ public class OutProjectStatisticsPatent extends OutProjectStatistics {
     private Integer	urgentDay;
     private Integer	certificatesCount;
 
+    @Override
+    public String getServiceType() {
+        return serviceType;
+    }
+
+    @Override
+    public void setServiceType(String serviceType) {
+        this.serviceType = serviceType;
+    }
+
+    @Override
+    public String getServiceProject() {
+        return serviceProject;
+    }
+
+    @Override
+    public void setServiceProject(String serviceProject) {
+        this.serviceProject = serviceProject;
+    }
+
     public String getQuantityAndcount() {
         return quantityAndcount;
     }

+ 23 - 0
src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsSoftwareWorks.java

@@ -27,6 +27,10 @@ public class OutProjectStatisticsSoftwareWorks extends OutProjectStatistics {
     private String  pname;
     @Excel(name = "数量")
     private Integer  commodityQuantity;
+    @Excel(name = "服务类型")
+    private String serviceType;
+    @Excel(name = "服务项目")
+    private String serviceProject;
     @Excel(name = "负责部门")
     private String techDepName;
     @Excel(name = "咨询师/咨询师经理")
@@ -69,6 +73,25 @@ public class OutProjectStatisticsSoftwareWorks extends OutProjectStatistics {
     private String	acceptTime;
     private Integer	certificatesCount;
 
+    @Override
+    public String getServiceType() {
+        return serviceType;
+    }
+
+    @Override
+    public void setServiceType(String serviceType) {
+        this.serviceType = serviceType;
+    }
+
+    @Override
+    public String getServiceProject() {
+        return serviceProject;
+    }
+
+    @Override
+    public void setServiceProject(String serviceProject) {
+        this.serviceProject = serviceProject;
+    }
 
     public String getOrderRemarks() {
         return orderRemarks;

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

@@ -177,6 +177,25 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
 				}
 				NewExcelUtil<OutProjectStatisticsMember> excelUtil=new NewExcelUtil<>(OutProjectStatisticsMember.class);
 				res=excelUtil.exportExcel(tl,"项目汇总表(会员)",downloadPath);
+			}else if (ib.getStatus()==6){//会员
+				List<OutProjectStatisticsAudit> tl=new ArrayList<>();
+				for (OutProjectStatistics o : list) {
+					OutProjectStatisticsAudit audit = new OutProjectStatisticsAudit();
+					BeanUtils.copyProperties(o,audit);
+					if (audit.getServiceLife()!=null){
+						JSONArray jsonArray = JSONArray.parseArray(audit.getServiceLife());
+						Object[] object=jsonArray.stream().toArray();
+						audit.setServiceLife(StringUtils.join(object,","));
+					}
+					if (audit.getContractTerm()!=null){
+						JSONArray jsonArray = JSONArray.parseArray(audit.getContractTerm());
+						Object[] object=jsonArray.stream().toArray();
+						audit.setContractTerm(StringUtils.join(object,"~"));
+					}
+					tl.add(audit);
+				}
+				NewExcelUtil<OutProjectStatisticsAudit> excelUtil=new NewExcelUtil<>(OutProjectStatisticsAudit.class);
+				res=excelUtil.exportExcel(tl,"项目汇总表(审计)",downloadPath);
 			}
 			return  res;
 	}