Commit ac38a8af authored by huyuchen's avatar huyuchen

huych-合同自动化代码提交

parent badeec4b
...@@ -197,8 +197,8 @@ public class TEmployeeContractPreController { ...@@ -197,8 +197,8 @@ public class TEmployeeContractPreController {
*/ */
@Operation(description = "查询在用或者在途的合同数据") @Operation(description = "查询在用或者在途的合同数据")
@GetMapping("/getContractInfo") @GetMapping("/getContractInfo")
public R<TEmployeeContractInfo> getInuseContractInfo(@RequestParam String deptNo,@RequestParam String empIdcard) { public R<List<TEmployeeContractInfo>> getInuseContractInfo(@RequestParam String deptNo,@RequestParam String empIdcard) {
TEmployeeContractInfo employeeContractInfo = employeeContractInfoMapper.selectOne(Wrappers.<TEmployeeContractInfo>query().lambda() List<TEmployeeContractInfo> employeeContractInfo = employeeContractInfoMapper.selectList(Wrappers.<TEmployeeContractInfo>query().lambda()
.eq(TEmployeeContractInfo::getEmpIdcard, empIdcard) .eq(TEmployeeContractInfo::getEmpIdcard, empIdcard)
.eq(TEmployeeContractInfo::getDeptNo, deptNo) .eq(TEmployeeContractInfo::getDeptNo, deptNo)
.and(obj -> obj.eq(TEmployeeContractInfo::getAuditStatus, CommonConstants.ONE_INT) .and(obj -> obj.eq(TEmployeeContractInfo::getAuditStatus, CommonConstants.ONE_INT)
...@@ -206,8 +206,7 @@ public class TEmployeeContractPreController { ...@@ -206,8 +206,7 @@ public class TEmployeeContractPreController {
.eq(TEmployeeContractInfo::getAuditStatus, CommonConstants.TWO_INT) .eq(TEmployeeContractInfo::getAuditStatus, CommonConstants.TWO_INT)
.eq(TEmployeeContractInfo::getInUse, CommonConstants.ZERO_STRING) .eq(TEmployeeContractInfo::getInUse, CommonConstants.ZERO_STRING)
) )
.eq(TEmployeeContractInfo::getDeleteFlag, CommonConstants.ZERO_INT) .eq(TEmployeeContractInfo::getDeleteFlag, CommonConstants.ZERO_INT));
.last(CommonConstants.LAST_ONE_SQL));
return R.ok(employeeContractInfo); return R.ok(employeeContractInfo);
} }
......
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