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

@@ -187,6 +187,31 @@ public class ExcelUtil <T> implements Serializable {
 		}
 		return tempValue;
 	}
+	/**
+	 * @Author fxj
+	 * @Description  单独转义字典值
+	 * @Date 15:26 2022/11/8
+	 * @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;
+					}
+				}
+			}
+		}
+		return tempValue;
+	}
 	/**
 	 * 返回传参对应的fileds
 	 *

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

@@ -36,6 +36,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.*;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.exception.ErrorCodes;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
@@ -109,6 +110,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 
 	private final TIncomeService incomeService;
 
+	ExcelUtil<Object> excelUtil = new ExcelUtil<>(Object.class);
+
 	/**
 	 * 派单信息记录表简单分页查询
 	 *
@@ -1866,7 +1869,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		project.setCreateBy(user.getId());
 		project.setCreateName(user.getNickname());
 		project.setDeptNo(excel.getSettleDomainCode());
-		project.setContractType(excel.getContractName());
+		project.setContractType(excelUtil.getLabelByDataType(excel.getContractName(), ExcelAttributeConstants.PERSONNEL_TYPE));
 		project.setEmpIdcard(excel.getEmpIdcard());
 		project.setEmpName(excel.getEmpName());
 		project.setEmpNatrue(excel.getEmpType());