Commit 5aaf17ee authored by fangxinjiang's avatar fangxinjiang

合同续签待办-fxj

parent ef69bb1e
......@@ -287,11 +287,11 @@ public class TEmpContractAlertExportVo {
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("签署方式")
@Schema(description = "签署方式:1线下签0电子签")
private Integer signType;
private String signType;
/**
* 续签状态:0待确认,1待发起,2线下签待审核,3线下签审核不通过4线下签待归档5发起失败6签署中7签署失败8电子待归档9(已归档-电子签+线下签)已完结10撤销签署
*/
@ExcelAttribute(name = "续签状态", readConverterExp = "0=待确认,1=待发起,2=线待审核,3=审核不通过,4=线下签待归档,5=发起失败,6=签署中,7=签署失败,8=电子待归档,9=已归档,10=撤销签署-客服撤销 11=撤销签署-系统自动撤销")
@ExcelAttribute(name = "续签状态", readConverterExp = "0=待确认,1=待发起,2=线下签待审核,3=线下签审核不通过,4=线下签待归档,5=发起失败,6=签署中,7=签署失败,8=电子待归档,9=已完结,10=撤销签署-客服撤销,11=撤销签署-系统自动撤销")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("续签状态")
@Schema(description = "签署方式:0待确认,1待发起,2线下签待审核,3线下签审核不通过4线下签待归档5发起失败6签署中7签署失败8电子待归档9(已归档-电子签+线下签)已完结10撤销签署-客服撤销 11撤销签署-系统自动撤销")
......
......@@ -336,6 +336,7 @@ public class TEmpContractAlertController {
@Operation(description = "导出自动化续签待办")
@PostMapping("/autoExport")
public void autoExport(HttpServletResponse response, @RequestBody ContractAlertSearchVo searchVo) {
searchVo.setAutoFlag(CommonConstants.ZERO_STRING);
tEmpContractAlertService.listAutoExport(response,searchVo);
}
......
......@@ -1151,12 +1151,19 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
searchVo.setIdList(Arrays.asList(searchVo.getIds().split(CommonConstants.COMMA_STRING)));
}
// 如果查询条件续签状态为空默认查询 非已完成 状态数据
if (Common.isNotNull(searchVo.getProcessStatusList())){
if (!Common.isNotNull(searchVo.getProcessStatusList())){
searchVo.setProcessStatusList(Stream.of("0","1","2","3","4","5","6","7","8","10","11").collect(Collectors.toList()));
}
//初始化客服的项目权限 ,管理员及SSC 全量
initSearchVo(searchVo);
if (ArrayUtil.isNotEmpty(searchVo.getStartEndTimecreate())
&& searchVo.getStartEndTimecreate().length == 2) {
searchVo.setExpectedCollectionTimeStart(searchVo.getStartEndTimecreate()[0]);
searchVo.setExpectedCollectionTimeEnd(searchVo.getStartEndTimecreate()[1]);
}
//默认导出自动化的合同续签待办
searchVo.setAutoFlag(CommonConstants.ZERO_STRING);
initSearchVo(searchVo);
String fileName = ArchivesConstants.EMP_AUTO_RENEWAL_RECORD + DateUtil.getThisTime() + CommonConstants.XLSX;
//获取要导出的列表
List<TEmpContractAlertExportVo> list = new ArrayList<>();
......
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