bug修改

无关风月

2025-09-24 447e07c3067b0370e47e7d2967ffef7935388601

bug修改

 cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java

@@ -406,9 +406,15 @@
                    TStudent tStudent = tStudents.stream().filter(e -> e.getId().equals(Integer.valueOf(payHuimin.getStudentId().split(",")[0]))).findFirst().orElse(null);
                    if (tStudent!=null){
                        huiminCardVO1.setStudentName(tStudent.getName());
                        String temp = "{\"id\":"+payHuimin.getId()  + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tStudent.getId() + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + "}";
                        huiminCardVO1.setQrCode(temp);

                    }else{
                        huiminCardVO1.setStudentName("");

                        String temp = "{\"id\":"+payHuimin.getId()  + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tStudent.getId() + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + "}";
                        huiminCardVO1.setQrCode(temp);
                    }
                    String temp = "{\"id\":"+payHuimin.getId()  + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tStudent.getId() + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + "}";
                    huiminCardVO1.setQrCode(temp);
                    huiminCardVOS.add(huiminCardVO1);
                    integers.add(payHuimin.getCardId());

@@ -659,9 +665,13 @@
                TStudent tStudent = tStudents.stream().filter(e -> e.getId().equals(studentId)).findFirst().orElse(null);
                if (tStudent!=null){
                    huiminCardStudentVO.setStudentName(tStudent.getName());
                    String temp = "{\"id\":"+tPayHuimin.getId()  + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tStudent.getId() + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + "}";
                    huiminCardStudentVO.setQrCode(temp);
                }else{
                    huiminCardStudentVO.setStudentName("");
                    String temp = "{\"id\":"+tPayHuimin.getId()  + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tStudent.getId() + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + "}";
                    huiminCardStudentVO.setQrCode(temp);
                }
                String temp = "{\"id\":"+tPayHuimin.getId()  + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tStudent.getId() + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + "}";
                huiminCardStudentVO.setQrCode(temp);

            }


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

@@ -350,7 +350,7 @@
     */
    @RequestMapping("/lockSite/{id}")
    public String lockSite(Model model,@PathVariable("id") Integer id) {
        DateFormat dateformat = new SimpleDateFormat("yyyy-MM-dd hh:mm");
        DateFormat dateformat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
        List<TSiteLockDTO> listById = siteLockClient.getListById(id);
        for (TSiteLockDTO tSiteLockDTO : listById) {
            tSiteLockDTO.setSsTime(dateformat.format(tSiteLockDTO.getStartTime()));

 cloud-server-management/src/main/webapp/static/modular/system/tSite/tSiteLock.js

@@ -21,6 +21,9 @@
    console.log(id)
    var startTime = $("#start-time").val().replace("T"," ");
    var endTime =   $("#end-time").val().replace("T"," ");
    if (startTime==null || startTime=='' || endTime==null || endTime==''){
        Feng.error("请选择正确的时间!");
    }
    data1 = {
        siteId:id,
        startTime:startTime,