liujie
2023-07-26 948b7295fa09ff0edbabc2ef92875adf6ed9bc2e
后台代码删除
6个文件已修改
19个文件已添加
1427 ■■■■■ 已修改文件
cloud-server-account/src/main/java/com/dsh/account/controller/CityController.java 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/main/java/com/dsh/account/entity/TCityManager.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/main/java/com/dsh/account/mapper/CityMapper.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/main/java/com/dsh/account/service/CityService.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/main/java/com/dsh/account/service/impl/CityServiceImpl.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/main/resources/mapper/CityMapper.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-competition/src/main/java/com/dsh/competition/feignclient/model/GetPeopleQuery.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/java/com/dsh/course/feignClient/account/CityClient.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/CityListQuery.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/TCityManager.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/CompetitionClient.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/GetPeopleQuery.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/Participant.java 73 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/java/com/dsh/course/mapper/CityMapper.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCityController.java 139 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TCity.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ICityService.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CityServiceImpl.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/resources/mapper/CityMapper.xml 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCity/TCity.html 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCity/TCity_add.html 163 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCity/TCity_edit.html 401 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html 212 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/main/java/com/dsh/account/controller/CityController.java
New file
@@ -0,0 +1,39 @@
package com.dsh.account.controller;
import com.dsh.account.entity.TAppUser;
import com.dsh.account.model.AddAppUserVo;
import com.dsh.account.model.JoinPlayPaiVo;
import com.dsh.account.model.LoginSMSCodeVo;
import com.dsh.account.model.LoginWeChatVo;
import com.dsh.account.service.CityService;
import com.dsh.account.service.IVipPaymentService;
import com.dsh.account.service.TAppUserService;
import com.dsh.account.util.PayMoneyUtil;
import com.dsh.account.util.ResultUtil;
import com.dsh.account.util.TokenUtil;
import com.dsh.account.util.ToolUtil;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
import java.util.Map;
/**
 * @author zhibing.pu
 * @date 2023/6/14 15:30
 */
@RestController
@RequestMapping("")
public class CityController {
    @Autowired
    private CityService cityService;
}
cloud-server-account/src/main/java/com/dsh/account/entity/TCityManager.java
New file
@@ -0,0 +1,22 @@
package com.dsh.account.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@Data
@TableName("t_city_manager")
public class TCityManager {
    private Integer id;
    private String name;
    private String phone;
    private String password;
    private String province;
    @TableField("provinceCode")
    private String provinceCode;
    private String city;
    @TableField("cityCode")
    private String cityCode;
    private Integer state;
}
cloud-server-account/src/main/java/com/dsh/account/mapper/CityMapper.java
New file
@@ -0,0 +1,17 @@
package com.dsh.account.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dsh.account.entity.Coach;
import com.dsh.account.entity.TCityManager;
/**
 * <p>
 * 教练 Mapper 接口
 * </p>
 *
 * @author jqs
 * @since 2023-07-05
 */
public interface CityMapper extends BaseMapper<TCityManager> {
}
cloud-server-account/src/main/java/com/dsh/account/service/CityService.java
New file
@@ -0,0 +1,17 @@
package com.dsh.account.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.dsh.account.entity.Coach;
import com.dsh.account.entity.TCityManager;
/**
 * <p>
 * 教练 服务类
 * </p>
 *
 * @author jqs
 * @since 2023-07-05
 */
public interface CityService extends IService<TCityManager> {
}
cloud-server-account/src/main/java/com/dsh/account/service/impl/CityServiceImpl.java
New file
@@ -0,0 +1,23 @@
package com.dsh.account.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsh.account.entity.Coach;
import com.dsh.account.entity.TCityManager;
import com.dsh.account.mapper.CityMapper;
import com.dsh.account.mapper.CoachMapper;
import com.dsh.account.service.CityService;
import com.dsh.account.service.CoachService;
import org.springframework.stereotype.Service;
/**
 * <p>
 * 教练 服务实现类
 * </p>
 *
 * @author jqs
 * @since 2023-07-05
 */
@Service
public class CityServiceImpl extends ServiceImpl<CityMapper, TCityManager> implements CityService {
}
cloud-server-account/src/main/resources/mapper/CityMapper.xml
New file
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dsh.account.mapper.CityMapper">
</mapper>
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
@@ -5,8 +5,10 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dsh.competition.entity.Competition;
import com.dsh.competition.entity.Participant;
import com.dsh.competition.entity.PaymentCompetition;
import com.dsh.competition.entity.UserCompetition;
import com.dsh.competition.feignclient.model.GetPeopleQuery;
import com.dsh.competition.feignclient.model.GetStuSourseList;
import com.dsh.competition.feignclient.model.ListQuery;
import com.dsh.competition.feignclient.model.PurchaseRecordVo;
@@ -14,6 +16,7 @@
import com.dsh.competition.model.CompetitionListVo;
import com.dsh.competition.model.PaymentCompetitionVo;
import com.dsh.competition.service.CompetitionService;
import com.dsh.competition.service.IParticipantService;
import com.dsh.competition.service.IPaymentCompetitionService;
import com.dsh.competition.service.UserCompetitionService;
import com.dsh.competition.util.PayMoneyUtil;
@@ -65,6 +68,9 @@
    @Autowired
    private IPaymentCompetitionService paymentCompetitionService;
    @Autowired
    private IParticipantService participantService;
    @PostMapping("/base/competition/getPayedCompetitions")
@@ -415,5 +421,51 @@
            return new Page<Competition>();
        }
    }
    @PostMapping("/base/competition/add")
    public void add(@RequestBody Competition competition){
        try {
            cttService.save(competition);
        }catch (Exception e){
            e.printStackTrace();
        }
    }
    @PostMapping("/base/competition/update")
    public void update(@RequestBody Competition competition){
        try {
            cttService.updateById(competition);
        }catch (Exception e){
            e.printStackTrace();
        }
    }
    @PostMapping("/base/competition/cancel")
    public void cancel(@RequestBody Integer id){
        try {
            Competition byId = cttService.getById(id);
            byId.setStatus(4);
            cttService.updateById(byId);
        }catch (Exception e){
            e.printStackTrace();
        }
    }
//    @PostMapping("/base/competition/getPeopleFromId")
//    public  Page<Participant> getPeopleFromId(@RequestBody GetPeopleQuery getPeopleQuery){
//        try {
//            Page<Participant> participantPage = new Page<>();
//            LambdaQueryWrapper<Participant> participantLambdaQueryWrapper = new LambdaQueryWrapper<>();
//            if(getPeopleQuery.getState()!=null){
//                participantLambdaQueryWrapper.eq(Participant::getState)
//            }
//            participantService.page()
//        }catch (Exception e){
//            return null;
//        }
//    }
}
cloud-server-competition/src/main/java/com/dsh/competition/feignclient/model/GetPeopleQuery.java
New file
@@ -0,0 +1,15 @@
package com.dsh.competition.feignclient.model;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class GetPeopleQuery {
    private long limit;
    private long offset;
    private Integer id;
    private Integer state;
}
cloud-server-management/src/main/java/com/dsh/course/feignClient/account/CityClient.java
New file
@@ -0,0 +1,13 @@
package com.dsh.course.feignClient.account;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dsh.course.feignClient.account.model.CityListQuery;
import com.dsh.course.feignClient.account.model.TCityManager;
import org.springframework.cloud.openfeign.FeignClient;
@FeignClient("mb-cloud-account")
public interface CityClient {
    Page<TCityManager> list(CityListQuery listQuery);
}
cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/CityListQuery.java
New file
@@ -0,0 +1,18 @@
package com.dsh.course.feignClient.account.model;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class CityListQuery {
    private long limit;
    private long offset;
    private String provinceCode;
    private String cityCode;
    private String name;
    private String phone;
}
cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/TCityManager.java
New file
@@ -0,0 +1,22 @@
package com.dsh.course.feignClient.account.model;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@Data
@TableName("t_city_manager")
public class TCityManager {
    private Integer id;
    private String name;
    private String phone;
    private String password;
    private String province;
    @TableField("provinceCode")
    private String provinceCode;
    private String city;
    @TableField("cityCode")
    private String cityCode;
    private Integer state;
}
cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/CompetitionClient.java
@@ -2,7 +2,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dsh.course.feignClient.competition.model.Competition;
import com.dsh.course.feignClient.competition.model.GetPeopleQuery;
import com.dsh.course.feignClient.competition.model.ListQuery;
import com.dsh.course.feignClient.competition.model.Participant;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -17,6 +19,18 @@
    @PostMapping("/base/competition/list")
    Page<Competition> list(ListQuery listQuery);
    @PostMapping("/base/competition/add")
    void add(Competition competition);
    @PostMapping("/base/competition/update")
    void update(Competition competition);
    @PostMapping("/base/competition/cancel")
    void cancel(Integer id);
    @PostMapping("/base/competition/getPeopleFromId")
    Page<Participant> getPeopleFromId(GetPeopleQuery getPeopleQuery);
}
cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/GetPeopleQuery.java
New file
@@ -0,0 +1,15 @@
package com.dsh.course.feignClient.competition.model;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class GetPeopleQuery {
    private long limit;
    private long offset;
    private Integer id;
    private Integer state;
}
cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/Participant.java
New file
@@ -0,0 +1,73 @@
package com.dsh.course.feignClient.competition.model;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.util.Date;
/**
 * @author zhibing.pu
 * @date 2023/7/6 16:46
 */
@Data
@TableName("t_participant")
public class Participant {
    /**
     * 主键
     */
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    /**
     * 用户id
     */
    @TableField("appUserId")
    private Integer appUserId;
    /**
     * 姓名
     */
    @TableField("name")
    private String name;
    /**
     * 生日
     */
    @TableField("birthday")
    private Date birthday;
    /**
     * 性别(1=男,2=女)
     */
    @TableField("gender")
    private Integer gender;
    /**
     * 身高(CM)
     */
    @TableField("height")
    private Integer height;
    /**
     * 体重(KG)
     */
    @TableField("weight")
    private Double weight;
    /**
     * 联系电话
     */
    @TableField("phone")
    private String phone;
    /**
     * 身份证号码
     */
    @TableField("idcard")
    private String idcard;
    /**
     * 状态(1=正常,2=冻结,3=删除)
     */
    @TableField("state")
    private Integer state;
    /**
     * 添加时间
     */
    @TableField("insertTime")
    private Date insertTime;
}
cloud-server-management/src/main/java/com/dsh/course/mapper/CityMapper.java
@@ -2,8 +2,9 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dsh.course.entity.City;
import com.dsh.guns.modular.system.model.TCity;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface CityMapper extends BaseMapper<City> {
public interface CityMapper extends BaseMapper<TCity> {
}
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCityController.java
New file
@@ -0,0 +1,139 @@
package com.dsh.guns.modular.system.controller.code;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dsh.course.entity.City;
import com.dsh.course.feignClient.account.CityClient;
import com.dsh.course.feignClient.account.model.CityListQuery;
import com.dsh.course.feignClient.account.model.TCityManager;
import com.dsh.course.feignClient.competition.CompetitionClient;
import com.dsh.course.feignClient.competition.model.Competition;
import com.dsh.course.feignClient.competition.model.GetPeopleQuery;
import com.dsh.course.feignClient.competition.model.ListQuery;
import com.dsh.course.feignClient.competition.model.Participant;
import com.dsh.guns.core.base.controller.BaseController;
import com.dsh.guns.core.common.constant.factory.PageFactory;
import com.dsh.guns.core.util.ToolUtil;
import com.dsh.guns.modular.system.model.TCity;
import com.dsh.guns.modular.system.model.TStore;
import com.dsh.guns.modular.system.service.IStoreService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
/**
 * 车辆管理控制器
 *
 * @author fengshuonan
 * @Date 2020-06-05 17:25:12
 */
@Controller
@RequestMapping("/tCity")
public class TCityController extends BaseController {
    private String PREFIX = "/system/tCity/";
    @Autowired
    private CompetitionClient competitionClient;
    @Autowired
    private CityClient cityClient;
    @Autowired
    private IStoreService storeService;
    /**
     * 跳转到车辆管理首页
     */
    @RequestMapping("")
    public String index(Model model) {
        return PREFIX + "TCompetition.html";
    }
    /**
     * 跳转到添加车辆管理
     */
    @RequestMapping("/tCompetition_add")
    public String tCompetitionAdd(Model model) {
        return PREFIX + "TCompetition_add.html";
    }
    /**
     * 跳转到修改车辆管理
     */
    @RequestMapping("/tCompetition_update/{id}")
    public String tCarUpdate(@PathVariable Integer id, Model model) {
        Competition competition = competitionClient.queryById(id);
        model.addAttribute("item",competition);
        return PREFIX + "tCompetition_edit.html";
    }
    @RequestMapping(value = "/list")
    @ResponseBody
    public Object list(String provinceCode, String cityCode , String name, String phone) {
        Page<Competition> page = new PageFactory<Competition>().defaultPage();
        CityListQuery listQuery = new CityListQuery(page.getSize(),page.getCurrent(),provinceCode,cityCode,name,phone);
        Page<TCityManager> competitions = cityClient.list(listQuery);
        return  super.packForBT(competitions);
    }
    @RequestMapping(value = "/add")
    public Object list(Competition competition) {
        try {
            competitionClient.add(competition);
            return SUCCESS_TIP;
        }catch (Exception e){
            e.printStackTrace();
            return ERROR;
        }
    }
    @RequestMapping(value = "/update")
    public Object update(Competition competition) {
        try {
            competitionClient.update(competition);
            return SUCCESS_TIP;
        }catch (Exception e){
            e.printStackTrace();
            return ERROR;
        }
    }
    @RequestMapping(value = "/cancel")
    public Object cancel(Integer id) {
        try {
            competitionClient.cancel(id);
            return SUCCESS_TIP;
        }catch (Exception e){
            e.printStackTrace();
            return ERROR;
        }
    }
    @RequestMapping(value = "/getPeopleFromId")
    public Object getPeopleFromId(Integer id,Integer state) {
        try {
            Page<Object> page = new PageFactory<>().defaultPage();
            Page<Participant> data =   competitionClient.getPeopleFromId(new GetPeopleQuery(page.getSize(),page.getCurrent(),id,state));
            return  super.packForBT(data);
        }catch (Exception e){
            e.printStackTrace();
            return ERROR;
        }
    }
}
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java
@@ -4,7 +4,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dsh.course.feignClient.competition.CompetitionClient;
import com.dsh.course.feignClient.competition.model.Competition;
import com.dsh.course.feignClient.competition.model.GetPeopleQuery;
import com.dsh.course.feignClient.competition.model.ListQuery;
import com.dsh.course.feignClient.competition.model.Participant;
import com.dsh.guns.core.base.controller.BaseController;
import com.dsh.guns.core.base.tips.SuccessTip;
import com.dsh.guns.core.common.constant.factory.PageFactory;
@@ -94,9 +96,56 @@
                }
            }
        }
        return  super.packForBT(competitions);
    }
    @RequestMapping(value = "/add")
    public Object list(Competition competition) {
        try {
            competitionClient.add(competition);
            return SUCCESS_TIP;
        }catch (Exception e){
            e.printStackTrace();
            return ERROR;
        }
    }
    @RequestMapping(value = "/update")
    public Object update(Competition competition) {
        try {
            competitionClient.update(competition);
            return SUCCESS_TIP;
        }catch (Exception e){
            e.printStackTrace();
            return ERROR;
        }
    }
    @RequestMapping(value = "/cancel")
    public Object cancel(Integer id) {
        try {
            competitionClient.cancel(id);
            return SUCCESS_TIP;
        }catch (Exception e){
            e.printStackTrace();
            return ERROR;
        }
    }
    @RequestMapping(value = "/getPeopleFromId")
    public Object getPeopleFromId(Integer id,Integer state) {
        try {
            Page<Object> page = new PageFactory<>().defaultPage();
            Page<Participant> data =   competitionClient.getPeopleFromId(new GetPeopleQuery(page.getSize(),page.getCurrent(),id,state));
            return  super.packForBT(data);
        }catch (Exception e){
            e.printStackTrace();
            return ERROR;
        }
    }
}
cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TCity.java
New file
@@ -0,0 +1,20 @@
package com.dsh.guns.modular.system.model;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.math.BigDecimal;
@TableName("t_region")
@Data
public class TCity {
    private Integer id;
    private String name;
    private String code;
    private String citycode;
    @TableField("parent_id")
    private Integer parentId;
    private String english;
}
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ICityService.java
New file
@@ -0,0 +1,17 @@
package com.dsh.guns.modular.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.dsh.guns.modular.system.model.TCity;
import com.dsh.guns.modular.system.model.TStore;
/**
 * 字典服务
 *
 * @author fengshuonan
 * @date 2017-04-27 17:00
 */
public interface ICityService extends IService<TCity> {
}
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CityServiceImpl.java
New file
@@ -0,0 +1,15 @@
package com.dsh.guns.modular.system.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsh.course.mapper.CityMapper;
import com.dsh.course.mapper.StoreMapper;
import com.dsh.guns.modular.system.model.TCity;
import com.dsh.guns.modular.system.model.TStore;
import com.dsh.guns.modular.system.service.ICityService;
import com.dsh.guns.modular.system.service.IStoreService;
import org.springframework.stereotype.Service;
@Service
public class CityServiceImpl extends ServiceImpl<CityMapper, TCity> implements ICityService {
}
cloud-server-management/src/main/resources/mapper/CityMapper.xml
@@ -2,12 +2,4 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dsh.course.mapper.CityMapper">
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.dsh.course.entity.City">
        <id column="id" property="id"/>
        <result column="chineseName" property="chineseName"/>
        <result column="englishName" property="englishName"/>
        <result column="indonesianName" property="indonesianName"/>
        <result column="pid" property="pid"/>
    </resultMap>
</mapper>
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCity/TCity.html
New file
@@ -0,0 +1,52 @@
@layout("/common/_container.html"){
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <div class="ibox-title">
                <h5>城市管理</h5>
            </div>
            <div class="ibox-content">
                <div class="row row-lg">
                    <div class="col-sm-12">
                        <div class="row">
                            <div class="col-sm-3">
                            </div>
                            <div class="col-sm-3">
                            </div>
                            <div class="col-sm-3">
                                <#NameCon id="name" name="管理员姓名" />
                            </div>
                            <div class="col-sm-3">
                                <#NameCon id="phone" name="管理员手机号" />
                            </div>
                    <div class="col-sm-3">
                        <#button name="搜索" icon="fa-search" clickFun="TCompetition.search()"/>
                        <#button name="重置" icon="fa-trash" clickFun="TCompetition.resetSearch()" space="true"/>
                    </div>
                </div>
                <div class="hidden-xs" id="TCompetitionTableToolbar" role="group">
                    <#button name="添加" icon="fa-plus" clickFun="TCompetition.openAddTCompetition()"/>
                    <#button name="编辑" icon="fa-edit" clickFun="TCompetition.openTCompetitionDetail()" space="true"/>
                    <#button name="取消" icon="fa-remove" clickFun="TCompetition.delete()" space="true"/>
                    <#button name="查看详情" icon="fa-remove" clickFun="TCompetition.delete()" space="true"/>
                    <#button name="已报名人员" icon="fa-remove" clickFun="TCompetition.delete()" space="true"/>
                </div>
                <#table id="TCompetitionTable"/>
            </div>
        </div>
    </div>
</div>
</div>
</div>
<script src="${ctxPath}/modular/system/tCity/tCity.js"></script>
<script>
    laydate.render({
        elem: '#createTime'
        ,range: true
        ,lang:"en"
    });
</script>
@}
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCity/TCity_add.html
New file
@@ -0,0 +1,163 @@
@layout("/common/_container.html"){
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal" id="carInfoForm">
            <div class="form-group" id="provinceCode">
                <label class="col-sm-3 control-label">举办省:</label>
                <div class="col-sm-9">
                    <select class="form-control" id="pCode" name="pCode">
                        <option value="">选择省</option>
                    </select>
                </div>
            </div>
            <div class="form-group" id="cityCode">
                <label class="col-sm-3 control-label">举办市:</label>
                <div class="col-sm-9">
                    <select class="form-control" id="cCode" name="cCode">
                        <option value="">选择市</option>
                    </select>
                </div>
            </div>
            <div class="form-group" id="shop">
                <label class="col-sm-3 control-label">举办门店:</label>
                <div class="col-sm-9">
                    <select class="form-control" id="shopId" name="shopId">
                        <option value="">选择门店</option>
                    </select>
                </div>
            </div>
        <#input id="name" name="赛事名称" type="text"/>
        <#input id="startTime" name="开始时间" type="text"/>
        <#input id="endTime" name="结束时间" type="text"/>
        <#input id="registerEndTime" name="截止报名时间" type="text"/>
            <div class="form-group">
                <label class="col-sm-3 control-label">报名条件:</label>
                <div class="col-sm-9">
                    <input type="radio" name="registerCondition" value="1" checked> 全部用户
                    <input type="radio" name="registerCondition" value="2">仅限年度会员参与
                    <input type="radio" name="registerCondition" value="3">仅限学员参与
                </div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">报名年龄:</label>
                <div class="col-sm-9" style="display: flex">
                    <input class="form-control"  style="width: 100px;"  type="text" id="startAge"> ~ <input class="form-control"  style="width: 100px;" type="text" id="endAge">
                </div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">支付方式:</label>
                <div class="col-sm-9">
                    <input type="checkbox"> 现金支付
                    <input type="checkbox"> 玩湃币支付
                    <input type="checkbox"> 课时支付
                </div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">现金支付:</label>
                <div class="col-sm-9">
                    <input class="form-control"  style="width: 200px;"  type="text" id="cashPrice">
                </div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">玩湃币支付:</label>
                <div class="col-sm-9">
                    <input class="form-control"  style="width: 200px;" type="text" id="playPaiCoin">
                </div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">课时支付:</label>
                <div class="col-sm-9">
                    <input class="form-control"  style="width: 200px;" type="text" id="classPrice">
                </div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">参加地点:</label>
                <div class="col-sm-9">
                    <input class="form-control"  style="width: 500px;" type="text" id="address">
                </div>
            </div>
            <#input id="applicantsNumber" name="报名人数" type="text"/>
            <#input id="baseNumber" name="基础报名人数" type="text"/>
            <div class="form-group">
                <label class="col-sm-3 control-label">是否实名:</label>
                <div class="col-sm-9">
                    <input type="radio" name="realName" value="1" checked> 是
                    <input type="radio" name="realName" value="0"> 否
                </div>
            </div>
                <div class="form-group">
                    <label class="col-sm-3 control-label">赛事简介:</label>
                    <div class="col-sm-9">
                        <textarea  id="introduction"></textarea>
                    </div>
                </div>
                <#avatar id="coverDrawing" name="赛事封面(推荐像素:210*280px):" />
                <#avatar id="imgs" name="赛事图片(推荐像素:780*440px):" />
                <#avatar id="registrationNotes" name="报名须知(推荐像素:宽780px):" />
        </div>
</div>
<div class="row btn-group-m-t">
    <div class="col-sm-10 col-sm-offset-5">
        <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TCarInfoDlg.addSubmit()"/>
        <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TCarInfoDlg.close()"/>
    </div>
</div>
        </div>
    </div>
</div>
<script src="${ctxPath}/modular/system/tCompetition/tCompetition_info.js"></script>
<script>
    laydate.render({
        elem: '#annualInspectionTime'
        ,lang:"en"
    });
    laydate.render({
        elem: '#commercialInsuranceTime'
        ,lang:"en"
    });
    laydate.render({
        elem: '#certifyDateA'
        ,lang:"en"
    });
    laydate.render({
        elem: '#transDateStart'
        ,lang:"en"
    });
    laydate.render({
        elem: '#transDateStop'
        ,lang:"en"
    });
    laydate.render({
        elem: '#certifyDateB'
        ,lang:"en"
    });
    laydate.render({
        elem: '#nextFixDate'
        ,lang:"en"
    });
    laydate.render({
        elem: '#GPSInstallDate'
        ,lang:"en"
    });
    laydate.render({
        elem: '#registerDate'
        ,lang:"en"
    });
</script>
@}
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCity/TCity_edit.html
New file
@@ -0,0 +1,401 @@
@layout("/common/_container.html"){
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal" id="carInfoForm">
            <input type="hidden" id="id" name="id" value="${item.id}">
            <input hidden id="language" value="${language}">
            <input type="hidden" id="roleType" name="roleType" value="${roleType}">
            @if(language==1){
            <div class="row">
                <div class="col-sm-11">
                    <div class="form-group">
                        <label class="col-sm-3 control-label">所属机构:</label>
                        <div class="col-sm-9"  style="display: flex;align-items: center;">
                            @if(roleType == 1){
                            <div class="radio radio-info radio-inline">
                                <input type="radio" id="companyType1" value="1" name="companyType" ${1 == companyType ? 'checked=checked' : ''} onclick="TCarInfoDlg.companyTypeClick(1)">
                                <label for="companyType1"> 平台车辆 </label>
                            </div>
                            <div class="radio radio-success radio-inline">
                                <input type="radio" id="companyTyp2" value="2" name="companyType" ${2 == companyType ? 'checked=checked' : ''} onclick="TCarInfoDlg.companyTypeClick(2)">
                                <label for="companyTyp2"> 加盟车辆 </label>
                            </div>
                            <select class="form-control companyDiv" id="oneId" onchange="TCarInfoDlg.oneChange(this)" style="width: 200px">
                                <option value="">选择所属分公司</option>
                                @for(obj in companyList!){
                                <option value="${obj.id}" ${obj.id == item.companyId ? 'selected=selected' : ''}>${obj.name}</option>
                                @}
                            </select>
                            <select class="form-control companyDiv" id="twoId"  style="width: 200px;margin-left: 30px;">
                                <option value="">选择所属加盟商</option>
                                @for(obj in franchiseeList!){
                                <option value="${obj.id}" ${obj.id == item.franchiseeId ? 'selected=selected' : ''}>${obj.name}</option>
                                @}
                            </select>
                            @}else if(roleType == 2){
                            <span class="control-label">${objectName!}</span>
                            <select class="form-control" id="franchiseeId"  style="width: 200px;margin-left: 30px;">
                                <option value="">选择所属加盟商</option>
                                @for(obj in franchiseeList!){
                                <option value="${obj.id}" ${obj.id == item.franchiseeId ? 'selected=selected' : ''}>${obj.name}</option>
                                @}
                            </select>
                            @}else if(roleType == 3){
                            <span class="control-label">${objectName!}</span>
                            @}
                        </div>
                    </div>
                    <div class="form-group">
                        <fieldset>
                            <label class="col-sm-3 control-label">服务模式:</label>
                            <div class="col-sm-9">
                                <div class="checkbox checkbox-success  checkbox-inline">
                                    <input type="checkbox" name="serverBox" id="serverBox1" value="1" ${2 == one ? 'checked=checked' : ''} onclick="TCarInfoDlg.zcServerClick()">
                                    <label for="serverBox1"> 摩托车 </label>
                                </div>
                                <div class="checkbox checkbox-success  checkbox-inline">
                                    <input type="checkbox" name="serverBox" id="serverBox4" value="4" ${2 == four ? 'checked=checked' : ''}>
                                    <label for="serverBox4"> 同城快送 </label>
                                </div>
                            </div>
                        </fieldset>
                    </div>
                    <div class="form-group" id="zcModelDiv">
                        <label class="col-sm-3 control-label">摩托车车型:</label>
                        <div class="col-sm-9">
                            <select class="form-control" id="zcModel" name="zcModel">
                                <option value="">选择车型</option>
                                @for(obj in zcModelList){
                                <option value="${obj.id}" ${obj.id == zcModel ? 'selected=selected' : ''}>${obj.name}</option>
                                @}
                            </select>
                        </div>
                    </div>
                    <#select id="carBrandId" name="车辆品牌:" onchange="TCarInfoDlg.brandChange(this)">
                    <option value="">选择车辆品牌</option>
                    @for(obj in brandList){
                    <option value="${obj.id}" ${obj.id == item.carBrandId ? 'selected=selected' : ''}>${obj.name}</option>
                    @}
                </#select>
                <#select id="carModelId" name="车辆类型:">
                <option value="">选择车辆类型</option>
                @for(obj in modelList){
                <option value="${obj.id}" ${obj.id == item.carModelId ? 'selected=selected' : ''}>${obj.name}</option>
                @}
            </#select>
            <#select id="carColor" name="车辆颜色:">
            <option value="">选择车辆颜色</option>
            <option value="1" ${'1' == item.carColor ? 'selected=selected' : ''}>黑色</option>
            <option value="2" ${'2' == item.carColor ? 'selected=selected' : ''}>银色</option>
            <option value="3" ${'3' == item.carColor ? 'selected=selected' : ''}>白色</option>
            <option value="4" ${'4' == item.carColor ? 'selected=selected' : ''}>红色</option>
            <option value="5" ${'5' == item.carColor ? 'selected=selected' : ''}>黄色</option>
            <option value="6" ${'6' == item.carColor ? 'selected=selected' : ''}>橙色</option>
            <option value="7" ${'7' == item.carColor ? 'selected=selected' : ''}>蓝色</option>
        </#select>
        <#input id="carLicensePlate" name="车牌号" value="${item.carLicensePlate}"/>
        <#avatar id="carPhoto" name="车辆照片:" avatarImg="${item.carPhoto}"/>
        <#input id="drivingLicenseNumber" name="行驶证编号" value="${item.drivingLicenseNumber}"/>
        <#avatar id="drivingLicensePhoto" name="行驶证照片:" avatarImg="${item.drivingLicensePhoto}"/>
        <#input id="annualInspectionTime" name="年检到期时间" type="text" value="${item.annualInspectionTime}"/>
        <#input id="commercialInsuranceTime" name="商业保险到期时间" type="text" value="${item.commercialInsuranceTime}"/>
    </div>
</div>
<div class="row btn-group-m-t">
    <div class="col-sm-10 col-sm-offset-5">
        <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TCarInfoDlg.editSubmit()"/>
        <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TCarInfoDlg.close()"/>
    </div>
</div>
            @}
            @if(language==2){
<div class="row">
    <div class="col-sm-11">
        <div class="form-group">
            <label class="col-sm-3 control-label">Affiliated organization:</label>
            <div class="col-sm-9"  style="display: flex;align-items: center;">
                @if(roleType == 1){
                <div class="radio radio-info radio-inline">
                    <input type="radio" id="companyType1" value="1" name="companyType" ${1 == companyType ? 'checked=checked' : ''} onclick="TCarInfoDlg.companyTypeClick(1)">
                    <label for="companyType1"> Platform vehicle </label>
                </div>
                <div class="radio radio-success radio-inline">
                    <input type="radio" id="companyTyp2" value="2" name="companyType" ${2 == companyType ? 'checked=checked' : ''} onclick="TCarInfoDlg.companyTypeClick(2)">
                    <label for="companyTyp2"> Franchised vehicles </label>
                </div>
                <select class="form-control companyDiv" id="oneId" onchange="TCarInfoDlg.oneChange(this)" style="width: 200px">
                    <option value="">Select Branch</option>
                    @for(obj in companyList!){
                    <option value="${obj.id}" ${obj.id == item.companyId ? 'selected=selected' : ''}>${obj.name}</option>
                    @}
                </select>
                <select class="form-control companyDiv" id="twoId"  style="width: 200px;margin-left: 30px;">
                    <option value="">Select the franchisee</option>
                    @for(obj in franchiseeList!){
                    <option value="${obj.id}" ${obj.id == item.franchiseeId ? 'selected=selected' : ''}>${obj.name}</option>
                    @}
                </select>
                @}else if(roleType == 2){
                <span class="control-label">${objectName!}</span>
                <select class="form-control" id="franchiseeId"  style="width: 200px;margin-left: 30px;">
                    <option value="">Select the franchisee</option>
                    @for(obj in franchiseeList!){
                    <option value="${obj.id}" ${obj.id == item.franchiseeId ? 'selected=selected' : ''}>${obj.name}</option>
                    @}
                </select>
                @}else if(roleType == 3){
                <span class="control-label">${objectName!}</span>
                @}
            </div>
        </div>
        <div class="form-group">
            <fieldset>
                <label class="col-sm-3 control-label">Service mode:</label>
                <div class="col-sm-9">
                    <div class="checkbox checkbox-success  checkbox-inline">
                        <input type="checkbox" name="serverBox" id="serverBox1" value="1" ${2 == one ? 'checked=checked' : ''} onclick="TCarInfoDlg.zcServerClick()">
                        <label for="serverBox1"> motorcycle </label>
                    </div>
                    <div class="checkbox checkbox-success  checkbox-inline">
                        <input type="checkbox" name="serverBox" id="serverBox4" value="4" ${2 == four ? 'checked=checked' : ''}>
                        <label for="serverBox4"> Intra-city express delivery </label>
                    </div>
                </div>
            </fieldset>
        </div>
        <div class="form-group" id="zcModelDiv">
            <label class="col-sm-3 control-label">Motorcycle model setting:</label>
            <div class="col-sm-9">
                <select class="form-control" id="zcModel" name="zcModel">
                    <option value="">Select vehicle type</option>
                    @for(obj in zcModelList){
                    <option value="${obj.id}" ${obj.id == zcModel ? 'selected=selected' : ''}>${obj.name}</option>
                    @}
                </select>
            </div>
        </div>
        <div class="form-group" id="kcModelDiv">
            <label class="col-sm-3 control-label">Cross city travel model:</label>
            <div class="col-sm-9">
                <select class="form-control" id="kcModel" name="kcModel">
                    <option value="">Select vehicle type</option>
                    @for(obj in kcModelList){
                    <option value="${obj.id}" ${obj.id == kcModel ? 'selected=selected' : ''}>${obj.name}</option>
                    @}
                </select>
            </div>
        </div>
        <#select id="carBrandId" name="Vehicle brand:" onchange="TCarInfoDlg.brandChange(this)">
        <option value="">Select vehicle brand</option>
        @for(obj in brandList){
        <option value="${obj.id}" ${obj.id == item.carBrandId ? 'selected=selected' : ''}>${obj.name}</option>
        @}
    </#select>
    <#select id="carModelId" name="Vehicle type:">
    <option value="">Select vehicle type</option>
    @for(obj in modelList){
    <option value="${obj.id}" ${obj.id == item.carModelId ? 'selected=selected' : ''}>${obj.name}</option>
    @}
</#select>
<#select id="carColor" name="Vehicle color:">
<option value="">Select vehicle color</option>
<option value="1" ${'1' == item.carColor ? 'selected=selected' : ''}>black</option>
<option value="2" ${'2' == item.carColor ? 'selected=selected' : ''}>silvery</option>
<option value="3" ${'3' == item.carColor ? 'selected=selected' : ''}>white</option>
<option value="4" ${'4' == item.carColor ? 'selected=selected' : ''}>red</option>
<option value="5" ${'5' == item.carColor ? 'selected=selected' : ''}>yellow</option>
<option value="6" ${'6' == item.carColor ? 'selected=selected' : ''}>orange</option>
<option value="7" ${'7' == item.carColor ? 'selected=selected' : ''}>blue</option>
</#select>
<#input id="carLicensePlate" name="License plate number" value="${item.carLicensePlate}"/>
<#avatar id="carPhoto" name="Vehicle photos:" avatarImg="${item.carPhoto}"/>
<#input id="drivingLicenseNumber" name="Driving license number" value="${item.drivingLicenseNumber}"/>
<#avatar id="drivingLicensePhoto" name="Photo of driving license:" avatarImg="${item.drivingLicensePhoto}"/>
<#input id="annualInspectionTime" name="Annual inspection expiration time" type="text" value="${item.annualInspectionTime}"/>
<#input id="commercialInsuranceTime" name="Expiration time of commercial insurance" type="text" value="${item.commercialInsuranceTime}"/>
</div>
</div>
<div class="row btn-group-m-t">
    <div class="col-sm-10 col-sm-offset-5">
        <#button btnCss="info" name="Submit" id="ensure" icon="fa-check" clickFun="TCarInfoDlg.editSubmit()"/>
        <#button btnCss="danger" name="Cancel" id="cancel" icon="fa-eraser" clickFun="TCarInfoDlg.close()"/>
    </div>
</div>
            @}
            @if(language==3){
<div class="row">
    <div class="col-sm-11">
        <div class="form-group">
            <label class="col-sm-3 control-label">Organisasi Afiliasi:</label>
            <div class="col-sm-9"  style="display: flex;align-items: center;">
                @if(roleType == 1){
                <div class="radio radio-info radio-inline">
                    <input type="radio" id="companyType1" value="1" name="companyType" ${1 == companyType ? 'checked=checked' : ''} onclick="TCarInfoDlg.companyTypeClick(1)">
                    <label for="companyType1"> Kendaraan platform </label>
                </div>
                <div class="radio radio-success radio-inline">
                    <input type="radio" id="companyTyp2" value="2" name="companyType" ${2 == companyType ? 'checked=checked' : ''} onclick="TCarInfoDlg.companyTypeClick(2)">
                    <label for="companyTyp2"> Kendaraan waralaba </label>
                </div>
                <select class="form-control companyDiv" id="oneId" onchange="TCarInfoDlg.oneChange(this)" style="width: 200px">
                    <option value="">Pilih Branch</option>
                    @for(obj in companyList!){
                    <option value="${obj.id}" ${obj.id == item.companyId ? 'selected=selected' : ''}>${obj.name}</option>
                    @}
                </select>
                <select class="form-control companyDiv" id="twoId"  style="width: 200px;margin-left: 30px;">
                    <option value="">Pilih pemilik franchise</option>
                    @for(obj in franchiseeList!){
                    <option value="${obj.id}" ${obj.id == item.franchiseeId ? 'selected=selected' : ''}>${obj.name}</option>
                    @}
                </select>
                @}else if(roleType == 2){
                <span class="control-label">${objectName!}</span>
                <select class="form-control" id="franchiseeId"  style="width: 200px;margin-left: 30px;">
                    <option value="">Pilih pemilik franchise</option>
                    @for(obj in franchiseeList!){
                    <option value="${obj.id}" ${obj.id == item.franchiseeId ? 'selected=selected' : ''}>${obj.name}</option>
                    @}
                </select>
                @}else if(roleType == 3){
                <span class="control-label">${objectName!}</span>
                @}
            </div>
        </div>
        <div class="form-group">
            <fieldset>
                <label class="col-sm-3 control-label">Mode Layanan:</label>
                <div class="col-sm-9">
                    <div class="checkbox checkbox-success  checkbox-inline">
                        <input type="checkbox" name="serverBox" id="serverBox1" value="1" ${2 == one ? 'checked=checked' : ''} onclick="TCarInfoDlg.zcServerClick()">
                        <label for="serverBox1"> sepeda motor </label>
                    </div>
                    <div class="checkbox checkbox-success  checkbox-inline">
                        <input type="checkbox" name="serverBox" id="serverBox4" value="4" ${2 == four ? 'checked=checked' : ''}>
                        <label for="serverBox4"> Pengiriman Ekspres Dalam Kota </label>
                    </div>
                </div>
            </fieldset>
        </div>
        <div class="form-group" id="zcModelDiv">
            <label class="col-sm-3 control-label">Pengaturan model sepeda motor:</label>
            <div class="col-sm-9">
                <select class="form-control" id="zcModel" name="zcModel">
                    <option value="">Pilih Jenis Kendaraan</option>
                    @for(obj in zcModelList){
                    <option value="${obj.id}" ${obj.id == zcModel ? 'selected=selected' : ''}>${obj.name}</option>
                    @}
                </select>
            </div>
        </div>
        <div class="form-group" id="kcModelDiv">
            <label class="col-sm-3 control-label">Model perjalanan melintasi kota:</label>
            <div class="col-sm-9">
                <select class="form-control" id="kcModel" name="kcModel">
                    <option value="">Pilih Jenis Kendaraan</option>
                    @for(obj in kcModelList){
                    <option value="${obj.id}" ${obj.id == kcModel ? 'selected=selected' : ''}>${obj.name}</option>
                    @}
                </select>
            </div>
        </div>
        <#select id="carBrandId" name="Merek kendaraan:" onchange="TCarInfoDlg.brandChange(this)">
        <option value="">Pilih Merek Kendaraan</option>
        @for(obj in brandList){
        <option value="${obj.id}" ${obj.id == item.carBrandId ? 'selected=selected' : ''}>${obj.name}</option>
        @}
    </#select>
    <#select id="carModelId" name="Jenis Kendaraan:">
    <option value="">Pilih Jenis Kendaraan</option>
    @for(obj in modelList){
    <option value="${obj.id}" ${obj.id == item.carModelId ? 'selected=selected' : ''}>${obj.name}</option>
    @}
</#select>
<#select id="carColor" name="车辆颜色:">
<option value="">选择车辆颜色</option>
<option value="1" ${'1' == item.carColor ? 'selected=selected' : ''}>hitam</option>
<option value="2" ${'2' == item.carColor ? 'selected=selected' : ''}>perak</option>
<option value="3" ${'3' == item.carColor ? 'selected=selected' : ''}>putih</option>
<option value="4" ${'4' == item.carColor ? 'selected=selected' : ''}>merah</option>
<option value="5" ${'5' == item.carColor ? 'selected=selected' : ''}>kuning</option>
<option value="6" ${'6' == item.carColor ? 'selected=selected' : ''}>oranye</option>
<option value="7" ${'7' == item.carColor ? 'selected=selected' : ''}>biru</option>
</#select>
<#input id="carLicensePlate" name="Nomor plat nomor" value="${item.carLicensePlate}"/>
<#avatar id="carPhoto" name="Foto kendaraan:" avatarImg="${item.carPhoto}"/>
<#input id="drivingLicenseNumber" name="Nomor SIM Mengemudi" value="${item.drivingLicenseNumber}"/>
<#avatar id="drivingLicensePhoto" name="Foto SIM:" avatarImg="${item.drivingLicensePhoto}"/>
<#input id="annualInspectionTime" name="Waktu Kedaluwarsa Inspeksi Tahunan" type="text" value="${item.annualInspectionTime}"/>
<#input id="commercialInsuranceTime" name="Waktu kedaluwarsa asuransi komersial" type="text" value="${item.commercialInsuranceTime}"/>
</div>
</div>
<div class="row btn-group-m-t">
    <div class="col-sm-10 col-sm-offset-5">
        <#button btnCss="info" name="Kirim" id="ensure" icon="fa-check" clickFun="TCarInfoDlg.editSubmit()"/>
        <#button btnCss="danger" name="Batal" id="cancel" icon="fa-eraser" clickFun="TCarInfoDlg.close()"/>
    </div>
</div>
            @}
        </div>
    </div>
</div>
<script src="${ctxPath}/modular/system/tCar/tCar_info.js"></script>
<script>
    laydate.render({
        elem: '#annualInspectionTime'
        ,lang:"en"
    });
    laydate.render({
        elem: '#commercialInsuranceTime'
        ,lang:"en"
    });
    laydate.render({
        elem: '#certifyDateA'
        ,lang:"en"
    });
    laydate.render({
        elem: '#transDateStart'
        ,lang:"en"
    });
    laydate.render({
        elem: '#transDateStop'
        ,lang:"en"
    });
    laydate.render({
        elem: '#certifyDateB'
        ,lang:"en"
    });
    laydate.render({
        elem: '#nextFixDate'
        ,lang:"en"
    });
    laydate.render({
        elem: '#GPSInstallDate'
        ,lang:"en"
    });
    laydate.render({
        elem: '#registerDate'
        ,lang:"en"
    });
</script>
<script type="application/javascript">
    $(function() {
        var companyType = $("input[name='companyType']:checked").val();
        if (1 == companyType){
            $(".companyDiv").hide();
        } else if (2 == companyType){
            $(".companyDiv").show();
        }
        TCarInfoDlg.zcServerClick();
        TCarInfoDlg.kcServerClick();
    });
</script>
@}
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html
@@ -1,110 +1,113 @@
@layout("/common/_container.html"){
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal" id="carInfoForm">
            <input type="hidden" id="roleType" name="roleType" value="${roleType}">
            <input hidden id="language" value="${language}">
            @if(language==1){
            <div class="row">
                <div class="col-sm-11">
                    <div class="form-group">
                        <label class="col-sm-3 control-label">所属机构:</label>
                        <div class="col-sm-9"  style="display: flex;align-items: center;">
                            @if(roleType == 1){
                            <div class="radio radio-info radio-inline">
                                <input type="radio" id="companyType1" value="1" name="companyType" checked="" onclick="TCarInfoDlg.companyTypeClick(1)">
                                <label for="companyType1"> 平台车辆 </label>
                            </div>
                            <div class="radio radio-success radio-inline">
                                <input type="radio" id="companyTyp2" value="2" name="companyType" onclick="TCarInfoDlg.companyTypeClick(2)">
                                <label for="companyTyp2"> 加盟车辆 </label>
                            </div>
                            <select class="form-control companyDiv" id="oneId" onchange="TCarInfoDlg.oneChange(this)" style="width: 200px;display: none;">
                                <option value="">选择所属分公司</option>
                                @for(obj in companyList!){
                                <option value="${obj.id}">${obj.name}</option>
                                @}
                            </select>
                            <select class="form-control companyDiv" id="twoId"  style="width: 200px;margin-left: 30px;display: none;">
                                <option value="">选择所属加盟商</option>
                            </select>
                            @}else if(roleType == 2){
                            <span class="control-label">${objectName!}</span>
                            <select class="form-control" id="franchiseeId"  style="width: 200px;margin-left: 30px;">
                                <option value="">选择所属加盟商</option>
                                @for(obj in franchiseeList!){
                                <option value="${obj.id}">${obj.name}</option>
                                @}
                            </select>
                            @}else if(roleType == 3){
                            <span class="control-label">${objectName!}</span>
                            @}
                        </div>
                    </div>
                    <div class="form-group">
                        <fieldset>
                            <label class="col-sm-3 control-label">服务模式:</label>
                            <div class="col-sm-9">
                                <div class="checkbox checkbox-success  checkbox-inline">
                                    <input type="checkbox" name="serverBox" id="serverBox1" value="1" onclick="TCarInfoDlg.zcServerClick()">
                                    <label for="serverBox1"> 摩托车 </label>
                                </div>
                                <div class="checkbox checkbox-success  checkbox-inline">
                                    <input type="checkbox" name="serverBox" id="serverBox4" value="4">
                                    <label for="serverBox4"> 同城快送 </label>
                                </div>
                            </div>
                        </fieldset>
                    </div>
                    <div class="form-group" style="display: none;" id="zcModelDiv">
                        <label class="col-sm-3 control-label">摩托车车型:</label>
                        <div class="col-sm-9">
                            <select class="form-control" id="zcModel" name="zcModel">
                                <option value="">选择车型</option>
                                @for(obj in zcModelList){
                                <option value="${obj.id}">${obj.name}</option>
                                @}
                            </select>
                        </div>
                    </div>
                    <div class="form-group" style="display: none;" id="kcModelDiv">
                        <label class="col-sm-3 control-label">同城快送车型:</label>
                        <div class="col-sm-9">
                            <select class="form-control" id="kcModel" name="kcModel">
                                <option value="">选择车型</option>
                                @for(obj in kcModelList){
                                <option value="${obj.id}">${obj.name}</option>
                                @}
                            </select>
                        </div>
                    </div>
                    <#select id="carBrandId" name="车辆品牌:" onchange="TCarInfoDlg.brandChange(this)">
                    <option value="">选择车辆品牌</option>
                    @for(obj in brandList){
                    <option value="${obj.id}">${obj.name}</option>
                    @}
                </#select>
                <#select id="carModelId" name="车辆类型:">
                <option value="">选择车辆类型</option>
            </#select>
            <#select id="carColor" name="车辆颜色:">
            <option value="">选择车辆颜色</option>
            <option value="1">黑色</option>
            <option value="2">银色</option>
            <option value="3">白色</option>
            <option value="4">红色</option>
            <option value="5">黄色</option>
            <option value="6">橙色</option>
            <option value="7">蓝色</option>
        </#select>
        <#input id="carLicensePlate" name="车牌号" />
        <#avatar id="carPhoto" name="车辆照片:" />
        <#input id="drivingLicenseNumber" name="行驶证编号" />
        <#avatar id="drivingLicensePhoto" name="行驶证照片:" />
        <#input id="annualInspectionTime" name="年检到期时间" type="text"/>
        <#input id="commercialInsuranceTime" name="商业保险到期时间" type="text"/>
    </div>
        <div class="form-horizontal" id="carInfoForm">
            <div class="form-group" id="provinceCode">
                <label class="col-sm-3 control-label">举办省:</label>
                <div class="col-sm-9">
                    <select class="form-control" id="pCode" name="pCode">
                        <option value="">选择省</option>
                    </select>
                </div>
            </div>
            <div class="form-group" id="cityCode">
                <label class="col-sm-3 control-label">举办市:</label>
                <div class="col-sm-9">
                    <select class="form-control" id="cCode" name="cCode">
                        <option value="">选择市</option>
                    </select>
                </div>
            </div>
            <div class="form-group" id="shop">
                <label class="col-sm-3 control-label">举办门店:</label>
                <div class="col-sm-9">
                    <select class="form-control" id="shopId" name="shopId">
                        <option value="">选择门店</option>
                    </select>
                </div>
            </div>
        <#input id="name" name="赛事名称" type="text"/>
        <#input id="startTime" name="开始时间" type="text"/>
        <#input id="endTime" name="结束时间" type="text"/>
        <#input id="registerEndTime" name="截止报名时间" type="text"/>
            <div class="form-group">
                <label class="col-sm-3 control-label">报名条件:</label>
                <div class="col-sm-9">
                    <input type="radio" name="registerCondition" value="1" checked> 全部用户
                    <input type="radio" name="registerCondition" value="2">仅限年度会员参与
                    <input type="radio" name="registerCondition" value="3">仅限学员参与
                </div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">报名年龄:</label>
                <div class="col-sm-9" style="display: flex">
                    <input class="form-control"  style="width: 100px;"  type="text" id="startAge"> ~ <input class="form-control"  style="width: 100px;" type="text" id="endAge">
                </div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">支付方式:</label>
                <div class="col-sm-9">
                    <input type="checkbox"> 现金支付
                    <input type="checkbox"> 玩湃币支付
                    <input type="checkbox"> 课时支付
                </div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">现金支付:</label>
                <div class="col-sm-9">
                    <input class="form-control"  style="width: 200px;"  type="text" id="cashPrice">
                </div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">玩湃币支付:</label>
                <div class="col-sm-9">
                    <input class="form-control"  style="width: 200px;" type="text" id="playPaiCoin">
                </div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">课时支付:</label>
                <div class="col-sm-9">
                    <input class="form-control"  style="width: 200px;" type="text" id="classPrice">
                </div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">参加地点:</label>
                <div class="col-sm-9">
                    <input class="form-control"  style="width: 500px;" type="text" id="address">
                </div>
            </div>
            <#input id="applicantsNumber" name="报名人数" type="text"/>
            <#input id="baseNumber" name="基础报名人数" type="text"/>
            <div class="form-group">
                <label class="col-sm-3 control-label">是否实名:</label>
                <div class="col-sm-9">
                    <input type="radio" name="realName" value="1" checked> 是
                    <input type="radio" name="realName" value="0"> 否
                </div>
            </div>
                <div class="form-group">
                    <label class="col-sm-3 control-label">赛事简介:</label>
                    <div class="col-sm-9">
                        <textarea  id="introduction"></textarea>
                    </div>
                </div>
                <#avatar id="coverDrawing" name="赛事封面(推荐像素:210*280px):" />
                <#avatar id="imgs" name="赛事图片(推荐像素:780*440px):" />
                <#avatar id="registrationNotes" name="报名须知(推荐像素:宽780px):" />
        </div>
</div>
<div class="row btn-group-m-t">
@@ -113,13 +116,12 @@
        <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TCarInfoDlg.close()"/>
    </div>
</div>
            @}
        </div>
    </div>
</div>
<script src="${ctxPath}/modular/system/tCar/tCar_info.js"></script>
<script src="${ctxPath}/modular/system/tCompetition/tCompetition_info.js"></script>
<script>
    laydate.render({
        elem: '#annualInspectionTime'