Commit e3a90f58 authored by hongguangwu's avatar hongguangwu

MVP1.7.7-合同信息

parent 3248adde
...@@ -63,9 +63,9 @@ public class TEmployeeProjectBelongDeptController { ...@@ -63,9 +63,9 @@ public class TEmployeeProjectBelongDeptController {
* @return * @return
*/ */
@Operation(description = "简单分页查询") @Operation(description = "简单分页查询")
@GetMapping("/page") @PostMapping("/page")
public R<IPage<EmployeeProjectScpVO>> getTEmployeeProjectBelongDeptPage(Page<EmployeeProjectScpVO> page public R<IPage<EmployeeProjectScpVO>> getTEmployeeProjectBelongDeptPage(Page<EmployeeProjectScpVO> page
, TEmployeeProjectBelongDeptSearchVo tEmployeeProjectBelongDept) { , @RequestBody TEmployeeProjectBelongDeptSearchVo tEmployeeProjectBelongDept) {
return new R<>(tEmployeeProjectBelongDeptService.getTEmployeeProjectBelongDeptPage(page, tEmployeeProjectBelongDept)); return new R<>(tEmployeeProjectBelongDeptService.getTEmployeeProjectBelongDeptPage(page, tEmployeeProjectBelongDept));
} }
......
...@@ -2610,7 +2610,10 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -2610,7 +2610,10 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
contractAudit.setRemark(vo.getRemarkTemp()); contractAudit.setRemark(vo.getRemarkTemp());
contractAudit.setRootName("合同审核"); contractAudit.setRootName("合同审核");
contractServicer.updateInUseStatusById(c.getEmpId(), c.getDeptNo(), c.getId()); contractServicer.updateInUseStatusById(c.getEmpId(), c.getDeptNo(), c.getId());
tEmployeeProjectService.updateContractStatus(c.getEmpId(), c.getSettleDomain(), CommonConstants.ONE_INT); if (p != null) {
p.setContractStatus(CommonConstants.ONE_INT);
}
//tEmployeeProjectService.updateContractStatus(c.getEmpId(), c.getSettleDomain(), CommonConstants.ONE_INT)
baseMapper.updateContractStatus(c.getEmpId(), CommonConstants.ONE_INT); baseMapper.updateContractStatus(c.getEmpId(), CommonConstants.ONE_INT);
//审核不同 //审核不同
} else if (CommonConstants.ONE_STRING.equals(vo.getType())) { } else if (CommonConstants.ONE_STRING.equals(vo.getType())) {
......
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