diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java index 2fcf8095..4418005c 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java @@ -40,5 +40,4 @@ public class CompeteScoreController { - } diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java index 16db5922..9b765c08 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java @@ -57,14 +57,24 @@ public class CompeteVideoController { } @MustLogin - @ApiOperation(value = "查看用户签到状态(签到用)(有筛选", notes = "Mr.王---------") + @ApiOperation(value = "查看单位签到状态(签到用)(有筛选", notes = "Mr.王---------查看单位的人的最近一条的签到状态") @RequestMapping(value = "/selectUserStatus", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse selectUserStatus(@ApiParam @Validated @RequestBody QueryDto params) { - //这个没写完了 + public JsonResponse> selectCompanySignStatus(@ApiParam @Validated @RequestBody QueryDto params) { - log.info("添加用户观看开幕式视频记录(签到用)",params); - return JsonResponse.newInstance().ok(); + log.info("查看单位签到状态(签到用)",params); + List peoSignStatus = iCompeteVedioService.selectCompanySignStatus(params); + return JsonResponse.newInstance().ok(peoSignStatus); + } + @MustLogin + @ApiOperation(value = "查看教练签到状态(签到用)(有筛选", notes = "Mr.王---------查看教练的人的签到状态") + @RequestMapping(value = "/selectCoachStatus", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> selectCoachSignStatus(@ApiParam @Validated @RequestBody QueryDto params) { + + + log.info("查看教练签到状态(签到用)",params); + List coachSignStatus = iCompeteVedioService.selectCoachSignStatus(params); + return JsonResponse.newInstance().ok(coachSignStatus); } @MustLogin @@ -84,8 +94,8 @@ public class CompeteVideoController { log.info("添加用户观看开幕式视频记录(签到用)",params); List list=iCompeteVedioService.selectAllCompany(params); return JsonResponse.newInstance().ok(list); - } + } diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/ScoreDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/ScoreDto.java index 4bdcd814..a2f4abec 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/ScoreDto.java +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/ScoreDto.java @@ -1,5 +1,6 @@ package com.ccsens.mt.bean.dto; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -83,4 +84,35 @@ public class ScoreDto { @ApiModelProperty("分数") private BigDecimal score; } + + + @Data + @ApiModel + public static class InformationSubmitted{ + @ApiModelProperty("大赛id") + private Long competeTimeId; + @ApiModelProperty("项目Id") + private Long projectId; + @ApiModelProperty("场次id") + private BigDecimal siteOrderId; + @ApiModelProperty("裁判id") + private Long judgmentId; +// @ApiModelProperty("几分") +// List + + } + @Data + @ApiModel + public static class Fraction{ + @ApiModelProperty("分数") + private int score; + @ApiModelProperty("分数类型") + private String code; + + + + + } + + } diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java index 151a6c2e..21bb3fd9 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java @@ -3,6 +3,7 @@ package com.ccsens.mt.bean.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.NonNull; /** @@ -42,6 +43,7 @@ public class VideoDto { @Data @ApiModel("添加用户观看开幕式视频记录(签到用)") public static class Vdeo{ + @NonNull @ApiModelProperty("视频文件id") private Long companyId; } @@ -72,4 +74,20 @@ public class VideoDto { @ApiModelProperty("大赛id") private Long teamId; } + @Data + @ApiModel("参赛队伍/裁判签到表") + public static class GetTeamSignStatu{ + @ApiModelProperty("大赛id") + private Long id; + @ApiModelProperty("姓名/参赛队伍") + private String name; + + @ApiModelProperty("账号") + private String phone; + + @ApiModelProperty("签到时间") + private Long signEndTime; + + } + } diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgment.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgment.java index c2de5e32..079c5ad4 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgment.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgment.java @@ -6,6 +6,12 @@ import java.util.Date; public class CompeteJudgment implements Serializable { private Long id; + private String name; + + private String phone; + + private String remark; + private Long competeTimeId; private Long siteOrderId; @@ -32,6 +38,30 @@ public class CompeteJudgment implements Serializable { this.id = id; } + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name == null ? null : name.trim(); + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone == null ? null : phone.trim(); + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark == null ? null : remark.trim(); + } + public Long getCompeteTimeId() { return competeTimeId; } @@ -103,6 +133,9 @@ public class CompeteJudgment implements Serializable { sb.append(" ["); sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); + sb.append(", name=").append(name); + sb.append(", phone=").append(phone); + sb.append(", remark=").append(remark); sb.append(", competeTimeId=").append(competeTimeId); sb.append(", siteOrderId=").append(siteOrderId); sb.append(", projectId=").append(projectId); diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgmentExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgmentExample.java index 4d75f9ed..f88f0ccc 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgmentExample.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgmentExample.java @@ -165,6 +165,216 @@ public class CompeteJudgmentExample { return (Criteria) this; } + public Criteria andNameIsNull() { + addCriterion("name is null"); + return (Criteria) this; + } + + public Criteria andNameIsNotNull() { + addCriterion("name is not null"); + return (Criteria) this; + } + + public Criteria andNameEqualTo(String value) { + addCriterion("name =", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotEqualTo(String value) { + addCriterion("name <>", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThan(String value) { + addCriterion("name >", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThanOrEqualTo(String value) { + addCriterion("name >=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThan(String value) { + addCriterion("name <", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThanOrEqualTo(String value) { + addCriterion("name <=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLike(String value) { + addCriterion("name like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotLike(String value) { + addCriterion("name not like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameIn(List values) { + addCriterion("name in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameNotIn(List values) { + addCriterion("name not in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameBetween(String value1, String value2) { + addCriterion("name between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andNameNotBetween(String value1, String value2) { + addCriterion("name not between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andPhoneIsNull() { + addCriterion("phone is null"); + return (Criteria) this; + } + + public Criteria andPhoneIsNotNull() { + addCriterion("phone is not null"); + return (Criteria) this; + } + + public Criteria andPhoneEqualTo(String value) { + addCriterion("phone =", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneNotEqualTo(String value) { + addCriterion("phone <>", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneGreaterThan(String value) { + addCriterion("phone >", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneGreaterThanOrEqualTo(String value) { + addCriterion("phone >=", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneLessThan(String value) { + addCriterion("phone <", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneLessThanOrEqualTo(String value) { + addCriterion("phone <=", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneLike(String value) { + addCriterion("phone like", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneNotLike(String value) { + addCriterion("phone not like", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneIn(List values) { + addCriterion("phone in", values, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneNotIn(List values) { + addCriterion("phone not in", values, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneBetween(String value1, String value2) { + addCriterion("phone between", value1, value2, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneNotBetween(String value1, String value2) { + addCriterion("phone not between", value1, value2, "phone"); + return (Criteria) this; + } + + public Criteria andRemarkIsNull() { + addCriterion("remark is null"); + return (Criteria) this; + } + + public Criteria andRemarkIsNotNull() { + addCriterion("remark is not null"); + return (Criteria) this; + } + + public Criteria andRemarkEqualTo(String value) { + addCriterion("remark =", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotEqualTo(String value) { + addCriterion("remark <>", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkGreaterThan(String value) { + addCriterion("remark >", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkGreaterThanOrEqualTo(String value) { + addCriterion("remark >=", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLessThan(String value) { + addCriterion("remark <", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLessThanOrEqualTo(String value) { + addCriterion("remark <=", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLike(String value) { + addCriterion("remark like", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotLike(String value) { + addCriterion("remark not like", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkIn(List values) { + addCriterion("remark in", values, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotIn(List values) { + addCriterion("remark not in", values, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkBetween(String value1, String value2) { + addCriterion("remark between", value1, value2, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotBetween(String value1, String value2) { + addCriterion("remark not between", value1, value2, "remark"); + return (Criteria) this; + } + public Criteria andCompeteTimeIdIsNull() { addCriterion("compete_time_id is null"); return (Criteria) this; diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/VideoProjectVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/VideoProjectVo.java index 9130201c..0dd30cbb 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/VideoProjectVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/VideoProjectVo.java @@ -26,5 +26,28 @@ public class VideoProjectVo { private String companyName; } + @Data + @ApiModel("查找单位签到的状态") + public static class PeoSignStatu{ + @ApiModelProperty("姓名") + private String name; + @ApiModelProperty("账号") + private String phone; + @ApiModelProperty("最近签到时间") + private Long time; + } + @Data + @ApiModel("查找裁判签到的状态") + public static class CoachSignStatu{ + @ApiModelProperty("姓名") + private String name; + @ApiModelProperty("账号") + private String phone; + @ApiModelProperty("裁判类型") + private byte chiefJudgment; + @ApiModelProperty("最近签到时间") + private Long time; + } + } diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteVideoDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteVideoDao.java new file mode 100644 index 00000000..f014c8c0 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteVideoDao.java @@ -0,0 +1,18 @@ +package com.ccsens.mt.persist.dao; + +import com.ccsens.mt.bean.dto.VideoDto; +import com.ccsens.mt.bean.vo.VideoProjectVo; +import com.ccsens.mt.persist.mapper.CompeteCompanyMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author Mr.王 + */ +public interface CompeteVideoDao extends CompeteCompanyMapper { + + List selectCompanySignStatus(@Param("param") VideoDto.GetTeamSignStatu param); + + List selectCoachSignStatus(@Param("param") VideoDto.GetTeamSignStatu param); +} diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java index 78556327..0f3a36fa 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java @@ -4,6 +4,7 @@ import cn.hutool.core.lang.Snowflake; import com.ccsens.mt.bean.dto.VideoDto; import com.ccsens.mt.bean.po.*; import com.ccsens.mt.bean.vo.VideoProjectVo; +import com.ccsens.mt.persist.dao.CompeteVideoDao; import com.ccsens.mt.persist.mapper.CompeteCompanyMapper; import com.ccsens.mt.persist.mapper.CompetePlayerLookMapper; import com.ccsens.mt.persist.mapper.CompeteProjectMapper; @@ -37,7 +38,8 @@ public class CompeteVedioService implements ICompeteVedioService{ private CompeteProjectMapper competeProjectMapper; @Resource private CompeteCompanyMapper competeCompanyMapper; - + @Resource + private CompeteVideoDao competeVideoDao; @Override public void insertSignVideo(Long companyId) { @@ -99,4 +101,26 @@ public class CompeteVedioService implements ICompeteVedioService{ }); return list1; } + /** + * 查看公司的签到状态 + * @param params + * @return + */ + @Override + public List selectCompanySignStatus(QueryDto params) { + return competeVideoDao.selectCompanySignStatus(params.getParam()); + } + /** + * 查看教练的签到状态 + * @param params + * @return + */ + @Override + public List selectCoachSignStatus(QueryDto params) { + log.info(params.getParam().toString()); + return competeVideoDao.selectCoachSignStatus(params.getParam()); + } + + + } diff --git a/mt/src/main/java/com/ccsens/mt/service/ICompeteVedioService.java b/mt/src/main/java/com/ccsens/mt/service/ICompeteVedioService.java index 3cc76419..96a011e9 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ICompeteVedioService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ICompeteVedioService.java @@ -27,4 +27,8 @@ public interface ICompeteVedioService { List selectTwoProject(QueryDto params); List selectAllCompany(QueryDto params); + + List selectCompanySignStatus(QueryDto params); + + List selectCoachSignStatus(QueryDto params); } diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index f59084b0..4ecd13fd 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: test - include: common, util-test + active: dev + include: common, util-dev diff --git a/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml b/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml new file mode 100644 index 00000000..6bbbcbc4 --- /dev/null +++ b/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml @@ -0,0 +1,63 @@ + + + + + + + \ No newline at end of file diff --git a/mt/src/main/resources/mapper_raw/CompeteJudgmentMapper.xml b/mt/src/main/resources/mapper_raw/CompeteJudgmentMapper.xml index 13d3e48c..443a9a91 100644 --- a/mt/src/main/resources/mapper_raw/CompeteJudgmentMapper.xml +++ b/mt/src/main/resources/mapper_raw/CompeteJudgmentMapper.xml @@ -3,6 +3,9 @@ + + + @@ -71,8 +74,8 @@ - id, compete_time_id, site_order_id, project_id, user_id, chief_judgment, created_at, - updated_at, rec_status + id, name, phone, remark, compete_time_id, site_order_id, project_id, user_id, chief_judgment, + created_at, updated_at, rec_status