|
@@ -3827,6 +3827,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
if (nameCell != null)nameCell.setCellType(CellType.STRING);
|
|
if (nameCell != null)nameCell.setCellType(CellType.STRING);
|
|
if (categoryCell != null)categoryCell.setCellType(CellType.STRING);
|
|
if (categoryCell != null)categoryCell.setCellType(CellType.STRING);
|
|
if (isPublicCell != null)isPublicCell.setCellType(CellType.STRING);
|
|
if (isPublicCell != null)isPublicCell.setCellType(CellType.STRING);
|
|
|
|
+ if (descCell != null)descCell.setCellType(CellType.STRING);
|
|
if (subNameCell != null)subNameCell.setCellType(CellType.STRING);
|
|
if (subNameCell != null)subNameCell.setCellType(CellType.STRING);
|
|
if (participatorCell != null)participatorCell.setCellType(CellType.STRING);
|
|
if (participatorCell != null)participatorCell.setCellType(CellType.STRING);
|
|
if (inchargerCell != null)inchargerCell.setCellType(CellType.STRING);
|
|
if (inchargerCell != null)inchargerCell.setCellType(CellType.STRING);
|
|
@@ -3947,7 +3948,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
project.setContractAmount(Double.parseDouble(amountCell.getStringCellValue()));
|
|
project.setContractAmount(Double.parseDouble(amountCell.getStringCellValue()));
|
|
}
|
|
}
|
|
if(descCell!=null&&!StringUtils.isEmpty(descCell.getStringCellValue())){
|
|
if(descCell!=null&&!StringUtils.isEmpty(descCell.getStringCellValue())){
|
|
- project.setProjectDesc(amountCell.getStringCellValue());
|
|
|
|
|
|
+ project.setProjectDesc(descCell.getStringCellValue());
|
|
}
|
|
}
|
|
if (isPublicCell != null && !StringUtils.isEmpty(isPublicCell.getStringCellValue())) {
|
|
if (isPublicCell != null && !StringUtils.isEmpty(isPublicCell.getStringCellValue())) {
|
|
project.setIsPublic(MessageUtils.message("excel.yes").equals(isPublicCell.getStringCellValue())?1:0);
|
|
project.setIsPublic(MessageUtils.message("excel.yes").equals(isPublicCell.getStringCellValue())?1:0);
|