Merge remote-tracking branch 'origin/cjl' into qa

cjl

2023-12-14 6992aaf0587c09f7c511c1afd12e1519d91363d3

 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;
@@ -24,6 +25,7 @@
import com.moral.util.DateUtils;
import com.moral.util.WebUtils;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -44,6 +46,7 @@
@Api(tags = {"立行立改"})
@RestController
@RequestMapping("allocation")
@Slf4j
public class AllocationController {

    @Value("${file.path}")
@@ -96,6 +99,7 @@
     */
    @PostMapping("update")
    @ApiOperation("修改")

    public ResultMessage update(@Valid @RequestBody AllocationUpdateCond allocationUpdateCond){
        allocationService.updateAll(allocationUpdateCond);
        return ResultMessage.ok();
@@ -169,7 +173,6 @@
        return ResultMessage.ok(ObjectUtils.isEmpty(map1)? "0":map1);
    }


    @GetMapping("unitExel")
    public void unitExel(HttpServletResponse response,HttpServletRequest request){
        Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
@@ -226,7 +229,7 @@
        try {
            genImageExcel(extList,response);
        }catch (Exception e){

            log.error("error result ",e);
        }

    }
@@ -245,7 +248,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()){
@@ -253,7 +256,7 @@
            }
            item.setWriteCellDataFileResult(urlsAfter);
            item.setEscalationTimeStr(DateUtils.dateToDateString(excelExt.getEscalationTime(),DateUtils.yyyy_MM_dd_EN));
            item.setChangeTimeStr(DateUtils.dateToDateString(excelExt.getChangeTime(),DateUtils.yyyy_MM_dd_EN));
            item.setChangeTimeStr(Objects.isNull(excelExt.getChangeTime())?" ":DateUtils.dateToDateString(excelExt.getChangeTime(),DateUtils.yyyy_MM_dd_EN));
            demoDataList.add(item);
        }
        try {
@@ -262,8 +265,9 @@
            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);
        }
    }
    private String handleFileRealPath(String path) {