Commit b0c24bbc by wangweidong

土工平台修改

parent 7ebb90ca
...@@ -199,6 +199,9 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap ...@@ -199,6 +199,9 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
@Override @Override
public SoilOriginalRecord saveExcelOriginalRecord(Long[] ids, Long templateId, Account account) { public SoilOriginalRecord saveExcelOriginalRecord(Long[] ids, Long templateId, Account account) {
logger.error("saveExcelOriginalRecord开始生成");
RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择试验项目!"); RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择试验项目!");
RestAssert.fail(null == templateId,"请选择原始记录模板"); RestAssert.fail(null == templateId,"请选择原始记录模板");
...@@ -206,17 +209,23 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap ...@@ -206,17 +209,23 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
if (null == template){ if (null == template){
RestAssert.fail("模板不存在"); RestAssert.fail("模板不存在");
} }
logger.error("saveExcelOriginalRecord模板存在");
List<SoilExperimentVO> voList = soilExperimentService.listVOByIds(ids); List<SoilExperimentVO> voList = soilExperimentService.listVOByIds(ids);
if (CollectionUtils.isEmpty(voList)){ if (CollectionUtils.isEmpty(voList)){
return null; return null;
} }
logger.error("saveExcelOriginalRecord项目查询存在");
SoilEntrust entrust = soilEntrustService.getById(voList.get(0).getEntrustId()); SoilEntrust entrust = soilEntrustService.getById(voList.get(0).getEntrustId());
logger.error("saveExcelOriginalRecord entrust");
InputStream io = ossClient.download(template.getObjectKey()); InputStream io = ossClient.download(template.getObjectKey());
if (null == io){ if (null == io){
RestAssert.fail("模板不存在"); RestAssert.fail("模板不存在");
} }
logger.error(" InputStream io 存在");
SoilOriginalRecord objectKey=null; SoilOriginalRecord objectKey=null;
XSSFWorkbook xssfWorkbook= null; XSSFWorkbook xssfWorkbook= null;
try { try {
...@@ -238,8 +247,10 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap ...@@ -238,8 +247,10 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
if (null != template.getSampleBeginRow() if (null != template.getSampleBeginRow()
&& null!=template.getSampleMergerNum() && null!=template.getSampleMergerNum()
&& null!=template.getTemplateSampleNum()){ && null!=template.getTemplateSampleNum()){
List<SoilOriginalTemplateConfig> configList = soilOriginalTemplateConfigService.list(Condition.create().eq("template_id",templateId)); logger.error("不为空");
List<SoilOriginalTemplateConfig> configList = soilOriginalTemplateConfigService.list(Condition.create().eq("template_id",templateId));
logger.error("configList");
int templateSampleNum = template.getTemplateSampleNum(); int templateSampleNum = template.getTemplateSampleNum();
if (voList.size()<templateSampleNum){ if (voList.size()<templateSampleNum){
int beginRow = template.getSampleBeginRow(); int beginRow = template.getSampleBeginRow();
...@@ -380,6 +391,8 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap ...@@ -380,6 +391,8 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
os.flush(); os.flush();
objectKey= soilOriginalRecordService.uploadExpGenerate(ids,template,entrust, account, "原始记录生成", file); objectKey= soilOriginalRecordService.uploadExpGenerate(ids,template,entrust, account, "原始记录生成", file);
} catch (Exception e) { } catch (Exception e) {
logger.error("Exception 报错"+e.getMessage());
e.printStackTrace(); e.printStackTrace();
} finally { } finally {
try { try {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment