From 929cef2c84b1b72481a309bee5549a7c387d29e8 Mon Sep 17 00:00:00 2001
From: wang0018 <1007152140@qq.com>
Date: Fri, 20 Nov 2020 16:02:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=9F=A5=E8=AF=A2=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=8D=95=E4=BD=8D=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mt/api/CompeteCompanyController.java      | 39 +++++++++++++++++++
 .../com/ccsens/mt/bean/dto/CompeteDto.java    |  8 +++-
 .../java/com/ccsens/mt/bean/vo/CompeteVo.java |  6 +++
 .../com/ccsens/mt/service/CompeteService.java | 11 ++++++
 .../ccsens/mt/service/ICompeteService.java    |  2 +
 mt/src/main/resources/application.yml         |  2 +-
 6 files changed, 66 insertions(+), 2 deletions(-)
 create mode 100644 mt/src/main/java/com/ccsens/mt/api/CompeteCompanyController.java

diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteCompanyController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteCompanyController.java
new file mode 100644
index 00000000..ea6506d0
--- /dev/null
+++ b/mt/src/main/java/com/ccsens/mt/api/CompeteCompanyController.java
@@ -0,0 +1,39 @@
+package com.ccsens.mt.api;
+
+import com.ccsens.cloudutil.annotation.MustLogin;
+import com.ccsens.mt.bean.dto.CompeteDto;
+import com.ccsens.mt.bean.vo.CompeteVo;
+import com.ccsens.mt.service.CompeteService;
+import com.ccsens.mt.service.ICompeteService;
+import com.ccsens.util.JsonResponse;
+import com.ccsens.util.bean.dto.QueryDto;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@Slf4j
+@Api(tags = "用户信息", description = "")
+@RestController
+@RequestMapping("/compete/userMes")
+public class CompeteCompanyController {
+    @Resource
+    private ICompeteService competeService;
+    @MustLogin
+    @ApiOperation(value = "用户的参赛单位id", notes = "")
+    @RequestMapping(value = "/getUserCompanyId", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<CompeteVo.CompanyId> getUserCompanyId(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.GetUserCompany> params) {
+        log.info("查看当前用户的参赛单位id：{}",params);
+        CompeteVo.CompanyId companyId1=new CompeteVo.CompanyId();
+        Long companyId = competeService.getUserCompanyId(params.getUserId(),params.getParam().getType());
+        companyId1.setCompanyId(companyId);
+        return JsonResponse.newInstance().ok(companyId1);
+    }
+}
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 4c238d3c..5e577495 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
@@ -390,5 +390,11 @@ public class CompeteDto {
         @ApiModelProperty("项目id")
         private Long projectId;
     }
-
+    @Data
+    @ApiModel
+    public static class GetUserCompany {
+        @NotNull
+        @ApiModelProperty("比赛的类型，0跳绳省赛 1跳绳校内比赛")
+        private Byte type;
+    }
 }
diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java
index 4a8aba8c..73f4b577 100644
--- a/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java
+++ b/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java
@@ -582,4 +582,10 @@ public class CompeteVo {
         @ApiModelProperty("项目id")
         private Long projectId;
     }
+    @Data
+    @ApiModel("公司id")
+    public static class CompanyId {
+        @ApiModelProperty("公司")
+        private Long companyId;
+    }
 }
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 b5691e16..41f609c3 100644
--- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java
+++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java
@@ -1578,4 +1578,15 @@ public class CompeteService implements ICompeteService {
         return selScropeVo;
     }
 
+    @Override
+    public Long getUserCompanyId(Long userId, Byte type) {
+        CompeteCompanyExample competeCompanyExample=new CompeteCompanyExample();
+        competeCompanyExample.createCriteria().andUserIdEqualTo(userId).andTypeEqualTo(type).andRecStatusEqualTo((byte) 0);
+        List<CompeteCompany> competeCompanies = competeCompanyMapper.selectByExample(competeCompanyExample);
+        if(competeCompanies.size()>0){
+            return competeCompanies.get(0).getId();
+        }
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java b/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java
index 7b5e6aab..8cf36d5c 100644
--- a/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java
+++ b/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java
@@ -204,6 +204,8 @@ public interface ICompeteService {
     List<ScoreVo.CountScoreCurrentSite> queryCountScoreAll(ScoreDto.ShowResult param);
 
     CompeteVo.SelScropeVo selSubmitOrderList(ScoreDto.SelScrop param);
+
+    Long getUserCompanyId(Long userId, Byte type);
 }
 
 
diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml
index 0f6c58d9..4ecd13fd 100644
--- a/mt/src/main/resources/application.yml
+++ b/mt/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 spring:
   profiles:
     active: dev
-    include: common, util-test
+    include: common, util-dev