Merge remote-tracking branch 'origin/dev' into dev

cjl

2023-11-22 319fdcaa2d7979b056b2801e11d08fe6ecdff126

 screen-api/src/main/java/com/moral/api/controller/AllocationController.java

@@ -7,6 +7,7 @@
import com.moral.api.entity.ResponsibilityUnit;
import com.moral.api.pojo.enums.AllocationApproveEnum;
import com.moral.api.pojo.enums.ChangeEnum;
import com.moral.api.pojo.enums.YesOrNo;
import com.moral.api.pojo.ext.allocation.AllocationExcelExt;
import com.moral.api.pojo.ext.allocation.AllocationExt;
import com.moral.api.pojo.ext.allocation.AllocationPageExt;
@@ -248,7 +249,7 @@
                urls.add(handleFileRealPath(z.getFileAddress()));
            }
            item.setChangeTypeStr(Objects.isNull(excelExt.getChangeType())?" ":ChangeEnum.getByValue(excelExt.getChangeType()).getName());
            item.setChangeStr(Objects.isNull(excelExt.getIsChange())?"否":ChangeEnum.getByValue(excelExt.getChangeType()).getName());
            item.setChangeStr(Objects.isNull(excelExt.getIsChange())?"否": YesOrNo.getByValue(excelExt.getIsChange()).getName());
            item.setWriteCellDataFile(urls);
            List<String> urlsAfter = new ArrayList<>();
            for(FileAddressVo z : excelExt.getFileChangeList()){
@@ -265,6 +266,7 @@
            response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
        EasyExcel.write(response.getOutputStream(), AllocationListExcelVo.class)
                .registerWriteHandler(new CustomImageModifyHandler()).sheet("交办单").doWrite(demoDataList);
            response.getOutputStream().close();
        }catch (Exception e){
            log.error("error result ",e);
        }