diff --git a/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java b/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java index ad15e257..acf78581 100644 --- a/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java +++ b/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java @@ -3,7 +3,6 @@ package com.ccsens.mt.api; import com.ccsens.cloudutil.annotation.MustLogin; import com.ccsens.mt.bean.dto.CompeteDto; import com.ccsens.mt.bean.dto.ProvinceCompeteDto; -import com.ccsens.mt.bean.vo.CompeteVo; import com.ccsens.mt.bean.vo.ProvinceCompeteVo; import com.ccsens.mt.service.IProvinceService; import com.ccsens.util.JsonResponse; @@ -106,13 +105,50 @@ public class ProvinceController { @MustLogin @ApiOperation(value = "添加/修改单位信息", notes = "") @RequestMapping(value = "/save/company", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse saveCompany(@ApiParam @Validated @RequestBody QueryDto params) { + public JsonResponse saveCompany(@ApiParam @Validated @RequestBody QueryDto params) { log.info("添加/修改单位信息：{}",params); ProvinceCompeteVo.CompeteCompany competeCompany = provinceService.changeCompany(params.getParam()); log.info("添加/修改单位信息：{}",competeCompany); return JsonResponse.newInstance().ok(competeCompany); } + @MustLogin + @ApiOperation(value = "查找此单位的领队和教练信息", notes = "") + @RequestMapping(value = "/query/coach", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse queryCoach(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("查找此单位的领队和教练信息：{}",params); + ProvinceCompeteVo.CompeteCompanyCoach competeCompanyCoach = provinceService.queryCoach(params.getParam()); + log.info("查找此单位的领队和教练信息：{}",competeCompanyCoach); + return JsonResponse.newInstance().ok(competeCompanyCoach); + } + @MustLogin + @ApiOperation(value = "保存领队和教练信息", notes = "") + @RequestMapping(value = "/save/coach", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse saveCoach(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("保存领队和教练信息：{}",params); + provinceService.saveCoach(params.getParam()); + log.info("保存领队和教练信息：{}","插入成功"); + return JsonResponse.newInstance().ok(); + } + + @MustLogin + @ApiOperation(value = "删除领队和教练信息", notes = "") + @RequestMapping(value = "/delete/coach", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse deleteCoach(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("删除领队和教练信息：{}",params); + provinceService.deleteCoach(params.getParam()); + log.info("删除领队和教练信息：{}","删除成功"); + return JsonResponse.newInstance().ok(); + } + + @MustLogin + @ApiOperation(value = "参加比赛", notes = "") + @RequestMapping(value = "/join", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse playerJoinProject(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("参加比赛：{}",params); + provinceService.playerJoinProject(params.getParam()); + return JsonResponse.newInstance().ok(); + } } diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java index f3fd7331..5122a834 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java @@ -249,5 +249,27 @@ public class CompeteDto { private int authorization; } + @Data + @ApiModel("当前用户参赛单位基本信息") + public static class AddCoach{ + @ApiModelProperty("参赛单位id") + private Long companyId; + @ApiModelProperty("教练或领队的id，有则修改，没有则添加") + private Long coachId; + @ApiModelProperty("身份: 0领队 1教练") + private int identity ; + @ApiModelProperty("姓名") + private String name ; + @ApiModelProperty("性别") + private int gender ; + @ApiModelProperty("手机号") + private String phone ; + @ApiModelProperty("身份证号") + private String idCard; + @ApiModelProperty("证件照（文件类型") + private Long idPhoto; + @ApiModelProperty("教练证（只有教练需要，文件类型") + private Long coachCertificate; + } } diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java index b7da8617..c913f01f 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java @@ -6,6 +6,7 @@ import lombok.Data; import javax.servlet.http.Part; import javax.validation.constraints.NotNull; +import java.util.List; /** * @author 逗 @@ -57,16 +58,42 @@ public class ProvinceCompeteDto { @ApiModelProperty("身份证号") private String idCard; @ApiModelProperty("身份证正面照片") - private Part idCardFront; + private Long idCardFront; @ApiModelProperty("身份证反面照片") - private Part idCardBack; + private Long idCardBack; @ApiModelProperty("证件照") - private Part idPhone; + private Long idPhone; @ApiModelProperty("学籍照片") - private Part studentRecord; + private Long studentRecord; @ApiModelProperty("体检证明照片") - private Part healthRecord; + private Long healthRecord; @ApiModelProperty("保险证明照片") - private Part insuranceRecord; + private Long insuranceRecord; +// @ApiModelProperty("身份证正面照片") +// private Part idCardFront; +// @ApiModelProperty("身份证反面照片") +// private Part idCardBack; +// @ApiModelProperty("证件照") +// private Part idPhone; +// @ApiModelProperty("学籍照片") +// private Part studentRecord; +// @ApiModelProperty("体检证明照片") +// private Part healthRecord; +// @ApiModelProperty("保险证明照片") +// private Part insuranceRecord; } + @Data + @ApiModel("选择选手参加项目") + public static class JoinProject{ + @NotNull + @ApiModelProperty("大赛id") + private Long competeTimeId ; + @ApiModelProperty("项目id") + private Long projectId; + @ApiModelProperty("单位id") + private Long companyId; + @ApiModelProperty("选手id") + private List playerId; + } + } diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteTeam.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteTeam.java index 1b959386..d88d0524 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteTeam.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteTeam.java @@ -28,6 +28,8 @@ public class CompeteTeam implements Serializable { private Byte success; + private Long companyId; + private static final long serialVersionUID = 1L; public Long getId() { @@ -126,6 +128,14 @@ public class CompeteTeam implements Serializable { this.success = success; } + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -144,6 +154,7 @@ public class CompeteTeam implements Serializable { sb.append(", recStatus=").append(recStatus); sb.append(", competeGroupId=").append(competeGroupId); sb.append(", success=").append(success); + sb.append(", companyId=").append(companyId); sb.append("]"); return sb.toString(); } diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteTeamExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteTeamExample.java index 8d06ad1e..f447e9ef 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteTeamExample.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteTeamExample.java @@ -834,6 +834,66 @@ public class CompeteTeamExample { addCriterion("success not between", value1, value2, "success"); return (Criteria) this; } + + public Criteria andCompanyIdIsNull() { + addCriterion("company_id is null"); + return (Criteria) this; + } + + public Criteria andCompanyIdIsNotNull() { + addCriterion("company_id is not null"); + return (Criteria) this; + } + + public Criteria andCompanyIdEqualTo(Long value) { + addCriterion("company_id =", value, "companyId"); + return (Criteria) this; + } + + public Criteria andCompanyIdNotEqualTo(Long value) { + addCriterion("company_id <>", value, "companyId"); + return (Criteria) this; + } + + public Criteria andCompanyIdGreaterThan(Long value) { + addCriterion("company_id >", value, "companyId"); + return (Criteria) this; + } + + public Criteria andCompanyIdGreaterThanOrEqualTo(Long value) { + addCriterion("company_id >=", value, "companyId"); + return (Criteria) this; + } + + public Criteria andCompanyIdLessThan(Long value) { + addCriterion("company_id <", value, "companyId"); + return (Criteria) this; + } + + public Criteria andCompanyIdLessThanOrEqualTo(Long value) { + addCriterion("company_id <=", value, "companyId"); + return (Criteria) this; + } + + public Criteria andCompanyIdIn(List values) { + addCriterion("company_id in", values, "companyId"); + return (Criteria) this; + } + + public Criteria andCompanyIdNotIn(List values) { + addCriterion("company_id not in", values, "companyId"); + return (Criteria) this; + } + + public Criteria andCompanyIdBetween(Long value1, Long value2) { + addCriterion("company_id between", value1, value2, "companyId"); + return (Criteria) this; + } + + public Criteria andCompanyIdNotBetween(Long value1, Long value2) { + addCriterion("company_id not between", value1, value2, "companyId"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java index 30bd59b3..745c1121 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java @@ -25,6 +25,8 @@ public class ProvinceCompeteVo { private int guideNum; @ApiModelProperty("当前添加的参赛人员的人数") private int playerNum; + @ApiModelProperty("当前报名的项目数量") + private int projectNum; } @Data @@ -104,4 +106,21 @@ public class ProvinceCompeteVo { @ApiModelProperty("参赛人员的人数") private int playerNum; } + @Data + + @ApiModel("查询当前用户参赛单位基本信息") + public static class CompeteCompanyCoach { + @ApiModelProperty("教练id") + private Long coachId; + @ApiModelProperty("领队id") + private Long guideId; + @ApiModelProperty("教练名字") + private String coachName; + @ApiModelProperty("领队名字") + private String guideName; + @ApiModelProperty("性别") + private int gender; + @ApiModelProperty("联系方式") + private String phone; + } } diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java index b95fb035..c6195f1f 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java @@ -56,6 +56,27 @@ public interface CompeteCompanyDao extends CompeteCompanyMapper { ProvinceCompeteVo.CompeteCompany getCompany(@Param("competeTimeId")long competeTimeId,@Param("userId")long userId); - void saveCompany (ProvinceCompeteVo.CompeteCompany competeCompany); + /** + * 查看单位报名的项目的数量 + * @param companyId 单位id + * @return 返回单位参加的项目的数量 + */ + int getJoinProjectNum(@Param("competeTimeId")Long companyId); + + /** + * 查找单位在某项目下的某个组别的参赛数量（个人项目） + * @param projectId 项目id + * @param companyId 单位id + * @param groupId 组别id + * @return 返回参加的数量 + */ + int getNumByCompanyAndGroup(@Param("projectId")Long projectId, @Param("companyId")Long companyId, @Param("groupId")Long groupId,@Param("competeTimeId")Long competeTimeId); + /** + * 查看此用户在这届大赛参加了几个团队项目 + * @param competeTimeId 大赛id + * @param playerId 选手id + * @return 参加的数量 + */ + int getTeamNumByPlayerId(@Param("competeTimeId")Long competeTimeId, @Param("playerId")Long playerId); } diff --git a/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java b/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java index efc56efe..d206d84b 100644 --- a/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java @@ -2,7 +2,6 @@ package com.ccsens.mt.service; import com.ccsens.mt.bean.dto.CompeteDto; import com.ccsens.mt.bean.dto.ProvinceCompeteDto; -import com.ccsens.mt.bean.vo.CompeteVo; import com.ccsens.mt.bean.vo.ProvinceCompeteVo; import java.util.List; @@ -76,4 +75,33 @@ public interface IProvinceService { ProvinceCompeteVo.CompeteCompany changeCompany(CompeteDto.CompeteCompany param); + /** + * 查找此单位的领队和教练信息 + * @param + * @param + * @return + */ + ProvinceCompeteVo.CompeteCompanyCoach queryCoach(CompeteDto.CompeteCompany param); + + /** + * 添加领队和教练信息 + * @param + * @param + * @return + */ + void saveCoach(CompeteDto.AddCoach param); + + /** + * 删除领队和教练信息 + * @param + * @param + * @return + */ + void deleteCoach(CompeteDto.AddCoach param); + + /** + * 选择选手参加比赛 + * @param param 选手id和项目id + */ + void playerJoinProject(ProvinceCompeteDto.JoinProject param); } diff --git a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java index 2fffc572..df6a13cf 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java @@ -1,225 +1,397 @@ -package com.ccsens.mt.service; - -import cn.hutool.core.lang.Snowflake; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.ccsens.mt.bean.dto.CompeteDto; -import com.ccsens.mt.bean.dto.ProvinceCompeteDto; -import com.ccsens.mt.bean.po.*; -import com.ccsens.mt.bean.vo.ProvinceCompeteVo; -import com.ccsens.mt.persist.dao.CompeteCompanyDao; -import com.ccsens.mt.persist.dao.CompetePlayerDao; -import com.ccsens.mt.persist.dao.CompeteTimeDao; -import com.ccsens.mt.persist.mapper.CommonFileMapper; -import com.ccsens.mt.util.Constant; -import com.ccsens.util.CodeEnum; -import com.ccsens.util.PropUtil; -import com.ccsens.util.UploadFileUtil_Servlet3; -import com.ccsens.util.exception.BaseException; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import javax.servlet.http.Part; -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -/** - * @author 逗 - */ -@Slf4j -@Service -@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) -public class ProvinceService implements IProvinceService { - @Resource - private CompeteCompanyDao competeCompanyDao; - @Resource - private Snowflake snowflake; - @Resource - private CompeteTimeDao competeTimeDao; - @Resource - private CommonFileMapper commonFileMapper; - @Resource - private CompetePlayerDao competePlayerDao; - - /** - * 查找当前用户填写的信息的概览 - */ - @Override - public ProvinceCompeteVo.CompeteOverview getOverview(CompeteDto.CompeteTime param, Long userId) { - return competeCompanyDao.getCompanyOverview(param.getCompeteTimeId(),userId); - } - - /** - * 通过组别id查找本单位的注册选手 - */ - @Override - public List queryPlayerByGroupId(ProvinceCompeteDto.QueryPlayerByGroup param, Long userId) { - return competeCompanyDao.queryPlayerByGroupId(param.getCompanyId(),param.getGroupId(),param.getProjectId()); - } - - - /** - * 查找一级项目 - */ - @Override - public List queryFirstProjectByCompeteTimeId(CompeteDto.CompeteTime param, Long userId) { - List firstProjects = new ArrayList<>(); - //根据比赛类型查找大赛id - CompeteTime competeTime = competeTimeDao.selectByPrimaryKey(param.getCompeteTimeId()); - if(ObjectUtil.isNotNull(competeTime)){ - firstProjects = competeCompanyDao.queryFirstProjectByCompeteTimeId(competeTime.getType()); - } - return firstProjects; - } - - @Override - public List queryProjectByFirstProject(ProvinceCompeteDto.FirstProject param, Long userId) { - return competeCompanyDao.queryProjectByFirstProject(param.getFirstProjectId()); - } - - /** - * 添加或修改选手 - */ - @Override - public void saveOrUpdatePlayer(ProvinceCompeteDto.PlayerInfo param, Long userId) throws Exception { - //判断选手id是否为空 - if(ObjectUtil.isNull(param.getPlayerId())){ - //id为空，新加一个选手 - CompetePlayer player = new CompetePlayer(); - player.setId(snowflake.nextId()); - player.setName(param.getPlayerName()); - player.setGender((byte) param.getGender()); - player.setIdCard(param.getIdCard()); - player.setCompanyId(param.getCompeteId()); - player.setCompeteGroupId(param.getGroupId()); - //添加身份证正面照片 - player.setIdCardFrontFile(uploadPhotoFile(param.getIdCardFront(),userId)); - //身份证反面 - player.setIdCardBackFile(uploadPhotoFile(param.getIdCardFront(),userId)); - //一寸证件照 - player.setIdPhotoFile(uploadPhotoFile(param.getIdCardFront(),userId)); - //学籍证明 - player.setStudentRecordFile(uploadPhotoFile(param.getIdCardFront(),userId)); - //健康证明 - player.setHealthRecordFile(uploadPhotoFile(param.getIdCardFront(),userId)); - //保险证明 - player.setInsuranceRecordFile(uploadPhotoFile(param.getIdCardFront(),userId)); - competePlayerDao.insertSelective(player); - log.info("新加参赛选手：{}",player); - }else { - //否则修改选手信息 - CompetePlayer player = competePlayerDao.selectByPrimaryKey(param.getPlayerId()); - log.info("查找需要修改的选手信息：{}",player); - if(ObjectUtil.isNull(player)){ throw new BaseException(CodeEnum.PARAM_ERROR); } - //字段不为空则修改 - if(StrUtil.isNotEmpty(param.getPlayerName())){player.setName(param.getPlayerName());} - if(StrUtil.isNotEmpty(param.getIdCard())){player.setIdCard(param.getIdCard());} - if(ObjectUtil.isNotNull(param.getGender())){player.setGender((byte) param.getGender());} - if(ObjectUtil.isNotNull(param.getGroupId())){player.setCompeteGroupId(param.getGroupId());} - if(ObjectUtil.isNotNull(param.getCompeteId())){player.setCompanyId(param.getCompeteId());} - if(ObjectUtil.isNotNull(param.getIdCardFront())){player.setIdCardFrontFile(uploadPhotoFile(param.getIdCardFront(),userId));} - if(ObjectUtil.isNotNull(param.getIdCardBack())){player.setIdCardBackFile(uploadPhotoFile(param.getIdCardFront(),userId));} - if(ObjectUtil.isNotNull(param.getIdPhone())){player.setIdPhotoFile(uploadPhotoFile(param.getIdCardFront(),userId));} - if(ObjectUtil.isNotNull(param.getStudentRecord())){ player.setStudentRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));} - if(ObjectUtil.isNotNull(param.getHealthRecord())){ player.setHealthRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));} - if(ObjectUtil.isNotNull(param.getInsuranceRecord())){ player.setInsuranceRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));} - competePlayerDao.updateByPrimaryKeySelective(player); - } - } - - /** - * 查找所有选手 - * @param param 单位id - * @param userId userId - * @return - */ - @Override - public List queryPlayerByCompanyId(ProvinceCompeteDto.CompanyIdVo param, Long userId) { - return competePlayerDao.queryPlayerByCompanyId(param.getCompanyId()); - } - - /** - * 将上传的图片信息保存，并在数据库添加记录 - */ - private Long uploadPhotoFile(Part file,Long userId) throws Exception { - log.info("上传文件:{}", file.getSubmittedFileName()); - String allowedExt = "jpg,jpeg,png"; - String dir = PropUtil.path; - String path = UploadFileUtil_Servlet3.uploadFile(file, allowedExt, dir); - log.info(dir+""+path); - - CommonFile fileDo = new CommonFile(); - String name = file.getSubmittedFileName(); - fileDo.setId(snowflake.nextId()); - fileDo.setFileName(name); - fileDo.setLocation(dir + File.separator + path); - fileDo.setUserId(userId); - fileDo.setVisitLocation(PropUtil.imgDomain + Constant.File.UPLOAD_URL + File.separator + path); - commonFileMapper.insertSelective(fileDo); - log.info("保存文件：{}", fileDo); - return fileDo.getId(); - } - - - @Override - public ProvinceCompeteVo.CompeteCompany getCompany(CompeteDto.CompeteTime param, Long userId) { - Long competeTimeId = param.getCompeteTimeId(); - return competeCompanyDao.getCompany(competeTimeId,userId); - } - - @Override - public ProvinceCompeteVo.CompeteCompany changeCompany(CompeteDto.CompeteCompany param) { - //判断当前单位id是否为空， - Long companyid = param.getCompanyId(); - CompeteCompany competeCompany = new CompeteCompany(); - ProvinceCompeteVo.CompeteCompany competeCompany1; - //单位id为空，新增 - if (ObjectUtil.isNull(companyid)){ - Long id = snowflake.nextId(); - competeCompany.setId(id); - competeCompany.setCoachNum(param.getCoachNum()); - competeCompany.setName(param.getCompanyName()); - competeCompany.setContactsName(param.getContactsName()); - competeCompany.setContactsPhone(param.getContactsPhone()); - competeCompany.setLeaderNum(param.getGuideNum()); - competeCompany.setJoinNum(param.getPlayerNum()); - competeCompanyDao.insertSelective(competeCompany); - CompeteCompanyExample competeCompanyExample = new CompeteCompanyExample(); - competeCompanyExample.createCriteria().andIdEqualTo(companyid); - competeCompany1 = (ProvinceCompeteVo.CompeteCompany) competeCompanyDao.selectByExample(competeCompanyExample); - }else { - //不为空，根据单位id查出来修改 判断传进来的参数是否为空 为空则跳过 不为空则修改 - CompeteCompanyExample competeCompanyExample = new CompeteCompanyExample(); - competeCompanyExample.createCriteria().andIdEqualTo(companyid); - competeCompany = (CompeteCompany) competeCompanyDao.selectByExample(competeCompanyExample); - if (ObjectUtil.isNotNull(param.getCoachNum())){ - competeCompany.setCoachNum(param.getCoachNum()); - } - if (ObjectUtil.isNotNull(param.getCompanyName())) { - competeCompany.setName(param.getCompanyName()); - } - if (ObjectUtil.isNotNull(param.getContactsName())) { - competeCompany.setContactsName(param.getContactsName()); - } - if (ObjectUtil.isNotNull(param.getContactsPhone())) { - competeCompany.setContactsPhone(param.getContactsPhone()); - } - if (ObjectUtil.isNotNull(param.getGuideNum())) { - competeCompany.setLeaderNum(param.getGuideNum()); - } - if (ObjectUtil.isNotNull(param.getPlayerNum())) { - competeCompany.setJoinNum(param.getPlayerNum()); - } - competeCompanyDao.updateByPrimaryKeySelective(competeCompany); - competeCompanyExample.createCriteria().andIdEqualTo(competeCompany.getId()); - competeCompany1 = (ProvinceCompeteVo.CompeteCompany) competeCompanyDao.selectByExample(competeCompanyExample); - } - return competeCompany1; - } - -} - +package com.ccsens.mt.service; + +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.lang.Snowflake; +import cn.hutool.core.util.IdcardUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.ccsens.mt.bean.dto.CompeteDto; +import com.ccsens.mt.bean.dto.ProvinceCompeteDto; +import com.ccsens.mt.bean.po.*; +import com.ccsens.mt.bean.vo.ProvinceCompeteVo; +import com.ccsens.mt.persist.dao.CompeteCompanyDao; +import com.ccsens.mt.persist.dao.CompetePlayerDao; +import com.ccsens.mt.persist.dao.CompeteTeamDao; +import com.ccsens.mt.persist.dao.CompeteTimeDao; +import com.ccsens.mt.persist.mapper.*; +import com.ccsens.mt.util.Constant; +import com.ccsens.util.CodeEnum; +import com.ccsens.util.PropUtil; +import com.ccsens.util.UploadFileUtil_Servlet3; +import com.ccsens.util.exception.BaseException; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import javax.servlet.http.Part; +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +/** + * @author 逗 + */ +@Slf4j +@Service +@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) +public class ProvinceService implements IProvinceService { + @Resource + private CompeteCompanyDao competeCompanyDao; + @Resource + private Snowflake snowflake; + @Resource + private CompeteTimeDao competeTimeDao; + @Resource + private CommonFileMapper commonFileMapper; + @Resource + private CompetePlayerDao competePlayerDao; + @Resource + private CompeteCoachMapper competeCoachMapper; + @Resource + private CompeteProjectMapper competeProjectMapper; + @Resource + private CompeteProjectPlayerMapper projectPlayerMapper; + @Resource + private CompeteTeamDao competeTeamDao; + @Resource + private CompeteTeamMemberMapper teamMemberMapper; + + /** + * 查找当前用户填写的信息的概览 + */ + @Override + public ProvinceCompeteVo.CompeteOverview getOverview(CompeteDto.CompeteTime param, Long userId) { + ProvinceCompeteVo.CompeteOverview competeOverview = competeCompanyDao.getCompanyOverview(param.getCompeteTimeId(),userId); + if(ObjectUtil.isNotNull(competeOverview)){ + competeOverview.setProjectNum(competeCompanyDao.getJoinProjectNum(competeOverview.getCompanyId())); + } + return competeOverview; + } + + /** + * 通过组别id查找本单位的注册选手 + */ + @Override + public List queryPlayerByGroupId(ProvinceCompeteDto.QueryPlayerByGroup param, Long userId) { + return competeCompanyDao.queryPlayerByGroupId(param.getCompanyId(),param.getGroupId(),param.getProjectId()); + } + + + /** + * 查找一级项目 + */ + @Override + public List queryFirstProjectByCompeteTimeId(CompeteDto.CompeteTime param, Long userId) { + List firstProjects = new ArrayList<>(); + //根据比赛类型查找大赛id + CompeteTime competeTime = competeTimeDao.selectByPrimaryKey(param.getCompeteTimeId()); + if(ObjectUtil.isNotNull(competeTime)){ + firstProjects = competeCompanyDao.queryFirstProjectByCompeteTimeId(competeTime.getType()); + } + return firstProjects; + } + + @Override + public List queryProjectByFirstProject(ProvinceCompeteDto.FirstProject param, Long userId) { + return competeCompanyDao.queryProjectByFirstProject(param.getFirstProjectId()); + } + + /** + * 添加或修改选手 + */ + @Override + public void saveOrUpdatePlayer(ProvinceCompeteDto.PlayerInfo param, Long userId) { + //判断选手id是否为空 + if(ObjectUtil.isNull(param.getPlayerId())){ + //id为空，新加一个选手 + CompetePlayer player = new CompetePlayer(); + player.setId(snowflake.nextId()); + player.setName(param.getPlayerName()); + player.setGender((byte) param.getGender()); + //身份证不能为空，且正确 + if(StrUtil.isEmpty(param.getIdCard()) || !IdcardUtil.isValidCard(param.getIdCard())){throw new BaseException(CodeEnum.ID_CARD_ERROR);} + //是否已注册 + CompetePlayerExample competePlayerExample = new CompetePlayerExample(); + competePlayerExample.createCriteria().andIdCardEqualTo(param.getIdCard()); + if(competePlayerDao.countByExample(competePlayerExample) != 0){ + throw new BaseException(CodeEnum.WBS_REPEAT_MEMBER_PHONE); + } + player.setIdCard(param.getIdCard()); + player.setCompanyId(param.getCompeteId()); + player.setCompeteGroupId(param.getGroupId()); + player.setIdCardFrontFile(param.getIdCardFront()); + player.setIdCardBackFile(param.getIdCardBack()); + player.setIdPhotoFile(param.getIdPhone()); + player.setStudentRecordFile(param.getStudentRecord()); + player.setHealthRecordFile(param.getHealthRecord()); + player.setInsuranceRecordFile(param.getInsuranceRecord()); +// //添加身份证正面照片 +// player.setIdCardFrontFile(uploadPhotoFile(param.getIdCardFront(),userId)); +// //身份证反面 +// player.setIdCardBackFile(uploadPhotoFile(param.getIdCardFront(),userId)); +// //一寸证件照 +// player.setIdPhotoFile(uploadPhotoFile(param.getIdCardFront(),userId)); +// //学籍证明 +// player.setStudentRecordFile(uploadPhotoFile(param.getIdCardFront(),userId)); +// //健康证明 +// player.setHealthRecordFile(uploadPhotoFile(param.getIdCardFront(),userId)); +// //保险证明 +// player.setInsuranceRecordFile(uploadPhotoFile(param.getIdCardFront(),userId)); + competePlayerDao.insertSelective(player); + log.info("新加参赛选手：{}",player); + }else { + //否则修改选手信息 + CompetePlayer player = competePlayerDao.selectByPrimaryKey(param.getPlayerId()); + log.info("查找需要修改的选手信息：{}",player); + if(ObjectUtil.isNull(player)){ throw new BaseException(CodeEnum.PARAM_ERROR); } + //字段不为空则修改 + if(StrUtil.isNotEmpty(param.getPlayerName())){player.setName(param.getPlayerName());} + if(StrUtil.isNotEmpty(param.getIdCard())){player.setIdCard(param.getIdCard());} + if(ObjectUtil.isNotNull(param.getGender())){player.setGender((byte) param.getGender());} + if(ObjectUtil.isNotNull(param.getGroupId())){player.setCompeteGroupId(param.getGroupId());} + if(ObjectUtil.isNotNull(param.getCompeteId())){player.setCompanyId(param.getCompeteId());} + + if(ObjectUtil.isNotNull(param.getIdCardFront())){player.setIdCardFrontFile(param.getIdCardFront());} + if(ObjectUtil.isNotNull(param.getIdCardBack())){player.setIdCardBackFile(param.getIdCardBack());} + if(ObjectUtil.isNotNull(param.getIdPhone())){player.setIdPhotoFile(param.getIdPhone());} + if(ObjectUtil.isNotNull(param.getStudentRecord())){player.setStudentRecordFile(param.getStudentRecord());} + if(ObjectUtil.isNotNull(param.getHealthRecord())){player.setHealthRecordFile(param.getHealthRecord());} + if(ObjectUtil.isNotNull(param.getInsuranceRecord())){player.setInsuranceRecordFile(param.getInsuranceRecord());} + +// if(ObjectUtil.isNotNull(param.getIdCardFront())){player.setIdCardFrontFile(uploadPhotoFile(param.getIdCardFront(),userId));} +// if(ObjectUtil.isNotNull(param.getIdCardBack())){player.setIdCardBackFile(uploadPhotoFile(param.getIdCardFront(),userId));} +// if(ObjectUtil.isNotNull(param.getIdPhone())){player.setIdPhotoFile(uploadPhotoFile(param.getIdCardFront(),userId));} +// if(ObjectUtil.isNotNull(param.getStudentRecord())){ player.setStudentRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));} +// if(ObjectUtil.isNotNull(param.getHealthRecord())){ player.setHealthRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));} +// if(ObjectUtil.isNotNull(param.getInsuranceRecord())){ player.setInsuranceRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));} + competePlayerDao.updateByPrimaryKeySelective(player); + } + } + + /** + * 查找所有选手 + * @param param 单位id + * @param userId userId + * @return 返回选手信息 + */ + @Override + public List queryPlayerByCompanyId(ProvinceCompeteDto.CompanyIdVo param, Long userId) { + return competePlayerDao.queryPlayerByCompanyId(param.getCompanyId()); + } + + /** + * 将上传的图片信息保存，并在数据库添加记录 + */ + private Long uploadPhotoFile(Part file,Long userId) throws Exception { + log.info("上传文件:{}", file.getSubmittedFileName()); + String allowedExt = "jpg,jpeg,png"; + String dir = PropUtil.path; + String path = UploadFileUtil_Servlet3.uploadFile(file, allowedExt, dir); + log.info(dir+""+path); + + CommonFile fileDo = new CommonFile(); + String name = file.getSubmittedFileName(); + fileDo.setId(snowflake.nextId()); + fileDo.setFileName(name); + fileDo.setLocation(dir + File.separator + path); + fileDo.setUserId(userId); + fileDo.setVisitLocation(PropUtil.imgDomain + Constant.File.UPLOAD_URL + File.separator + path); + commonFileMapper.insertSelective(fileDo); + log.info("保存文件：{}", fileDo); + return fileDo.getId(); + } + + + @Override + public ProvinceCompeteVo.CompeteCompany getCompany(CompeteDto.CompeteTime param, Long userId) { + Long competeTimeId = param.getCompeteTimeId(); + return competeCompanyDao.getCompany(competeTimeId,userId); + } + + @Override + public ProvinceCompeteVo.CompeteCompany changeCompany(CompeteDto.CompeteCompany param) { + //判断当前单位id是否为空， + Long companyid = param.getCompanyId(); + CompeteCompany competeCompany = new CompeteCompany(); + ProvinceCompeteVo.CompeteCompany competeCompany1; + //单位id为空，新增 + if (ObjectUtil.isNull(companyid)){ + Long id = snowflake.nextId(); + competeCompany.setId(id); + competeCompany.setCoachNum(param.getCoachNum()); + competeCompany.setName(param.getCompanyName()); + competeCompany.setContactsName(param.getContactsName()); + competeCompany.setContactsPhone(param.getContactsPhone()); + competeCompany.setLeaderNum(param.getGuideNum()); + competeCompany.setJoinNum(param.getPlayerNum()); + competeCompanyDao.insertSelective(competeCompany); + CompeteCompanyExample competeCompanyExample = new CompeteCompanyExample(); + competeCompanyExample.createCriteria().andIdEqualTo(companyid); + competeCompany1 = (ProvinceCompeteVo.CompeteCompany) competeCompanyDao.selectByExample(competeCompanyExample); + }else { + //不为空，根据单位id查出来修改 判断传进来的参数是否为空 为空则跳过 不为空则修改 + CompeteCompanyExample competeCompanyExample = new CompeteCompanyExample(); + competeCompanyExample.createCriteria().andIdEqualTo(companyid); + competeCompany = (CompeteCompany) competeCompanyDao.selectByExample(competeCompanyExample); + if (ObjectUtil.isNotNull(param.getCoachNum())){ + competeCompany.setCoachNum(param.getCoachNum()); + } + if (ObjectUtil.isNotNull(param.getCompanyName())) { + competeCompany.setName(param.getCompanyName()); + } + if (ObjectUtil.isNotNull(param.getContactsName())) { + competeCompany.setContactsName(param.getContactsName()); + } + if (ObjectUtil.isNotNull(param.getContactsPhone())) { + competeCompany.setContactsPhone(param.getContactsPhone()); + } + if (ObjectUtil.isNotNull(param.getGuideNum())) { + competeCompany.setLeaderNum(param.getGuideNum()); + } + if (ObjectUtil.isNotNull(param.getPlayerNum())) { + competeCompany.setJoinNum(param.getPlayerNum()); + } + competeCompanyDao.updateByPrimaryKeySelective(competeCompany); + competeCompanyExample.createCriteria().andIdEqualTo(competeCompany.getId()); + competeCompany1 = (ProvinceCompeteVo.CompeteCompany) competeCompanyDao.selectByExample(competeCompanyExample); + } + return competeCompany1; + } + @Override + public ProvinceCompeteVo.CompeteCompanyCoach queryCoach(CompeteDto.CompeteCompany param) { + Long company = param.getCompanyId(); + CompeteCoach competeCoach = competeCoachMapper.selectByPrimaryKey(company); + if (ObjectUtil.isNull(competeCoach)){ + throw new BaseException(CodeEnum.PARAM_ERROR); + } + ProvinceCompeteVo.CompeteCompanyCoach competeCompanyCoach = new ProvinceCompeteVo.CompeteCompanyCoach(); + if (competeCoach.getIdentity() == 0){ + //给领队赋值 + competeCompanyCoach.setCoachName(competeCoach.getName()); + competeCompanyCoach.setCoachId(competeCoach.getId()); + competeCompanyCoach.setGender(competeCoach.getGender()); + competeCompanyCoach.setPhone(competeCoach.getPhone()); + }else { + competeCompanyCoach.setGuideName(competeCoach.getName()); + competeCompanyCoach.setCoachId(competeCoach.getId()); + competeCompanyCoach.setGender(competeCoach.getGender()); + competeCompanyCoach.setPhone(competeCoach.getPhone()); + } + return competeCompanyCoach; + } + + @Override + public void saveCoach(CompeteDto.AddCoach param) { + CompeteCoach competeCoach = new CompeteCoach(); + Long companyId = param.getCompanyId(); + competeCoach.setCompanyId(companyId); + Long cpachId = param.getCoachId(); + competeCoach.setId(cpachId); + int identity = param.getIdentity(); + competeCoach.setIdentity((byte) identity); + String name = param.getName(); + competeCoach.setName(name); + int gender = param.getGender(); + competeCoach.setGender((byte) gender); + String phone = param.getPhone(); + competeCoach.setPhone(phone); + String idCard = param.getIdCard(); + competeCoach.setIdCard(idCard); + Long idPhoto = param.getIdPhoto(); + competeCoach.setIdPhoto(idPhoto); + Long coachCertificate = param.getCoachCertificate(); + competeCoach.setCoachCertificate(coachCertificate); + competeCoachMapper.insertSelective(competeCoach); + } + + @Override + public void deleteCoach(CompeteDto.AddCoach param) { + Long coachId = param.getCoachId(); + CompeteCoach competeCoach = competeCoachMapper.selectByPrimaryKey(coachId); + competeCoachMapper.deleteByPrimaryKey(competeCoach.getId()); + } + + /** + * 选择选手参加比赛 + */ + @Override + public void playerJoinProject(ProvinceCompeteDto.JoinProject param) { + //查找项目信息 + CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(param.getProjectId()); + if(ObjectUtil.isNull(competeProject)){ throw new BaseException(CodeEnum.PARAM_ERROR); } + //检查参赛人数是否符合 + if(CollectionUtil.isEmpty(param.getPlayerId())){ throw new BaseException(CodeEnum.PARAM_ERROR); } + if(param.getPlayerId().size() < competeProject.getMemberMin() || param.getPlayerId().size() > competeProject.getMemberMax()){ + throw new BaseException(CodeEnum.TEAM_MEMBER_ERROR); + } + //判断项目是个人还是团队 + if(competeProject.getTeam() == 0){ + param.getPlayerId().forEach(playerId -> { + CompetePlayer player = competePlayerDao.selectByPrimaryKey(playerId); + if(ObjectUtil.isNull(player)){ throw new BaseException(CodeEnum.PARAM_ERROR); } + //查找此公司此组别是否参加过这个项目 + int num = competeCompanyDao.getNumByCompanyAndGroup(competeProject.getId(),player.getCompanyId(),player.getCompeteGroupId(),param.getCompeteTimeId()); + if(num > 0){ + throw new BaseException(CodeEnum.JOIN_PROJECT_NUM_FULL.mtProjectMsg("该项目该组别")); + } + //查找个人参赛数量是否符合 + CompeteProjectPlayerExample projectPlayerExample = new CompeteProjectPlayerExample(); + projectPlayerExample.createCriteria().andPlayerIdEqualTo(playerId).andCompeteTimeIdEqualTo(param.getCompeteTimeId()); + if(projectPlayerMapper.countByExample(projectPlayerExample) >= 3){ + throw new BaseException(CodeEnum.JOIN_PROJECT_NUM_FULL.mtProjectMsg(player.getName())); + } + //参加比赛记录 + CompeteProjectPlayer projectPlayer = new CompeteProjectPlayer(); + projectPlayer.setId(snowflake.nextId()); + projectPlayer.setCompeteTimeId(param.getCompeteTimeId()); + projectPlayer.setProjectId(param.getProjectId()); + projectPlayer.setPlayerId(playerId); + projectPlayer.setCompeteGroupId(player.getCompeteGroupId()); + projectPlayer.setGenderGroup(player.getGender()); + projectPlayerMapper.insertSelective(projectPlayer); + }); + }else { + //查找当前公司是否已经报名次项目 + CompeteTeamExample teamExample = new CompeteTeamExample(); + teamExample.createCriteria().andProjectIdEqualTo(competeProject.getId()).andCompanyIdEqualTo(param.getCompanyId()).andCompeteTimeIdEqualTo(param.getCompeteTimeId()); + if(competeTeamDao.countByExample(teamExample) > 0){ + throw new BaseException(CodeEnum.JOIN_PROJECT_NUM_FULL.mtProjectMsg("该项目")); + } + //生成团队 + CompeteTeam competeTeam = new CompeteTeam(); + competeTeam.setId(snowflake.nextId()); + competeTeam.setCompeteTimeId(param.getCompeteTimeId()); + competeTeam.setProjectId(param.getProjectId()); + competeTeam.setCompanyId(param.getCompanyId()); + //添加成员表 + for (int i = 0; i < param.getPlayerId().size(); i++) { + CompetePlayer player = competePlayerDao.selectByPrimaryKey(param.getPlayerId().get(i)); + if(ObjectUtil.isNull(player)){ throw new BaseException(CodeEnum.PARAM_ERROR); } + //检查该选手报名项目数量 + int a = competeCompanyDao.getTeamNumByPlayerId(param.getCompeteTimeId(),player.getId()); + if(a >= 6){ + throw new BaseException(CodeEnum.JOIN_PROJECT_NUM_FULL.mtProjectMsg(player.getName())); + } + //团队性别组根据参赛成员而定 + if (i == 0){ + competeTeam.setGenderGroup(player.getGender()); + }else { + if(!competeTeam.getGenderGroup().equals(player.getGender())){ + competeTeam.setGenderGroup((byte) 2); + } + } + //添加成员表 + CompeteTeamMember teamMember = new CompeteTeamMember(); + teamMember.setId(snowflake.nextId()); + teamMember.setCompeteTeamId(competeTeam.getId()); + teamMember.setPlayerId(player.getId()); + teamMemberMapper.insertSelective(teamMember); + } + //添加团队表 + competeTeamDao.insertSelective(competeTeam); + } + } +} + diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index 5c2cd5c4..5889ff7f 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: dev - include: common, util-dev \ No newline at end of file + active: test + include: common, util-test \ No newline at end of file diff --git a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml index 34bec894..b5782cb7 100644 --- a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml @@ -158,54 +158,52 @@ where user_id = #{userId} and compete_time_id = #{competeTimeId} + + + + - - insert into t_compete_company - - - id, - - - name, - - - contacts_name, - - - contacts_phone, - - - judgment_num, - - - leader_num, - - - join_num, - - - - - #{companyId,jdbcType=BIGINT}, - - - #{companyName,jdbcType=BIGINT}, - - - #{contactsName,jdbcType=INTEGER}, - - - #{contactsPhone,jdbcType=VARCHAR}, - - - #{coachNum,jdbcType=TIMESTAMP}, - - - #{guideNum,jdbcType=TIMESTAMP}, - - - #{playerNum,jdbcType=TINYINT}, - - - \ No newline at end of file diff --git a/mt/src/main/resources/mapper_raw/CompeteTeamMapper.xml b/mt/src/main/resources/mapper_raw/CompeteTeamMapper.xml index 260cc7b8..4c7a3c92 100644 --- a/mt/src/main/resources/mapper_raw/CompeteTeamMapper.xml +++ b/mt/src/main/resources/mapper_raw/CompeteTeamMapper.xml @@ -14,6 +14,7 @@ + @@ -75,7 +76,7 @@ id, creator, project_id, compete_time_id, gender_group, certificate, qr_code, created_at, - updated_at, rec_status, compete_group_id, success + updated_at, rec_status, compete_group_id, success, company_id @@ -243,6 +250,9 @@ success = #{record.success,jdbcType=TINYINT}, + + company_id = #{record.companyId,jdbcType=BIGINT}, + @@ -261,7 +271,8 @@ updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, rec_status = #{record.recStatus,jdbcType=TINYINT}, compete_group_id = #{record.competeGroupId,jdbcType=BIGINT}, - success = #{record.success,jdbcType=TINYINT} + success = #{record.success,jdbcType=TINYINT}, + company_id = #{record.companyId,jdbcType=BIGINT} @@ -302,6 +313,9 @@ success = #{success,jdbcType=TINYINT}, + + company_id = #{companyId,jdbcType=BIGINT}, + where id = #{id,jdbcType=BIGINT} @@ -317,7 +331,8 @@ updated_at = #{updatedAt,jdbcType=TIMESTAMP}, rec_status = #{recStatus,jdbcType=TINYINT}, compete_group_id = #{competeGroupId,jdbcType=BIGINT}, - success = #{success,jdbcType=TINYINT} + success = #{success,jdbcType=TINYINT}, + company_id = #{companyId,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT} \ No newline at end of file diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index af78a879..ebc544af 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,9 +1,5 @@ spring: profiles: -<<<<<<< HEAD active: test include: util-test,common -======= - active: dev - include: util-dev,common ->>>>>>> f7d8f099ca8ad4f99f76e5616b35eb8202fecdf8 + diff --git a/tall/src/main/resources/mapper_dao/TaskSubTimeDao.xml b/tall/src/main/resources/mapper_dao/TaskSubTimeDao.xml index e1d7271c..e2831abd 100644 --- a/tall/src/main/resources/mapper_dao/TaskSubTimeDao.xml +++ b/tall/src/main/resources/mapper_dao/TaskSubTimeDao.xml @@ -188,10 +188,10 @@ r.`name` as executorRoleName, d.`name` as taskName, d.milestone as milestone, - FROM_UNIXTIME(s.begin_time/1000,'%Y-%m-%d %H:%m') as beginTime, - FROM_UNIXTIME(s.end_time/1000,'%Y-%m-%d %H:%m') as endTime, - if(s.real_begin_time = 0,'' ,FROM_UNIXTIME(s.real_begin_time/1000,'%Y-%m-%d %H:%m')) as realBeginTime, - if(s.real_end_time = 0,'' ,FROM_UNIXTIME(s.real_end_time/1000,'%Y-%m-%d %H:%m')) as realEndTime, + FROM_UNIXTIME(s.begin_time/1000,'%m-%d %H:%m') as beginTime, + FROM_UNIXTIME(s.end_time/1000,'%m-%d %H:%m') as endTime, + if(s.real_begin_time = 0,'' ,FROM_UNIXTIME(s.real_begin_time/1000,'%m-%d %H:%m')) as realBeginTime, + if(s.real_end_time = 0,'' ,FROM_UNIXTIME(s.real_end_time/1000,'%m-%d %H:%m')) as realEndTime, t.commentId as commentId, t.userName as userName, t.commentValue as commentValue, @@ -248,10 +248,10 @@ r.`name` as executorRoleName, d.`name` as taskName, d.milestone as milestone, - FROM_UNIXTIME(s.begin_time/1000,'%Y-%m-%d %H:%m') as beginTime, - FROM_UNIXTIME(s.end_time/1000,'%Y-%m-%d %H:%m') as endTime, - if(s.real_begin_time = 0,'' ,FROM_UNIXTIME(s.real_begin_time/1000,'%Y-%m-%d %H:%m')) as realBeginTime, - if(s.real_end_time = 0,'' ,FROM_UNIXTIME(s.real_end_time/1000,'%Y-%m-%d %H:%m')) as realEndTime, + FROM_UNIXTIME(s.begin_time/1000,'%m-%d %H:%m') as beginTime, + FROM_UNIXTIME(s.end_time/1000,'%m-%d %H:%m') as endTime, + if(s.real_begin_time = 0,'' ,FROM_UNIXTIME(s.real_begin_time/1000,'%m-%d %H:%m')) as realBeginTime, + if(s.real_end_time = 0,'' ,FROM_UNIXTIME(s.real_end_time/1000,'%m-%d %H:%m')) as realEndTime, p.id as projectId, p.`name` as projectName, t.commentId as commentId, diff --git a/util/src/main/java/com/ccsens/util/CodeEnum.java b/util/src/main/java/com/ccsens/util/CodeEnum.java index 7a404f6c..f54770df 100644 --- a/util/src/main/java/com/ccsens/util/CodeEnum.java +++ b/util/src/main/java/com/ccsens/util/CodeEnum.java @@ -161,9 +161,14 @@ public enum CodeEnum { DINGDING_EXCEPTION(132,"钉钉接口调用异常。",true), URL_ERROR(133, "请求路径转换异常", true), + JOIN_PROJECT_NUM_FULL(134, "可参赛次数已满", true), ; + public CodeEnum mtProjectMsg(String msg){ + this.msg = msg+this.msg; + return this; + } public CodeEnum addMsg(String msg){ this.msg = msg+"行："+this.msg; return this;