diff --git a/src/main/java/com/subsidy/service/impl/CompanyDictServiceImpl.java b/src/main/java/com/subsidy/service/impl/CompanyDictServiceImpl.java index 16ca1f3..750a650 100644 --- a/src/main/java/com/subsidy/service/impl/CompanyDictServiceImpl.java +++ b/src/main/java/com/subsidy/service/impl/CompanyDictServiceImpl.java @@ -9,6 +9,7 @@ import com.subsidy.common.exception.HttpException; import com.subsidy.dto.administer.OperatorsDTO; import com.subsidy.dto.company.AddCompanyDTO; import com.subsidy.mapper.AdministerMapper; +import com.subsidy.mapper.ClassHourDictMapper; import com.subsidy.mapper.ClassTypeDictMapper; import com.subsidy.mapper.CompanyDictMapper; import com.subsidy.mapper.CompanyFieldMappingMapper; @@ -74,6 +75,10 @@ public class CompanyDictServiceImpl extends ServiceImpl operators(OperatorsDTO operatorsDTO) { Page pager = new Page(operatorsDTO.getPageNum(), operatorsDTO.getPageSize()); @@ -154,6 +159,7 @@ public class CompanyDictServiceImpl extends ServiceImpl fields = addCompanyDTO.getField(); diff --git a/src/main/resources/mapper/ClassMemberMappingMapper.xml b/src/main/resources/mapper/ClassMemberMappingMapper.xml index 78ef38e..55093f8 100644 --- a/src/main/resources/mapper/ClassMemberMappingMapper.xml +++ b/src/main/resources/mapper/ClassMemberMappingMapper.xml @@ -29,7 +29,8 @@ WHERE t.delete_date IS NULL AND t2.delete_date IS NULL - and t2.end_date >=DATE_FORMAT(now(), '%Y-%m-%d') + and DATE_FORMAT(t2.end_date ,'%Y-%m-%d')>=DATE_FORMAT(now(), '%Y-%m-%d') + and DATE_FORMAT(t2.start_date ,'%Y-%m-%d')<= DATE_FORMAT(now(), '%Y-%m-%d') and t.member_id = #{memberId} @@ -70,7 +71,7 @@ t.delete_date IS NULL AND t2.delete_date IS NULL and t2.end_date >=DATE_FORMAT(now(), '%Y-%m-%d') - and t2.start_date < DATE_FORMAT(now(), '%Y-%m-%d') + and t2.start_date <= DATE_FORMAT(now(), '%Y-%m-%d') and t.member_id = #{memberId} diff --git a/src/main/resources/mapper/MemberMapper.xml b/src/main/resources/mapper/MemberMapper.xml index 4ff0e05..b941196 100644 --- a/src/main/resources/mapper/MemberMapper.xml +++ b/src/main/resources/mapper/MemberMapper.xml @@ -94,6 +94,7 @@ WHERE t.delete_date IS NULL AND t2.delete_date IS NULL + and t2.id is not null GROUP BY t.course_id ) t4 ON t3.id = t4.course_id