Commit db5c4786 authored by hongguangwu's avatar hongguangwu

合同优化

parent ee05fee8
......@@ -101,8 +101,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
//是否归档:否
tEmployeeContractInfo.setIsFile(CommonConstants.ONE_STRING);
//是否在用:
tEmployeeContractInfo.setInUse(CommonConstants.ZERO_STRING);
//是否在用:
tEmployeeContractInfo.setInUse(CommonConstants.ONE_STRING);
ExcelAttributeValidityUtil<TEmployeeContractInfo> validity = new ExcelAttributeValidityUtil<>(TEmployeeContractInfo.class);
validity.ValidityObj(tEmployeeContractInfo);
......@@ -135,8 +135,10 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
tEmployeeContractInfo.setUpdateBy(user.getId());
tEmployeeContractInfo.setUpdateTime(LocalDateTime.now());
//是否在用:是
tEmployeeContractInfo.setInUse(CommonConstants.ZERO_STRING);
//是否归档:否
tEmployeeContractInfo.setIsFile(CommonConstants.ONE_STRING);
//是否在用:否
tEmployeeContractInfo.setInUse(CommonConstants.ONE_STRING);
ExcelAttributeValidityUtil<TEmployeeContractInfo> validity = new ExcelAttributeValidityUtil<>(TEmployeeContractInfo.class);
validity.ValidityObj(tEmployeeContractInfo);
......
......@@ -70,12 +70,11 @@
<result property="createTime" column="CREATE_TIME"/>
<result property="updateBy" column="UPDATE_BY"/>
<result property="updateTime" column="UPDATE_TIME"/>
<result property="unitName" column="UNIT_NAME"/>
<result property="unitNo" column="UNIT_NO"/>
<result property="deptName" column="DEPT_NAME"/>
<result property="deptNo" column="DEPT_NO"/>
<result property="applyNo" column="APPLY_NO"/>
<result property="auditStatus" column="AUDIT_STATUS"/>
<result property="deleteFlag" column="DELETE_FLAG"/>
</resultMap>
<sql id="Base_Column_List">
a.ID,
......@@ -130,7 +129,8 @@
a.DEPT_NAME,
a.DEPT_NO,
a.AUDIT_STATUS,
a.APPLY_NO
a.APPLY_NO,
a.DELETE_FLAG
</sql>
<sql id="tEmployeeContractInfo_where">
<if test="tEmployeeContractInfo != null">
......@@ -303,7 +303,7 @@
<include refid="Base_Column_List"/>
FROM t_employee_contract_info a
<where>
1=1
a.DELETE_FLAG = 0
<include refid="tEmployeeContractInfo_where"/>
</where>
</select>
......
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