Skip to content

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

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

parents f513fd8b 1d7f716d
Expand all Show whitespace changes
Inline Side-by-side
Showing with 603 additions and 34 deletions
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TSalaryOriginalExportVo.java 0 → 100644
View file @ 96e6236d
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.salary.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.HeadFontStyle;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
/**
* 薪资原表识别配置导出vo
*
* @author hgw
* @date 2023-01-10 11:34:27
*/
@Data
@Schema(description = "薪资代发户配置导出Vo")
public class TSalaryOriginalExportVo {
@ExcelAttribute(name = "项目编码", maxLength = 32)
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("项目编码")
private String deptNo;
@ExcelAttribute(name = "项目名称", maxLength = 50)
@Length(max = 50, message = "项目名称不能超过50个字符")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("项目名称")
private String deptName;
@ExcelAttribute(name = "原表类型", maxLength = 50)
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("原表类型")
private String setName;
@ExcelAttribute(name = "申请人", maxLength = 50)
@Schema(description = "申请人")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("申请人")
private String createName;
@ExcelAttribute(name = "申请时间", maxLength = 50)
@Schema(description = "申请时间")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("申请时间")
private String createTime;
}
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TSalaryOriginalSearchVo.java 0 → 100644
View file @ 96e6236d
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.salary.vo;
import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryStandardOriginal;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
/**
* 薪资识别配置导出查询vo
*
* @author hgw
* @date 2024-5-13 17:50:35
*/
@Data
public class TSalaryOriginalSearchVo extends TSalaryStandardOriginal {
/**
* 多选导出或删除等操作
*/
@Schema(description = "选中ID,多个逗号分割")
private String ids;
/**
* 创建时间区间 [开始时间，结束时间]
*/
@Schema(description = "创建时间区间")
private LocalDateTime[] createTimes;
/**
* @Author fxj
* 查询数据起
**/
@Schema(description = "查询limit 开始")
private int limitStart;
/**
* @Author fxj
* 查询数据止
**/
@Schema(description = "查询limit 数据条数")
private int limitEnd;
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryStandardOriginalController.java
View file @ 96e6236d
......@@ -31,9 +31,7 @@ import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryStandardOriginal;
import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryStandardOriginalDetail;
import com.yifu.cloud.plus.v1.yifu.salary.service.TSalaryStandardOriginalDetailService;
import com.yifu.cloud.plus.v1.yifu.salary.service.TSalaryStandardOriginalService;
import com.yifu.cloud.plus.v1.yifu.salary.vo.ExcelSheetVo;
import com.yifu.cloud.plus.v1.yifu.salary.vo.SalaryUploadOriginalParamVo;
import com.yifu.cloud.plus.v1.yifu.salary.vo.SalaryUploadParamVo;
import com.yifu.cloud.plus.v1.yifu.salary.vo.*;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
......@@ -42,6 +40,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.net.URL;
import java.util.List;
......@@ -266,4 +265,17 @@ public class TSalaryStandardOriginalController {
return tSalaryStandardOriginalService.salaryUploadByOriginal(file, vo);
}
/**
* 薪资原表配置导出 批量导出
* @author hgw
* @date 2024-5-13 17:47:07
**/
//@Operation(description = "薪资原表配置导出 hasPermission('tsalaryoriginal-export')")
@Operation(description = "薪资原表配置导出")
@PostMapping("/exportOriginal")
//@PreAuthorize("@pms.hasPermission('tsalaryoriginal-export')")
public void exportOriginal(HttpServletResponse response, @RequestBody TSalaryOriginalSearchVo searchVo) {
tSalaryStandardOriginalService.exportOriginal(response,searchVo);
}
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TSalaryStandardOriginalMapper.java
View file @ 96e6236d
......@@ -20,7 +20,11 @@ package com.yifu.cloud.plus.v1.yifu.salary.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryStandardIssue;
import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryStandardOriginal;
import com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryOriginalExportVo;
import com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryOriginalSearchVo;
import com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryStandardIssueExportVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
......@@ -50,4 +54,7 @@ public interface TSalaryStandardOriginalMapper extends BaseMapper<TSalaryStandar
*/
List<String> getSpecialIdCardList();
List<TSalaryOriginalExportVo> getTSalaryOriginalExportVoList(@Param("tSalaryStandardOriginal") TSalaryOriginalSearchVo tSalaryStandardOriginal
, @Param("idsStr") List<String> idsStr);
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/TSalaryStandardOriginalService.java
View file @ 96e6236d
......@@ -22,11 +22,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryStandardOriginal;
import com.yifu.cloud.plus.v1.yifu.salary.vo.ExcelSheetVo;
import com.yifu.cloud.plus.v1.yifu.salary.vo.SalaryUploadOriginalParamVo;
import com.yifu.cloud.plus.v1.yifu.salary.vo.SalaryUploadParamVo;
import com.yifu.cloud.plus.v1.yifu.salary.vo.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
......@@ -64,4 +63,12 @@ public interface TSalaryStandardOriginalService extends IService<TSalaryStandard
**/
R<SalaryUploadParamVo> salaryUploadByOriginal(MultipartFile file, SalaryUploadOriginalParamVo excelVo);
/**
* @Description: 薪资原表配置导出
* @Author: hgw
* @Date: 2024/5/13 17:47
* @return: void
**/
void exportOriginal(HttpServletResponse response, TSalaryOriginalSearchVo searchVo);
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardOriginalServiceImpl.java
View file @ 96e6236d
......@@ -16,15 +16,23 @@
*/
package com.yifu.cloud.plus.v1.yifu.salary.service.impl;
import cn.hutool.core.util.ArrayUtil;
import com.alibaba.excel.EasyExcelFactory;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.metadata.WriteSheet;
import com.alibaba.fastjson.JSON;
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;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.monitorjbl.xlsx.StreamingReader;
import com.yifu.cloud.plus.v1.check.entity.TCheckIdCard;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
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.R;
import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryStandardIssue;
import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryStandardOriginal;
import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryStandardOriginalDetail;
import com.yifu.cloud.plus.v1.yifu.salary.mapper.TSalaryStandardOriginalMapper;
......@@ -32,10 +40,7 @@ import com.yifu.cloud.plus.v1.yifu.salary.service.SalaryUploadService;
import com.yifu.cloud.plus.v1.yifu.salary.service.TSalaryStandardOriginalDetailService;
import com.yifu.cloud.plus.v1.yifu.salary.service.TSalaryStandardOriginalService;
import com.yifu.cloud.plus.v1.yifu.salary.util.SalaryConstants;
import com.yifu.cloud.plus.v1.yifu.salary.vo.ExcelColumnVo;
import com.yifu.cloud.plus.v1.yifu.salary.vo.ExcelSheetVo;
import com.yifu.cloud.plus.v1.yifu.salary.vo.SalaryUploadOriginalParamVo;
import com.yifu.cloud.plus.v1.yifu.salary.vo.SalaryUploadParamVo;
import com.yifu.cloud.plus.v1.yifu.salary.vo.*;
import lombok.AllArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.apache.poi.hssf.usermodel.*;
......@@ -43,9 +48,12 @@ import org.apache.poi.ss.usermodel.*;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.math.BigDecimal;
import java.net.URLEncoder;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.HashMap;
......@@ -80,6 +88,17 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
return baseMapper.getTSalaryStandardOriginalPage(page, tSalaryStandardOriginal);
}
/**
* @Description: 导出
* @Author: hgw
* @Date: 2023/1/18 10:31
* @return: java.util.List<com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryStandardIssueExportVo>
**/
private List<TSalaryOriginalExportVo> exportList(TSalaryOriginalSearchVo searchVo) {
List<String> idList = Common.getList(searchVo.getIds());
return baseMapper.getTSalaryOriginalExportVoList(searchVo, idList);
}
/**
* @Description: 分页查询
* @Author: hgw
......@@ -1013,4 +1032,77 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
return R.failed("无法识别数据！请联系管理员！");
}
/**
* @Description: 薪资原表配置导出
* @Author: hgw
* @Date: 2024/5/13 17:47
* @return: void
**/
@Override
public void exportOriginal(HttpServletResponse response, TSalaryOriginalSearchVo searchVo) {
String fileName = "薪资原表配置导出" + DateUtil.getThisTime() + ".xlsx";
//获取要导出的列表
List<TSalaryOriginalExportVo> list = new ArrayList<>();
long count = noPageCountDiy(searchVo);
ServletOutputStream out = null;
try {
out = response.getOutputStream();
response.setContentType(CommonConstants.MULTIPART_FORM_DATA);
response.setCharacterEncoding("utf-8");
response.setHeader(CommonConstants.CONTENT_DISPOSITION, CommonConstants.ATTACHMENT_FILENAME + URLEncoder.encode(fileName, CommonConstants.UTF8));
// 这里 需要指定写用哪个class去写，然后写到第一个sheet，然后文件流会自动关闭
ExcelWriter excelWriter = EasyExcelFactory.write(out, TSalaryStandardIssueExportVo.class).build();
int index = 0;
if (count > CommonConstants.ZERO_INT) {
for (int i = 0; i <= count; i = i + CommonConstants.EXCEL_EXPORT_LIMIT) {
// 获取实际记录
searchVo.setLimitStart(i);
searchVo.setLimitEnd(CommonConstants.EXCEL_EXPORT_LIMIT);
list = exportList(searchVo);
if (Common.isNotNull(list)) {
WriteSheet writeSheet = EasyExcelFactory.writerSheet("原表配置" + index).build();
excelWriter.write(list, writeSheet);
index++;
list.clear();
}
}
} else {
WriteSheet writeSheet = EasyExcelFactory.writerSheet("原表配置" + index).build();
excelWriter.write(list, writeSheet);
}
if (Common.isNotNull(list)) {
list.clear();
}
out.flush();
excelWriter.finish();
} catch (Exception e) {
log.error("执行异常", e);
} finally {
try {
if (null != out) {
out.close();
}
} catch (IOException e) {
log.error("执行异常", e);
}
}
}
private Long noPageCountDiy(TSalaryOriginalSearchVo searchVo) {
LambdaQueryWrapper<TSalaryStandardOriginal> wrapper = buildQueryWrapper(searchVo);
List<String> idList = Common.getList(searchVo.getIds());
if (Common.isNotNull(idList)) {
wrapper.in(TSalaryStandardOriginal::getId, idList);
}
return baseMapper.selectCount(wrapper);
}
private LambdaQueryWrapper buildQueryWrapper(TSalaryOriginalSearchVo entity) {
LambdaQueryWrapper<TSalaryOriginalSearchVo> wrapper = Wrappers.lambdaQuery(entity);
if (Common.isNotNull(entity.getCreateName())) {
wrapper.like(TSalaryOriginalSearchVo::getCreateName, entity.getCreateName());
}
return wrapper;
}
}
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryStandardOriginalMapper.xml
View file @ 96e6236d
......@@ -43,6 +43,14 @@
<result property="dateNum" column="DATE_NUM"/>
<result property="deleteFlag" column="DELETE_FLAG"/>
</resultMap>
<resultMap id="TSalaryOriginalExportMap" type="com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryOriginalExportVo">
<result property="deptNo" column="DEPT_NO"/>
<result property="deptName" column="DEPT_NAME"/>
<result property="setName" column="SET_NAME"/>
<result property="createName" column="CREATE_NAME"/>
<result property="createTime" column="CREATE_TIME"/>
</resultMap>
<sql id="Base_Column_List">
a.ID,
a.DEPT_ID,
......@@ -98,6 +106,9 @@
<if test="tSalaryStandardOriginal.attaType != null and tSalaryStandardOriginal.attaType.trim() != ''">
AND ATTA_TYPE = #{tSalaryStandardOriginal.attaType}
</if>
<if test="tSalaryStandardOriginal.createName != null and tSalaryStandardOriginal.createName.trim() != ''">
and a.CREATE_NAME like concat('%',#{tSalaryStandardOriginal.createName},'%')
</if>
</if>
</sql>
<!--TSalaryStandardOriginal简单分页查询-->
......@@ -111,6 +122,29 @@
</where>
ORDER BY a.CREATE_TIME desc
</select>
<select id="getTSalaryOriginalExportVoList" resultMap="TSalaryOriginalExportMap">
SELECT
a.DEPT_NO,a.DEPT_NAME,a.SET_NAME,a.CREATE_NAME,a.CREATE_TIME
FROM
t_salary_standard_original a
<where> a.DELETE_FLAG = 0
<if test="idsStr != null and idsStr.size > 0">
AND a.ID in
<foreach item="items" index="index" collection="idsStr" open="(" separator="," close=")">
#{items}
</foreach>
</if>
<include refid="TSalaryStandardOriginal_where"/>
</where>
ORDER BY a.CREATE_TIME desc
<if test="tSalaryStandardOriginal != null">
<if test="tSalaryStandardOriginal.limitStart != null">
limit #{tSalaryStandardOriginal.limitStart},#{tSalaryStandardOriginal.limitEnd}
</if>
</if>
</select>
<!--导入工资时的获取识别配置列表-->
<select id="getTSalaryStandardOriginalList" resultMap="TSalaryStandardOriginalMap">
SELECT
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SocialSoldierExportVo.java
View file @ 96e6236d
......@@ -24,10 +24,10 @@ public class SocialSoldierExportVo implements Serializable {
@ExcelProperty("派单类型")
private String type;
@Schema(description = "办理状态")
@Schema(description = "派单办理状态")
//@ExcelAttribute(name = "办理状态", readConverterExp = "0=未办理,1=全部办理成功,2=全部办理失败,3=部分办理成功,4=办理中", needExport = true)
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("办理状态")
@ExcelProperty("派单办理状态")
private String socialHandleStatus;
//@ExcelAttribute(name = "养老工伤失业-办理状态", readConverterExp = "0=无,1=待办理,2=自动办理中,3=继续办理,4=中止办理,5=人工处理,6=成功", needExport = true)
......@@ -105,12 +105,12 @@ public class SocialSoldierExportVo implements Serializable {
private String socialHouseholdName;
/**
* 缴纳地-省
* 社保缴纳地
*/
//@ExcelAttribute(name = "社保缴纳地-省", maxLength = 32, isArea = true, needExport = true)
@Schema(description = "社保缴纳地-省")
//@ExcelAttribute(name = "社保缴纳地", maxLength = 32, isArea = true, needExport = true)
@Schema(description = "社保缴纳地")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保缴纳地-省")
@ExcelProperty("社保缴纳地")
private String socialProvince;
......@@ -122,9 +122,9 @@ public class SocialSoldierExportVo implements Serializable {
//@ExcelAttribute(name = "派单项", maxLength = 50, needExport = true)
@Schema(description = "派单项：如 养老、公积金")
@Schema(description = "派单项")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("派单项：如 养老、公积金")
@ExcelProperty("派单项")
private String dispatchItem;
//@ExcelAttribute(name = "申请人", needExport = true)
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialSoldierPageVo.java 0 → 100644
View file @ 96e6236d
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.social.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.HeadFontStyle;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
/**
* 社保士兵列表查询
*
* @author hgw
* @date 2024-5-13 15:36:27
*/
@Data
public class TSocialSoldierPageVo extends TDispatchInfo {
/**
* 社保户名称
*/
@ExcelAttribute(name = "社保户名称", maxLength = 50)
@Schema(description = "社保户名称" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保户名称" )
private String socialHouseholdName;
@NotBlank(message = "养工失状态不能为空" )
@Length(max = 32, message = "养工失状态 不能超过32个字符" )
@ExcelAttribute(name = "养工失状态", isNotEmpty = true, errorInfo = "办理状态不能为空", maxLength = 32)
@Schema(description = "养工失状态：（0空、1待办理、2自动办理中、3继续办理、4终止办理、5人工处理、6成功）" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("养工失状态" )
private String ygsHandleStatus;
/**
* 医生大状态：（0空、1待办理、2自动办理中、3继续办理、4终止办理、5人工处理）
*/
@NotBlank(message = "医生大状态不能为空" )
@Length(max = 32, message = "医生大状态 不能超过32个字符" )
@ExcelAttribute(name = "医生大状态", isNotEmpty = true, errorInfo = "办理状态不能为空", maxLength = 32)
@Schema(description = "医生大状态：（0空、1待办理、2自动办理中、3继续办理、4终止办理、5人工处理、6成功）" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医生大状态" )
private String ysdHandleStatus;
/**
* 养工失反馈
*/
@Length(max = 500, message = "养工失反馈 不能超过500个字符" )
@ExcelAttribute(name = "养工失反馈", maxLength = 500)
@Schema(description = "养工失反馈" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("养工失反馈" )
private String ygsRemark;
/**
* 医生大反馈
*/
@Length(max = 500, message = "医生大反馈 不能超过500个字符" )
@ExcelAttribute(name = "医生大反馈", maxLength = 500)
@Schema(description = "医生大反馈" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医生大反馈" )
private String ysdRemark;
/**
* 养工失反馈-原反馈
*/
@Length(max = 500, message = "养工失反馈-原反馈 不能超过500个字符" )
@ExcelAttribute(name = "养工失反馈-原反馈", maxLength = 500)
@Schema(description = "养工失反馈-原反馈" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("养工失反馈-原反馈" )
private String ygsRemarkOld;
/**
* 医生大反馈-原反馈
*/
@Length(max = 500, message = "医生大反馈-原反馈 不能超过500个字符" )
@ExcelAttribute(name = "医生大反馈-原反馈", maxLength = 500)
@Schema(description = "医生大反馈-原反馈" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医生大反馈-原反馈" )
private String ysdRemarkOld;
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialSoldierReturnErrorVo.java
View file @ 96e6236d
......@@ -30,6 +30,7 @@ import java.io.Serializable;
*/
@Data
public class TSocialSoldierReturnErrorVo extends RowIndex implements Serializable {
//是否处理完成 是否成功 反馈结果 企业名称 证件类型 身份证号码 姓名 国籍 个人身份 民族 参加工作日期 工资 新增原因 文化程度 户口性质 增员年月 户口所在地 用工形式 手机号码 通讯地址 就业登记时间 单位就业起始时间 合同期限类型 合同起始时间 合同终止日期 录用工种代码 合同签订类别 工作时间制度 养老参保日期 工伤参保日期 失业参保日期 户口所在地行政区划代码 居住所在地行政区划代码 当前经办行政区划代码 补缴原因 资料文件 录屏文件路径 回传信息 回传信息1 回传信息2
@ExcelProperty("错误信息")
private String errorInfo;
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoController.java
View file @ 96e6236d
......@@ -217,7 +217,7 @@ public class TDispatchInfoController {
**/
@Operation(description = "简单分页查询--社保士兵列表")
@GetMapping("/pageSocialSoldier")
public R<IPage<TDispatchInfo>> pageSocialSoldier(Page<TDispatchInfo> page, SocialHandleSearchVo tDispatchInfo) {
public R<IPage<TSocialSoldierPageVo>> pageSocialSoldier(Page<TSocialSoldierPageVo> page, SocialHandleSearchVo tDispatchInfo) {
tDispatchInfo.setDeleteFlag(CommonConstants.ZERO_STRING);
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, tDispatchInfo);
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TDispatchInfoMapper.java
View file @ 96e6236d
......@@ -111,7 +111,7 @@ public interface TDispatchInfoMapper extends BaseMapper<TDispatchInfo> {
* @Date: 2024/5/10 11:50
* @return: com.baomidou.mybatisplus.core.metadata.IPage<com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo>
**/
IPage<TDispatchInfo> getTSocialSoldierHandlePage(Page<TDispatchInfo> page,
IPage<TSocialSoldierPageVo> getTSocialSoldierHandlePage(Page<TSocialSoldierPageVo> page,
@Param("tDispatchInfo") SocialHandleSearchVo tDispatchInfo,
@Param("idsStr") List<String> idsStr);
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TDispatchInfoService.java
View file @ 96e6236d
......@@ -98,7 +98,7 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> {
* @Date: 2024/5/10 11:51
* @return: com.baomidou.mybatisplus.core.metadata.IPage<com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo>
**/
IPage<TDispatchInfo> getTSocialSoldierHandlePage(Page<TDispatchInfo> page, SocialHandleSearchVo tDispatchInfo);
IPage<TSocialSoldierPageVo> getTSocialSoldierHandlePage(Page<TSocialSoldierPageVo> page, SocialHandleSearchVo tDispatchInfo);
IPage<TDispatchInfo> getTDispatchSocialHandlePage(Page<TDispatchInfo> page, SocialHandleSearchVo tDispatchInfo);
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @ 96e6236d
......@@ -5225,7 +5225,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
@Override
public IPage<TDispatchInfo> getTSocialSoldierHandlePage(Page<TDispatchInfo> page, SocialHandleSearchVo tDispatchInfo) {
public IPage<TSocialSoldierPageVo> getTSocialSoldierHandlePage(Page<TSocialSoldierPageVo> page, SocialHandleSearchVo tDispatchInfo) {
return baseMapper.getTSocialSoldierHandlePage(page,tDispatchInfo,null);
}
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialSoldierPushServiceImpl.java
View file @ 96e6236d
......@@ -87,10 +87,11 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
String addId = socialConfig.getFourAppAdd(restTemplate, fileAddUrl, moduleDetailMap.get(type), terminalId);
log.info(addId);
for (TSocialInfo socialInfo : socialList) {
socialInfo.setYgsAddId(addId);
if ("社保增员".equals(type) || "社保减员".equals(type)) {
socialInfo.setYgsAddId(addId);
socialInfo.setYgsHandleStatus(CommonConstants.TWO_STRING);
} else {
socialInfo.setYsdAddId(addId);
socialInfo.setYsdHandleStatus(CommonConstants.TWO_STRING);
}
}
......
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @ 96e6236d
......@@ -1290,8 +1290,18 @@
<include refid="where_getSocialSoldier"/>
</select>
<resultMap id="socialSoldierPageMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.TSocialSoldierPageVo" extends="tDispatchInfoMap">
<result property="socialHouseholdName" column="SOCIAL_HOUSEHOLD_NAME"/>
<result property="ygsHandleStatus" column="YGS_HANDLE_STATUS"/>
<result property="ysdHandleStatus" column="YSD_HANDLE_STATUS"/>
<result property="ygsRemark" column="YGS_REMARK"/>
<result property="ysdRemark" column="YSD_REMARK"/>
<result property="ygsRemarkOld" column="YGS_REMARK_OLD"/>
<result property="ysdRemarkOld" column="YSD_REMARK_OLD"/>
</resultMap>
<!-- hgw 2024-5-10 10:42:33 社保士兵列表查询 -->
<select id="getTSocialSoldierHandlePage" resultMap="dispatchPageMap">
<select id="getTSocialSoldierHandlePage" resultMap="socialSoldierPageMap">
SELECT
<include refid="Base_Column_List"/>
,a.SOCIAL_HOUSEHOLD_NAME,s.YGS_HANDLE_STATUS,s.YSD_HANDLE_STATUS
......
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