Commit dc08e148 authored by hongguangwu's avatar hongguangwu

工资-a.DELETE_FLAG = 0

parent e5d176ea
...@@ -197,7 +197,7 @@ public class SalaryAccountUtil implements Serializable { ...@@ -197,7 +197,7 @@ public class SalaryAccountUtil implements Serializable {
} }
newEmp.setEmpName(empName); newEmp.setEmpName(empName);
} }
if (SalaryConstants.IF_NEW_EMPLOYEE.equals(dbFiedName) if ((SalaryConstants.IF_NEW_EMPLOYEE.equals(dbFiedName) || SalaryConstants.IS_NEW_EMPLOYEE.equals(dbFiedName))
&& SalaryConstants.IS_NEW.equals(cellValueStr)) { && SalaryConstants.IS_NEW.equals(cellValueStr)) {
isNewEmployee = true; isNewEmployee = true;
} }
......
...@@ -89,6 +89,7 @@ public class SalaryConstants { ...@@ -89,6 +89,7 @@ public class SalaryConstants {
public static final String IS_MUST = "1"; public static final String IS_MUST = "1";
public static final String EMP_NAME = "姓名"; public static final String EMP_NAME = "姓名";
public static final String IF_NEW_EMPLOYEE = "是否新员工(默认否)"; public static final String IF_NEW_EMPLOYEE = "是否新员工(默认否)";
public static final String IS_NEW_EMPLOYEE = "是否新员工";
public static final String IS_NEW = "是"; public static final String IS_NEW = "是";
public static final String ID_NUMBER = "身份证号"; public static final String ID_NUMBER = "身份证号";
public static final String CHECK_ID_NUMBER = "身份证号码"; public static final String CHECK_ID_NUMBER = "身份证号码";
......
...@@ -50,12 +50,6 @@ ...@@ -50,12 +50,6 @@
</select> </select>
<!--获取自有员工身份证--> <!--获取自有员工身份证-->
<select id="getOwnEmpList" resultType="String"> <select id="getOwnEmpList" resultType="String">
SELECT SELECT EMP_IDCARD FROM view_own_employee
e.EMP_IDCARD
FROM
t_own_dept d
LEFT JOIN t_salary_employee e ON e.DEPT_ID = d.dept_id
WHERE
e.FILE_STATUS = '0'
</select> </select>
</mapper> </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