Commit 200e2372 authored by hongguangwu's avatar hongguangwu

MVP1.5.3-单增的合同日期

parent 53a0258b
......@@ -108,5 +108,5 @@ public interface TEmployeeContractInfoMapper extends BaseMapper<TEmployeeContrac
void updateContractChange(@Param("idCard")String empIdcard, @Param("deptNo")String deptNo, @Param("oldDeptNo")String odlDeptNo);
int getContractByEmpIdCardAndDeptId(@Param("empIdCard") String empIdCard, @Param("deptId") String deptId);
String getContractByEmpIdCardAndDeptId(@Param("empIdCard") String empIdCard, @Param("deptId") String deptId);
}
......@@ -1524,9 +1524,9 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
@Override
public R<String> getContractByEmpIdCardAndDeptId(String mpIdCard, String deptId) {
int count = baseMapper.getContractByEmpIdCardAndDeptId(mpIdCard, deptId);
if (count >0) {
return R.ok();
String contractStart = baseMapper.getContractByEmpIdCardAndDeptId(mpIdCard, deptId);
if (Common.isNotNull(contractStart)) {
return R.ok(contractStart);
} else {
return R.failed("未找到合同");
}
......
......@@ -806,9 +806,9 @@
where a.EMP_IDCARD = #{idCard} and a.DEPT_NO = #{oldDeptNo} and b.DEPART_NO= #{deptNo} and b.DELETE_FLAG='0';
</update>
<select id="getContractByEmpIdCardAndDeptId" resultType="java.lang.Integer">
<select id="getContractByEmpIdCardAndDeptId" resultType="java.lang.String">
select
count(1)
e.CONTRACT_START
from t_employee_contract_info e
where e.EMP_IDCARD = #{empIdCard} and e.SETTLE_DOMAIN = #{deptId}
and e.DELETE_FLAG = '0'
......@@ -817,5 +817,6 @@
OR
( e.AUDIT_STATUS = '1' AND e.IN_USE = '1' )
)
limit 1
</select>
</mapper>
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