feature-wzb :bug修复

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeRetirementController.java

@@ -48,7 +48,7 @@ public class TEmployeeRetirementController {
 
 	@Inner
 	@Operation(summary = "分页查询", description = "分页查询")
-	@GetMapping("/inner/retireeRemind" )
+	@PostMapping("/inner/retireeRemind" )
 	public void retireeRemind() {
 		tEmployeeRetirementService.retireeRemind();
 	}

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TEmployeeRetirementMapper.java

@@ -25,7 +25,7 @@ public interface TEmployeeRetirementMapper extends BaseMapper<TEmployeeRetiremen
 
 	IPage<TEmployeeRetirement> getTEmployeeRetirementPage(Page page, @Param("searchVo") TEmployeeRetirementSearchVo searchVo);
 
-	List<TEmployeeRetirement> getBirthday(@Param("TT") String TT, @Param("LL") String LL);
+	List<TEmployeeRetirement> getBirthday(@Param("oo") String oo, @Param("pp") String pp);
 
 	boolean changeHandleFlagAll(@Param("changeHandleFlagAllVo") ChangeHandleFlagAllVo changeHandleFlagAllVo);
 

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeRetirementServiceImpl.java

@@ -55,7 +55,6 @@ private TEmployeeRetirementFlagDetailMapper tEmployeeRetirementFlagDetailMapper;
 
 
 	@Override
-	@Scheduled(cron = "0 */1 * * * ?")
 	public void retireeRemind() {
 		Date date = DateUtil.getCurrentDateTime();
 		YifuUser user = SecurityUtils.getUser();
@@ -67,7 +66,9 @@ private TEmployeeRetirementFlagDetailMapper tEmployeeRetirementFlagDetailMapper;
 		String wRemainTime = DateUtil.getYearAndMonth(YearMonth, ArchivesConstants.WYEAR_MONTH);
 		String TT = mRemainTime + dateOne;
 		String LL = wRemainTime + dateOne;
-		List<TEmployeeRetirement> list = baseMapper.getBirthday(DateUtil.dateToString(DateUtil.stringToDate(TT),DateUtil.ISO_EXPANDED_DATE_FORMAT),DateUtil.dateToString(DateUtil.stringToDate(LL),DateUtil.ISO_EXPANDED_DATE_FORMAT));
+		String oo=DateUtil.dateToString(DateUtil.stringToDate(TT));
+		String pp=DateUtil.dateToString(DateUtil.stringToDate(LL));
+		List<TEmployeeRetirement> list = baseMapper.getBirthday(oo,pp);
 		for (TEmployeeRetirement tEmployeeRetirement : list) {
 			int i = baseMapper.selectByEmpIdcard(tEmployeeRetirement.getEmpIdcard());
 			if (i == 0) {

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeRetirementMapper.xml

@@ -184,8 +184,8 @@
 			   b.EMP_BIRTHDAY
 		FROM t_employee_project a
 				 LEFT JOIN t_employee_info b ON a.EMP_IDCARD = b.EMP_IDCARD
-		where ((datediff(#{TT}, b.EMP_BIRTHDAY) = 0 and b.EMP_SEX = '1')
-		   or (datediff(#{LL}, b.EMP_BIRTHDAY) = 0 and b.EMP_SEX = '2'))
+		where ((datediff(#{oo}, b.EMP_BIRTHDAY) = 0 and b.EMP_SEX = '1')
+		   or (datediff(#{pp}, b.EMP_BIRTHDAY) = 0 and b.EMP_SEX = '2'))
 			and b.FILE_STATUS = 0 and a.EMP_NATRUE in ('0','1','3')
 		GROUP BY a.EMP_ID
 	</select>

yifu-auth/src/main/resources/application-dev.yml

@@ -9,7 +9,6 @@ spring:
       matching-strategy: ant_path_matcher
   redis:
     host: 127.0.0.1
-    password: '@yf_2017'
   cloud:
     sentinel:
       eager: true

yifu-job/yifu-job-api/src/main/java/com/yifu/cloud/plus/v1/job/compont/ArchiveTask.java

@@ -56,7 +56,7 @@ public class ArchiveTask {
 	public void retireeRemind() {
 		log.info("-------------每日凌晨1点人员退休提醒-定时任务开始------------");
 		HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(), daprArchivesProperties.getAppId(),
-				"/temployeeretirement/inner/everyDayRemind", "", Object.class,
+				"/temployeeretirement/inner/retireeRemind", "", Object.class,
 				SecurityConstants.FROM_IN);
 		log.info("-------------每日凌晨1点人员退休提醒-定时任务开始------------");
 	}