Commit 8852a331 authored by hongguangwu's avatar hongguangwu

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

parents 9b77a034 620be035
......@@ -275,4 +275,17 @@ public class SysBaseSetInfoController {
menuUtil.setAuthSql(user, searchVo);
sysBaseSetInfoService.listFundExport(response,searchVo);
}
/**
* 通过类型和和名称查询基数设置表最新数据
*
* @param type: 0 社保 1 公积金 houseHoldName:户名称
* @return R
*/
@Operation(summary = "通过id查询", description = "通过id查询")
@GetMapping("/selectLastSetInfo")
public R<SysBaseSetInfo> selectLastSetInfo(@RequestParam(name = "type",required = true) String type,
@RequestParam(name = "houseHoldName",required = true)String houseHoldName) {
return R.ok(sysBaseSetInfoService.selectLastSetInfo(type,houseHoldName));
}
}
......@@ -85,4 +85,6 @@ public interface SysBaseSetInfoMapper extends BaseMapper<SysBaseSetInfo> {
* @return: int
**/
int getCountByEdit(@Param("sysBaseSetInfo") SysBaseSetInfo sysBaseSetInfo);
SysBaseSetInfo selectLastSetInfo(@Param("type")String type,@Param("departName")String departName);
}
......@@ -93,4 +93,7 @@ public interface SysBaseSetInfoService extends IService<SysBaseSetInfo> {
void listFundExport(HttpServletResponse response, SysBaseSetInfo searchVo);
void updateAreaCode(String name, String province, String city, String town, String type);
SysBaseSetInfo selectLastSetInfo(String type,String departName);
}
......@@ -1510,6 +1510,9 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
tSocialLogService.saveModificationRecord(logType,old.getId(),old,sysBaseSetInfo);
}
}
@Override
public SysBaseSetInfo selectLastSetInfo(String type,String departName){
return baseMapper.selectLastSetInfo(type,departName);
}
}
......@@ -665,4 +665,10 @@
</where>
order by a.CREATE_TIME desc
</select>
<select id="selectLastSetInfo" resultMap="sysBaseSetInfoMap">
select t.* from sys_base_set_info t where t.BASE_TYPE = #{type} and t.STATUS = 0 and t.DELETE_FLAG = '0' and
DATE_FORMAT(t.APPLY_START_DATE,'%Y-%m-%d') <![CDATA[ <= ]]> DATE_FORMAT(CURDATE(),'%Y-%m-%d') and DATE_FORMAT(CURDATE(),'%Y-%m-%d') <![CDATA[ <= ]]> IFNULL(t.APPLY_END_DATE,DATE_FORMAT(CURDATE(),'%Y-%m-%d'))
and t.DEPART_NAME =#{departName} limit 1
</select>
</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