Commit f82734a8 authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.21' into MVP1.7.21

parents 92f2bcb4 19d7863d
...@@ -282,7 +282,7 @@ public class SysBaseSetInfoController { ...@@ -282,7 +282,7 @@ public class SysBaseSetInfoController {
* @param type: 0 社保 1 公积金 houseHoldName:户名称 * @param type: 0 社保 1 公积金 houseHoldName:户名称
* @return R * @return R
*/ */
@Operation(summary = "通过id查询", description = "通过id查询") @Operation(summary = "通过类型和和名称查询基数设置表最新数据", description = "通过类型和和名称查询基数设置表最新数据")
@GetMapping("/selectLastSetInfo") @GetMapping("/selectLastSetInfo")
public R<SysBaseSetInfo> selectLastSetInfo(@RequestParam(name = "type",required = true) String type, public R<SysBaseSetInfo> selectLastSetInfo(@RequestParam(name = "type",required = true) String type,
@RequestParam(name = "houseHoldName",required = true)String houseHoldName) { @RequestParam(name = "houseHoldName",required = true)String houseHoldName) {
......
...@@ -833,7 +833,8 @@ ...@@ -833,7 +833,8 @@
where where
a.expected_collection_time is not null a.expected_collection_time is not null
and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d") <![CDATA[ <= ]]> CURDATE() and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d") <![CDATA[ <= ]]> CURDATE()
and a.process_status in ('1','2','4','8','9') <!-- '1','2','4','8','9' 改为 '1','2'-->
and a.process_status in ('1','2')
and a.type_sub = '1' and a.IS_REFUSE ='1' and a.IS_LEAVE ='1' and a.type_sub = '1' and a.IS_REFUSE ='1' and a.IS_LEAVE ='1'
</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