节假日配置表及社保医疗截止配置表调整

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialDeadlineInfoServiceImpl.java

@@ -288,7 +288,9 @@ public class TSocialDeadlineInfoServiceImpl extends ServiceImpl<TSocialDeadlineI
 				}
 			}
 			TSocialDeadlineInfo save;
+			LambdaQueryWrapper<TSocialDeadlineInfo> queryWrapper;
 			for (TSocialDeadlineInfo sd:baseLists){
+				queryWrapper= null;
 				save = new TSocialDeadlineInfo();
 				BeanUtil.copyProperties(sd,save);
 				save.setId(null);
@@ -296,6 +298,10 @@ public class TSocialDeadlineInfoServiceImpl extends ServiceImpl<TSocialDeadlineI
 				save.setType(CommonConstants.ZERO_STRING);
 				initSocialEndDate(holidayMap, save);
 				initMedicalEndDate(holidayMap, save);
+				queryWrapper = initCountQuery(save,queryWrapper);
+				if (baseMapper.selectCount(queryWrapper) > 0){
+					continue;
+				}
 				saveList.add(save);
 			}
 			if (Common.isNotNull(saveList)){
@@ -303,6 +309,24 @@ public class TSocialDeadlineInfoServiceImpl extends ServiceImpl<TSocialDeadlineI
 			}
 		}
 	}
+
+	private LambdaQueryWrapper<TSocialDeadlineInfo> initCountQuery(TSocialDeadlineInfo save,LambdaQueryWrapper<TSocialDeadlineInfo> queryWrapper) {
+		queryWrapper  = Wrappers.lambdaQuery();
+		queryWrapper.eq(TSocialDeadlineInfo::getMonth, save.getMonth());
+		queryWrapper.eq(TSocialDeadlineInfo::getProvince, save.getProvince());
+		if (Common.isNotNull(save.getCity())){
+			queryWrapper.eq(TSocialDeadlineInfo::getCity, save.getCity());
+			if (Common.isNotNull(save.getTown())){
+				queryWrapper.eq(TSocialDeadlineInfo::getTown, save.getTown());
+			}else {
+				queryWrapper.isNull(TSocialDeadlineInfo::getTown);
+			}
+		}else {
+			queryWrapper.isNull(TSocialDeadlineInfo::getCity);
+		}
+		return queryWrapper;
+	}
+
 	@Transactional
 	@Override
 	public R<Boolean>  updateByIdAsso(TSocialDeadlineInfo tSocialDeadlineInfo) {

yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialDeadlineInfoMapper.xml

@@ -120,5 +120,6 @@
             1=1
             <include refid="tSocialDeadlineInfo_where"/>
         </where>
+		order by a.month DESC
     </select>
 </mapper>