整改清单报表导出

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxProjectManageServiceImpl.java

@@ -3,6 +3,7 @@ package com.rongwei.bscommon.sys.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.aspose.cells.*;
@@ -354,7 +355,8 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
         String listId = (String) summaryfiles;
         String projectId = (String) projectIdobj;
         ResponseVO responseVO = luckySheetFeignService.getLuckySheetJson(listId);
-        List<JSONObject> jsonObjects = JsonUtil.convertToJsonObjectList(responseVO.getData());
+        //List<JSONObject> jsonObjects = JsonUtil.convertToJsonObjectList(responseVO.getData());
+        List<JSONObject> jsonObjects = JSON.parseArray(JSON.toJSONString(responseVO.getData()), JSONObject.class);
         ExportProjectSummaryDto dto = new ExportProjectSummaryDto();
         dto.setSheetList(jsonObjects);
         dto.setProjectId(projectId);
@@ -507,6 +509,7 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
 
                     List<RectifyMachineDto> innerDataList = row.getData();
                     colIndex = 2;
+                    colorIndex = 0;
                     for (String no : noList) {
                         RectifyMachineDto rectifyMachineDto = innerDataList.stream()
                                 .filter(innerRow -> no.equals(innerRow.getNo()))