优化

zhibing.pu

2024-06-24 f6d15260d3fdcb326869f541a266bc4688a1b101

优化

 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java

@@ -311,9 +311,10 @@
            map.put("total", 0);
            return map;
        }
        List<WorldCupPaymentParticipant> list1 = this.list(new QueryWrapper<WorldCupPaymentParticipant>().in("worldCupPaymentId", collect));
        List<WorldCupPaymentParticipant> list1 = this.list(new QueryWrapper<WorldCupPaymentParticipant>().in("worldCupPaymentId", collect).orderByDesc("createTime"));
        List<Map<String, Object>> list2 = new ArrayList<>();
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
        SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        for (WorldCupPaymentParticipant on : list1) {
            WorldCupPayment worldCupPayment = worldCupPaymentService.getById(on.getWorldCupPaymentId());
            Map<String, Object> map1 = new HashMap<>();
@@ -337,6 +338,7 @@
                map1.put("phone", ToolUtil.isEmpty(tStudent.getPhone()) ? appUser.getPhone() : tStudent.getPhone());
                map1.put("idcard", tStudent.getIdCard());
                map1.put("state", worldCupPayment.getPayStatus() - 1);
                map1.put("insertTime", sdf1.format(worldCupPayment.getPayTime()));
            }else{
                Participant participant = participantClient.getParticipant(on.getParticipantId());
                if(ToolUtil.isNotEmpty(name) && participant.getName().indexOf(name) == -1){
@@ -356,6 +358,7 @@
                map1.put("phone", ToolUtil.isNotEmpty(participant.getPhone()) ? participant.getPhone() : appUser.getPhone());
                map1.put("idcard", participant.getIdcard());
                map1.put("state", worldCupPayment.getPayStatus() - 1);
                map1.put("insertTime", sdf1.format(worldCupPayment.getPayTime()));
            }
            list2.add(map1);
        }

 cloud-server-competition/src/main/java/com/dsh/competition/feignclient/model/CompetitionUser.java

@@ -1,6 +1,9 @@
package com.dsh.competition.feignclient.model;

import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;

import java.util.Date;

@Data
public class CompetitionUser {
@@ -11,4 +14,6 @@
    private String phone;
    private String idCard;
    private Integer state;
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date insertTime;
}

 cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java

@@ -303,6 +303,7 @@
            if(null != paymentCompetition){
                competitionUser.setState(paymentCompetition.getPayStatus());
            }
            competitionUser.setInsertTime(userCompetition.getInsertTime());
            list.add(competitionUser);
        }
        Page<CompetitionUser> page = new Page<>();

 cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/CompetitionUser.java

@@ -1,6 +1,9 @@
package com.dsh.course.feignClient.competition.model;

import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;

import java.util.Date;

@Data
public class CompetitionUser {
@@ -11,4 +14,6 @@
    private String phone;
    private String idCard;
    private Integer state;
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date insertTime;
}

 cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetitionUser.js

@@ -31,6 +31,8 @@
        },
        {title:  '身份证号', field: 'idCard', visible: true, align: 'center', valign: 'middle',width:'8%',
        },
        {title:  '报名时间', field: 'insertTime', visible: true, align: 'center', valign: 'middle',width:'8%',
        },
        {title: '状态', field: 'state', visible: true, align: 'center', valign: 'middle',width:'8%',
            formatter:function (data) {
                return {1:"正常",2:"正常",3:"已取消"}[data]

 cloud-server-management/src/main/webapp/static/modular/system/worldCup/registeredPersonnel.js

@@ -24,6 +24,7 @@
                return '<a href="#" onclick="RegisteredPersonnel.openQRCode(' + item.id + ', ' + item.isStudent + ',\'' + item.name + '\')" style="color:blue;">查看</a>'
            }
        },
        {title: '报名时间', field: 'insertTime', visible: true, align: 'center', valign: 'middle'},
        {title: '状态', field: 'state', visible: true, align: 'center', valign: 'middle',
            formatter:function (data) {
                return {1:"正常",2:"已取消"}[data]