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

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeExportVO.java

@@ -150,35 +150,35 @@ public class EmployeeExportVO extends BaseEntity {
 	 */
 	@ExcelAttribute(name = "合同状态", isDataId = true,dataType = ExcelAttributeConstants.PERSONNEL_STATE)
 	@ExcelProperty(value = "合同状态")
-	private Integer contractStatus;
+	private String contractStatus;
 
 	/**
 	 * 商险状态（字典）
 	 */
 	@ExcelAttribute(name = "商险状态", isDataId = true,dataType = ExcelAttributeConstants.COMMERCIAL_SATTE)
 	@ExcelProperty(value = "商险状态")
-	private Integer insuranceStatus;
+	private String insuranceStatus;
 
 	/**
 	 * 社保状态（字典）
 	 */
 	@ExcelAttribute(name = "社保状态", isDataId = true,dataType = ExcelAttributeConstants.SOCIAL_ECURITY_STATE)
 	@ExcelProperty(value = "社保状态")
-	private Integer socialStatus;
+	private String socialStatus;
 
 	/**
 	 * 公积金状态（字典）
 	 */
 	@ExcelAttribute(name = "公积金状态", isDataId = true,dataType = ExcelAttributeConstants.FUND_STATUS)
 	@ExcelProperty(value = "公积金状态")
-	private Integer fundStatus;
+	private String fundStatus;
 
 	/**
 	 * 近3个月发薪（0否；1是）
 	 */
 	@ExcelAttribute(name = "近3个月发薪", readConverterExp = "0=无,1=是,2=否")
 	@ExcelProperty(value = "近3个月发薪")
-	private Integer salaryStatus;
+	private String salaryStatus;
 
 	@ExcelProperty(value = "创建人")
 	private String createName;

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

@@ -78,8 +78,6 @@ public class FddContractInfoServiceImpl extends ServiceImpl<FddContractInfoMappe
 	@Autowired
 	private FddContractTemplateFileService fddContractTemplateFileService;
 	@Autowired
-	private FddContractInfoService fddContractInfoService;
-	@Autowired
 	private FddCompanyInfoService fddCompanyInfoService;
 	@Autowired
 	private FddSealPersonAuthService fddSealPersonAuthService;

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

@@ -362,12 +362,9 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
 				isTrue = false;
 				errorMessageVO = this.getErrorMessageVO(i, CommonConstants.ZERO_INT, excel.getEmpName()
 						, idCard, errorMsg);
-			} else {
-				errorMessageVO = this.getErrorMessageVO(i, CommonConstants.ONE_INT, excel.getEmpName()
-						, idCard, errorMsg);
-			}
 				errorMessageList.add(errorMessageVO);
 			}
+		}
 		// 查找档案库
 		Map<String, TEmployeeInfo> existEmpMap = new HashMap<>();
 		if (!idCardList.isEmpty()) {
@@ -1375,7 +1372,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
 					out = response.getOutputStream();
 					response.setContentType("multipart/form-data");
 					response.setCharacterEncoding("utf-8");
-					response.setHeader("Content-Disposition", "attachment;filename*=utf-8'zh_cn'" + URLEncoder.encode(fileName, "UTF-8"));
+					response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, CommonConstants.UTF8));
 					// 这里 需要指定写用哪个class去写，然后写到第一个sheet，然后文件流会自动关闭
 					EasyExcel.write(out, EmployeeExportVO.class).includeColumnFiledNames(employeeInfo.getExportFields())
 							.sheet("人员档案").doWrite(list);

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

@@ -534,6 +534,7 @@
 			a.DELETE_FLAG = '0'
 			<include refid="employeeInfo_where"/>
 		</where>
+		GROUP BY a.id
 	</select>
 
 	<!--tEmployeeInfo离职档案导出查询-->
@@ -551,6 +552,7 @@
 			a.DELETE_FLAG = '0'
 			<include refid="employeeInfo_where"/>
 		</where>
+		GROUP BY a.id
 	</select>
 
 </mapper>