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

yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/util/ExcelUtil.java

@@ -194,23 +194,19 @@ public class ExcelUtil <T> implements Serializable {
 	 * @Param
 	 * @return
 	**/
-	public static String getLabelByDataType(String value,String dataType){
-		String tempValue = null;
-		if (Common.isEmpty(tempValue) && Common.isNotNull(dataType)){
-			Map<String,String> dicObj = (Map<String, String>) RedisUtil.redis.opsForValue()
-					.get(CacheConstants.DICT_DETAILS
-							+ CommonConstants.COLON_STRING
-							+dataType);
-			if (dicObj != null) {
-				for (Map.Entry<String, String> entry : dicObj.entrySet()) {
-					if (Common.isNotNull(entry.getKey()) && entry.getKey().equals(value.trim())) {
-						tempValue = entry.getValue();
-						break;
-					}
-				}
+	public static String getDicValueByDataType(String value, String dataType){
+		String tempStr = null;
+		Map<String,String> dicObj = (Map<String, String>) RedisUtil.redis.opsForValue()
+				.get(CacheConstants.DICT_DETAILS
+						+ CommonConstants.COLON_STRING
+						+ dataType);
+		for (Map.Entry<String,String> entry:dicObj.entrySet()){
+			if (Common.isNotNull(entry.getValue()) && entry.getValue().equals(value.trim())){
+				tempStr = entry.getKey();
+				break;
 			}
 		}
-		return tempValue;
+		return tempStr;
 	}
 	/**
 	 * 返回传参对应的fileds

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

@@ -1869,7 +1869,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		project.setCreateBy(user.getId());
 		project.setCreateName(user.getNickname());
 		project.setDeptNo(excel.getSettleDomainCode());
-		project.setContractType(excelUtil.getLabelByDataType(excel.getContractName(), ExcelAttributeConstants.PERSONNEL_TYPE));
+		project.setContractType(excelUtil.getDicValueByDataType(excel.getContractName(), ExcelAttributeConstants.PERSONNEL_TYPE));
 		project.setEmpIdcard(excel.getEmpIdcard());
 		project.setEmpName(excel.getEmpName());
 		project.setEmpNatrue(excel.getEmpType());

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

@@ -388,12 +388,14 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 			}
 		}
 		if (Common.isNotNull(socialCreateMonth)) {
-			wrapper.eq(TPaymentInfo::getSocialCreateMonth, socialCreateMonth).or()
-					.eq(TPaymentInfo::getProvidentCreateMonth, socialCreateMonth);
+			wrapper.and(wrapper2 -> wrapper2.eq(TPaymentInfo::getSocialCreateMonth, socialCreateMonth)
+					.or(wrapper1 -> wrapper1.eq(TPaymentInfo::getProvidentCreateMonth, socialCreateMonth)
+					));
 		}
 		if (Common.isNotNull(socialPayMonth)) {
-			wrapper.eq(TPaymentInfo::getSocialPayMonth, socialPayMonth).or()
-					.eq(TPaymentInfo::getProvidentPayMonth, socialPayMonth);
+			wrapper.and(wrapper2 -> wrapper2.eq(TPaymentInfo::getSocialPayMonth, socialPayMonth)
+					.or(wrapper1 -> wrapper1.eq(TPaymentInfo::getProvidentPayMonth, socialPayMonth)
+					));
 		}
 		return wrapper;
 	}