|
@@ -18,6 +18,7 @@ import com.rongwei.bsentity.domain.ZhcxProjectRectifyMachineDo;
|
|
import com.rongwei.bsentity.dto.project.*;
|
|
import com.rongwei.bsentity.dto.project.*;
|
|
import com.rongwei.rwcommon.base.exception.CustomException;
|
|
import com.rongwei.rwcommon.base.exception.CustomException;
|
|
import com.rongwei.rwcommon.utils.SecurityUtil;
|
|
import com.rongwei.rwcommon.utils.SecurityUtil;
|
|
|
|
+import com.rongwei.rwcommon.utils.StringUtils;
|
|
import com.rongwei.rwcommoncomponent.excel.aspose.ExcelUtils;
|
|
import com.rongwei.rwcommoncomponent.excel.aspose.ExcelUtils;
|
|
import com.rongwei.rwcommoncomponent.file.dto.SysFileItemParamDto;
|
|
import com.rongwei.rwcommoncomponent.file.dto.SysFileItemParamDto;
|
|
import com.rongwei.rwcommoncomponent.file.service.SysFileItemService;
|
|
import com.rongwei.rwcommoncomponent.file.service.SysFileItemService;
|
|
@@ -186,6 +187,8 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
|
|
main.setRemark1(row.getString("备注1"));
|
|
main.setRemark1(row.getString("备注1"));
|
|
main.setRemark2(row.getString("备注2"));
|
|
main.setRemark2(row.getString("备注2"));
|
|
|
|
|
|
|
|
+ main.setMachineno(StringUtils.join(summaryDataBo.getPrjDeviceNumMap().keySet(), ","));
|
|
|
|
+
|
|
mainList.add(main);
|
|
mainList.add(main);
|
|
|
|
|
|
JSONObject children = row.getJSONObject("children");
|
|
JSONObject children = row.getJSONObject("children");
|