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 983dd98f..c1bc93e4 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java @@ -40,7 +40,7 @@ public class CompeteScoreController { return JsonResponse.newInstance().ok(playerList); } - @MustLogin +// @MustLogin @ApiOperation(value = "项目状态", notes = "lihong,查询项目集合,再根据时间判断项目得状态") @RequestMapping(value = "/countScore", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse countScore(@ApiParam @Validated @RequestBody QueryDto params) { 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 21bb3fd9..2105d806 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 @@ -81,10 +81,8 @@ public class VideoDto { 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/service/CompeteService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java index 5f14e370..0ed4dbaa 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -1123,7 +1123,8 @@ public class CompeteService implements ICompeteService { competeCountScore.setDeductCause(params.getDeductReason()); competeCountScore.setFinalScore(params.getFinalScore()); competeCountScore.setId(snowflake.nextId()); - competeCountScoreMapper.insert(competeCountScore); + competeCountScore.setRecStatus((byte) 0); + competeCountScoreMapper.insert(competeCountScore); } diff --git a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml index 5edd2613..64c4c54a 100644 --- a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml @@ -65,7 +65,7 @@ and tcc.id = #{companyId} - and tcp.name = #{name} + and tcp.name like #{name} and tcp.id_card = #{idCard} diff --git a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml index 1a789b7b..43ea9e8f 100644 --- a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml @@ -18,7 +18,7 @@ and tcc.rec_status = 0 and tcpp.project_id= #{projectId} and tcpp.compete_group_id =#{competeGroupId} - GROUP BY tccs.final_score + GROUP BY tccs.final_score DESC diff --git a/tall/src/main/resources/application-dev.yml b/tall/src/main/resources/application-dev.yml index ee29058b..ee0a41b5 100644 --- a/tall/src/main/resources/application-dev.yml +++ b/tall/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 7070 + port: 7030 servlet: context-path: /v1.0 spring: diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index ebc544af..b5408a3a 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: test - include: util-test,common + active: dev + include: util-dev,common