11-26-1

mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java

@@ -32,7 +32,7 @@ public class CompeteVideoController {
     private ICompeteVedioService iCompeteVedioService;
 
     @MustLogin
-    @ApiOperation(value = "添加用户观看开幕式视频记录（签到用）", notes = "Mr.王---------根据公司的id在t_compete_player_look表中插入一条数据，单表操作，")
+    @ApiOperation(value = "添加单位观看开幕式视频记录（签到用）", notes = "Mr.王---------根据公司的id在t_compete_player_look表中插入一条数据，单表操作，")
     @RequestMapping(value = "/addUserSign", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse addCompeteCompany(@ApiParam @Validated @RequestBody QueryDto<VideoDto.Video> params) {
         log.info("添加用户观看开幕式视频记录（签到用）:{}",params);
@@ -42,7 +42,6 @@ public class CompeteVideoController {
     @MustLogin
     @ApiOperation(value = "查看用户观看视频记录（签到用）", notes = "Mr.王---------根据公司的id在t_compete_player_look表中查询数据，单表操作，如果是看了，返回true，没看返回false")
     @RequestMapping(value = "/selectUserSign", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-
     public JsonResponse selCompeteCompany(@ApiParam @Validated @RequestBody QueryDto<VideoDto.Video> params) {
         log.info("添加用户观看开幕式视频记录（签到用）:{}",params);
         boolean code= iCompeteVedioService.selectSignVideo(params.getParam().getCompanyId());

mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java

@@ -61,7 +61,7 @@ public class CompeteVedioService implements ICompeteVedioService{
     @Override
     public boolean selectSignVideo(Long companyId) {
         CompetePlayerLookExample competePlayerLookExample=new CompetePlayerLookExample();
-        competePlayerLookExample.createCriteria().andCompanyIdEqualTo(companyId);
+        competePlayerLookExample.createCriteria().andCompanyIdEqualTo(companyId).andRecStatusEqualTo((byte) 0);
         List<CompetePlayerLook> competePlayerLooks = competePlayerLookMapper.selectByExample(competePlayerLookExample);
         return competePlayerLooks.size()==0? false:true;
     }

mt/src/main/resources/mapper_dao/CompeteScoreDao.xml

@@ -743,6 +743,7 @@
     IF
         (
         (
+
         ( tcp.id IN ( SELECT t_compete_project_player.player_id FROM t_compete_project_player where  t_compete_project_player.rec_status=0) )
         OR ( tcp.id IN ( SELECT t_compete_team_member.player_id FROM t_compete_team_member where t_compete_team_member.rec_status=0 ) )
         ),
@@ -842,10 +843,6 @@
 
             ( tcp.id IN ( SELECT t_compete_project_player.player_id FROM t_compete_project_player where  t_compete_project_player.rec_status=0 ) )
             OR ( tcp.id IN ( SELECT t_compete_team_member.player_id FROM t_compete_team_member where  t_compete_team_member.rec_status=0  ) )
--- =======
---             ( tcp.id IN ( SELECT t_compete_project_player.player_id FROM t_compete_project_player WHERE rec_status = 0) )
---             OR ( tcp.id IN ( SELECT t_compete_team_member.player_id FROM t_compete_team_member WHERE rec_status = 0) )
--- >>>>>>> 4adc089d09a6c4afde0f4ad70b88920c167d5e7a
             ),
             1,
             0

mt/src/main/resources/mapper_dao/CompeteVideoDao.xml

@@ -8,7 +8,37 @@
       tcc.`contacts_phone` as phone,
       tcpl.`look_time` as `time`
     from
-      t_compete_company tcc
+      (
+        SELECT
+        *
+        FROM
+        (
+        SELECT
+        tcc.*,
+        (
+        IF
+        (
+        (
+        ( tcp.id IN ( SELECT t_compete_project_player.player_id FROM t_compete_project_player WHERE t_compete_project_player.rec_status = 0 ) )
+        OR ( tcp.id IN ( SELECT t_compete_team_member.player_id FROM t_compete_team_member WHERE t_compete_team_member.rec_status = 0 ) )
+        ),
+        1,
+        0
+        )
+        ) AS `after`
+        FROM
+        t_compete_company tcc
+        LEFT JOIN t_compete_player tcp ON tcp.company_id = tcc.id
+        WHERE
+        tcc.rec_status = 0
+        AND tcp.rec_status = 0
+        AND tcc.compete_time_id = 1
+        ) t
+        WHERE
+        `after` != 0
+        GROUP BY
+        t.id
+        ) tcc
     LEFT JOIN t_compete_time tct on tct.id=tcc.compete_time_id
     LEFT JOIN (
        select company_id,max(look_time) as `look_time`
@@ -18,18 +48,6 @@
         and  t_compete_player_look.`look_time` <= #{param.signEndTime,jdbcType=TIMESTAMP}
        </if>
         group by company_id
-
-<!--       select company_id,look_time-->
-<!--       From (-->
-<!--        select * from t_compete_player_look-->
-<!--        where `rec_status`=0-->
-<!--        <if test="param.signEndTime!=null">-->
-<!--            and  t_compete_player_look.`look_time` &lt;= #{param.signEndTime,jdbcType=TIMESTAMP}-->
-<!--        </if>-->
-<!--        ORDER BY look_time desc-->
-<!--        ) group by company id-->
-
-
     ) tcpl on tcpl.company_id=tcc.id
     where
     tct.id= #{param.id}