Browse Source

10.28

tiaosheng
Wang0018 5 years ago
parent
commit
bc57141788
  1. 10
      mt/src/main/java/com/ccsens/mt/api/ProvinceController.java
  2. 22
      mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java
  3. 2
      mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java
  4. 1
      mt/src/main/java/com/ccsens/mt/persist/dao/CompeteTimeDao.java
  5. 6
      mt/src/main/java/com/ccsens/mt/service/IProvinceService.java
  6. 23
      mt/src/main/java/com/ccsens/mt/service/ProvinceService.java

10
mt/src/main/java/com/ccsens/mt/api/ProvinceController.java

@ -12,6 +12,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Repository;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@ -112,6 +113,15 @@ public class ProvinceController {
log.info("添加/修改单位信息:{}",competeCompany);
return JsonResponse.newInstance().ok(competeCompany);
}
@MustLogin
@ApiOperation(value ="添加/修改领队或教练",notes = "")
@RequestMapping(value = "/province/save/coach",method = RequestMethod.POST,produces = {"application/json;charset=UTF-8"})
public JsonResponse updataLeader(@ApiParam @Validated @RequestBody QueryDto<ProvinceCompeteDto.ModifyLeader> params){
log.info("添加/修改单位信息:{}",params);
provinceService.updateLeader(params.getParam());
return JsonResponse.newInstance().ok();
}

22
mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java

@ -69,4 +69,26 @@ public class ProvinceCompeteDto {
@ApiModelProperty("保险证明照片")
private Part insuranceRecord;
}
@Data
@ApiModel("添加/修改领队或教练")
public static class ModifyLeader{
@ApiModelProperty("参赛单位id")
private Long companyId; //参赛单位id
@ApiModelProperty("教练或领队的id")
private Long coachId; //教练或领队的id,有则修改,没有则添加
@ApiModelProperty("身份: 0领队 1教练")
private int identity; //身份: 0领队 1教练
@ApiModelProperty("姓名")
private String name; //姓名
@ApiModelProperty("性别")
private String gender; //性别
@ApiModelProperty("联系方式")
private String phone; //联系方式
@ApiModelProperty("身份证号")
private String idCard; //身份证号
@ApiModelProperty("证件照")
private Long idPhoto; //证件照(文件类型)
@ApiModelProperty("教练证")
private Long coachCertificate; //教练证(只有教练需要,文件类型)
}
}

2
mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java

@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.servlet.http.Part;
import java.util.List;
@ -102,4 +103,5 @@ public class ProvinceCompeteVo {
@ApiModelProperty("参赛人员的人数")
private int playerNum;
}
}

1
mt/src/main/java/com/ccsens/mt/persist/dao/CompeteTimeDao.java

@ -49,4 +49,5 @@ public interface CompeteTimeDao extends CompeteTimeMapper {
* @return 返回组别信息
*/
List<CompeteVo.CompeteGroup> queryGroupByProject(@Param("type") int type, @Param("projectId") Long projectId);
}

6
mt/src/main/java/com/ccsens/mt/service/IProvinceService.java

@ -75,5 +75,9 @@ public interface IProvinceService {
*/
ProvinceCompeteVo.CompeteCompany changeCompany(CompeteDto.CompeteCompany param);
/**
* 添加/修改领队或教练
* @param param
*/
void updateLeader(ProvinceCompeteDto.ModifyLeader param);
}

23
mt/src/main/java/com/ccsens/mt/service/ProvinceService.java

@ -1,5 +1,6 @@
package com.ccsens.mt.service;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.lang.Snowflake;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@ -11,6 +12,7 @@ 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.persist.mapper.CompeteCoachMapper;
import com.ccsens.mt.util.Constant;
import com.ccsens.util.CodeEnum;
import com.ccsens.util.PropUtil;
@ -45,6 +47,9 @@ public class ProvinceService implements IProvinceService {
@Resource
private CompetePlayerDao competePlayerDao;
@Resource
private CompeteCoachMapper competeCoachMapper;
/**
* 查找当前用户填写的信息的概览
*/
@ -157,6 +162,7 @@ public class ProvinceService implements IProvinceService {
commonFileMapper.insertSelective(fileDo);
log.info("保存文件:{}", fileDo);
return fileDo.getId();
}
@ -216,5 +222,22 @@ public class ProvinceService implements IProvinceService {
return competeCompany1;
}
@Override
public void updateLeader(ProvinceCompeteDto.ModifyLeader param) {
Long coachId=param.getCoachId();
if(ObjectUtil.isNull(coachId)){
CompeteCoach competeCoach=new CompeteCoach();
competeCoach.setId(snowflake.nextId());
BeanUtil.copyProperties(param,competeCoach);
competeCoachMapper.insertSelective(competeCoach);
}else{
CompeteCoach competeCoach=competeCoachMapper.selectByPrimaryKey(coachId);
if(ObjectUtil.isNotNull(competeCoach)){
BeanUtil.copyProperties(param,competeCoach);
competeCoachMapper.updateByPrimaryKeySelective(competeCoach);
}
}
}
}

Loading…
Cancel
Save