临时上个版本 联调中

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.administer.OperatorsDTO;
 import com.subsidy.dto.company.AddCompanyDTO;
 import com.subsidy.dto.company.AddCompanyDTO;
 import com.subsidy.mapper.AdministerMapper;
 import com.subsidy.mapper.AdministerMapper;
+import com.subsidy.mapper.ClassHourDictMapper;
 import com.subsidy.mapper.ClassTypeDictMapper;
 import com.subsidy.mapper.ClassTypeDictMapper;
 import com.subsidy.mapper.CompanyDictMapper;
 import com.subsidy.mapper.CompanyDictMapper;
 import com.subsidy.mapper.CompanyFieldMappingMapper;
 import com.subsidy.mapper.CompanyFieldMappingMapper;
@@ -74,6 +75,10 @@ public class CompanyDictServiceImpl extends ServiceImpl<CompanyDictMapper, Compa
 
 
     @Autowired
     @Autowired
     private ClassTypeDictMapper classTypeDictMapper;
     private ClassTypeDictMapper classTypeDictMapper;
+
+    @Autowired
+    private ClassHourDictMapper classHourDictMapper;
+
     public IPage<OperatorsVO> operators(OperatorsDTO operatorsDTO) {
     public IPage<OperatorsVO> operators(OperatorsDTO operatorsDTO) {
         Page pager = new Page(operatorsDTO.getPageNum(), operatorsDTO.getPageSize());
         Page pager = new Page(operatorsDTO.getPageNum(), operatorsDTO.getPageSize());
 
 
@@ -154,6 +159,7 @@ public class CompanyDictServiceImpl extends ServiceImpl<CompanyDictMapper, Compa
         classHourDictDO2.setRepeatStatus(0);
         classHourDictDO2.setRepeatStatus(0);
         classHourDictDO2.setRepeatTime(3);
         classHourDictDO2.setRepeatTime(3);
         redisUtil.set(RedisPrefixConstant.SUBSIDY_SETTINGS_PREFIX + companyDictDO.getId(), classHourDictDO2);
         redisUtil.set(RedisPrefixConstant.SUBSIDY_SETTINGS_PREFIX + companyDictDO.getId(), classHourDictDO2);
+        classHourDictMapper.insert(classHourDictDO2);
 
 
         //行业
         //行业
         List<Long> fields = addCompanyDTO.getField();
         List<Long> fields = addCompanyDTO.getField();

src/main/resources/mapper/ClassMemberMappingMapper.xml

@@ -29,7 +29,8 @@
         WHERE
         WHERE
         t.delete_date IS NULL
         t.delete_date IS NULL
         AND t2.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}
         and t.member_id = #{memberId}
     </select>
     </select>
 
 
@@ -70,7 +71,7 @@
         t.delete_date IS NULL
         t.delete_date IS NULL
         AND t2.delete_date IS NULL
         AND t2.delete_date IS NULL
         and t2.end_date >=DATE_FORMAT(now(), '%Y-%m-%d')
         and t2.end_date >=DATE_FORMAT(now(), '%Y-%m-%d')
-        and t2.start_date  &lt; DATE_FORMAT(now(), '%Y-%m-%d')
+        and t2.start_date  &lt;= DATE_FORMAT(now(), '%Y-%m-%d')
         and t.member_id = #{memberId}
         and t.member_id = #{memberId}
     </select>
     </select>
 
 

src/main/resources/mapper/MemberMapper.xml

@@ -94,6 +94,7 @@
         WHERE
         WHERE
         t.delete_date IS NULL
         t.delete_date IS NULL
         AND t2.delete_date IS NULL
         AND t2.delete_date IS NULL
+        and t2.id is not null
         GROUP BY
         GROUP BY
         t.course_id
         t.course_id
         ) t4 ON t3.id = t4.course_id
         ) t4 ON t3.id = t4.course_id