Commit f513fd8b authored by fangxinjiang's avatar fangxinjiang

节假日配置表及社保医疗截止配置表

parent 7eb029d3
......@@ -18,9 +18,7 @@
package com.yifu.cloud.plus.v1.yifu.social.entity;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
......@@ -58,7 +56,7 @@ public class TSocialDeadlineInfo extends BaseEntity {
@Length(max = 6, message = "月份不能超过6个字符")
@ExcelProperty("月份")
@Schema(description = "月份")
private String month;
private Integer month;
/**
* 省
*/
......@@ -75,6 +73,7 @@ public class TSocialDeadlineInfo extends BaseEntity {
@Length(max = 10, message = "市不能超过10个字符")
@ExcelProperty("市")
@Schema(description = "市")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String city;
/**
* 县
......@@ -83,6 +82,7 @@ public class TSocialDeadlineInfo extends BaseEntity {
@Length(max = 10, message = "县不能超过10个字符")
@ExcelProperty("县")
@Schema(description = "县")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String town;
/**
* 社保截止日
......
......@@ -55,4 +55,17 @@ private int limitStart;
@Schema(description = "查询limit 数据条数")
private int limitEnd;
/**
* @Author fxj
* 月份起时间
**/
@Schema(description = "查询month 开始")
private int monthStart;
/**
* @Author fxj
* 月份止时间
**/
@Schema(description = "查询month 数据条数")
private int monthEnd;
}
......@@ -154,8 +154,8 @@ public class TSocialDeadlineInfoController {
*/
@Operation(summary = "通过id启用0/禁用1社保医疗截止日配置", description = "通过id启用0/禁用1社保医疗截止日配置")
@SysLog("通过id启用/禁用社保医疗截止日配置")
@PutMapping("/{id}")
public R<Boolean> updateStatusById(@PathVariable String id,@RequestParam String status) {
@PutMapping("/updateStatusById")
public R<Boolean> updateStatusById(@RequestParam String id,@RequestParam String status) {
YifuUser user = SecurityUtils.getUser();
if (!Common.isNotNull(user)){
return R.failed(CommonConstants.USER_FAIL);
......
......@@ -100,6 +100,12 @@
<if test="tSocialDeadlineInfo.status != null and tSocialDeadlineInfo.status.trim() != ''">
AND a.STATUS = #{tSocialDeadlineInfo.status}
</if>
<if test="tSocialDeadlineInfo.monthEnd != 0">
AND a.MONTH <![CDATA[<=]]> #{tSocialDeadlineInfo.monthEnd}
</if>
<if test="tSocialDeadlineInfo.monthStart != 0">
AND a.MONTH <![CDATA[>=]]> #{tSocialDeadlineInfo.monthStart}
</if>
<if test="tSocialDeadlineInfo.type != null and tSocialDeadlineInfo.type.trim() != ''">
AND a.TYPE = #{tSocialDeadlineInfo.type}
</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