Commit a8cb5cc5 authored by huyuchen's avatar huyuchen

huych-社保自动化相关提交

parent a6f0556e
...@@ -322,7 +322,7 @@ public class TEmployeeContractPreController { ...@@ -322,7 +322,7 @@ public class TEmployeeContractPreController {
**/ **/
@Operation(description = "一键催办") @Operation(description = "一键催办")
@PostMapping("/contractUrg") @PostMapping("/contractUrg")
public R contractUrg(@RequestBody List<String> idList) { public R contractUrg(@RequestBody String id) {
return tEmployeeContractPreService.contractUrg(idList); return tEmployeeContractPreService.contractUrg(id);
} }
} }
...@@ -102,5 +102,5 @@ public interface TEmployeeContractPreService extends IService<TEmployeeContractP ...@@ -102,5 +102,5 @@ public interface TEmployeeContractPreService extends IService<TEmployeeContractP
* @param idList id集合 * @param idList id集合
* @return * @return
*/ */
R contractUrg(List<String> idList); R contractUrg(String id);
} }
...@@ -1073,11 +1073,11 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra ...@@ -1073,11 +1073,11 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
} }
@Override @Override
public R contractUrg(List<String> idList) { public R contractUrg(String id) {
// 查询所有待催办的合同 // 查询所有待催办的合同
List<TContractAutoLog> signingContracts = contractAutoLogService.list(Wrappers.<TContractAutoLog>query() List<TContractAutoLog> signingContracts = contractAutoLogService.list(Wrappers.<TContractAutoLog>query()
.lambda() .lambda()
.in(TContractAutoLog::getId, idList) .eq(TContractAutoLog::getContractId, id)
); );
if (Common.isNotNull(signingContracts) && signingContracts.size() > 0) { if (Common.isNotNull(signingContracts) && signingContracts.size() > 0) {
try { try {
......
...@@ -1339,7 +1339,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -1339,7 +1339,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
boolean injury) { boolean injury) {
// 是否SSC:SSC派单组-1659015946137583618L SSC审核组-1659016108176130049L // 是否SSC:SSC派单组-1659015946137583618L SSC审核组-1659016108176130049L
long roleId = 1659015946137583618L; long roleId = 1659015946137583618L;
boolean isSsc = haveRole(user, roleId); boolean isSsc = false;
if (null != user) {
isSsc = haveRole(user, roleId);
}
TDispatchInfo dispatch = new TDispatchInfo(); TDispatchInfo dispatch = new TDispatchInfo();
// 初始化派单项 // 初始化派单项
dispatch.setOrderId(excel.getOrderId()); dispatch.setOrderId(excel.getOrderId());
...@@ -1352,7 +1355,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -1352,7 +1355,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
} else { } else {
dispatch.setContactAddress(excel.getContactAddress()); dispatch.setContactAddress(excel.getContactAddress());
} }
dispatch.setOrganName(user.getDeptName()); dispatch.setOrganName(null == user ? "自动化派单部门" : user.getDeptName());
if (Common.isNotNull(excel.getPreId())) { if (Common.isNotNull(excel.getPreId())) {
dispatch.setPreId(excel.getPreId()); dispatch.setPreId(excel.getPreId());
} }
...@@ -1368,7 +1371,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -1368,7 +1371,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
dispatch.setTryPeriod(excel.getTryPeriod()); dispatch.setTryPeriod(excel.getTryPeriod());
dispatch.setEmpMobile(excel.getEmpMobile()); dispatch.setEmpMobile(excel.getEmpMobile());
dispatch.setType(CommonConstants.ZERO_STRING); dispatch.setType(CommonConstants.ZERO_STRING);
dispatch.setCurrentOperator(user.getNickname()); dispatch.setCurrentOperator(null == excel.getPreName() ? user.getNickname() : excel.getPreName());
dispatch.setTrustRemark(excel.getTrustRemark()); dispatch.setTrustRemark(excel.getTrustRemark());
dispatch.setBelongUnitName(excel.getCustomerName()); dispatch.setBelongUnitName(excel.getCustomerName());
dispatch.setBelongUnit(excel.getCustomerId()); dispatch.setBelongUnit(excel.getCustomerId());
......
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