法规意见收集、法规技术评估导出完善。
This commit is contained in:
+11
-2
@@ -191,14 +191,23 @@ public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl<LawsOp
|
||||
|
||||
this.disposeData(exportData,lawsOpinionAssessmentResultEO,cut);
|
||||
|
||||
String lawsOpinionGatherId = (String)params.get("lawsOpinionGatherId");
|
||||
if(StringUtils.isEmpty(lawsOpinionGatherId)){
|
||||
if(StringUtils.equals(cut,CutEnum.CN.getValue())){
|
||||
throw new JeroBootException("法规意见收集id为空,请检查!");
|
||||
}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
|
||||
throw new JeroBootException("The lawsOpinionGatherId is empty, please check!");
|
||||
}
|
||||
}
|
||||
LawsOpinionGatherEO lawsOpinionGatherEO = this.lawsOpinionGatherEOService.queryById(lawsOpinionGatherId);
|
||||
String title = "";
|
||||
String fileName = "";
|
||||
if(StringUtils.equals(cut, CutEnum.CN.getValue())){
|
||||
title = "相关章节,问题/建议,理由,条款内容,附件,评估人,提出时间";
|
||||
fileName = "评估结果" + ".xls";
|
||||
fileName = lawsOpinionGatherEO.getSerialNumber() + " 评估结果" + ".xls";
|
||||
}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
|
||||
title = "Related section,IssueOrSuggest,Reason,Item Content,Accessory,Evaluator,Submit Date";
|
||||
fileName = "Evaluation results" + ".xls";
|
||||
fileName = lawsOpinionGatherEO.getSerialNumber() + " Evaluation results" + ".xls";
|
||||
}
|
||||
|
||||
OutputStream os = null;
|
||||
|
||||
+15
-2
@@ -11,11 +11,13 @@ import com.jero.common.system.vo.LoginUser;
|
||||
import com.jero.common.util.FileUtils;
|
||||
import com.jero.common.util.oss.CosBootUtil;
|
||||
import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationComplianceResultEO;
|
||||
import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO;
|
||||
import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO;
|
||||
import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationResultEO;
|
||||
import com.jero.modules.lawsTechnologyEvaluation.enums.ComplianceResultEnum;
|
||||
import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationComplianceResultEOMapper;
|
||||
import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationComplianceResultEOService;
|
||||
import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationEOService;
|
||||
import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationFlowDetailEOService;
|
||||
import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationResultEOService;
|
||||
import com.jero.modules.oss.entity.OSSFile;
|
||||
@@ -64,6 +66,8 @@ public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends Servi
|
||||
private ILawsTechnologyEvaluationFlowDetailEOService lawsTechnologyEvaluationFlowDetailEOService;
|
||||
@Autowired
|
||||
private ISysUserService sysUserService;
|
||||
@Autowired
|
||||
private ILawsTechnologyEvaluationEOService lawsTechnologyEvaluationEOService;
|
||||
|
||||
/**
|
||||
* 保存
|
||||
@@ -173,6 +177,15 @@ public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends Servi
|
||||
Map<String, Object> params) {
|
||||
String ids = (String)params.get("ids");
|
||||
String cut = (String)params.get("cut");
|
||||
String lawsTechnologyEvaluationId = (String)params.get("lawsTechnologyEvaluationId");
|
||||
if(StringUtils.isEmpty(lawsTechnologyEvaluationId)){
|
||||
if(StringUtils.equals(cut,CutEnum.CN.getValue())){
|
||||
throw new JeroBootException("法规技术评估id为空,请检查!");
|
||||
}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
|
||||
throw new JeroBootException("The lawsTechnologyEvaluationId is empty, please check!");
|
||||
}
|
||||
}
|
||||
LawsTechnologyEvaluationEO lawsTechnologyEvaluationEO = this.lawsTechnologyEvaluationEOService.queryById(lawsTechnologyEvaluationId);
|
||||
|
||||
if(!StringUtils.isEmpty(ids)){
|
||||
lawsTechnologyEvaluationComplianceResultEO.setIds(ids);
|
||||
@@ -187,12 +200,12 @@ public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends Servi
|
||||
if(org.apache.commons.lang3.StringUtils.equals(cut, CutEnum.CN.getValue())){
|
||||
title = "相关章节,问题说明,附件";
|
||||
bottomTitle = "符合性结果:";
|
||||
fileName = "评估结果" + ".xls";
|
||||
fileName = lawsTechnologyEvaluationEO.getSerialNumber() + " 评估结果" + ".xls";
|
||||
sheetName = "反馈结果";
|
||||
}else if(org.apache.commons.lang3.StringUtils.equals(cut,CutEnum.EN.getValue())){
|
||||
title = "Related section,Problem description,Accessory";
|
||||
bottomTitle = "Compliance results:";
|
||||
fileName = "Evaluation results" + ".xls";
|
||||
fileName = lawsTechnologyEvaluationEO.getSerialNumber() + " Evaluation results" + ".xls";
|
||||
sheetName = "Feedback result";
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user