Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	common/common-entity/sql记录

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/course/RecruitStudentsEndpoint.java

@@ -1,7 +1,9 @@
package com.yihu.jw.base.endpoint.course;
import com.yihu.jw.base.service.course.RecruitStudentsRecordService;
import com.yihu.jw.base.service.course.RecruitStudentsService;
import com.yihu.jw.entity.care.course.RecruitStudentsDO;
import com.yihu.jw.entity.care.course.RecruitStudentsRecordDO;
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
@@ -34,6 +36,8 @@ public class RecruitStudentsEndpoint extends EnvelopRestEndpoint {
    private RecruitStudentsService recruitStudentsService;
    @Autowired
    private WlyyHospitalSysDictDao wlyyHospitalSysDictDao;
    @Autowired
    private RecruitStudentsRecordService recruitStudentsRecordService;
    @PostMapping(value = "create")
    @ApiOperation(value = "创建")
@@ -87,6 +91,10 @@ public class RecruitStudentsEndpoint extends EnvelopRestEndpoint {
            filters += ";del=1";
        }
        List<RecruitStudentsDO> recruitStudentsDOs = recruitStudentsService.search(fields, filters, sorts, page, size);
        for (RecruitStudentsDO recruitStudentsDO:recruitStudentsDOs){
            List<RecruitStudentsRecordDO> list = recruitStudentsRecordService.findListById(recruitStudentsDO.getId());
            recruitStudentsDO.setAdmittedNum(list.size());
        }
        int count = (int)recruitStudentsService.getCount(filters);
        return success(recruitStudentsDOs, count, page, size, RecruitStudentsDO.class);
    }

svr/svr-base/src/main/java/com/yihu/jw/base/service/course/RecruitStudentsRecordService.java

@@ -116,8 +116,7 @@ public class RecruitStudentsRecordService extends BaseJpaService<RecruitStudents
     * @return
     */
    public synchronized boolean isAdmissionFull(String id){
        String sql = "select * from base_recruit_students_record where recruit_students_id = '"+id+"' and status in ('2','3','6') and del =1 ";
        List<RecruitStudentsRecordDO> list = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(RecruitStudentsRecordDO.class));
        List<RecruitStudentsRecordDO> list = findListById(id);
        RecruitStudentsDO recruitStudentsDO = recruitStudentsDao.findOne(id);
        if(recruitStudentsDO.getNum()<=list.size()){
            return true;
@@ -125,6 +124,12 @@ public class RecruitStudentsRecordService extends BaseJpaService<RecruitStudents
        return false;
    }
    public List<RecruitStudentsRecordDO> findListById(String id){
        String sql = "select * from base_recruit_students_record where recruit_students_id = '"+id+"' and status in ('2','3','6') and del =1 ";
        List<RecruitStudentsRecordDO> list = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(RecruitStudentsRecordDO.class));
        return list;
    }
    /**
     * 录取单个
     * @param id