ソースを参照

项目进度详情开发

anderx 1 年間 前
コミット
a099f67433
共有2 個のファイルを変更した262 個の追加13 個の削除を含む
  1. 256 7
      src/main/java/com/goafanti/common/utils/excel/NewExcelUtil.java
  2. 6 6
      src/main/java/com/goafanti/techproject/bo/OutTaskDetailsBo.java

+ 256 - 7
src/main/java/com/goafanti/common/utils/excel/NewExcelUtil.java

@@ -1944,7 +1944,7 @@ public class NewExcelUtil<T> {
     }
 
 	private void addCell(Row row,OutTaskDetailsBo o) {
-		for (int i = 0; i < 20; i++) {
+		for (int i = 0; i < 53; i++) {
 			Cell cell = row.createCell(i);
 			cell.setCellStyle(styles.get("data4"));
 			if (i==0)cell.setCellValue(1);
@@ -1953,8 +1953,17 @@ public class NewExcelUtil<T> {
 			else if(i==3)cell.setCellValue(o.getServiceyear());
 			else if(i==4)cell.setCellValue("");
 			else if(i==5)cell.setCellValue(o.getMemberLvl());
-			else if(i==6)cell.setCellValue(o.getBeforeLastSalesAmount().stripTrailingZeros().toPlainString());
-			else if(i==7)cell.setCellValue(o.getBeforeLastRdBudget().stripTrailingZeros().toPlainString());
+			else if(i==6){
+				if (o.getBeforeLastSalesAmount()!=null){
+					cell.setCellValue(o.getBeforeLastSalesAmount().stripTrailingZeros().toPlainString());
+				}else cell.setCellValue("");
+			}
+			else if(i==7){
+				if (o.getBeforeLastRdBudget()!=null){
+					cell.setCellValue(o.getBeforeLastRdBudget().stripTrailingZeros().toPlainString());
+				}else cell.setCellValue("");
+
+			}
 			else if(i==8)cell.setCellValue(o.getLastSalesAmount().stripTrailingZeros().toPlainString());
 			else if(i==9)cell.setCellValue(o.getLastRdBudget().stripTrailingZeros().toPlainString());
 			else if(i==10){
@@ -1970,13 +1979,253 @@ public class NewExcelUtil<T> {
 
 					}
 
-			}
-			else if(i==11){
+			}else if(i==11){
+				cell.setCellValue(o.getProjectApprovalNumber());
+			}else if(i==12)cell.setCellValue(o.getRdBudget().stripTrailingZeros().toPlainString());
+			else if(i==13)cell.setCellValue(o.getRdSalesAmount().stripTrailingZeros().toPlainString());
+			else if(i==14)cell.setCellValue(o.getRdBudgetRate());
+			else if(i==15)cell.setCellValue(o.getThreeYearsRdBudgetRate());
+			else if(i==16){
+				switch (o.getDataCycle())
+				{
+					case "0":
+						cell.setCellValue("第一季度");
+						break;
+					case "1": cell.setCellValue("上半年"); break;
+					case "2": cell.setCellValue("前三季度"); break;
+					case "3": cell.setCellValue("全年"); break;
 
+				}
 			}
+			else if(i==17)cell.setCellValue(o.getActualRdNumber());
+			else if(i==18)cell.setCellValue(o.getActualRdAmount().stripTrailingZeros().toPlainString());
+			else if(i==19)cell.setCellValue(o.getActualSalesAmount().stripTrailingZeros().toPlainString());
+			else if(i==20)cell.setCellValue(o.getActualRdRate());
+			else if(i==21)cell.setCellValue(o.getThreeYearsActualRdRate());
+			else if(i==22) {
+				switch (o.getTorchStatus())
+				{
+					case 0:
+						String res="其他:"+o.getTorchOther();
+						cell.setCellValue(res);
+						break;
+					case 1: cell.setCellValue("待完成"); break;
+					case 2: cell.setCellValue("已完成"); break;
+					case 3: cell.setCellValue("合同无此项"); break;
+				}
+			}
+			else if(i==23){
+				switch (o.getStatisticsStatus())
+				{
+					case 0:
+						String res="其他:"+o.getStatisticsOther();
+						cell.setCellValue(res);
+						break;
+					case 1: cell.setCellValue("待完成"); break;
+					case 2: cell.setCellValue("已完成"); break;
+					case 3: cell.setCellValue("合同无此项"); break;
+				}
+			}
+			else if(i==24){
+				switch (o.getChStatus())
+				{
+					case 0:
+						String res="其他:"+o.getChOther();
+						cell.setCellValue(res);
+						break;
+					case 1: cell.setCellValue("待完成"); break;
+					case 2: cell.setCellValue("已完成"); break;
+					case 3: cell.setCellValue("合同无此项"); break;
+				}
+			}
+			else if(i==25){
+				switch (o.getFinalSettlementStatus())
+				{
+					case 0:
+						String res="其他:"+o.getFinalSettlementOther();
+						cell.setCellValue(res);
+						break;
+					case 1: cell.setCellValue("待完成"); break;
+					case 2: cell.setCellValue("已完成"); break;
+					case 3: cell.setCellValue("合同无此项"); break;
+				}
+			}
+			else if(i==26)cell.setCellValue(o.getReportRdAmount().stripTrailingZeros().toPlainString());
+			else if(i==27){
+				switch (o.getRdReservesStatus())
+				{
+					case 0:
+						String res="其他:"+o.getRdReservesOther();
+						cell.setCellValue(res);
+						break;
+					case 1: cell.setCellValue("待完成"); break;
+					case 2: cell.setCellValue("已完成"); break;
+					case 3: cell.setCellValue("合同无此项"); break;
+				}
+			}
+			else if(i==28){
+				switch (o.getRdAwardCompensationStatus())
+				{
+					case 0:
+						String res="其他:"+o.getRdAwardCompensationOther();
+						cell.setCellValue(res);
+						break;
+					case 1: cell.setCellValue("待完成"); break;
+					case 2: cell.setCellValue("已完成"); break;
+					case 3: cell.setCellValue("合同无此项"); break;
+				}
+			}
+			else if(i==29){
+				switch (o.getRdAwardCompensationStatus())
+				{
+					case 0:
+						String res="其他:"+o.getRdAwardCompensationOther();
+						cell.setCellValue(res);
+						break;
+					case 1: cell.setCellValue("待完成"); break;
+					case 2: cell.setCellValue("已完成"); break;
+					case 3: cell.setCellValue("合同无此项"); break;
+				}
+			}
+			else if(i==30){cell.setCellValue(o.getRdAnnouncementAmount().stripTrailingZeros().toPlainString());}
+			else if(i==31){
+				switch (o.getAdDeliverStatus())
+				{
+					case 0:
+						String res="其他:"+o.getAdDeliverOther();
+						cell.setCellValue(res);
+						break;
+					case 1: cell.setCellValue("待完成"); break;
+					case 2: cell.setCellValue("已完成"); break;
+					case 3: cell.setCellValue("合同无此项"); break;
+				}
+			}
+			else if(i==32){
+				switch (o.getAdDeliverStatus())
+				{
+					case 0:
+						String res="其他:"+o.getAdDeliverOther();
+						cell.setCellValue(res);
+						break;
+					case 1: cell.setCellValue("待完成"); break;
+					case 2: cell.setCellValue("已完成"); break;
+					case 3: cell.setCellValue("合同无此项"); break;
+				}
+			}
+			else if(i==33){
+				switch (o.getHtDeliverStatus())
+				{
+					case 0:
+						String res="其他:"+o.getHtDeliverOther();
+						cell.setCellValue(res);
+						break;
+					case 1: cell.setCellValue("待完成"); break;
+					case 2: cell.setCellValue("已完成"); break;
+					case 3: cell.setCellValue("合同无此项"); break;
+				}
+			}
+			else if(i==34){
+				StringBuilder res= new StringBuilder();
+				if (o.getPhasedType()==1){
+					res.append("月度");
+				}else if (o.getPhasedType()==2){
+					res.append("季度");
+				}
+				String[] split = o.getPhasedContent().split(",");
+                for (String s : split) {
+                    res.append(s).append("月");
+                }
+				cell.setCellValue(res.toString());
+			}
+			else if(i==35){
+				cell.setCellValue(o.getProjectApprovalWriteNumber());
+			}
+			else if(i==36){
+				cell.setCellValue(o.getProjectApprovalWriteRate());
+			}
+			else if(i==37){
+				switch (o.getAdPrepareJulyStatus())
+				{
+					case 0:
+						String res="其他:"+o.getAdPrepareJulyOther();
+						cell.setCellValue(res);
+						break;
+					case 1: cell.setCellValue("待完成"); break;
+					case 2: cell.setCellValue("已完成"); break;
+					case 3: cell.setCellValue("合同无此项"); break;
+				}
+			}
+			else if(i==38){
+				switch (o.getAdPrepareOctoberStatus())
+				{
+					case 0:
+						String res="其他:"+o.getAdPrepareOctoberOther();
+						cell.setCellValue(res);
+						break;
+					case 1: cell.setCellValue("待完成"); break;
+					case 2: cell.setCellValue("已完成"); break;
+					case 3: cell.setCellValue("合同无此项"); break;
+				}
+			}
+			else if(i==39){
+				cell.setCellValue(o.getIpDeclare());
+			}
+			else if(i==40){
+				cell.setCellValue(o.getIpAuthorize());
+			}
+			else if(i==41){
+				cell.setCellValue(o.getPublicReleaseStipulation());
+			}
+			else if(i==42){
+				cell.setCellValue(o.getPublicReleaseActual());
+			}
+			else if(i==43){
+				cell.setCellValue(o.getTrainingStipulation());
+			}
+			else if(i==44){
+				cell.setCellValue(o.getTrainingActual());
+			}
+			else if(i==45){
+				cell.setCellValue(o.getSpecialInspect());
+			}
+			else if(i==46){
+				cell.setCellValue(o.getSimulatedAudit());
+			}
+			else if(i==47){
+				cell.setCellValue(o.getFeaturedWorkOther());
+			}
+			else if(i==48){
+				switch (o.getWebSubmit()){
+					case 0:
+						String res="其他:"+o.getWebSubmitOther();
+						cell.setCellValue(res);
+						break;
+					case 1: cell.setCellValue("待完成"); break;
+					case 2: cell.setCellValue("已完成"); break;
+					case 3: cell.setCellValue("合同无此项"); break;
+				}
 
-
-
+			}
+			else if(i==49){
+				switch (o.getPaperSubmit()){
+					case 0:
+						String res="其他:"+o.getPaperSubmitOther();
+						cell.setCellValue(res);
+						break;
+					case 1: cell.setCellValue("待完成"); break;
+					case 2: cell.setCellValue("已完成"); break;
+					case 3: cell.setCellValue("合同无此项"); break;
+				}
+			}
+			else if(i==50){
+				cell.setCellValue(o.getReviewProvinceNumber());
+			}
+			else if(i==51){
+				cell.setCellValue(o.getReviewCountryNumber());
+			}
+			else if(i==52){
+				cell.setCellValue(DateUtils.formatDateYYYYMMddHHmm(o.getUpdateTime()));
+			}
 		}
 
 

+ 6 - 6
src/main/java/com/goafanti/techproject/bo/OutTaskDetailsBo.java

@@ -75,7 +75,7 @@ public class OutTaskDetailsBo {
     /**
      * 研发立项数
      */
-    private Integer prjectApprovalNumber;
+    private Integer projectApprovalNumber;
     /**
      * 年度研发预算
      */
@@ -245,7 +245,7 @@ public class OutTaskDetailsBo {
      */
     private String adPrepareJulyOther;
     /**
-     * 加扣预申报月 0=其他,1=待完成,2=已完成,3=合同无此项
+     * 加扣预申报月 0=其他,1=待完成,2=已完成,3=合同无此项
      */
     private Integer adPrepareOctoberStatus;
     /**
@@ -567,12 +567,12 @@ public class OutTaskDetailsBo {
         this.workersRate = workersRate;
     }
 
-    public Integer getPrjectApprovalNumber() {
-        return prjectApprovalNumber;
+    public Integer getProjectApprovalNumber() {
+        return projectApprovalNumber;
     }
 
-    public void setPrjectApprovalNumber(Integer prjectApprovalNumber) {
-        this.prjectApprovalNumber = prjectApprovalNumber;
+    public void setProjectApprovalNumber(Integer projectApprovalNumber) {
+        this.projectApprovalNumber = projectApprovalNumber;
     }
 
     public BigDecimal getRdBudget() {