Merge branch 'dev' of http://git.echepei.com/lazhaoqian/bladex into dev

blade-service/blade-client/src/main/java/org/springblade/client/scheduled/CorpsProfitTimer.java

@@ -4,12 +4,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.xmlbeans.impl.xb.xsdschema.Public;
 import org.springblade.client.corps.service.IBasicCorpsProfitChangeService;
 import org.springblade.client.corps.service.ICorpsDescService;
 import org.springblade.client.entity.BasicCorpsProfitChange;
 import org.springblade.client.entity.CorpsDesc;
 import org.springblade.client.entity.Message;
 import org.springblade.client.feign.IMessageClient;
+import org.springblade.client.school.service.ISchoolTeacherService;
 import org.springblade.core.tool.api.R;
 import org.springblade.purchase.sales.entity.Order;
 import org.springframework.context.annotation.Configuration;
@@ -40,6 +42,7 @@ public class CorpsProfitTimer
 	private final IBasicCorpsProfitChangeService basicCorpsProfitChangeService;
 
     private final IMessageClient messageClient;
+    private final ISchoolTeacherService schoolTeacherService;
 
     //每月1号凌晨 开始检查,累计计算,目前只统计租户681169的返利情况
 	@Scheduled(cron="0 0 0 1 * ?")
@@ -81,7 +84,12 @@ public class CorpsProfitTimer
 
 
 
-
 	}
+	/*@Scheduled(cron="0 0/2 * * * ?")
+	public void updateTeacherMessage(){
+		log.info("=================开始计算校龄================");
+		schoolTeacherService.updateTeacherMessage();
+		log.info("=================计算校龄结束================");
+	}*/
 
 }

blade-service/blade-client/src/main/java/org/springblade/client/school/service/impl/SchoolTeacherServiceImpl.java

@@ -150,7 +150,7 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 		//获取校龄开始时间不为空的计算校龄
 		LambdaQueryWrapper<SchoolTeacher> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(SchoolTeacher::getIsDeleted,0);
-		lambdaQueryWrapper.ne(SchoolTeacher::getSchoolAge,0);
+		lambdaQueryWrapper.isNotNull(SchoolTeacher::getSchoolAgeSalaryDate);
 		List<SchoolTeacher> schoolTeacherList = baseMapper.selectList(lambdaQueryWrapper);
 		//有数据执行更新校龄操作
 		if (CollectionUtils.isNotEmpty(schoolTeacherList)){