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

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchImportVo.java

@@ -249,7 +249,7 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
 	 * 备案基数
 	 */
 	@Length(max = 255, message = "备案基数 不能超过255 个字符" )
-	@ExcelAttribute(name = "备案基数", maxLength = 255)
+	@ExcelAttribute(name = "备案基数", isFloat = true,max = "999999999.99")
 	@Schema(description = "备案基数：购买社保时必填" )
 	@ExcelProperty("备案基数" )
 	private String recordBase;
@@ -317,21 +317,21 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
 	/**
 	 * 养老基数
 	 */
-	@ExcelAttribute(name = "养老基数" )
+	@ExcelAttribute(name = "养老基数",  isFloat = true,max = "999999999.99" )
 	@Schema(description = "养老基数" )
 	@ExcelProperty("养老基数" )
 	private BigDecimal pensionCardinal;
 	/**
 	 * 医疗基数
 	 */
-	@ExcelAttribute(name = "医疗基数" )
+	@ExcelAttribute(name = "医疗基数",  isFloat = true,max = "999999999.99" )
 	@Schema(description = "医疗基数" )
 	@ExcelProperty("医疗基数" )
 	private BigDecimal medicalCardinal;
 	/**
 	 * 失业基数
 	 */
-	@ExcelAttribute(name = "失业基数" )
+	@ExcelAttribute(name = "失业基数",  isFloat = true,max = "999999999.99" )
 	@Schema(description = "失业基数" )
 	@ExcelProperty("失业基数" )
 	private BigDecimal unemploymentCardinal;
@@ -339,14 +339,14 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
 	/**
 	 * 工伤基数
 	 */
-	@ExcelAttribute(name = "工伤基数" )
+	@ExcelAttribute(name = "工伤基数",  isFloat = true,max = "999999999.99" )
 	@Schema(description = "工伤基数" )
 	@ExcelProperty("工伤基数" )
 	private BigDecimal workInjuryCardinal;
 	/**
 	 * 生育基数
 	 */
-	@ExcelAttribute(name = "生育基数" )
+	@ExcelAttribute(name = "生育基数",  isFloat = true,max = "999999999.99" )
 	@Schema(description = "生育基数" )
 	@ExcelProperty("生育基数" )
 	private BigDecimal birthCardinal;
@@ -354,7 +354,7 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
 	/**
 	 * 大病基数
 	 */
-	@ExcelAttribute(name = "大病基数" )
+	@ExcelAttribute(name = "大病基数" ,  isFloat = true,max = "999999999.99" )
 	@Schema(description = "大病基数" )
 	@ExcelProperty("大病基数" )
 	private BigDecimal bigailmentCardinal;
@@ -379,7 +379,7 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
 	/**
 	 * 公积金基数
 	 */
-	@ExcelAttribute(name = "公积金基数" )
+	@ExcelAttribute(name = "公积金基数",  isFloat = true,max = "999999999.99" )
 	@Schema(description = "公积金基数" )
 	@ExcelProperty("公积金基数" )
 	private BigDecimal providentCardinal;

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoController.java

@@ -113,8 +113,7 @@ public class TDispatchInfoController {
 	@Operation(description = "简单分页查询--审核")
 	@GetMapping("/pageAudit")
 	public R<IPage<TDispatchInfo>> getTDispatchAuditPage(Page<TDispatchInfo> page, TDispatchInfoSearchVo tDispatchInfo) {
-		tDispatchInfo.setStatus(CommonConstants.ZERO_STRING);
-		tDispatchInfo.setDeleteFlag(CommonConstants.ZERO_STRING);
+		tDispatchInfo.setDeleteFlag(CommonConstants.ONE_STRING);
 		return  new R<>(tDispatchInfoService.getTDispatchInfoPage(page,tDispatchInfo));
 	}
 

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

@@ -330,7 +330,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				empVo = empVoMap.get(excel.getEmpIdcard());
 			}
 			// 数据合法情况
-			if (validImport(errorMessageList, excel,setInfoVo,socialFundMap,empVo,socialSet)) {
+			if (validImport(errorMessageList, excel,setInfoVo,socialFundMap,empVo,socialSet,fundSet)) {
 				excelVOTemp.put(excel.getEmpIdcard(),excel.getEmpIdcard());
 				continue;
 			}
@@ -1342,7 +1342,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 								TDispatchImportVo excel,
 								ProjectSetInfoVo setInfoVo,
 								Map<String, TSocialFundInfo> socialFundMap,
-								DispatchEmpVo empVo, SysBaseSetInfo socialSet) {
+								DispatchEmpVo empVo, SysBaseSetInfo socialSet, SysBaseSetInfo fundSet) {
 		if (Common.isEmpty(setInfoVo)){
 			errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_PROJECT_NOT_FOUND)));
 			return true;