Commit 3687fb1f authored by hongguangwu's avatar hongguangwu

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

parents 6f470bb9 dd766872
......@@ -214,7 +214,7 @@ public class FascController {
@Operation(description = "自动化待办续签获取附件")
@GetMapping("/getRenewFileByRequestId")
public R<String> getRenewFileByRequestId(@RequestParam String id) throws ApiException {
fascService.getFileByRequestIdRenew(id);
fascService.getFileByRequestIdRenew(id,null);
return R.ok();
}
......
......@@ -115,7 +115,12 @@ public class TEmployeeContractPreNewController {
@Operation(summary = "通过id查询", description = "通过id查询")
@GetMapping("/{id}")
public R<TEmployeeContractPreNew> getById(@PathVariable("id") String id) {
return R.ok(tEmployeeContractPreNewService.getById(id));
TEmployeeContractPreNew preNew = tEmployeeContractPreNewService.getById(id);
//特殊处理兼容处理 合同详情
if (null != preNew){
preNew.setConfirmEmpSelect(preNew.getContractContent());
}
return R.ok(preNew);
}
/**
......
......@@ -64,6 +64,6 @@ public interface FascService extends IService<FddContractInfo> {
boolean getFileByRequestId(String id) throws ApiException;
// 自动化续签待办:获取附件
boolean getFileByRequestIdRenew(String id) throws ApiException;
boolean getFileByRequestIdRenew(String id,String contractId) throws ApiException;
}
......@@ -582,7 +582,7 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
return fascUtil.getFileByRequestId(contract, tFascPushLogService, tAttaInfoMapper, ossUtil, company);
}
@Override
public boolean getFileByRequestIdRenew(String id) throws ApiException {
public boolean getFileByRequestIdRenew(String id,String contractId) throws ApiException {
// templateName 签署任务模板名称
TEmployeeContractPreNew contract = tEmployeeContractPreNewMapper.selectById(id);
if (contract == null) {
......@@ -596,7 +596,7 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
if (company == null) {
return false;
}
return fascUtil.getFileByRequestId(contract, tFascPushLogService, tAttaInfoMapper, ossUtil, company);
return fascUtil.getFileByRequestId(contract, tFascPushLogService, tAttaInfoMapper, ossUtil, company, contractId);
}
}
......@@ -1252,7 +1252,7 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
vo.setEmpPhone(employeeInfo.getEmpPhone());
}
TEmployeeContractPreNew preNew = contractPreNewMapper.selectOne(Wrappers.<TEmployeeContractPreNew>lambdaQuery()
.eq(TEmployeeContractPreNew::getContractId, contractInfo.getId()).last(CommonConstants.LAST_ONE_SQL));
.eq(TEmployeeContractPreNew::getId, contractInfo.getPreNewId()).last(CommonConstants.LAST_ONE_SQL));
vo.setPreNew(preNew);
TEmployeeContractPreHistory pre = contractPreHistoryMapper.selectOne(Wrappers.<TEmployeeContractPreHistory>lambdaQuery()
.eq(TEmployeeContractPreHistory::getContractId, contractInfo.getId()).last(CommonConstants.LAST_ONE_SQL));
......
......@@ -96,7 +96,7 @@ public class DoFascTask {
this.saveAuditLogSuccess("签署成功",contractInfo.getId());
// 尝试获取归档文件
boolean flag = fascService.getFileByRequestIdRenew(preNew.getId());
boolean flag = fascService.getFileByRequestIdRenew(preNew.getId(),contractInfo.getId());
contractInfo.setAuditStatus(CommonConstants.TWO_INT);
// 传了false,就不要审核日志
......
......@@ -1370,7 +1370,7 @@ public class FascUtil {
}
// 自动化续签待办:获取附件
public boolean getFileByRequestId(TEmployeeContractPreNew contract, TFascPushLogService tFascPushLogService
, TAttaInfoMapper tAttaInfoMapper, OSSUtil ossUtil, TFascCompany company) throws ApiException {
, TAttaInfoMapper tAttaInfoMapper, OSSUtil ossUtil, TFascCompany company,String contractId) throws ApiException {
OpenApiClient openApiClient = new OpenApiClient(company.getAppId(), company.getAppSecret(), company.getAppUrl());
String accessToken = this.getFascToken(openApiClient, company);
......@@ -1387,7 +1387,7 @@ public class FascUtil {
String empIdCard = contract.getEmpIdcard();
pushLog.setTypeKey("获取附件,身份证:" + empIdCard);
pushLog.setTypeName("获取附件");
pushLog.setContractId(contract.getId());
pushLog.setContractId(contractId);
pushLog.setSignTaskId(contract.getRequestId());
tFascPushLogService.save(pushLog);
......@@ -1402,7 +1402,7 @@ public class FascUtil {
if (Common.isNotNull(doc.getFddFileUrl())) {
// 存储文档
// 将法大大回传的url字符串转化为流,存储到阿里云
this.streamUpload(doc.getFddFileUrl(), ossUtil, tAttaInfoMapper, contract.getContractId(), doc.getDocName());
this.streamUpload(doc.getFddFileUrl(), ossUtil, tAttaInfoMapper, contractId, doc.getDocName());
}
}
}
......
......@@ -696,7 +696,7 @@
SELECT
a.id
FROM t_employee_contract_pre_new a
where a.process_status in('3','5','7') and (a.expected_collection_time is null or a.expected_collection_time <![CDATA[ <= ]]> now())
where a.process_status in('1','5' and (a.expected_collection_time <![CDATA[ <= ]]> now())
</select>
<!--tEmployeeContractPreNew简单分页查询-->
......
......@@ -58,7 +58,9 @@ public class TEmployeeInsurancePreController {
menuUtil.setAuthSql(user, tEmployeeInsurancePre);
//无查询条件的时候直接 默认传非 已完成的数据
if (Common.isEmpty(tEmployeeInsurancePre.getProcessStatus())){
if (Common.isEmpty(tEmployeeInsurancePre.getStatusList())){
tEmployeeInsurancePre.setStatusList(CommonConstants.processListPreArchivesStatus);
}
}else {
//有查询条件的时候 按查询条件查询 后面有判断statusList 为空默认的情况
List<String> statusList = new ArrayList<>();
......@@ -152,6 +154,17 @@ public class TEmployeeInsurancePreController {
public void export(HttpServletResponse response, @RequestBody TEmployeeInsurancePreSearchVo searchVo) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, searchVo);
//无查询条件的时候直接 默认传非 已完成的数据
if (Common.isEmpty(searchVo.getProcessStatus())){
if (Common.isEmpty(searchVo.getStatusList())){
searchVo.setStatusList(CommonConstants.processListPreArchivesStatus);
}
}else {
//有查询条件的时候 按查询条件查询 后面有判断statusList 为空默认的情况
List<String> statusList = new ArrayList<>();
statusList.add(searchVo.getProcessStatus());
searchVo.setStatusList(statusList);
}
tEmployeeInsurancePreService.listExport(response,searchVo);
}
......
......@@ -94,7 +94,7 @@ public class TDispatchInfoPreController {
if (Common.isEmpty(tDispatchInfoPre.getProcessStatus())) {
String typeSub = null==tDispatchInfoPre.getTypeSub()?CommonConstants.EMPTY_STRING:tDispatchInfoPre.getTypeSub();
List<String> statusList = STATUS_MAP.get(typeSub);
if (statusList != null) {
if (statusList != null && Common.isEmpty(tDispatchInfoPre.getStatusList())) {
tDispatchInfoPre.setStatusList(new ArrayList<>(statusList)); // 拷贝以防止外部修改
}
}
......@@ -192,6 +192,16 @@ public class TDispatchInfoPreController {
public void export(HttpServletResponse response, @RequestBody TDispatchInfoPreSearchVo searchVo) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, searchVo);
//typeSuB 0 社保 1 公积金
searchVo.setTypeSub(CommonConstants.ZERO_STRING);
// 主逻辑优化
if (Common.isEmpty(searchVo.getProcessStatus())) {
String typeSub = null==searchVo.getTypeSub()?CommonConstants.EMPTY_STRING:searchVo.getTypeSub();
List<String> statusList = STATUS_MAP.get(typeSub);
if (statusList != null && Common.isEmpty(searchVo.getStatusList())) {
searchVo.setStatusList(new ArrayList<>(statusList)); // 拷贝以防止外部修改
}
}
tDispatchInfoPreService.listExport(response, searchVo);
}
......@@ -207,6 +217,16 @@ public class TDispatchInfoPreController {
public void exportFund(HttpServletResponse response, @RequestBody TDispatchInfoPreSearchVo searchVo) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, searchVo);
//typeSuB 0 社保 1 公积金
searchVo.setTypeSub(CommonConstants.ONE_STRING);
// 主逻辑优化
if (Common.isEmpty(searchVo.getProcessStatus())) {
String typeSub = null==searchVo.getTypeSub()?CommonConstants.EMPTY_STRING:searchVo.getTypeSub();
List<String> statusList = STATUS_MAP.get(typeSub);
if (statusList != null && Common.isEmpty(searchVo.getStatusList())) {
searchVo.setStatusList(new ArrayList<>(statusList)); // 拷贝以防止外部修改
}
}
tDispatchInfoPreService.listExportFund(response, 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