Merge branch 'zx_saas_training_202303' of http://git.dayaedu.com/yonge/mec into master_saas

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TempLittleArtistTrainingCampServiceImpl.java

@@ -285,11 +285,11 @@ public class TempLittleArtistTrainingCampServiceImpl extends ServiceImpl<TempLit
             List<Integer> studentIds = records.stream().map(e -> e.getId()).collect(Collectors.toList());
             Map<Integer,String> subjectMap = MapUtil.convertIntegerMap(studentDao.getStudentSubjectMapList(studentIds));
             Map<Integer,String> groupNameMap = MapUtil.convertMybatisMap(musicGroupDao.queryNormalGroupName(studentIds));
-            Integer signStandard = Integer.parseInt(param.get("signStandard").toString());
+            Integer standardDays = Integer.parseInt(param.get("standardDays").toString());
             for (TempCampUserTrainingDetailVo record : records) {
                 record.setSubjectName(subjectMap.get(record.getId()));
                 record.setMusicGroupName(groupNameMap.get(record.getId()));
-                record.setStandardFlag(record.getPlayDay() >= signStandard);
+                record.setStandardFlag(record.getPlayDay() >= standardDays);
             }
         }
         return PageUtil.pageInfo(vos);

mec-biz/src/main/resources/config/mybatis/TempLittleArtistTrainingCampMapper.xml

@@ -143,6 +143,12 @@
             <if test="param.imGroupId != null">
                 AND e.id_ = #{param.imGroupId}
             </if>
+            <if test="param.standardFlag != null and param.standardFlag == true">
+                AND ifnull( b.playDay, 0 ) >= #{param.standardDays}
+            </if>
+            <if test="param.standardFlag != null and param.standardFlag == false">
+                AND ifnull( b.playDay, 0 ) &lt; #{param.standardDays}
+            </if>
             <if test="param.search != null ">
                 AND (
                 d.`id_` LIKE CONCAT('%', #{param.search},'%')

mec-web/src/main/java/com/ym/mec/web/controller/TempLittleArtistTrainingCampController.java

@@ -100,6 +100,7 @@ public class TempLittleArtistTrainingCampController extends BaseController {
             @ApiImplicitParam(name = "search", dataType = "String", value = "学员姓名/手机号/编号-模糊搜索"),
             @ApiImplicitParam(name = "imGroupId", dataType = "Integer", value = "所在群组Id"),
             @ApiImplicitParam(name = "campId", dataType = "Integer", value = "训练营id"),
+            @ApiImplicitParam(name = "standardFlag", dataType = "Boolean", value = "是否达标"),
             @ApiImplicitParam(name = "page", dataType = "Integer", required = true, value = "页数"),
             @ApiImplicitParam(name = "rows", dataType = "Integer", required = true, value = "每页数量"),
     })