权限配置页面

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

@@ -40,7 +40,7 @@ import java.util.Date;
 @Schema(description = "派单审核导出Vo")
 public class TDispatchAuditExportVo {
 
-	@ExcelAttribute(name = "派单类型", readConverterExp = "0=增加派单,1=减少派单")
+	@ExcelAttribute(name = "派单类型", readConverterExp = "0=派增,1=派减")
 	@Schema(description = "派单类型：0派增1派减")
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("派单类型")

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

@@ -94,7 +94,7 @@ public class TDispatchInfoExportVo {
 	@ExcelProperty("项目编码")
 	private String settleDomainCode;
 
-	@ExcelAttribute(name = "派单类型", readConverterExp = "0=增加派单,1=减少派单")
+	@ExcelAttribute(name = "派单类型", readConverterExp = "0=派增,1=派减")
 	@Schema(description = "派单类型：0派增1派减")
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("派单类型")

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

@@ -4074,7 +4074,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 	 **/
 	@Override
 	public void doexportFundRecordChange(HttpServletResponse response,String idStr, SocialHandleSearchVo searchVo) {
-		String fileName = DispatchConstants.SOCIAL_RECORD_EXPORT + LocalDateTime.now() + CommonConstants.XLSX;
+		String fileName = DispatchConstants.SOCIAL_RECORD_EXPORT + DateUtil.getThisTime() + CommonConstants.XLSX;
 		//获取要导出的列表
 		List<FundHandleExportVo> list = new ArrayList<>();
 		long count = getFundRecordCount(searchVo,idStr);

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

@@ -814,7 +814,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 		initDayConfMap(dayConfMap);
 		TPreDispatchInfo  temp  = null;
 		TPreDispatchInfo  repeat  = null;
-		int i=1;
+		int i=0;
 		String str = null;
 		for (TPreDispatchInfo info:listInfo) {
 			i++;
@@ -2048,7 +2048,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 				if (Common.isNotNull(existsMap)){
 					temp = existsMap.get(info.getId());
 					if (Common.isNotNull(temp)){
-						houseMap.put(info.getCompany(),info.getCompany());
+						houseMap.put(temp.getCompany(),temp.getCompany());
 					}
 				}else {
 					houseMap.put(info.getCompany(),info.getCompany());
@@ -2063,13 +2063,13 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 			}
 		}
 		// 获取所有户对应的社保户和公积金户对应的在用基数配置
-		if (Common.isNotNull(houseMap)){
+		if (Common.isNotNull(houseMap) && houseMap.size() > 0){
 			List<SysBaseSetInfo> baseSetInfoList = sysBaseSetInfoMapper.selectList(Wrappers.<SysBaseSetInfo>query().lambda()
 					.eq(SysBaseSetInfo::getDeleteFlag,CommonConstants.ZERO_STRING)
 					.eq(SysBaseSetInfo::getStatus,CommonConstants.ZERO_INT)
 					.in(SysBaseSetInfo::getDepartName,houseMap.values()));
 			List<SysBaseSetInfo> baseList;
-			if (Common.isNotNull(baseSetInfoList)){
+			if (Common.isNotNull(baseSetInfoList) && baseSetInfoList.size() > 0){
 				for (SysBaseSetInfo base:baseSetInfoList){
 					if (CommonConstants.ZERO_STRING.equals(base.getBaseType())){
 						baseList = baseSocialSetMap.get(base.getDepartName());