Commit 86091ae6 authored by fangxinjiang's avatar fangxinjiang

MVP1.2:项目薪资 创建时间区间查询

parent 4800c3a1
...@@ -376,9 +376,6 @@ ...@@ -376,9 +376,6 @@
<if test="tEmployeeContractInfo.createName != null and tEmployeeContractInfo.createName.trim() != ''"> <if test="tEmployeeContractInfo.createName != null and tEmployeeContractInfo.createName.trim() != ''">
AND a.CREATE_NAME = #{tEmployeeContractInfo.createName} AND a.CREATE_NAME = #{tEmployeeContractInfo.createName}
</if> </if>
<if test="tEmployeeContractInfo.createTime != null">
AND a.CREATE_TIME = #{tEmployeeContractInfo.createTime}
</if>
<if test="tEmployeeContractInfo.updateBy != null and tEmployeeContractInfo.updateBy.trim() != ''"> <if test="tEmployeeContractInfo.updateBy != null and tEmployeeContractInfo.updateBy.trim() != ''">
AND a.UPDATE_BY = #{tEmployeeContractInfo.updateBy} AND a.UPDATE_BY = #{tEmployeeContractInfo.updateBy}
</if> </if>
...@@ -386,7 +383,6 @@ ...@@ -386,7 +383,6 @@
AND a.UPDATE_TIME = #{tEmployeeContractInfo.updateTime} AND a.UPDATE_TIME = #{tEmployeeContractInfo.updateTime}
</if> </if>
<if test="tEmployeeContractInfo.unitNo != null and tEmployeeContractInfo.unitNo.trim() != ''"> <if test="tEmployeeContractInfo.unitNo != null and tEmployeeContractInfo.unitNo.trim() != ''">
AND a.UNIT_NO = #{tEmployeeContractInfo.unitNo} AND a.UNIT_NO = #{tEmployeeContractInfo.unitNo}
</if> </if>
......
...@@ -441,4 +441,12 @@ public class TSalaryStandard extends BaseEntity { ...@@ -441,4 +441,12 @@ public class TSalaryStandard extends BaseEntity {
*/ */
@TableField(exist = false) @TableField(exist = false)
private String salaryMonthEnd; private String salaryMonthEnd;
@TableField(exist = false)
@Schema(description = "创建时间起")
private String createTimeStart;
@TableField(exist = false)
@Schema(description = "创建时间止")
private String createTimeEnd;
} }
...@@ -250,8 +250,11 @@ ...@@ -250,8 +250,11 @@
<if test="tSalaryStandard.createName != null and tSalaryStandard.createName.trim() != ''"> <if test="tSalaryStandard.createName != null and tSalaryStandard.createName.trim() != ''">
AND a.CREATE_NAME = #{tSalaryStandard.createName} AND a.CREATE_NAME = #{tSalaryStandard.createName}
</if> </if>
<if test="tSalaryStandard.createTime != null"> <if test="tDispatchInfo.createTimeStart != null">
AND a.CREATE_TIME = #{tSalaryStandard.createTime} AND a.CREATE_TIME <![CDATA[ >= ]]> #{tDispatchInfo.createTimeStart}
</if>
<if test="tDispatchInfo.createTimeEnd != null">
AND a.CREATE_TIME <![CDATA[ <= ]]> #{tDispatchInfo.createTimeEnd}
</if> </if>
<if test="tSalaryStandard.updateBy != null and tSalaryStandard.updateBy.trim() != ''"> <if test="tSalaryStandard.updateBy != null and tSalaryStandard.updateBy.trim() != ''">
AND a.UPDATE_BY = #{tSalaryStandard.updateBy} AND a.UPDATE_BY = #{tSalaryStandard.updateBy}
......
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