Commit a267003d authored by fangxinjiang's avatar fangxinjiang

测试服务-多副本场景

parent 3d44ef36
...@@ -8,6 +8,7 @@ import io.swagger.v3.oas.annotations.media.Schema; ...@@ -8,6 +8,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List;
/** /**
* @Author fxj * @Author fxj
...@@ -67,4 +68,11 @@ public class SocialHandleSearchVo extends TDispatchInfo { ...@@ -67,4 +68,11 @@ public class SocialHandleSearchVo extends TDispatchInfo {
@Schema(description = "审核时间截止时间" ) @Schema(description = "审核时间截止时间" )
@ExcelIgnore @ExcelIgnore
private String auditTimeEnd; private String auditTimeEnd;
/**
* 派单项:如 养老、公积金
*/
@ExcelAttribute(name = "派单项查询")
@Schema(description = "派单项查询" )
private List<String> dispatchItems;
} }
...@@ -294,7 +294,7 @@ ...@@ -294,7 +294,7 @@
<if test="tDispatchInfo.dispatchItems != null and tDispatchInfo.dispatchItems.size >0"> <if test="tDispatchInfo.dispatchItems != null and tDispatchInfo.dispatchItems.size >0">
AND AND
<foreach item="item" index="index" collection="tDispatchInfo.dispatchItems" open="(" separator="or" close=")"> <foreach item="item" index="index" collection="tDispatchInfo.dispatchItems" open="(" separator="or" close=")">
a.dispatchItem contains(#{item}) INSTR(a.DISPATCH_ITEM,#{item})
</foreach> </foreach>
</if> </if>
<if test="tDispatchInfo.idList != null and tDispatchInfo.idList.size >0"> <if test="tDispatchInfo.idList != null and tDispatchInfo.idList.size >0">
...@@ -512,6 +512,12 @@ ...@@ -512,6 +512,12 @@
<sql id="tDispatchInfoAudit_where"> <sql id="tDispatchInfoAudit_where">
<if test="tDispatchInfo != null"> <if test="tDispatchInfo != null">
<if test="tDispatchInfo.dispatchItems != null and tDispatchInfo.dispatchItems.size >0">
AND
<foreach item="item" index="index" collection="tDispatchInfo.dispatchItems" open="(" separator="or" close=")">
INSTR(a.DISPATCH_ITEM,#{item})
</foreach>
</if>
<if test="tDispatchInfo.idList != null and tDispatchInfo.idList.size >0"> <if test="tDispatchInfo.idList != null and tDispatchInfo.idList.size >0">
AND a.ID in AND a.ID in
<foreach item="idStr" index="index" collection="tDispatchInfo.idList" open="(" separator="," close=")"> <foreach item="idStr" index="index" collection="tDispatchInfo.idList" open="(" separator="," close=")">
...@@ -1068,6 +1074,12 @@ ...@@ -1068,6 +1074,12 @@
</if>--> </if>-->
<if test="tDispatchInfo != null"> <if test="tDispatchInfo != null">
<if test="tDispatchInfo.dispatchItems != null and tDispatchInfo.dispatchItems.size >0">
AND
<foreach item="item" index="index" collection="tDispatchInfo.dispatchItems" open="(" separator="or" close=")">
INSTR(a.DISPATCH_ITEM,#{item})
</foreach>
</if>
<if test="tDispatchInfo.type != null and tDispatchInfo.type.trim() != ''"> <if test="tDispatchInfo.type != null and tDispatchInfo.type.trim() != ''">
AND a.TYPE = #{tDispatchInfo.type} AND a.TYPE = #{tDispatchInfo.type}
</if> </if>
...@@ -1178,6 +1190,12 @@ ...@@ -1178,6 +1190,12 @@
</if>--> </if>-->
<if test="tDispatchInfo != null"> <if test="tDispatchInfo != null">
<if test="tDispatchInfo.dispatchItems != null and tDispatchInfo.dispatchItems.size >0">
AND
<foreach item="item" index="index" collection="tDispatchInfo.dispatchItems" open="(" separator="or" close=")">
INSTR(a.DISPATCH_ITEM,#{item})
</foreach>
</if>
<if test="tDispatchInfo.fundProvince != null and tDispatchInfo.fundProvince.trim() != ''"> <if test="tDispatchInfo.fundProvince != null and tDispatchInfo.fundProvince.trim() != ''">
AND a.FUND_PROVINCE = #{tDispatchInfo.fundProvince} AND a.FUND_PROVINCE = #{tDispatchInfo.fundProvince}
</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