update

liujie

5 天以前 08c181231519361f1b7a533d1c7d8b00b776e787

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupController.java

@@ -196,9 +196,9 @@
    @PostMapping("/editWorldCup")
    public ResultUtil editWorldCup(WorldCup worldCup, String stores){
        WorldCup worldCup1 = worldCupClient.getWorldCupById(worldCup.getId());
        if(worldCup1.getStartTime().before(DateUtil.getDate())){
            return ResultUtil.error("赛事已开始，不能编辑");
        }
//        if(worldCup1.getStartTime().before(DateUtil.getDate())){
//            return ResultUtil.error("赛事已开始，不能编辑");
//        }
        Integer maxPeople = worldCup1.getMaxPeople();
        int registeredNumber = worldCupClient.getRegisteredNumber(worldCup.getId());
        if(maxPeople.compareTo(registeredNumber) < 0){
@@ -272,11 +272,13 @@
            response.setContentType("APPLICATION/OCTET-STREAM");
            response.setHeader("Content-Disposition","attachment; filename=" + URLEncoder.encode("二维码", "UTF-8") + ".zip");
            ZipOutputStream out = new ZipOutputStream(response.getOutputStream());
            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
            for(Map<String, Object> map : list){
                String id = map.get("id").toString();
                String isStudent = map.get("isStudent").toString();
                String name = map.get("name").toString();
                QRCodeUtils.encode("{\"id\":" + id + ",\"isStudent\":" + isStudent + "}", name, "/usr/playpai/qrcode", false);
                String name = map.get("name").toString() + sdf.format(new Date());
                String content = "{\"id\":" + id + ",\"isStudent\":" + isStudent + "}";
                QRCodeUtils.encode(content, name, "/usr/playpai/qrcode", false);
                File file = new File("/usr/playpai/qrcode/" + name + ".jpg");
                FileInputStream fileInputStream = new FileInputStream(file);

@@ -322,7 +324,7 @@
                values[i][1] = d.get("gender").toString();
                values[i][2] = d.get("age").toString();
                values[i][3] = d.get("phone").toString();
                values[i][4] = d.get("idcard").toString();
                values[i][4] = d.get("idcard")==null ? "" : d.get("idcard").toString();
                Integer state1 = Integer.valueOf(d.get("state").toString());
                if(1 == state1){
                    values[i][5] = "正常";