Commit c5710773 authored by huyuchen's avatar huyuchen

huych-社保自动化相关提交

parent 3277f545
...@@ -56,4 +56,7 @@ public class TEmployeeContractPreSearchVo extends TEmployeeContractPre { ...@@ -56,4 +56,7 @@ public class TEmployeeContractPreSearchVo extends TEmployeeContractPre {
@Schema(description = "列表类型 1 待办 2监控") @Schema(description = "列表类型 1 待办 2监控")
private String type; private String type;
@Schema(description = "自动标识 1不查询确认时间为空的数据")
private String autoSendFlag;
} }
...@@ -225,6 +225,9 @@ ...@@ -225,6 +225,9 @@
<if test="tEmployeeContractPre.processStatus != null and tEmployeeContractPre.processStatus.trim() != ''"> <if test="tEmployeeContractPre.processStatus != null and tEmployeeContractPre.processStatus.trim() != ''">
AND a.process_status = #{tEmployeeContractPre.processStatus} AND a.process_status = #{tEmployeeContractPre.processStatus}
</if> </if>
<if test="tEmployeeContractPre.autoSendFlag != null and tEmployeeContractPre.autoSendFlag.trim() != ''">
AND a.expected_confirm_time is not null
</if>
<if test="tEmployeeContractPre.statusList != null and tEmployeeContractPre.statusList.size() > 0"> <if test="tEmployeeContractPre.statusList != null and tEmployeeContractPre.statusList.size() > 0">
AND a.process_status in AND a.process_status in
<foreach item="item" index="index" collection="tEmployeeContractPre.statusList" open="(" separator="," <foreach item="item" index="index" collection="tEmployeeContractPre.statusList" open="(" separator=","
......
...@@ -57,4 +57,7 @@ public class TDispatchInfoPreSearchVo extends TDispatchInfoPre { ...@@ -57,4 +57,7 @@ public class TDispatchInfoPreSearchVo extends TDispatchInfoPre {
@TableField(exist = false) @TableField(exist = false)
private String failType; private String failType;
@Schema(description = "自动标识 1不查询确认时间为空的数据")
private String autoSendFlag;
} }
...@@ -213,6 +213,9 @@ ...@@ -213,6 +213,9 @@
<if test="tDispatchInfoPre.failType != null and tDispatchInfoPre.failType.trim() != ''"> <if test="tDispatchInfoPre.failType != null and tDispatchInfoPre.failType.trim() != ''">
AND a.error_info is not null AND a.error_info is not null
</if> </if>
<if test="tDispatchInfoPre.autoSendFlag != null and tDispatchInfoPre.autoSendFlag.trim() != ''">
AND a.EXPECTED_CONFIRM_TIME is not null
</if>
<if test="tDispatchInfoPre.authSql != null and tDispatchInfoPre.authSql.trim() != ''"> <if test="tDispatchInfoPre.authSql != null and tDispatchInfoPre.authSql.trim() != ''">
${tDispatchInfoPre.authSql} ${tDispatchInfoPre.authSql}
</if> </if>
......
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