Merge branch 'develop'

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

@@ -69,22 +69,25 @@ public class TCertRecordServiceImpl extends ServiceImpl<TCertRecordMapper, TCert
 		if (!Common.isNotNull(employeeInfo)){
 			return R.failed(CommonConstants.PARAM_IS_NOT_ERROR);
 		}
-		// 取值最早的合同
-		TEmployeeContractInfo last = contractInfoMapper.selectOne(Wrappers.<TEmployeeContractInfo>query().lambda()
+		// 取值最新审核的合同  2022-10-13  倩倩确认 最早取值审核通过的 最早合同开始时间
+		TEmployeeContractInfo first = contractInfoMapper.selectOne(Wrappers.<TEmployeeContractInfo>query().lambda()
 				.eq(TEmployeeContractInfo::getDeleteFlag,CommonConstants.ZERO_STRING)
 				.eq(TEmployeeContractInfo::getAuditStatus,CommonConstants.TWO_STRING)
-				.eq(TEmployeeContractInfo::getIsObsolete,CommonConstants.ZERO_STRING)
+				.ne(TEmployeeContractInfo::getSituation,"终止")
+				.ne(TEmployeeContractInfo::getSituation,"作废")
 				.eq(TEmployeeContractInfo::getEmpIdcard,employeeInfo.getEmpIdcard())
-				.orderByDesc(TEmployeeContractInfo::getAuditTimeLast)
+				.orderByAsc(TEmployeeContractInfo::getContractStart)
 				.last(CommonConstants.LAST_ONE_SQL));
 
-		// 取值最早的合同
-		TEmployeeContractInfo first = contractInfoMapper.selectOne(Wrappers.<TEmployeeContractInfo>query().lambda()
+		// 取值最早审核的合同
+		TEmployeeContractInfo last = contractInfoMapper.selectOne(Wrappers.<TEmployeeContractInfo>query().lambda()
 				.eq(TEmployeeContractInfo::getDeleteFlag,CommonConstants.ZERO_STRING)
 				.eq(TEmployeeContractInfo::getAuditStatus,CommonConstants.TWO_STRING)
-				.eq(TEmployeeContractInfo::getIsObsolete,CommonConstants.ZERO_STRING)
+				.ne(TEmployeeContractInfo::getSituation,"终止")
+				.ne(TEmployeeContractInfo::getSituation,"作废")
 				.eq(TEmployeeContractInfo::getEmpIdcard,employeeInfo.getEmpIdcard())
-				.orderByAsc(TEmployeeContractInfo::getAuditTimeLast)
+				.isNotNull(TEmployeeContractInfo::getContractEnd)
+				.orderByDesc(TEmployeeContractInfo::getContractEnd)
 				.last(CommonConstants.LAST_ONE_SQL));
 		TCertRecordVo vo = new TCertRecordVo();
 		vo.setEmpIdcard(project.getEmpIdcard());

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceDetail.java

@@ -334,5 +334,8 @@ public class TInsuranceDetail extends BaseEntity {
 	@Schema(description ="客户编码")
 	private String unitNo;
 
+	@Schema(description = "退回原因")
+	private String backRemark;
+
 	private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceListParam.java

@@ -71,7 +71,7 @@ public class InsuranceListParam extends BaseEntity {
 	private List<String> deptNoList;
 
 	/**
-	 * 购买类型， 1新增、3批增、4替换
+	 * 投保类型、购买类型， 1新增、3批增、4替换
 	 */
 	@Schema(description = " 购买类型(派单类型)， 1新增、3批增、4替换")
 	private Integer buyType;
@@ -87,4 +87,11 @@ public class InsuranceListParam extends BaseEntity {
 	 */
 	@Schema(description = "派单结束时间")
 	private String endDate;
+
+	/**
+	 * 减员状态 1待减员 2减员中3减员退回
+	 */
+	@Schema(description = "减员状态 1待减员 2减员中3减员退回,4减员成功")
+	private Integer reduceHandleStatus;
+
 }

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceListVO.java

 package com.yifu.cloud.plus.v1.yifu.insurances.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.HeadFontStyle;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -7,6 +11,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 /**
  * @author licancan
@@ -139,4 +144,19 @@ public class InsuranceListVO implements Serializable {
 	 */
 	@Schema(description = "错误信息")
 	private String errorMessage;
+
+	/**
+	 * 审批意见
+	 */
+	@Schema(description = "审批意见")
+	private String remark;
+
+	@Schema(description = "退回原因")
+	private String backRemark;
+
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
+	@Schema(description = "派单日期")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("派单日期")
+	private LocalDateTime createTime;
 }

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceRefundListVo.java

 package com.yifu.cloud.plus.v1.yifu.insurances.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.HeadFontStyle;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -7,6 +11,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 /**
  * @author zhaji
@@ -187,4 +192,15 @@ public class InsuranceRefundListVo implements Serializable {
 	 */
 	@Schema(description = "封面抬头")
 	private String invoiceTitle;
+
+	@Schema(description = "派单人")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("派单人")
+	private String createName;
+
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
+	@Schema(description = "派单日期")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("派单日期")
+	private LocalDateTime createTime;
 }

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceRefundParam.java

@@ -73,4 +73,16 @@ public class InsuranceRefundParam extends BaseEntity implements Serializable {
 	 */
 	@Schema(description = "项目编码列表")
 	private List<String> deptNoList;
+
+	/**
+	 * 派单开始时间
+	 */
+	@Schema(description = "派单开始时间")
+	private String startDate;
+
+	/**
+	 * 派单结束时间
+	 */
+	@Schema(description = "派单结束时间")
+	private String endDate;
 }

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuredListVo.java

@@ -233,5 +233,11 @@ public class InsuredListVo implements Serializable {
 	@Schema(description = "创建人所在部门名称")
 	private String createUserDeptName;
 
+	/**
+	 * 封面抬头
+	 */
+	@Schema(description = "封面抬头")
+	private String invoiceTitle;
+
 
 }

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuredParam.java

@@ -114,4 +114,10 @@ public class InsuredParam extends BaseEntity implements Serializable {
 	@Schema(description = "项目编码列表")
 	private List<String> deptNoList;
 
+	@Schema(description = " 投保类型， 1新增、3批增、4替换")
+	private Integer buyType;
+
+	@Schema(description = "减员状态 1待减员 2减员中3减员退回,4减员成功")
+	private Integer reduceHandleStatus;
+
 }

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java

@@ -234,6 +234,19 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			insuranceList.stream().forEach(e ->{
 				e.setBuyMonth(LocalDateUtil.betweenMonth(e.getPolicyStart().toString(),e.getPolicyEnd().toString()));
 			});
+			for (InsuranceListVO listVO : insuranceList) {
+				if (CommonConstants.FOUR_INT == listVO.getBuyHandleStatus()) {
+					TInsuranceOperate tInsuranceOperate = tInsuranceOperateService.getOne(Wrappers.<TInsuranceOperate>query().lambda()
+							.eq(TInsuranceOperate::getInsuranceDetailId,listVO.getId())
+							.eq(TInsuranceOperate::getDisplayFlag,CommonConstants.ONE_INT)
+							.orderByDesc(TInsuranceOperate::getCreateTime)
+							.last(CommonConstants.LAST_ONE_SQL)
+					);
+					if (Common.isNotNull(tInsuranceOperate)) {
+						listVO.setRemark(tInsuranceOperate.getRemark());
+					}
+				}
+			}
 		}
 		return R.ok(insuranceList);
 	}
@@ -843,7 +856,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				Map<String, ProjectSetInfoVo> data = setInfoByCodes.getData().getProjectSetInfoVoMap();
 				ProjectSetInfoVo jsonObject = data.get(insuranceDetailVO.getDeptNo());
 				if (null != jsonObject){
-					insuranceDetailVO.setProjectName(Optional.ofNullable(jsonObject.getDepartName()).orElse(""));
 					insuranceDetailVO.setInvoiceTitle(Optional.ofNullable(jsonObject.getInvoiceTitleInsurance()).orElse(""));
 				}
 			}
@@ -914,7 +926,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					if (data != null) {
 						jsonObject = data.get(record.getDeptNo());
 						if (null != jsonObject) {
-							record.setProjectName(Optional.ofNullable(jsonObject.getDepartName()).orElse(""));
 							record.setInvoiceTitle(Optional.ofNullable(jsonObject.getInvoiceTitleInsurance()).orElse(""));
 						}
 					}
@@ -974,6 +985,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 							vo.setBuyDay(LocalDateUtil.betweenDay(vo.getPolicyStart().toString(),vo.getPolicyEnd().toString()));
 							vo.setRemark(InsurancesConstants.QUIT);
 							vo.setBuyType(CommonConstants.FOUR_INT);
+							vo.setProjectName(vo.getProjectName());
 							list.add(vo);
 						}
 					}
@@ -989,7 +1001,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 								for (InsuranceExportListVO record : list) {
 									ProjectSetInfoVo jsonObject = data.get(record.getDeptNo());
 									if (null != jsonObject) {
-										record.setProjectName(Optional.ofNullable(jsonObject.getDepartName()).orElse(""));
 										record.setInvoiceTitle(Optional.ofNullable(jsonObject.getInvoiceTitleInsurance()).orElse(""));
 									}
 								}
@@ -1023,7 +1034,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	@Transactional(value = "insurancesTransactionManager" ,rollbackFor = {Exception.class})
 	public R<List<InsuranceListVO>> rollBackInsurance(YifuUser user, List<InsuranceHandleParam> paramList) {
 		//解析参数里的商险id
-		List<String> idList = paramList.stream().map(e -> e.getId()).distinct().collect(Collectors.toList());
+		List<String> idList = new ArrayList<>();
+		Map<String,String> remarkMap = new HashMap<>();
+		if (paramList != null) {
+			for (InsuranceHandleParam param : paramList) {
+				idList.add(param.getId());
+				remarkMap.put(param.getId(), param.getRemark());
+			}
+		}
 		//操作日志对象
 		List<InsuranceHandleParam> operateList = new ArrayList<>();
 
@@ -1082,6 +1100,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					}
 					detail.setUpdateBy(user.getId());
 					detail.setUpdateTime(LocalDateTime.now());
+					detail.setBackRemark(remarkMap.get(detail.getId()));
 					successList.add(detail);
 				}
 			}
@@ -3354,22 +3373,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		insuranceList = this.baseMapper.getInsuredListPage(page, param);
 		if (CollectionUtils.isNotEmpty(insuranceList.getRecords())){
 			//根据项目编码获取项目名称
-			List<String> collect = insuranceList.getRecords().stream().map(InsuredListVo::getDeptNo).distinct().collect(Collectors.toList());
-			R<SetInfoVo> setInfoByCodes = archivesDaprUtil.getSetInfoByCodes(collect);
-			if (null != setInfoByCodes && setInfoByCodes.getCode() == CommonConstants.SUCCESS && Common.isNotNull(setInfoByCodes.getData())) {
-				Map<String, ProjectSetInfoVo>  data = setInfoByCodes.getData().getProjectSetInfoVoMap();
-				for (InsuredListVo record : insuranceList.getRecords()) {
-					//购买月数
-					record.setBuyMonth(LocalDateUtil.betweenMonth(record.getPolicyStart().toString(),record.getPolicyEnd().toString()));
-					if (data != null) {
-						ProjectSetInfoVo jsonObject = data.get(record.getDeptNo());
-						if (null != jsonObject) {
-							record.setProjectName(Optional.ofNullable(jsonObject.getDepartName()).orElse(""));
-						}
-					}
-				}
+			for (InsuredListVo record : insuranceList.getRecords()) {
+				//购买月数
+				record.setBuyMonth(LocalDateUtil.betweenMonth(record.getPolicyStart().toString(),record.getPolicyEnd().toString()));
 			}
-
 		}
 		return insuranceList;
 	}
@@ -3404,7 +3411,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 						if (data != null) {
 							ProjectSetInfoVo jsonObject = data.get(record.getDeptNo());
 							if (null != jsonObject) {
-								record.setProjectName(Optional.ofNullable(jsonObject.getDepartName()).orElse(""));
+								record.setInvoiceTitle(Optional.ofNullable(jsonObject.getInvoiceTitleInsurance()).orElse(""));
 							}
 						}
 					}
@@ -3437,26 +3444,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		IPage<InsuranceRefundListVo> insuranceRefundPageList = this.baseMapper.getInsuranceRefundPageList(page, param);
 		if (CollectionUtils.isNotEmpty(insuranceRefundPageList.getRecords())){
 			//根据项目编码获取项目名称
-			List<String> collect = insuranceRefundPageList.getRecords().stream().map(InsuranceRefundListVo::getDeptNo).distinct().collect(Collectors.toList());
 			try {
-				R<SetInfoVo> setInfoByCodes = archivesDaprUtil.getSetInfoByCodes(collect);
-				if (null != setInfoByCodes && setInfoByCodes.getCode() == CommonConstants.SUCCESS && Common.isNotNull(setInfoByCodes.getData())) {
-					Map<String, ProjectSetInfoVo> data = setInfoByCodes.getData().getProjectSetInfoVoMap();
-					for (InsuranceRefundListVo record : insuranceRefundPageList.getRecords()) {
-						//购买月数
-						record.setBuyMonth(LocalDateUtil.betweenMonth(record.getPolicyStart().toString(),record.getPolicyEnd().toString()));
-						if (data != null) {
-							ProjectSetInfoVo jsonObject = data.get(record.getDeptNo());
-							if (null != jsonObject) {
-								record.setProjectName(Optional.ofNullable(jsonObject.getDepartName()).orElse(""));
-							}
-						}
-					}
+				for (InsuranceRefundListVo record : insuranceRefundPageList.getRecords()) {
+					//购买月数
+					record.setBuyMonth(LocalDateUtil.betweenMonth(record.getPolicyStart().toString(),record.getPolicyEnd().toString()));
 				}
 			}catch (Exception e){
 				log.error(InsurancesConstants.GET_DEPT_DETAIL_ERROR+e);
 			}
-
 		}
 		return R.ok(insuranceRefundPageList);
 	}
@@ -3489,7 +3484,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					if (data != null) {
 						ProjectSetInfoVo jsonObject = data.get(record.getDeptNo());
 						if (null != jsonObject) {
-							record.setProjectName(Optional.ofNullable(jsonObject.getDepartName()).orElse(""));
 							record.setInvoiceTitle(Optional.ofNullable(jsonObject.getInvoiceTitleInsurance()).orElse(""));
 						}
 					}
@@ -3524,22 +3518,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		IPage<RefundExportListVo> insuranceRefundHandlingPageList = this.baseMapper.getInsuranceRefundHandlingPageList(page, param);
 		if (CollectionUtils.isNotEmpty(insuranceRefundHandlingPageList.getRecords())){
 			//根据项目编码获取项目名称
-			List<String> collect = insuranceRefundHandlingPageList.getRecords().stream().map(RefundExportListVo::getDeptNo).distinct().collect(Collectors.toList());
-			R<SetInfoVo> setInfoByCodes = archivesDaprUtil.getSetInfoByCodes(collect);
-			if (null != setInfoByCodes && setInfoByCodes.getCode() == CommonConstants.SUCCESS && Common.isNotNull(setInfoByCodes.getData())) {
-				Map<String, ProjectSetInfoVo> data = setInfoByCodes.getData().getProjectSetInfoVoMap();
-				if (data != null) {
-					for (RefundExportListVo record : insuranceRefundHandlingPageList.getRecords()) {
-						//购买月数
-						record.setBuyMonth(LocalDateUtil.betweenMonth(record.getPolicyStart().toString(), record.getPolicyEnd().toString()));
-						if (data != null) {
-							ProjectSetInfoVo jsonObject = data.get(record.getDeptNo());
-							if (null != jsonObject) {
-								record.setProjectName(Optional.ofNullable(jsonObject.getDepartName()).orElse(""));
-							}
-						}
-					}
-				}
+			for (RefundExportListVo record : insuranceRefundHandlingPageList.getRecords()) {
+				//购买月数
+				record.setBuyMonth(LocalDateUtil.betweenMonth(record.getPolicyStart().toString(), record.getPolicyEnd().toString()));
 			}
 		}
 
@@ -3588,7 +3569,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					if (data != null) {
 						ProjectSetInfoVo jsonObject = data.get(record.getDeptNo());
 						if (null != jsonObject) {
-							record.setProjectName(Optional.ofNullable(jsonObject.getDepartName()).orElse(""));
 							record.setInvoiceTitle(Optional.ofNullable(jsonObject.getInvoiceTitleInsurance()).orElse(""));
 						}
 					}

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryAccountServiceImpl.java

@@ -64,21 +64,7 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
 	 */
 	@Override
 	public IPage<TSalaryAccount> getTSalaryAccountPage(Page<TSalaryAccount> page, TSalaryAccountSearchVo tSalaryAccount) {
-		long pageCount = baseMapper.getTSalaryAccountPageCountDiy(tSalaryAccount);
-		page.setTotal(pageCount);
-		if (pageCount > 0L) {
-			page.setPages((long) Math.ceil(pageCount / page.getSize()));
-		}
-		if (page.getCurrent() < 1) {
-			page.setCurrent(1L);
-		}
-		if (page.getSize() < 1) {
-			page.setSize(10L);
-		}
-		if (pageCount > ((page.getCurrent() - 1) * page.getSize())) {
-			page.setRecords(baseMapper.getTSalaryAccountPageDiy(tSalaryAccount, (page.getCurrent() - 1) * page.getSize(), page.getSize()));
-		}
-		return page;
+		return baseMapper.getTSalaryAccountPage(page, tSalaryAccount);
 	}
 
 	/**

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java

@@ -526,71 +526,75 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 			//报账表
 			List<EkpSalaryParamVo> ekpList = salaryAccountService.getEkpSalaryParamList(id);
 			YifuUser user = SecurityUtils.getUser();
-			if (user != null && ekpList != null && !ekpList.isEmpty()) {
-				boolean sendStatus = true;
-				String sendBack;
-				List<TSalaryAccount> accountList = new ArrayList<>();
-				TSalaryAccount account;
-				Date sendTime = new Date();
-				String nowMonth = DateUtil.addMonth(0);
-				EkpSalaryParam salaryParam;
-				for (EkpSalaryParamVo sendParam : ekpList) {
-					salaryParam = new EkpSalaryParam();
-					BeanUtils.copyProperties(sendParam, salaryParam);
-					// 转化报账表的参数
-					account = new TSalaryAccount();
-					account.setId(sendParam.getFd_3b10af838eab5c());
-					// 社保
-					if (Common.isNotNull(sendParam.getFd_3b16ce48a9735c())
-							&& !CommonConstants.ZERO_STRING.equals(sendParam.getFd_3b16ce48a9735c())) {
-						doSendForecastSocialToEkp(sendParam, s);
-					}
-					// 公积金
-					if (Common.isNotNull(sendParam.getFd_3b16ce4b7fc42a())
-							&& !CommonConstants.ZERO_STRING.equals(sendParam.getFd_3b16ce4b7fc42a())) {
-						doSendForecastFundToEkp(sendParam, s);
-					}
-					sendBack = ekpSalaryUtil.sendToEKP(salaryParam);
-					if (Common.isEmpty(sendBack) || sendBack.length() != 32) {
+			if (user != null) {
+				if (ekpList != null && !ekpList.isEmpty()){
+					boolean sendStatus = true;
+					String sendBack;
+					List<TSalaryAccount> accountList = new ArrayList<>();
+					TSalaryAccount account;
+					Date sendTime = new Date();
+					String nowMonth = DateUtil.addMonth(0);
+					EkpSalaryParam salaryParam;
+					for (EkpSalaryParamVo sendParam : ekpList) {
+						salaryParam = new EkpSalaryParam();
+						BeanUtils.copyProperties(sendParam, salaryParam);
+						// 转化报账表的参数
+						account = new TSalaryAccount();
+						account.setId(sendParam.getFd_3b10af838eab5c());
+						// 社保
+						if (Common.isNotNull(sendParam.getFd_3b16ce48a9735c())
+								&& !CommonConstants.ZERO_STRING.equals(sendParam.getFd_3b16ce48a9735c())) {
+							doSendForecastSocialToEkp(sendParam, s);
+						}
+						// 公积金
+						if (Common.isNotNull(sendParam.getFd_3b16ce4b7fc42a())
+								&& !CommonConstants.ZERO_STRING.equals(sendParam.getFd_3b16ce4b7fc42a())) {
+							doSendForecastFundToEkp(sendParam, s);
+						}
 						sendBack = ekpSalaryUtil.sendToEKP(salaryParam);
+						if (Common.isEmpty(sendBack) || sendBack.length() != 32) {
+							sendBack = ekpSalaryUtil.sendToEKP(salaryParam);
+						}
+						account.setSendTime(sendTime);
+						account.setSendUser(user.getId());
+						account.setSendUserName(user.getNickname());
+						if (Common.isNotNull(sendBack) && sendBack.length() == 32) {
+							account.setSendStatus(CommonConstants.ONE_STRING);
+							account.setSendMonth(nowMonth);
+							account.setEkpId(sendBack);
+						} else {
+							sendStatus = false;
+							TSendEkpError error = new TSendEkpError();
+							error.setCreateTime(new Date());
+							error.setCreateDay(DateUtil.getThisDay());
+							error.setType(CommonConstants.ONE_STRING);
+							error.setCreateUserName(s.getCreateName());
+							error.setLinkId(account.getId());
+							error.setTitle(sendBack);
+							error.setNums(CommonConstants.ONE_INT);
+							HttpDaprUtil.invokeMethodPost(socialProperties.getAppUrl(), socialProperties.getAppId()
+									, "/tsendekperror/inner/saveError", error, Boolean.class, SecurityConstants.FROM_IN);
+						}
+						accountList.add(account);
 					}
-					account.setSendTime(sendTime);
-					account.setSendUser(user.getId());
-					account.setSendUserName(user.getNickname());
-					if (Common.isNotNull(sendBack) && sendBack.length() == 32) {
-						account.setSendStatus(CommonConstants.ONE_STRING);
-						account.setSendMonth(nowMonth);
-						account.setEkpId(sendBack);
+					salaryAccountService.updateBatchById(accountList);
+					if (sendStatus) {
+						s.setSendTime(new Date());
+						s.setSendMonth(DateUtil.addMonth(0));
+						s.setStatus(SalaryConstants.STATUS[3]);
+						this.updateById(s);
+						// 添加流程进展明细
+						this.saveRecordLog(s, user, CommonConstants.ZERO_STRING, "发送数字化平台-成功");
+						return R.ok("发送成功！");
 					} else {
-						sendStatus = false;
-						TSendEkpError error = new TSendEkpError();
-						error.setCreateTime(new Date());
-						error.setCreateDay(DateUtil.getThisDay());
-						error.setType(CommonConstants.ONE_STRING);
-						error.setCreateUserName(s.getCreateName());
-						error.setLinkId(account.getId());
-						error.setTitle(sendBack);
-						error.setNums(CommonConstants.ONE_INT);
-						HttpDaprUtil.invokeMethodPost(socialProperties.getAppUrl(), socialProperties.getAppId()
-								, "/tsendekperror/inner/saveError", error, Boolean.class, SecurityConstants.FROM_IN);
+						s.setStatus(SalaryConstants.STATUS[10]);
+						this.updateById(s);
+						// 添加流程进展明细
+						this.saveRecordLog(s, user, CommonConstants.ONE_STRING, "发送数字化平台-失败");
+						return R.ok("发送失败！");
 					}
-					accountList.add(account);
-				}
-				salaryAccountService.updateBatchById(accountList);
-				if (sendStatus) {
-					s.setSendTime(new Date());
-					s.setSendMonth(DateUtil.addMonth(0));
-					s.setStatus(SalaryConstants.STATUS[3]);
-					this.updateById(s);
-					// 添加流程进展明细
-					this.saveRecordLog(s, user, CommonConstants.ZERO_STRING, "发送数字化平台-成功");
-					return R.ok("发送成功！");
-				} else {
-					s.setStatus(SalaryConstants.STATUS[10]);
-					this.updateById(s);
-					// 添加流程进展明细
-					this.saveRecordLog(s, user, CommonConstants.ONE_STRING, "发送数字化平台-失败");
-					return R.ok("发送失败！");
+				}else {
+					R.ok("无数据可发送！");
 				}
 			} else {
 				return R.failed("请登录！");

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryAccountMapper.xml

@@ -348,9 +348,11 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM t_salary_account a
-		LEFT JOIN t_dept_see d ON a.DEPT_NO = d.DEPT_NO
         <where>
-			a.DELETE_FLAG = 0 AND (d.CAN_SEE = 0 OR d.id is null)
+			a.DELETE_FLAG = 0
+			and not EXISTS (
+				select 1 from t_dept_see d where a.DEPT_NO = d.DEPT_NO and d.CAN_SEE = 1
+			)
 			<include refid="tSalaryAccount_where"/>
 			<if test="tSalaryAccount.authSql != null and tSalaryAccount.authSql.trim() != ''">
 				${tSalaryAccount.authSql}
@@ -578,9 +580,10 @@
 		SELECT
 		<include refid="Base_Column_List"/>
 		FROM t_salary_account a
-		LEFT JOIN t_dept_see d ON a.DEPT_NO = d.DEPT_NO
 		<where>
-			a.DELETE_FLAG = 0 AND (d.CAN_SEE = 0 OR d.id is null)
+			a.DELETE_FLAG = 0 and not EXISTS (
+			select 1 from t_dept_see d where a.DEPT_NO = d.DEPT_NO and d.CAN_SEE = 1
+			)
 			<include refid="where_export"/>
 			<if test="searchVo.authSql != null and searchVo.authSql.trim() != ''">
 				${searchVo.authSql}
@@ -617,9 +620,10 @@
 		SELECT
 		count(1)
 		FROM t_salary_account a
-		LEFT JOIN t_dept_see d ON a.DEPT_NO = d.DEPT_NO
 		<where>
-			a.DELETE_FLAG = 0 AND (d.CAN_SEE = 0 OR d.id is null)
+			a.DELETE_FLAG = 0 and not EXISTS (
+			select 1 from t_dept_see d where a.DEPT_NO = d.DEPT_NO and d.CAN_SEE = 1
+			)
 			<include refid="where_export"/>
 			<if test="searchVo.authSql != null and searchVo.authSql.trim() != ''">
 				${searchVo.authSql}

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TDispatchInfo.java

@@ -16,6 +16,7 @@
  */
 package com.yifu.cloud.plus.v1.yifu.social.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.HeadFontStyle;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -511,6 +512,14 @@ public class TDispatchInfo extends BaseEntity {
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("审核人" )
 	private String auditUser;
+
+	/**
+	 * 审核人姓名
+	 */
+	@Length(max = 32, message = "审核人姓名 不能超过32个字符" )
+	@Schema(description = "审核人姓名" )
+	@ExcelIgnore
+	private String auditUserName;
 	/**
 	 * 审核时间
 	 */
@@ -519,6 +528,7 @@ public class TDispatchInfo extends BaseEntity {
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("审核时间" )
 	private Date auditTime;
+
 	/**
 	 * 工时制：1标准工时 2 综合工时 3不定时工时制
 	 */

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

 package com.yifu.cloud.plus.v1.yifu.social.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo;
@@ -51,4 +52,19 @@ public class SocialHandleSearchVo extends TDispatchInfo {
 	private int limitEnd;
 
 	private String idStr;
+
+	/**
+	 * 审核时间开始时间
+	 */
+	@TableField(exist = false)
+	@Schema(description = "审核时间开始时间" )
+	@ExcelIgnore
+	private String auditTimeStart;
+	/**
+	 * 审核时间截止时间
+	 */
+	@TableField(exist = false)
+	@Schema(description = "审核时间截止时间" )
+	@ExcelIgnore
+	private String auditTimeEnd;
 }

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

@@ -16,6 +16,7 @@
  */
 package com.yifu.cloud.plus.v1.yifu.social.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.HeadFontStyle;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -25,6 +26,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 import java.util.Set;
 
@@ -93,4 +95,19 @@ public class TDispatchInfoSearchVo extends TDispatchInfo {
 	@ExcelProperty("公积金户名称" )
 	private String providentHouseholdName;
 
+	/**
+	 * 审核时间开始时间
+	 */
+	@TableField(exist = false)
+	@Schema(description = "审核时间开始时间" )
+	@ExcelIgnore
+	private String auditTimeStart;
+	/**
+	 * 审核时间截止时间
+	 */
+	@TableField(exist = false)
+	@Schema(description = "审核时间截止时间" )
+	@ExcelIgnore
+	private String auditTimeEnd;
+
 }

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

@@ -2915,6 +2915,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 					auditInfo.setDispatchInfoId(dis.getId());
 					auditInfoMapper.insert(auditInfo);
 					dis.setAuditUser(user.getId());
+					dis.setAuditUserName(user.getNickname());
 					dis.setAuditTime(now);
 					baseMapper.updateById(dis);
 

yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml

@@ -72,6 +72,7 @@
     <result property="fundCity" column="FUND_CITY"/>
     <result property="fundTown" column="FUND_TOWN"/>
     <result property="auditUser" column="AUDIT_USER"/>
+	  <result property="auditUserName" column="AUDIT_USER_NAME"/>
     <result property="auditTime" column="AUDIT_TIME"/>
     <result property="workingHours" column="WORKING_HOURS"/>
     <result property="createBy" column="CREATE_BY"/>
@@ -194,6 +195,7 @@
 		a.FUND_CITY,
 		a.FUND_TOWN,
 		a.AUDIT_USER,
+		a.AUDIT_USER_NAME,
 		a.AUDIT_TIME,
 		a.WORKING_HOURS,
 		a.CREATE_BY,
@@ -380,9 +382,19 @@
                     <if test="tDispatchInfo.auditUser != null and tDispatchInfo.auditUser.trim() != ''">
                         AND a.AUDIT_USER = #{tDispatchInfo.auditUser}
                     </if>
+					<if test="tDispatchInfo.auditUserName != null and tDispatchInfo.auditUserName.trim() != ''">
+						AND a.AUDIT_USER_NAME like concat('%',#{tDispatchInfo.auditUserName},'%')
+					</if>
                     <if test="tDispatchInfo.auditTime != null">
                         AND a.AUDIT_TIME = #{tDispatchInfo.auditTime}
                     </if>
+					<if test="tDispatchInfo.auditTimeStart != null">
+						AND a.AUDIT_TIME <![CDATA[>=]]> #{tDispatchInfo.auditTimeStart}
+					</if>
+					<if test="tDispatchInfo.auditTimeEnd != null">
+						AND a.AUDIT_TIME <![CDATA[<=]]> #{tDispatchInfo.auditTimeEnd}
+					</if>
+
                     <if test="tDispatchInfo.workingHours != null and tDispatchInfo.workingHours.trim() != ''">
                         AND a.WORKING_HOURS = #{tDispatchInfo.workingHours}
                     </if>
@@ -770,6 +782,15 @@
 				<if test="tDispatchInfo.createTimeStart != null">
 					AND a.CREATE_TIME <![CDATA[>=]]> #{tDispatchInfo.createTimeStart}
 				</if>
+				<if test="tDispatchInfo.auditTimeStart != null">
+					AND a.AUDIT_TIME <![CDATA[>=]]> #{tDispatchInfo.auditTimeStart}
+				</if>
+				<if test="tDispatchInfo.auditTimeEnd != null">
+					AND a.AUDIT_TIME <![CDATA[<=]]> #{tDispatchInfo.auditTimeEnd}
+				</if>
+				<if test="tDispatchInfo.auditUserName != null and tDispatchInfo.auditUserName.trim() != ''">
+					AND a.AUDIT_USER_NAME like concat('%',#{tDispatchInfo.auditUserName},'%')
+				</if>
 				<if test="tDispatchInfo.socialHouseholdName != null and tDispatchInfo.socialHouseholdName.trim() != ''">
 					AND a.SOCIAL_HOUSEHOLD_NAME  like CONCAT(CONCAT(#{tDispatchInfo.socialHouseholdName}), '%')
 				</if>
@@ -874,6 +895,15 @@
 				<if test="tDispatchInfo.createTimeStart != null">
 					AND a.CREATE_TIME <![CDATA[>=]]> #{tDispatchInfo.createTimeStart}
 				</if>
+				<if test="tDispatchInfo.auditTimeStart != null">
+					AND a.AUDIT_TIME <![CDATA[>=]]> #{tDispatchInfo.auditTimeStart}
+				</if>
+				<if test="tDispatchInfo.auditTimeEnd != null">
+					AND a.AUDIT_TIME <![CDATA[<=]]> #{tDispatchInfo.auditTimeEnd}
+				</if>
+				<if test="tDispatchInfo.auditUserName != null and tDispatchInfo.auditUserName.trim() != ''">
+					AND a.AUDIT_USER_NAME like concat('%',#{tDispatchInfo.auditUserName},'%')
+				</if>
 				<if test="tDispatchInfo.providentHouseholdName != null and tDispatchInfo.providentHouseholdName.trim() != ''">
 					AND a.PROVIDENT_HOUSEHOLD_NAME like CONCAT(CONCAT(#{tDispatchInfo.providentHouseholdName}), '%')
 				</if>