feature-wzb :bug修复

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

@@ -1245,9 +1245,9 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 			TSocialFundInfo sf = new TSocialFundInfo();
 			sf.setEmpIdcard(insert.getEmpIdcard());
 			sf.setSettleDomain(insert.getSettleDomain());
+			if (!CommonConstants.ONE_STRING.equals(insert.getSituation()) && !CommonConstants.TWO_STRING.equals(insert.getSituation()) && !CommonConstants.THREE_STRING.equals(insert.getSituation()) &&!CommonConstants.FOUR_STRING.equals(insert.getSituation())) {
 			R<Integer> socialFundR = HttpDaprUtil.invokeMethodPost(socialProperties.getAppUrl(), socialProperties.getAppId()
 					, "/tsocialfundinfo/inner/selectSocialFoundByContract", sf, Integer.class, SecurityConstants.FROM_IN);
-			if (CommonConstants.ONE_STRING.equals(insert.getSituation()) || CommonConstants.TWO_STRING.equals(insert.getSituation()) || CommonConstants.THREE_STRING.equals(insert.getSituation()) || CommonConstants.FOUR_STRING.equals(insert.getSituation())) {
 				if (socialFundR != null && socialFundR.getData() != null && socialFundR.getData() > 0) {
 					insert.setAuditStatus(CommonConstants.TWO_INT);
 					insert.setAuditUserName(user.getNickname());

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

@@ -57,7 +57,7 @@ private TEmployeeRetirementFlagDetailMapper tEmployeeRetirementFlagDetailMapper;
 	@Override
 	@Scheduled(cron = "0 */1 * * * ?")
 	public void retireeRemind() {
-		Date date = new Date();
+		Date date = DateUtil.getCurrentDateTime();
 		YifuUser user = SecurityUtils.getUser();
 		SimpleDateFormat formatterMenYear = new SimpleDateFormat("YYYYMM");
 		String YearMonth = formatterMenYear.format(date);
@@ -66,14 +66,8 @@ private TEmployeeRetirementFlagDetailMapper tEmployeeRetirementFlagDetailMapper;
 		String mRemainTime = DateUtil.getYearAndMonth(YearMonth, ArchivesConstants.MYEAR_MONTH);
 		String wRemainTime = DateUtil.getYearAndMonth(YearMonth, ArchivesConstants.WYEAR_MONTH);
 		String TT = mRemainTime + dateOne;
-		StringBuffer stringBuffer = new StringBuffer(TT);
-		stringBuffer.insert(CommonConstants.FOUR_INT, "-");
-		stringBuffer.insert(CommonConstants.SEVEN_INT, "-");
 		String LL = wRemainTime + dateOne;
-		StringBuffer stringBufferOne = new StringBuffer(LL);
-		stringBufferOne.insert(CommonConstants.FOUR_INT, "-");
-		stringBufferOne.insert(CommonConstants.SEVEN_INT, "-");
-		List<TEmployeeRetirement> list = baseMapper.getBirthday(TT,LL);
+		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));
 		for (TEmployeeRetirement tEmployeeRetirement : list) {
 			int i = baseMapper.selectByEmpIdcard(tEmployeeRetirement.getEmpIdcard());
 			if (i == 0) {
@@ -82,7 +76,6 @@ private TEmployeeRetirementFlagDetailMapper tEmployeeRetirementFlagDetailMapper;
 				tEmployeeRetirementMapper.insert(tEmployeeRetirement);
 			}
 		}
-
 	}
 
 	@Override

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

@@ -184,13 +184,9 @@
 			   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'
-			and b.FILE_STATUS = 0
-		   or datediff(#{LL}, b.EMP_BIRTHDAY) = 0
-			and b.EMP_SEX = '2'
-			and b.FILE_STATUS = 0
+		where ((datediff(#{TT}, b.EMP_BIRTHDAY) = 0 and b.EMP_SEX = '1')
+		   or (datediff(#{LL}, 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-archives/yifu-archives-biz/src/main/resources/mapper/TSettleDomainMapper.xml

@@ -279,7 +279,7 @@
 			and a.DEPART_NAME like concat("%",#{departName},"%")
 		</if>
 		<if test="nameOrNo != null and nameOrNo.trim() != ''">
-			and a.DEPART_NAME like concat("%",#{nameOrNo},"%") or a.DEPART_NO like concat("%",#{nameOrNo},"%")
+			and (a.DEPART_NAME like concat("%",#{nameOrNo},"%") or a.DEPART_NO like concat("%",#{nameOrNo},"%"))
 		</if>
 		<if test="customerId != null and customerId.trim() != ''">
 			and a.CUSTOMER_ID =#{customerId}