Commit 7f67ef0c authored by hongguangwu's avatar hongguangwu

MVP1.7.12-查询条件等

parent c1775c64
...@@ -168,4 +168,15 @@ public class SocialHandleSearchVo extends TDispatchInfo { ...@@ -168,4 +168,15 @@ public class SocialHandleSearchVo extends TDispatchInfo {
@ExcelIgnore @ExcelIgnore
@Schema(description = "税友自动化办理") @Schema(description = "税友自动化办理")
private String syFlag; private String syFlag;
// 1.7.12-hgw-各险种办理状态多选(养工失、医生大合并状态查询)
@ExcelProperty("各险种办理状态" )
@ExcelIgnore
private String[] ygsYsdHandleStatusArr;
// 1.7.12-hgw-派单办理状态多选
@ExcelProperty("派单办理状态" )
@ExcelIgnore
private String[] socialHandleStatusArr;
} }
...@@ -42,6 +42,12 @@ private String ids; ...@@ -42,6 +42,12 @@ private String ids;
*/ */
@Schema(description = "创建时间区间") @Schema(description = "创建时间区间")
private LocalDateTime[] createTimes; private LocalDateTime[] createTimes;
@Schema(description = "更新时间起")
private LocalDateTime updateTimeStart;
@Schema(description = "更新时间止")
private LocalDateTime updateTimeEnd;
/** /**
* @Author fxj * @Author fxj
* 查询数据起 * 查询数据起
......
...@@ -2120,6 +2120,27 @@ ...@@ -2120,6 +2120,27 @@
<if test="tDispatchInfo.ysdRemark != null and tDispatchInfo.ysdRemark.trim() != ''"> <if test="tDispatchInfo.ysdRemark != null and tDispatchInfo.ysdRemark.trim() != ''">
AND s.YSD_REMARK like concat('%',#{tDispatchInfo.ysdRemark},'%') AND s.YSD_REMARK like concat('%',#{tDispatchInfo.ysdRemark},'%')
</if> </if>
<if test="tDispatchInfo.ygsYsdHandleStatusArr != null and tDispatchInfo.ygsYsdHandleStatusArr.length > 0">
AND (
s.YGS_HANDLE_STATUS in
<foreach item="idStr" index="index" collection="tDispatchInfo.ygsYsdHandleStatusArr" open="(" separator=","close=")">
#{idStr}
</foreach>
or s.YSD_HANDLE_STATUS in
<foreach item="idStr" index="index" collection="tDispatchInfo.ygsYsdHandleStatusArr" open="(" separator=","close=")">
#{idStr}
</foreach>
)
</if>
<if test="tDispatchInfo.socialHandleStatusArr != null and tDispatchInfo.socialHandleStatusArr.length > 0">
AND a.SOCIAL_HANDLE_STATUS in
<foreach item="idStr" index="index" collection="tDispatchInfo.socialHandleStatusArr" open="(" separator=","close=")">
#{idStr}
</foreach>
</if>
</if> </if>
</where> </where>
</sql> </sql>
......
...@@ -108,6 +108,12 @@ ...@@ -108,6 +108,12 @@
<if test="tSocialDeadlineInfo.updateTime != null"> <if test="tSocialDeadlineInfo.updateTime != null">
AND a.UPDATE_TIME = #{tSocialDeadlineInfo.updateTime} AND a.UPDATE_TIME = #{tSocialDeadlineInfo.updateTime}
</if> </if>
<if test="tSocialDeadlineInfo.updateTimeStart != null">
AND a.UPDATE_TIME >= #{tSocialDeadlineInfo.updateTimeStart}
</if>
<if test="tSocialDeadlineInfo.updateTimeEnd != null">
AND a.UPDATE_TIME <![CDATA[ <= ]]> #{tSocialDeadlineInfo.updateTimeEnd}
</if>
<if test="tSocialDeadlineInfo.status != null and tSocialDeadlineInfo.status.trim() != ''"> <if test="tSocialDeadlineInfo.status != null and tSocialDeadlineInfo.status.trim() != ''">
AND a.STATUS = #{tSocialDeadlineInfo.status} AND a.STATUS = #{tSocialDeadlineInfo.status}
</if> </if>
...@@ -132,5 +138,6 @@ ...@@ -132,5 +138,6 @@
<include refid="tSocialDeadlineInfo_where"/> <include refid="tSocialDeadlineInfo_where"/>
</where> </where>
order by a.month DESC order by a.month DESC
,a.id desc
</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