Merge remote-tracking branch 'origin/develop' into develop

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

@@ -49,7 +49,6 @@ import java.util.Map;
 @RequiredArgsConstructor
 @RequestMapping("/tempcontractalert" )
 @Tag(name = "员工合同续签待办管理")
-@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
 public class TEmpContractAlertController {
 
     private final TEmpContractAlertService tEmpContractAlertService;
@@ -148,7 +147,8 @@ public class TEmpContractAlertController {
 	 * @Date 2022-07-4
 	 **/
 	@SysLog("定时任务生成合同续签代码信息")
-	@Inner
+	@Operation(description = "定时任务生成合同续签代码信息")
+	//@Inner
 	@PostMapping("/inner/taskCreateContractAlert")
 	public R<Boolean> taskCreateContractAlert() {
 		return tEmpContractAlertService.taskCreateContractAlert();

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

@@ -259,12 +259,19 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
 		alert.setEmpIdcard(contract.getEmpIdcard());
 		alert.setContractStart(LocalDateTimeUtils.convertLDToDate(contract.getContractStart()));
 		alert.setContractEnd(LocalDateTimeUtils.convertLDToDate(contract.getContractEnd()));
+		if (Common.isNotNull(contract.getFileProvince())){
 			alert.setFileProvince(Integer.toString(contract.getFileProvince()));
+		}
+		if (Common.isNotNull(contract.getFileCity())){
 			alert.setFileCity(Integer.toString(contract.getFileCity()));
+		}
+		if (Common.isNotNull(contract.getFileTown())){
 			alert.setFileTown(Integer.toString(contract.getFileTown()));
+		}
 		alert.setEmpType(contract.getEmpNatrue());
 		alert.setContractTerm(contract.getContractType());
 		alert.setContractTerm(contract.getContractTerm());
+		if (Common.isNotNull(alert.getContractEnd())){
 			if (Common.isNotNull(contract.getContractEnd()) && contract.getContractEnd().isBefore(now)){
 				alert.setDueFlag(CommonConstants.ONE_STRING);
 				alert.setDaysOver(DateUtil.daysBetween(nowDate,alert.getContractEnd()));
@@ -273,6 +280,7 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
 				alert.setDueFlag(CommonConstants.ZERO_STRING);
 			}
 			alert.setFirstAlertTime(DateUtil.dateIncreaseByMonth(alert.getContractEnd(),CommonConstants.THREE_INT_NEGATE));
+		}
 		alert.setHandleStatus(CommonConstants.ZERO_STRING);
 		alertMap.put(alert.getEmpIdcard(),alert);
 	}