Commit ac6c5d01 authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/MVP1.7.10' into MVP1.7.10

parents 28ff1c3a 99e0d896
......@@ -568,4 +568,34 @@ public class TEmployeeInfoController {
tEmployeeInfoService.exportEmployeeFile(id, response);
}
/**
* @param empName 姓名
* @param empIdCard 身份证
* @Description: 按姓名身份证查询档案-包括离职库
* @Author: hgw
* @Date: 2025-4-23 15:34:26
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/
@Operation(summary = "按姓名身份证查询档案-包括离职库", description = "按姓名身份证查询档案-包括离职库")
@SysLog("按姓名身份证查询档案-包括离职库")
@GetMapping("/getByEmpNameAndCard")
public R<TEmployeeInfo> getByEmpNameAndCard(@RequestParam String empName, @RequestParam String empIdCard) {
return tEmployeeInfoService.getByEmpNameAndCard(empName, empIdCard);
}
/**
* @param empPhoneOld 手机号-原先
* @param empPhoneNew 手机号-新
* @Description: 更新档案手机号-包括离职库
* @Author: hgw
* @Date: 2025-4-23 15:34:26
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/
@Operation(summary = "更新档案手机号-包括离职库", description = "更新档案手机号-包括离职库")
@SysLog("更新档案手机号-包括离职库")
@GetMapping("/updateEmpPhone")
public R<String> updateEmpPhone(@RequestParam String id, @RequestParam String empPhoneOld, @RequestParam String empPhoneNew) {
return tEmployeeInfoService.updateEmpPhone(id, empPhoneOld, empPhoneNew);
}
}
......@@ -271,4 +271,24 @@ public interface TEmployeeInfoService extends IService<TEmployeeInfo> {
List<TEmployeeInfo> getListByDeptIdByLimit(String deptId, Integer limit1, Integer limit2);
/**
* @param empPhoneOld 手机号-原先
* @param empPhoneNew 手机号-新
* @Description: 更新档案手机号-包括离职库
* @Author: hgw
* @Date: 2025-4-23 15:34:26
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/
R<String> updateEmpPhone(String id, String empPhoneOld, String empPhoneNew);
/**
* @param empName
* @param empIdCard
* @Description: 按姓名身份证查询档案
* @Author: hgw
* @Date: 2025/4/23 16:24
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo>
**/
R<TEmployeeInfo> getByEmpNameAndCard(String empName, String empIdCard);
}
......@@ -26,6 +26,7 @@ import com.alibaba.excel.read.metadata.holder.ReadRowHolder;
import com.alibaba.excel.util.ListUtils;
import com.alibaba.excel.write.metadata.WriteSheet;
import com.baomidou.lock.annotation.Lock4j;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
......@@ -4214,4 +4215,73 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
tEmpDisabilityInfoService.saveBatch(disabilityRecordList);
}
}
/**
* @param empPhoneOld 手机号-原先
* @param empPhoneNew 手机号-新
* @Description: 更新档案手机号-包括离职库
* @Author: hgw
* @Date: 2025-4-23 15:34:26
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/
@Override
public R<String> updateEmpPhone(String id, String empPhoneOld, String empPhoneNew) {
if (empPhoneOld.equals(empPhoneNew)) {
return R.failed("手机号未发生变化");
}
// 1:判断姓名、身份证是否存在
// 2:如果不存在,返回提示语:无该员工信息
// 3:如果存在,判断手机号old对不对,不对则返回提示语:旧手机号错误
// 4:如果手机号old对,判断手机号new对不对,不对则返回提示语:新手机号校验不通过
// 5:如果手机号new校验通过,判断手机号new是否已存在,存在则返回提示语:手机号已被其他身份证使用
// 6:如果手机号new未被使用,则更新手机号,并返回提示语:更新成功
TEmployeeInfo emp = this.getById(id);
if (emp != null) {
if (!emp.getEmpPhone().equals(empPhoneOld)) {
return R.failed("旧手机号发生变化,请重新获取档案信息!");
}
TEmployeeInfo empExist = baseMapper.selectOne(new LambdaQueryWrapper<TEmployeeInfo>().eq(TEmployeeInfo::getEmpPhone, empPhoneNew));
if (empExist != null) {
return R.failed("手机号已被使用");
}
TCheckMobile checkMobile = new TCheckMobile();
checkMobile.setMobile(empPhoneNew);
R<TCheckMobile> a = HttpDaprUtil.invokeMethodPost(daprCheckProperties.getAppUrl(), daprCheckProperties.getAppId()
, "/tcheckmobile/inner/checkOneMobile", checkMobile, TCheckMobile.class, SecurityConstants.FROM_IN);
if (a != null && a.getData() != null) {
checkMobile = a.getData();
if (checkMobile != null && Common.isNotNull(checkMobile.getStatus())) {
// 校验服务判断了1、4、5都返回为1,因此仅判断1即可
if (!CommonConstants.ONE_STRING.equals(checkMobile.getStatus())) {
return R.failed("手机号校验失败:" + checkMobile.getMessage());
}
} else {
return R.failed(EmployeeConstants.CHECK_ERROR);
}
} else {
return R.failed(EmployeeConstants.CHECK_ERROR);
}
// 可以更新:
emp.setEmpPhone(empPhoneNew);
baseMapper.updateById(emp);
return R.ok("更新成功!");
} else {
return R.failed("无该员工信息");
}
}
@Override
public R<TEmployeeInfo> getByEmpNameAndCard(String empName, String empIdCard) {
TEmployeeInfo emp = baseMapper.selectOne(new LambdaQueryWrapper<TEmployeeInfo>().eq(TEmployeeInfo::getEmpIdcard, empIdCard));
if (emp != null) {
if (empName.equals(emp.getEmpName())) {
return new R<>(emp);
} else {
return R.failed("姓名与身份证不匹配!");
}
} else {
return R.failed("无该员工信息");
}
}
}
......@@ -17,7 +17,6 @@
package com.yifu.cloud.plus.v1.yifu.salary.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainListVo;
......@@ -37,13 +36,11 @@ import com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpSocialViewVo;
import com.yifu.cloud.plus.v1.yifu.salary.constants.SalaryConstants;
import com.yifu.cloud.plus.v1.yifu.salary.entity.THaveSalaryNosocial;
import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount;
import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccountItem;
import com.yifu.cloud.plus.v1.yifu.salary.service.TSalaryAccountItemService;
import com.yifu.cloud.plus.v1.yifu.salary.service.TSalaryAccountService;
import com.yifu.cloud.plus.v1.yifu.salary.util.SalaryCommonUtil;
import com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryAccountSearchVo;
import com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryAccountSumVo;
import com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryDetailVo;
import com.yifu.cloud.plus.v1.yifu.salary.vo.WageProofDto;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
......@@ -53,9 +50,7 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
......
......@@ -27,7 +27,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ResultConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
import com.yifu.cloud.plus.v1.yifu.common.core.util.DictConverter;
import com.yifu.cloud.plus.v1.yifu.common.core.util.EasyExcelStyle;
import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParamVo;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpSocialViewVo;
......@@ -50,7 +49,10 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.math.BigDecimal;
import java.net.URLEncoder;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
......@@ -429,15 +431,15 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
// 固定的报账表列表
List<TSalaryAccountExportSpecialVo> baseList;
// 导出的全量内容列表
List<List<String>> listContent;
List<List<String>> listContent = null;
// 每一行的内容列表
List<String> contentList;
List<String> contentList = null;
// 明细表总mvp
Map<String, Map<String, String>> itemMap;
Map<String, Map<String, String>> itemMap = null;
// 每一行的mvp
Map<String, String> tempMap;
// 全部明细表
List<TSalaryAccountExportSpecialItemVo> itemList;
// 浮动的明细表
List<TSalaryAccountExportSpecialItemVo> itemList = null;
for (int i = 0; i < count; i += limit) {
searchVo.setLimitStart(i);
searchVo.setLimitEnd(limit);
......@@ -501,6 +503,18 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
}
excelWriter.write(listContent, writeSheet);
}
if (Common.isNotNull(listContent)) {
listContent.clear();
}
if (Common.isNotNull(contentList)) {
contentList.clear();
}
if (Common.isNotNull(itemMap)) {
itemMap.clear();
}
if (Common.isNotNull(itemList)) {
itemList.clear();
}
} else {
writeSheet = EasyExcelFactory.writerSheet("工资条" + index).build();
excelWriter.write(list, writeSheet);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment