diff --git a/src/main/java/com/bonus/aqgqj/business/backstage/service/plan/PlanApplyServiceImpl.java b/src/main/java/com/bonus/aqgqj/business/backstage/service/plan/PlanApplyServiceImpl.java index 20d3b2c..deef7b4 100644 --- a/src/main/java/com/bonus/aqgqj/business/backstage/service/plan/PlanApplyServiceImpl.java +++ b/src/main/java/com/bonus/aqgqj/business/backstage/service/plan/PlanApplyServiceImpl.java @@ -190,7 +190,24 @@ public class PlanApplyServiceImpl implements PlanApplyService { data.setName(row.getCell(2).getStringCellValue()); //物资名称 data.setModel(row.getCell(3).getStringCellValue()); //物资型号 data.setUnitName(row.getCell(4).getStringCellValue()); //单位 - data.setNeedNum(row.getCell(5).getStringCellValue()); //数量 +// data.setNeedNum(row.getCell(5).getStringCellValue()); //数量 + Cell cell5 = row.getCell(5); + if(cell5 != null){ + String needNum ; + switch (cell5.getCellType()){ + case STRING: + needNum = cell5.getStringCellValue(); + break; + case NUMERIC: + needNum = String.valueOf(cell5.getNumericCellValue()); + break; + default: + needNum = ""; + break; + } + data.setNeedNum(needNum); + } + Cell cell = row.getCell(6); // 假设时间是在第7列(0-based index 6) if (cell != null) { String timeValue; diff --git a/src/main/resources/mappers/business/backstage/PlanApplyMapper.xml b/src/main/resources/mappers/business/backstage/PlanApplyMapper.xml index d22d718..d70a0a0 100644 --- a/src/main/resources/mappers/business/backstage/PlanApplyMapper.xml +++ b/src/main/resources/mappers/business/backstage/PlanApplyMapper.xml @@ -285,8 +285,8 @@ INNER JOIN st_contract sc ON sct.contract_id = sc.id AND sc.is_active = '0' AND CURRENT_DATE BETWEEN sc.start_time AND sc.end_time ) a ON a.modelId = mt.id WHERE mt.level = '3' - and mt3.name = #{type} - and mt2.name = #{name} - and mt.name = #{model} + and mt3.name = #{param.type} + and mt2.name = #{param.name} + and mt.name = #{param.model} \ No newline at end of file