|
|
@@ -1975,7 +1975,7 @@ public class NewExcelUtil<T> {
|
|
|
}
|
|
|
|
|
|
private void addCell(Row row,TaskDetailsBo o,Integer index) {
|
|
|
- for (int i = 0; i < 81; i++) {
|
|
|
+ for (int i = 0; i < 85; i++) {
|
|
|
Cell cell = row.createCell(i);
|
|
|
cell.setCellStyle(styles.get("data4"));
|
|
|
if (i==0)cell.setCellValue(index);//序号
|
|
|
@@ -1985,7 +1985,17 @@ public class NewExcelUtil<T> {
|
|
|
else if(i==4){//服务年限
|
|
|
cell.setCellValue(o.getServiceYear());
|
|
|
}
|
|
|
- else if(i==5)cell.setCellValue(o.getMemberLvl());//会员级别
|
|
|
+ else if(i==5){//会员等级
|
|
|
+ if (o.getMemberLvl()==null){
|
|
|
+ cell.setCellValue("");
|
|
|
+ }else if (o.getMemberLvl()==1){
|
|
|
+ cell.setCellValue("I");
|
|
|
+ }else if (o.getMemberLvl()==2){
|
|
|
+ cell.setCellValue("II");
|
|
|
+ }else if (o.getMemberLvl()==3){
|
|
|
+ cell.setCellValue("III");
|
|
|
+ }
|
|
|
+ }
|
|
|
else if(i==6)cell.setCellValue(addThis(o.getTaskName())); //业务负责人
|
|
|
else if(i==7)cell.setCellValue(addThis(o.getProjectName())); //项目负责人
|
|
|
else if(i==8)cell.setCellValue(addThis(o.getTechnologyName())); //技术咨询师
|
|
|
@@ -2207,27 +2217,35 @@ public class NewExcelUtil<T> {
|
|
|
cell.setCellValue(addThis(o.getTrainingActual()));
|
|
|
}else if(i==69){//培训指标(本年度)-其他
|
|
|
cell.setCellValue(addThis(o.getTrainingOther()));
|
|
|
- }else if(i==70){//特色工作-专项检查
|
|
|
- cell.setCellValue("");
|
|
|
- }else if(i==71){//特色工作-模拟稽查
|
|
|
- cell.setCellValue("");
|
|
|
- }else if(i==72){//其他事项说明
|
|
|
+ }else if(i==70){//特色工作-高新技术税收优惠政策检查
|
|
|
+ cell.setCellValue(addThis(o.getFeatureHt()));
|
|
|
+ }else if(i==71){//特色工作-加计扣除税收优惠政策检查
|
|
|
+ cell.setCellValue(addThis(o.getFeatureAd()));
|
|
|
+ }else if(i==72){//特色工作-税务常规检查
|
|
|
+ cell.setCellValue(addThis(o.getFeatureTr()));
|
|
|
+ }else if(i==73){//特色工作-税务对研发费用检查
|
|
|
+ cell.setCellValue(addThis(o.getFeatureTe()));
|
|
|
+ }else if(i==74){//特色工作-税务稽查
|
|
|
+ cell.setCellValue(addThis(o.getFeatureTi()));
|
|
|
+ }else if(i==75){//特色工作-其他
|
|
|
+ cell.setCellValue(addThis(o.getFeatureOther()));
|
|
|
+ }else if(i==76){//其他事项说明
|
|
|
cell.setCellValue(addThis(o.getRemarks()));
|
|
|
- }else if(i==73){//创新能力评价评分
|
|
|
+ }else if(i==77){//创新能力评价评分
|
|
|
cell.setCellValue(addThis(o.getHtScore()));
|
|
|
- }else if(i==74){//实际申报批次
|
|
|
+ }else if(i==78){//实际申报批次
|
|
|
cell.setCellValue(addThis(o.getHtBatch()));
|
|
|
- }else if(i==75){//是否重点关注
|
|
|
+ }else if(i==79){//是否重点关注
|
|
|
if(o.getHtFocus()==null){
|
|
|
cell.setCellValue("");
|
|
|
}else {
|
|
|
cell.setCellValue(o.getHtFocus()==1?"是":"否");
|
|
|
}
|
|
|
- }else if(i==76){//网上系统提交
|
|
|
+ }else if(i==80){//网上系统提交
|
|
|
addParam(cell,o.getWebSubmit(),o.getWebSubmitOther());
|
|
|
- }else if(i==77){//纸质材料提交
|
|
|
+ }else if(i==81){//纸质材料提交
|
|
|
addParam(cell,o.getPaperSubmit(),o.getPaperSubmitOther());
|
|
|
- }else if(i==78){//省级-拟公示序号
|
|
|
+ }else if(i==82){//省级-拟公示序号
|
|
|
if(o.getReviewProvince()==null){
|
|
|
cell.setCellValue("");
|
|
|
}else {
|
|
|
@@ -2237,7 +2255,7 @@ public class NewExcelUtil<T> {
|
|
|
cell.setCellValue("公示,序号:"+o.getReviewProvinceNumber());
|
|
|
}
|
|
|
}
|
|
|
- }else if(i==79){//国家级-高企编号
|
|
|
+ }else if(i==83){//国家级-高企编号
|
|
|
if(o.getReviewCountry()==null){
|
|
|
cell.setCellValue("");
|
|
|
}else {
|
|
|
@@ -2247,7 +2265,7 @@ public class NewExcelUtil<T> {
|
|
|
cell.setCellValue("公示,编号:"+o.getReviewCountryNumber());
|
|
|
}
|
|
|
}
|
|
|
- }else if(i==80){//更新时间
|
|
|
+ }else if(i==84){//更新时间
|
|
|
if(o.getUpdateTime()==null){
|
|
|
cell.setCellValue("");
|
|
|
}else {
|