Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager

lxw

2023-03-01 558ffb85c9548c25023623b3458e2e0d8406bc7c

Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager

 src/main/java/com/whyc/controller/ECRController.java

@@ -15,6 +15,7 @@
import java.io.IOException;
import java.text.ParseException;
import java.util.Date;
import java.util.List;

/**
 * 设 计 工  程  变  更  申  请  调  查  表(ECR)
@@ -65,10 +66,10 @@
        return service.searchEcr(number,subCode,subModel,testTime1,testTime2,pageCurr,pageSize);
    }

    @ApiOperation("导出所有记录")
    @ApiOperation("导出记录")
    @GetMapping("exportExcel")
    public void exportExcel(HttpServletResponse response){
        service.exportExcel(response);
    public void exportExcel(HttpServletResponse response,@RequestParam(required = false) List<Integer> ids){
        service.exportExcel(response,ids);
    }

    @ApiOperation("删除ECR记录")

 src/main/java/com/whyc/service/ECRService.java

@@ -331,9 +331,17 @@
        return list;
    }

    public void exportExcel(HttpServletResponse response) {
        //查询所有
        List<ECR> ecrList = mapper.selectList(null);
    public void exportExcel(HttpServletResponse response, List<Integer> ids) {
        List<ECR> ecrList;
        if(ids == null) {
            //查询所有
            ecrList = mapper.selectList(null);
        }else{
            //查询ids的记录
            QueryWrapper<ECR> query = Wrappers.query();
            query.in("id",ids);
            ecrList = mapper.selectList(query);
        }
        int size = ecrList.size();
        //ECR编号,申请日期,申请人,变更描述,变更料号,变更型号,变更所属型号,处理方式,创建时间
        String[] title = new String[]{"年份","ECR编号","申请日期","申请人","变更描述","变更料号","变更型号","变更所属型号","处理方式","创建时间"};