bug: 企标计划、国内、海外、企标导出修改字段
This commit is contained in:
wxyclub
+38
-39
@@ -8,8 +8,7 @@ import com.adc.da.http.PageInfo;
|
||||
import com.adc.da.http.ResponseMessage;
|
||||
import com.adc.da.http.Result;
|
||||
import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService;
|
||||
import com.adc.da.slrs.sarEnterpriseStandardEvaluation.dao.QualityEvaluationDao;
|
||||
import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.QualityEvaluation;
|
||||
import com.adc.da.slrs.sarEnterpriseStandardEvaluation.service.IQualityEvaluationService;
|
||||
import com.adc.da.utils.util.EsRevisePlanExportUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
@@ -29,10 +28,7 @@ import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.io.IOException;
|
||||
import java.io.OutputStream;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.*;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
@@ -52,7 +48,7 @@ public class EsRevisePlanController extends BaseController<EsRevisePlan> {
|
||||
@Autowired
|
||||
IEsRevisePlanService iEsRevisePlanService;
|
||||
@Autowired
|
||||
private QualityEvaluationDao qualityEvaluationDao;
|
||||
private IQualityEvaluationService qualityEvaluationService;
|
||||
|
||||
@ApiOperation(value = "获取所有企标计划")
|
||||
@GetMapping("getAllPlans")
|
||||
@@ -106,38 +102,41 @@ public class EsRevisePlanController extends BaseController<EsRevisePlan> {
|
||||
revisePlan.setArea(area);
|
||||
//查评分
|
||||
if (ObjectUtils.isNotEmpty(revisePlan.getStandId())) {
|
||||
List<Double> last = new ArrayList<>();
|
||||
List<QualityEvaluation> evaluations = qualityEvaluationDao.getEvaluationForm(new QueryWrapper<QualityEvaluation>().eq("law_id", revisePlan.getStandId()).eq("evaluation_type", "quality"));
|
||||
for (QualityEvaluation evaluation : evaluations) {
|
||||
Double score;
|
||||
String value;
|
||||
if (evaluation.getProcessNode()==null){
|
||||
value="";
|
||||
}else {
|
||||
value=evaluation.getProcessNode();
|
||||
}
|
||||
String evaluationScore = ObjectUtils.isEmpty(evaluation.getScore()) ? "0" : evaluation.getScore();
|
||||
switch (value){
|
||||
case "征求意见":
|
||||
score=Double.valueOf(evaluationScore) * 0.3;
|
||||
break;
|
||||
case "技术委员会评审、评审意见修改":
|
||||
score=Double.valueOf(evaluationScore) * 0.4;
|
||||
break;
|
||||
case "重新技术委员会评审、评审意见修改":
|
||||
score=Double.valueOf(evaluationScore) * 0.4;
|
||||
break;
|
||||
case "标准化复审":
|
||||
score=Double.valueOf(evaluationScore) * 0.15;
|
||||
break;
|
||||
case "标准法规部高级经理审核":
|
||||
score=Double.valueOf(evaluationScore) * 0.15;
|
||||
break;
|
||||
default: score=Double.valueOf(evaluationScore);
|
||||
}
|
||||
last.add(score);
|
||||
}
|
||||
revisePlan.setScore(last.stream().mapToDouble(Double::doubleValue).sum());
|
||||
Map<String, Double> score = qualityEvaluationService.getScore(revisePlan.getStandId());
|
||||
revisePlan.setScore(score.get("finalScore"));
|
||||
// List<Double> last = new ArrayList<>();
|
||||
// List<QualityEvaluation> evaluations = qualityEvaluationDao.getEvaluationForm(new QueryWrapper<QualityEvaluation>().eq("law_id", revisePlan.getStandId()).eq("evaluation_type", "quality"));
|
||||
// for (QualityEvaluation evaluation : evaluations) {
|
||||
// Double score;
|
||||
// String value;
|
||||
// if (evaluation.getProcessNode()==null){
|
||||
// value="";
|
||||
// }else {
|
||||
// value=evaluation.getProcessNode();
|
||||
// }
|
||||
// String evaluationScore = ObjectUtils.isEmpty(evaluation.getScore()) ? "0" : evaluation.getScore();
|
||||
// switch (value){
|
||||
// case "征求意见":
|
||||
// score=Double.valueOf(evaluationScore) * 0.3;
|
||||
// break;
|
||||
// case "技术委员会评审、评审意见修改":
|
||||
// score=Double.valueOf(evaluationScore) * 0.4;
|
||||
// break;
|
||||
// case "重新技术委员会评审、评审意见修改":
|
||||
// score=Double.valueOf(evaluationScore) * 0.4;
|
||||
// break;
|
||||
// case "标准化复审":
|
||||
// score=Double.valueOf(evaluationScore) * 0.15;
|
||||
// break;
|
||||
// case "标准法规部高级经理审核":
|
||||
// score=Double.valueOf(evaluationScore) * 0.15;
|
||||
// break;
|
||||
// default: score=Double.valueOf(evaluationScore);
|
||||
// }
|
||||
// last.add(score);
|
||||
// }
|
||||
// revisePlan.setScore(last.stream().mapToDouble(Double::doubleValue).sum());
|
||||
|
||||
}
|
||||
}
|
||||
workbook = EsRevisePlanExportUtil.exportDatas(datas);
|
||||
|
||||
@@ -33,9 +33,15 @@ public class FieldConvertUtil {
|
||||
public static String exportBaseFieldNames = "标准体系,是否纳入认证清单,标准性质,标准类别,标准编号,标准年份,中文名称,英文名称," +
|
||||
"文本状态,发布日期"; // 导出基础表字段 //删除 实施日期 2021-05-28
|
||||
|
||||
public static String exportBaseFieldNewNames = "标准体系,是否纳入认证清单,标准性质,标准编号,中文名称,英文名称," +
|
||||
"文本状态,发布日期"; // 导出基础表字段 //删除 标准类别 标准编号 标准年份 ，统一为标准编号 2023-11-13
|
||||
|
||||
public static String exportBaseFieldNamesForeign = "标准类别,标准编号,标准年份,中文名称,英文名称," +
|
||||
"文本状态,发布日期,是否纳入认证清单,标准体系,适用认证,能源类型";// 导出基础表字段
|
||||
|
||||
public static String exportBaseFieldNamesNewForeign = "标准编号,中文名称,英文名称," +
|
||||
"文本状态,发布日期,是否纳入认证清单,标准体系,适用认证,能源类型";// 导出基础表字段 //删除 标准类别 标准编号 标准年份 ，统一为标准编号 2023-11-13
|
||||
|
||||
public static String exportAttrFieldNamesInland = "归口管理部门,发布机构,工作组信息,我司参与深度,适用车辆类型,要求类型," +
|
||||
"标签,发布稿（必读）,增补件（必读）,报批稿,送审稿,征求意见稿,草案,相关资料,新车型实施日期（文本）,在产车实施日期（文本）," +
|
||||
"EOP实施日期（文本）,责任部门,相关部门,SVPPS,FO,项目评估角色,法规维护人,代替标准编号," +
|
||||
|
||||
@@ -39,17 +39,21 @@ public class StandExportUtil {
|
||||
}
|
||||
for (SarStandAttrDetails detailsEO : detailsEOList) {
|
||||
if (!InitStandAttrUtil.fileFieldList.contains(detailsEO.getAttrField())) {
|
||||
attrBud.append(detailsEO.getAttrName() + ",");
|
||||
attrInfoMap.put(detailsEO.getAttrName(),detailsEO.getAttrField());
|
||||
// 去掉 参会记录 和 相关流程 两个导出字段 2023-11-13
|
||||
if("参会记录".equals(detailsEO.getAttrName()) || "相关流程".equals(detailsEO.getAttrName())) {
|
||||
continue;
|
||||
}
|
||||
attrBud.append(detailsEO.getAttrName() + ",");
|
||||
}
|
||||
}
|
||||
String header = FieldConvertUtil.exportBaseFieldNames + "," + attrBud.toString();
|
||||
String header = FieldConvertUtil.exportBaseFieldNewNames + "," + attrBud.toString();
|
||||
//国内导出去掉体系类别
|
||||
if (SarTypeEnum.INLAND_STAND.getValue().equals(standType)) {
|
||||
header = header.replace(",体系类别","");
|
||||
}
|
||||
if (SarTypeEnum.FOREIGN_STAND.getValue().equals(standType)) {
|
||||
header = FieldConvertUtil.exportBaseFieldNamesForeign + "," + attrBud.toString();
|
||||
header = FieldConvertUtil.exportBaseFieldNamesNewForeign + "," + attrBud.toString();
|
||||
}
|
||||
//创建工作表对象
|
||||
Sheet sheet = workbook.createSheet();
|
||||
@@ -125,9 +129,9 @@ public class StandExportUtil {
|
||||
case "适用区域":
|
||||
value = verifyBean(sarStandardsInfoEO.getCountryShow());
|
||||
break;
|
||||
case "标准类别":
|
||||
value = verifyBean(sarStandardsInfoEO.getStandSortShow());
|
||||
break;
|
||||
// case "标准类别":
|
||||
// value = verifyBean(sarStandardsInfoEO.getStandSortShow());
|
||||
// break;
|
||||
case "重要度":
|
||||
if (StringUtils.isNotBlank(sarStandardsInfoEO.getIsRelateAccess())) {
|
||||
if ("1".equals(sarStandardsInfoEO.getIsRelateAccess())) {
|
||||
@@ -138,11 +142,14 @@ public class StandExportUtil {
|
||||
}
|
||||
value = sarStandardsInfoEO.getIsRelateAccess();
|
||||
break;
|
||||
// case "标准编号":
|
||||
// value = verifyBean(sarStandardsInfoEO.getStandNumber());
|
||||
// break;
|
||||
// case "标准年份":
|
||||
// value = verifyBean(sarStandardsInfoEO.getStandYear());
|
||||
// break;
|
||||
case "标准编号":
|
||||
value = verifyBean(sarStandardsInfoEO.getStandNumber());
|
||||
break;
|
||||
case "标准年份":
|
||||
value = verifyBean(sarStandardsInfoEO.getStandYear());
|
||||
value = sarStandardsInfoEO.getStandCode();
|
||||
break;
|
||||
case "中文名称":
|
||||
value = verifyBean(sarStandardsInfoEO.getStandName());
|
||||
|
||||
+2
@@ -44,6 +44,7 @@
|
||||
<result column="stand_name" property="standName"/>
|
||||
<result column="stand_year" property="standYear"/>
|
||||
<result column="stand_number" property="standNumber"/>
|
||||
<result property="standCode" column="standCode" />
|
||||
<result column="id" property="id"/>
|
||||
</resultMap>
|
||||
|
||||
@@ -115,6 +116,7 @@
|
||||
SAR_STANDARDS_INFO.stand_sort,
|
||||
SAR_STANDARDS_INFO.stand_number,
|
||||
SAR_STANDARDS_INFO.stand_year,
|
||||
concat(SAR_STANDARDS_INFO.stand_sort,' ',SAR_STANDARDS_INFO.stand_number,'-',SAR_STANDARDS_INFO.stand_year) as standCode,
|
||||
SAR_STANDARDS_INFO.stand_name,
|
||||
SAR_STANDARDS_INFO.stand_en_name,
|
||||
SAR_STANDARDS_INFO.stand_state,
|
||||
|
||||
Reference in New Issue
Block a user