Skip to content

Y
yifu-mvp
Commit c8913aaf authored by fangxinjiang's avatar fangxinjiang
Browse files
Options

代码优化

parent 3add8e96
Show whitespace changes
Inline Side-by-side
Showing with 63 additions and 64 deletions
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpBadRecordServiceImpl.java
View file @ c8913aaf
......@@ -204,7 +204,7 @@ public class TEmpBadRecordServiceImpl extends ServiceImpl<TEmpBadRecordMapper, T
@Override
public void listExport(HttpServletResponse response, EmpBadRecordSearchVo searchVo) {
String fileName = "不良记录批量导出" + DateUtil.getThisTime() + ".xlsx";
String fileName = "不良记录批量导出" + DateUtil.getThisTime() + CommonConstants.XLSX;
//获取要导出的列表
List<TEmpBadRecord> list = new ArrayList<>();
long count = noPageCountDiy(searchVo);
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpContractAlertServiceImpl.java
View file @ c8913aaf
......@@ -93,7 +93,7 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
@Override
public void listExport(HttpServletResponse response, ContractAlertSearchVo searchVo) {
String fileName = ArchivesConstants.EMP_BAD_RECORD + LocalDateTime.now() + ".xlsx";
String fileName = ArchivesConstants.EMP_BAD_RECORD + LocalDateTime.now() + CommonConstants.XLSX;
//获取要导出的列表
List<TEmpContractAlert> list = new ArrayList<>();
long count = noPageCountDiy(searchVo);
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @ c8913aaf
......@@ -908,7 +908,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
@Override
public void exportContractInfo(TEmployeeContractInfo contractInfo, HttpServletResponse response) {
if (contractInfo != null && contractInfo.getExportFields() != null && !contractInfo.getExportFields().isEmpty()) {
String fileName = "员工合同批量导出" + DateUtil.getThisTime() + ".xlsx";
String fileName = "员工合同批量导出" + DateUtil.getThisTime() + CommonConstants.XLSX;
//获取要导出的列表
List<EmployeeContractExportVO> list = baseMapper.getTEmployeeContractExport(contractInfo);
ServletOutputStream out = null;
......@@ -948,7 +948,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
@Override
public void exportContractInfoHistory(TEmployeeContractInfo contractInfo, HttpServletResponse response) {
if (contractInfo != null && contractInfo.getExportFields() != null && !contractInfo.getExportFields().isEmpty()) {
String fileName = "员工合同批量导出【合并历史】" + DateUtil.getThisTime() + ".xlsx";
String fileName = "员工合同批量导出【合并历史】" + DateUtil.getThisTime() + CommonConstants.XLSX;
//获取要导出的列表
List<EmployeeContractExportVO> list = baseMapper.getTEmployeeContractExportHistory(contractInfo);
ServletOutputStream out = null;
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @ c8913aaf
......@@ -1965,7 +1965,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
@Override
public void exportEmployee(TEmployeeInfo employeeInfo, HttpServletResponse response) {
if (employeeInfo != null && employeeInfo.getExportFields() != null && !employeeInfo.getExportFields().isEmpty()) {
String fileName = "人员档案批量导出" + DateUtil.getThisTime() + ".xlsx";
String fileName = "人员档案批量导出" + DateUtil.getThisTime() + CommonConstants.XLSX;
//获取要导出的列表
employeeInfo.setFileStatus(CommonConstants.ZERO_INT);
List<EmployeeExportVO> list = baseMapper.getTEmployeeExportList(employeeInfo);
......@@ -2006,7 +2006,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
@Override
public void exportLeaveEmployee(TEmployeeInfo employeeInfo, HttpServletResponse response) {
if (employeeInfo != null && employeeInfo.getExportFields() != null && !employeeInfo.getExportFields().isEmpty()) {
String fileName = "离职档案批量导出" + DateUtil.getThisTime() + ".xlsx";
String fileName = "离职档案批量导出" + DateUtil.getThisTime() + CommonConstants.XLSX;
//获取要导出的列表
employeeInfo.setFileStatus(CommonConstants.ONE_INT);
List<EmployeeExportVO> list = baseMapper.getTEmployeeLeaveExportList(employeeInfo);
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @ c8913aaf
......@@ -1200,7 +1200,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
@Override
public void listExportProject(HttpServletResponse response, EmployeeProjectExportVO projectDTO, String idstr, List<String> exportFields) {
String fileName = "项目档案批量导出" + DateUtil.getThisTime() + ".xlsx";
String fileName = "项目档案批量导出" + DateUtil.getThisTime() + CommonConstants.XLSX;
// 根据用户传入确定要导出的字段
Set<String> includeColumnFiledNames = new HashSet<String>();
for (String exportField : exportFields) {
......
yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/constant/CommonConstants.java
View file @ c8913aaf
......@@ -475,4 +475,5 @@ public interface CommonConstants {
public static final String PARAM_INFO_ERROR = "传参有误！";
public static final String XLSX = CommonConstants.XLSX;
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/SysMessageSalaryServiceImpl.java
View file @ c8913aaf
......@@ -138,7 +138,7 @@ public class SysMessageSalaryServiceImpl extends ServiceImpl<SysMessageSalaryMap
**/
@Override
public void listExport(HttpServletResponse response, SysMessageSalarySearchVo searchVo) {
String fileName = "最低工资提醒批量导出" + DateUtil.getThisTime() + ".xlsx";
String fileName = "最低工资提醒批量导出" + DateUtil.getThisTime() + CommonConstants.XLSX;
//获取要导出的列表
List<SysMessageSalaryExportVo> list = new ArrayList<>();
// TODO
......
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/THaveSalaryNosocialServiceImpl.java
View file @ c8913aaf
......@@ -189,7 +189,7 @@ public class THaveSalaryNosocialServiceImpl extends ServiceImpl<THaveSalaryNosoc
**/
@Override
public void listExport(HttpServletResponse response, THaveSalaryNosocialSearchVo searchVo) {
String fileName = "有工资无社保批量导出" + DateUtil.getThisTime() + ".xlsx";
String fileName = "有工资无社保批量导出" + DateUtil.getThisTime() + CommonConstants.XLSX;
//获取要导出的列表
List<THaveSalaryNoSocialExportVo> list = new ArrayList<>();
// TODO
......
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryAccountServiceImpl.java
View file @ c8913aaf
......@@ -73,7 +73,7 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
*/
@Override
public void listExport(HttpServletResponse response, TSalaryAccountSearchVo searchVo) {
String fileName = "员工报账查询批量导出" + DateUtil.getThisTime() + ".xlsx";
String fileName = "员工报账查询批量导出" + DateUtil.getThisTime() + CommonConstants.XLSX;
//获取要导出的列表
List<TSalaryAccount> list = new ArrayList<>();
long count = noPageCountDiy(searchVo);
......
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
View file @ c8913aaf
......@@ -90,7 +90,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
*/
@Override
public void listExport(HttpServletResponse response, TSalaryEmployeeSearchVo searchVo) {
String fileName = "薪酬人员查询批量导出" + DateUtil.getThisTime() + ".xlsx";
String fileName = "薪酬人员查询批量导出" + DateUtil.getThisTime() + CommonConstants.XLSX;
//获取要导出的列表
List<TSalaryEmployeeExportVo> list = new ArrayList<>();
long count = noPageCountDiy(searchVo);
......
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java
View file @ c8913aaf
......@@ -118,7 +118,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
*/
@Override
public void listExport(HttpServletResponse response, TSalaryStandardSearchVo searchVo) {
String fileName = "项目薪酬查询批量导出" + DateUtil.getThisTime() + ".xlsx";
String fileName = "项目薪酬查询批量导出" + DateUtil.getThisTime() + CommonConstants.XLSX;
//获取要导出的列表
List<TSalaryStandardExportVo> list = new ArrayList<>();
long count = noPageCountDiy(searchVo);
......
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TStatisticsBonusServiceImpl.java
View file @ c8913aaf
......@@ -93,7 +93,7 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
*/
@Override
public void listExport(HttpServletResponse response, TStatisticsBonusSearchVo searchVo){
String fileName = "全年一次性奖金批量导出" + DateUtil.getThisTime() + ".xlsx";
String fileName = "全年一次性奖金批量导出" + DateUtil.getThisTime() + CommonConstants.XLSX;
//获取要导出的列表
List<TStatisticsBonus> list = new ArrayList<>();
long count = noPageCountDiy(searchVo);
......@@ -157,7 +157,7 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
*/
@Override
public void importDiy(HttpServletResponse response, List<TStatisticsBonusImportVo> list, String deptId){
String fileName = "全年一次性奖金测算导出" + DateUtil.getThisTime() + ".xlsx";
String fileName = "全年一次性奖金测算导出" + DateUtil.getThisTime() + CommonConstants.XLSX;
ServletOutputStream out = null;
//本次纳税额
BigDecimal res;
......
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TStatisticsCurrentReportServiceImpl.java
View file @ c8913aaf
......@@ -70,7 +70,7 @@ public class TStatisticsCurrentReportServiceImpl extends ServiceImpl<TStatistics
*/
@Override
public void listExport(HttpServletResponse response, TStatisticsCurrentReportSearchVo searchVo) {
String fileName = "本期申报批量导出" + DateUtil.getThisTime() + ".xlsx";
String fileName = "本期申报批量导出" + DateUtil.getThisTime() + CommonConstants.XLSX;
//获取要导出的列表
List<TStatisticsCurrentReport> list = new ArrayList<>();
long count = noPageCountDiy(searchVo);
......
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TStatisticsDeclarerServiceImpl.java
View file @ c8913aaf
......@@ -73,7 +73,7 @@ public class TStatisticsDeclarerServiceImpl extends ServiceImpl<TStatisticsDecla
*/
@Override
public void listExport(HttpServletResponse response, TStatisticsDeclarerSearchVo searchVo){
String fileName = "申报对象批量导出" + DateUtil.getThisTime() + ".xlsx";
String fileName = "申报对象批量导出" + DateUtil.getThisTime() + CommonConstants.XLSX;
//获取要导出的列表
List<TStatisticsDeclarer> list = new ArrayList<>();
long count = noPageCountDiy(searchVo);
......
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TStatisticsLaborServiceImpl.java
View file @ c8913aaf
......@@ -83,7 +83,7 @@ public class TStatisticsLaborServiceImpl extends ServiceImpl<TStatisticsLaborMap
*/
@Override
public void listExport(HttpServletResponse response, TStatisticsLaborSearchVo searchVo) {
String fileName = "本期劳务费导出" + DateUtil.getThisTime() + ".xlsx";
String fileName = "本期劳务费导出" + DateUtil.getThisTime() + CommonConstants.XLSX;
//获取要导出的列表
List<TStatisticsLabor> list = new ArrayList<>();
long count = noPageCountDiy(searchVo);
......
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TStatisticsRemunerationServiceImpl.java
View file @ c8913aaf
......@@ -79,7 +79,7 @@ public class TStatisticsRemunerationServiceImpl extends ServiceImpl<TStatisticsR
*/
@Override
public void listExport(HttpServletResponse response, TStatisticsRemunerationSearchVo searchVo) {
String fileName = "本期稿酬申报表导出" + DateUtil.getThisTime() + ".xlsx";
String fileName = "本期稿酬申报表导出" + DateUtil.getThisTime() + CommonConstants.XLSX;
//获取要导出的列表
List<TStatisticsRemuneration> list = new ArrayList<>();
long count = noPageCountDiy(searchVo);
......
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TStatisticsTaxSalaryServiceImpl.java
View file @ c8913aaf
......@@ -85,7 +85,7 @@ public class TStatisticsTaxSalaryServiceImpl extends ServiceImpl<TStatisticsTaxS
*/
@Override
public void listExport(HttpServletResponse response, TStatisticsTaxSalarySearchVo searchVo) {
String fileName = "工资薪金批量导出" + DateUtil.getThisTime() + ".xlsx";
String fileName = "工资薪金批量导出" + DateUtil.getThisTime() + CommonConstants.XLSX;
//获取要导出的列表
List<TStatisticsTaxSalary> list = new ArrayList<>();
long count = noPageCountDiy(searchVo);
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/constants/DispatchConstants.java
View file @ c8913aaf
......@@ -43,6 +43,8 @@ public class DispatchConstants {
public static final String DISPATCH_FUND= "公积金、";
public static final String DISPATCH_FUND_REDUCE_SUCCESS = "公积金派减办理成功：";
public static final String DISPATCH_FUND_REDUCE_FAIL = "公积金派减办理失败：";
public static final String DISPATCH_SYN_DOC_EXE ="同步人员档案、项目档案的社保公积金状态失败！";
public static final String DISPATCH_EXCEPTION = "派单办理异常：";
/**
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TAuditInfoServiceImpl.java
View file @ c8913aaf
......@@ -72,7 +72,7 @@ public class TAuditInfoServiceImpl extends ServiceImpl<TAuditInfoMapper, TAuditI
*/
@Override
public void listExport(HttpServletResponse response, TAuditInfoSearchVo searchVo){
String fileName = "不良记录批量导出" + DateUtil.getThisTime() + ".xlsx";
String fileName = "不良记录批量导出" + DateUtil.getThisTime() + CommonConstants.XLSX;
//获取要导出的列表
List<TAuditInfo> list = new ArrayList<>();
long count = noPageCountDiy(searchVo);
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchDayConfServiceImpl.java
View file @ c8913aaf
......@@ -73,7 +73,7 @@ public class TDispatchDayConfServiceImpl extends ServiceImpl<TDispatchDayConfMap
*/
@Override
public void listExport(HttpServletResponse response, TDispatchDayConfSearchVo searchVo){
String fileName = "不良记录批量导出" + DateUtil.getThisTime() + ".xlsx";
String fileName = "不良记录批量导出" + DateUtil.getThisTime() + CommonConstants.XLSX;
//获取要导出的列表
List<TDispatchDayConf> list = new ArrayList<>();
long count = noPageCountDiy(searchVo);
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @ c8913aaf
......@@ -118,7 +118,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
*/
@Override
public void listExport(HttpServletResponse response, TDispatchInfoSearchVo searchVo) {
String fileName = "派单批量导出" + DateUtil.getThisTime() + ".xlsx";
String fileName = "派单批量导出" + DateUtil.getThisTime() + CommonConstants.XLSX;
//获取要导出的列表
List<TDispatchInfoExportVo> list = new ArrayList<>();
long count = noPageCountDiy(searchVo);
......@@ -236,6 +236,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
@Override
@Transactional(rollbackFor = Exception.class)
@ShardingTransactionType(TransactionType.BASE)
public R<List<ErrorMessage>> importDiy(InputStream inputStream, String orderId) {
YifuUser user = SecurityUtils.getUser();
if (Common.isEmpty(user)){
......@@ -295,8 +297,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
return R.ok(errorMessageList);
}
@Override
@Transactional(rollbackFor = Exception.class)
@ShardingTransactionType(TransactionType.BASE)
public void importTDispatchInfo(List<TDispatchImportVo> excelVOList,
List<ErrorMessage> errorMessageList,
YifuUser user, String orderId) {
......@@ -360,12 +360,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if (Common.isNotNull(empVoMap)) {
empVo = empVoMap.get(excel.getEmpIdcard());
}
if (Common.isNotNull(socialFund) && Common.isNotNull(socialFund.getSocialId())){
if (Common.isNotNull(socialFund)
&& Common.isNotNull(socialFund.getSocialId())
&& CommonConstants.FOUR_STRING.equals(socialFund.getSocialStatus())){
// 部分失败
if (CommonConstants.FOUR_STRING.equals(socialFund.getSocialStatus())){
dispatchPart = true;
}
}
if (Common.isNotNull(excel.getSocialHousehold())){
if (Common.isEmpty(socialSet)){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SOCIAL_HOLD_NOT_EXIST)));
......@@ -576,7 +576,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}catch (Exception e){
log.error("派单新增异常：", e);
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "派单新增异常："+e.getMessage()));
continue;
}
}
// 清理map list 等数据
......@@ -610,7 +609,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
vo.setEmpIdCard(socialFund.getEmpIdcard());
R<Boolean> resUp = archivesDaprUtil.updateProjectSocialFund(vo);
if (Common.isEmpty(resUp) || !(CommonConstants.SUCCESS.intValue() == resUp.getCode()) || !resUp.getData().booleanValue()){
ServiceUtil.runTimeExceptionDiy("同步人员档案、项目档案的社保公积金状态失败！");
ServiceUtil.runTimeExceptionDiy(DispatchConstants.DISPATCH_SYN_DOC_EXE);
}
}
......@@ -1257,7 +1256,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
/**
* @author fxj
* @deprecated 对比公积金比例，对应上true false
* @Deprecated 对比公积金比例，对应上true false
**/
private boolean checkFundPer(List<SysPayProportion> pays,TDispatchImportVo excel){
if (Common.isNotNull(excel.getProvidentPer()) && Common.isNotNull(pays)){
......@@ -2320,6 +2319,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
@Override
@Transactional(rollbackFor = Exception.class)
@ShardingTransactionType(TransactionType.BASE)
public R<List<ErrorMessage>> importReduceDiy(InputStream inputStream, String orderId) {
YifuUser user = SecurityUtils.getUser();
if (Common.isEmpty(user)){
......@@ -2381,8 +2382,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
@Override
@Transactional(rollbackFor = Exception.class)
@ShardingTransactionType(TransactionType.BASE)
public void batchReduceDispatch(List<TDispatchReduceVo> excelVOList, List<ErrorMessage> errorMessageList, YifuUser user, String orderId) {
if (!Common.isNotNull(excelVOList)){
return;
......@@ -2440,7 +2439,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}catch (Exception e){
log.error("批量派减异常：",e);
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), CommonConstants.SAVE_FAILED));
continue;
}
}
}
......@@ -2695,8 +2693,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
* @Param
* @return
**/
@Transactional(rollbackFor = Exception.class)
@ShardingTransactionType(TransactionType.BASE)
@Override
public List<ErrorMessage> addBatchApplyAudit(List<String> idsList, YifuUser user, int flag, String auditStatus, String auditRemark, String remark) {
List<ErrorMessage> errorList = new ArrayList<>();
......@@ -2921,7 +2917,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
R<Boolean> resUp = archivesDaprUtil.updateProjectSocialFund(vo);
if (Common.isEmpty(resUp) || !(CommonConstants.SUCCESS.intValue() == resUp.getCode()) || !resUp.getData().booleanValue()){
ServiceUtil.runTimeExceptionDiy("同步人员档案、项目档案的社保公积金状态失败！");
ServiceUtil.runTimeExceptionDiy(DispatchConstants.DISPATCH_SYN_DOC_EXE);
}
}
}
......@@ -2936,7 +2932,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
return errorList;
}
@Transactional(rollbackFor = Exception.class)
@ShardingTransactionType(TransactionType.BASE)
@Override
public R<List<ErrorMessage>> addApplyAudit(String ids, String auditStatus, String auditRemark, String remark) {
YifuUser user = SecurityUtils.getUser();
......@@ -2964,7 +2961,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
return R.failed("数据异常，派单审核失败!");
}
}
@Transactional(rollbackFor = Exception.class)
@ShardingTransactionType(TransactionType.BASE)
@Override
public R<List<ErrorMessage>> addApplyHandle(String ids, String typeSub, String handleStatus, String handleRemark, String socialType, String remark) {
try {
......@@ -2993,7 +2991,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
return R.ok(errorInfo,"派单办理结果：");
}
} catch (Exception e) {
log.error("派单办理异常：" + e.getMessage());
log.error(DispatchConstants.DISPATCH_EXCEPTION + e.getMessage());
return R.failed("数据异常，办理失败!");
}
}
......@@ -3024,8 +3022,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
* @Author fxj
* @Date 2022-07-26
**/
@Transactional(rollbackFor = Exception.class)
@ShardingTransactionType(TransactionType.BASE)
public List<ErrorMessage> addBatchApplyHandle(List<String> idsList, String typeSub, YifuUser user
, int flag, String handleStatus, String handleRemark, String socialType, String remark) {
List<ErrorMessage> errorList = new ArrayList<>();
......@@ -3252,14 +3248,14 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
&& (CommonConstants.ONE_STRING.equals(dis.getSocialHandleStatus())
|| CommonConstants.TWO_STRING.equals(dis.getSocialHandleStatus())
|| CommonConstants.THREE_STRING.equals(dis.getSocialHandleStatus()))
&& ((CommonConstants.ONE_STRING.equals(dis.getFundHandleStatus())
|| CommonConstants.TWO_STRING.equals(dis.getFundHandleStatus())))) {
&& (CommonConstants.ONE_STRING.equals(dis.getFundHandleStatus())
|| CommonConstants.TWO_STRING.equals(dis.getFundHandleStatus()))) {
//办理成功
dis.setStatus(CommonConstants.FOUR_STRING);
}
if (Common.isEmpty(dis.getSocialHandleStatus())
&& ((CommonConstants.ONE_STRING.equals(dis.getFundHandleStatus())
|| CommonConstants.TWO_STRING.equals(dis.getFundHandleStatus())))) {
&& (CommonConstants.ONE_STRING.equals(dis.getFundHandleStatus())
|| CommonConstants.TWO_STRING.equals(dis.getFundHandleStatus()))) {
//办理成功
dis.setStatus(CommonConstants.FOUR_STRING);
}
......@@ -3276,14 +3272,14 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
&& Common.isNotNull(dis.getFundId())
&& (CommonConstants.ONE_STRING.equals(dis.getSocialHandleStatus())
|| CommonConstants.TWO_STRING.equals(dis.getSocialHandleStatus()))
&& ((CommonConstants.ONE_STRING.equals(dis.getFundHandleStatus())
|| CommonConstants.TWO_STRING.equals(dis.getFundHandleStatus())))) {
&& (CommonConstants.ONE_STRING.equals(dis.getFundHandleStatus())
|| CommonConstants.TWO_STRING.equals(dis.getFundHandleStatus()))) {
//办理成功
dis.setStatus(CommonConstants.FOUR_STRING);
}
if (Common.isEmpty(dis.getSocialId()) && Common.isNotNull(dis.getFundId())
&& ((CommonConstants.ONE_STRING.equals(dis.getFundHandleStatus())
|| CommonConstants.TWO_STRING.equals(dis.getFundHandleStatus())))) {
&& (CommonConstants.ONE_STRING.equals(dis.getFundHandleStatus())
|| CommonConstants.TWO_STRING.equals(dis.getFundHandleStatus()))) {
//办理成功
dis.setStatus(CommonConstants.FOUR_STRING);
}
......@@ -3334,7 +3330,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
vo.setDepartNo(dis.getSettleDomainCode());
R<Boolean> resUp = archivesDaprUtil.updateProjectSocialFund(vo);
if (Common.isEmpty(resUp) || !(CommonConstants.SUCCESS.intValue() == resUp.getCode()) || !resUp.getData().booleanValue()){
ServiceUtil.runTimeExceptionDiy("同步人员档案、项目档案的社保公积金状态失败！");
ServiceUtil.runTimeExceptionDiy(DispatchConstants.DISPATCH_SYN_DOC_EXE);
}
}
} else {
......@@ -3342,8 +3338,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
}
} catch(Exception e){
log.error("派单办理异常：", e);
errorList.add(new ErrorMessage(-1, "派单办理异常：" + e.getMessage()));
log.error(DispatchConstants.DISPATCH_EXCEPTION, e);
errorList.add(new ErrorMessage(-1, DispatchConstants.DISPATCH_EXCEPTION + e.getMessage()));
return errorList;
}
} else{
......@@ -3767,7 +3763,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
**/
@Override
public void doexportSocialRecordRoster(HttpServletResponse response, SocialHandleSearchVo searchVo, String idStr, String[] exportFields) {
String fileName = DispatchConstants.SOCIAL_RECORD_ROSTER_EXPORT + ".xlsx";
String fileName = DispatchConstants.SOCIAL_RECORD_ROSTER_EXPORT + CommonConstants.XLSX;
//获取要导出的列表
List<SocialHandleExportVo> list = new ArrayList<>();
// 项目权限 TODO
......@@ -3883,7 +3879,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
**/
@Override
public void doexportFundRecordChange(HttpServletResponse response,String idStr, SocialHandleSearchVo searchVo, List<String> settleDomains, String sql) {
String fileName = DispatchConstants.SOCIAL_RECORD_EXPORT + LocalDateTime.now() + ".xlsx";
String fileName = DispatchConstants.SOCIAL_RECORD_EXPORT + LocalDateTime.now() + CommonConstants.XLSX;
//获取要导出的列表
List<FundHandleExportVo> list = new ArrayList<>();
long count = getFundRecordCount(searchVo,idStr,settleDomains,sql);
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TForecastLibraryServiceImpl.java
View file @ c8913aaf
......@@ -100,7 +100,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
*/
@Override
public void listExport(HttpServletResponse response, TForecastLibrary searchVo) {
String fileName = "预估费用批量导出" + DateUtil.getThisTime() + ".xlsx";
String fileName = "预估费用批量导出" + DateUtil.getThisTime() + CommonConstants.XLSX;
//获取要导出的列表
List<TForecastLibraryExportVo> list = new ArrayList<>();
long count = noPageCountDiy(searchVo);
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TIncomeServiceImpl.java
View file @ c8913aaf
......@@ -79,7 +79,7 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
*/
@Override
public void listExport(HttpServletResponse response, TIncomeSearchVo searchVo) {
String fileName = "收入明细批量导出" + DateUtil.getThisTime() + ".xlsx";
String fileName = "收入明细批量导出" + DateUtil.getThisTime() + CommonConstants.XLSX;
//获取要导出的列表
List<IncomeExportVo> list = new ArrayList<>();
long count = noPageCountDiy(searchVo, null, Common.getList(searchVo.getIds()), "");
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoImportLogServiceImpl.java
View file @ c8913aaf
......@@ -60,7 +60,7 @@ public class TPaymentInfoImportLogServiceImpl extends ServiceImpl<TPaymentInfoIm
*/
public String exportPaymentInfoLog(HttpServletResponse response, String random) {
String fileName = "社保导入日志" + DateUtil.getThisTime() + ".xlsx";
String fileName = "社保导入日志" + DateUtil.getThisTime() + CommonConstants.XLSX;
List<TPaymentInfoImportLogVo> list = new ArrayList<>();
List<TPaymentInfoImportLog> paymentInfoImportLogList = lambdaQuery()
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @ c8913aaf
......@@ -131,7 +131,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
*/
@Override
public void listExport(HttpServletResponse response, TPaymentInfoSearchVo searchVo) {
String fileName = "缴费库批量导出" + DateUtil.getThisTime() + ".xlsx";
String fileName = "缴费库批量导出" + DateUtil.getThisTime() + CommonConstants.XLSX;
//获取要导出的列表
List<TPaymentInfo> list = new ArrayList<>();
Integer count = baseMapper.selectCountTPaymentInfo(searchVo);
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPreDispatchInfoServiceImpl.java
View file @ c8913aaf
......@@ -865,7 +865,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
@Override
public void doexportPreDispatch(HttpServletResponse response, TPreDispatchInfo tPreDispatchInfo) {
String fileName = "导出预派单" + DateUtil.getThisTime() + ".xlsx";
String fileName = "导出预派单" + DateUtil.getThisTime() + CommonConstants.XLSX;
//获取要导出的列表
List<TPreDispatchExportVo> list = new ArrayList<>();
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TProvidentFundServiceImpl.java
View file @ c8913aaf
......@@ -73,7 +73,7 @@ public class TProvidentFundServiceImpl extends ServiceImpl<TProvidentFundMapper,
*/
@Override
public void listExport(HttpServletResponse response, TProvidentFundSearchVo searchVo){
String fileName = "不良记录批量导出" + DateUtil.getThisTime() + ".xlsx";
String fileName = "不良记录批量导出" + DateUtil.getThisTime() + CommonConstants.XLSX;
//获取要导出的列表
List<TProvidentFund> list = new ArrayList<>();
long count = noPageCountDiy(searchVo);
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialFundHistoryServiceImpl.java
View file @ c8913aaf
......@@ -73,7 +73,7 @@ public class TSocialFundHistoryServiceImpl extends ServiceImpl<TSocialFundHistor
*/
@Override
public void listExport(HttpServletResponse response, TSocialFundHistorySearchVo searchVo){
String fileName = "不良记录批量导出" + DateUtil.getThisTime() + ".xlsx";
String fileName = "不良记录批量导出" + DateUtil.getThisTime() + CommonConstants.XLSX;
//获取要导出的列表
List<TSocialFundHistory> list = new ArrayList<>();
long count = noPageCountDiy(searchVo);
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialFundInfoServiceImpl.java
View file @ c8913aaf
......@@ -98,7 +98,7 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe
*/
@Override
public void listExport(HttpServletResponse response, TSocialFundInfoSearchVo searchVo) {
String fileName = "社保公积金批量导出" + DateUtil.getThisTime() + ".xlsx";
String fileName = "社保公积金批量导出" + DateUtil.getThisTime() + CommonConstants.XLSX;
//获取要导出的列表
List<TSocialFundInfoExportVo> list = new ArrayList<>();
long count = noPageCountDiy(searchVo);
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialInfoServiceImpl.java
View file @ c8913aaf
......@@ -72,7 +72,7 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
*/
@Override
public void listExport(HttpServletResponse response, TSocialInfoSearchVo searchVo){
String fileName = "不良记录批量导出" + DateUtil.getThisTime() + ".xlsx";
String fileName = "不良记录批量导出" + DateUtil.getThisTime() + CommonConstants.XLSX;
//获取要导出的列表
List<TSocialInfo> list = new ArrayList<>();
long count = noPageCountDiy(searchVo);
......
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