From f513fd8b7eb277e30678a3c12958a46c0cf71c66 Mon Sep 17 00:00:00 2001
From: fangxinjiang <3004453899@qq.com>
Date: Mon, 13 May 2024 18:14:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8A=82=E5=81=87=E6=97=A5=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E8=A1=A8=E5=8F=8A=E7=A4=BE=E4=BF=9D=E5=8C=BB=E7=96=97=E6=88=AA?=
 =?UTF-8?q?=E6=AD=A2=E9=85=8D=E7=BD=AE=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../social/entity/TSocialDeadlineInfo.java    |  8 +-
 .../vo/TSocialDeadlineInfoSearchVo.java       | 13 +++
 .../TSocialDeadlineInfoController.java        |  4 +-
 .../mapper/TSocialDeadlineInfoMapper.xml      | 96 ++++++++++---------
 4 files changed, 70 insertions(+), 51 deletions(-)

diff --git a/yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialDeadlineInfo.java b/yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialDeadlineInfo.java
index 63fe56edb..ca8596220 100644
--- a/yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialDeadlineInfo.java
+++ b/yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialDeadlineInfo.java
@@ -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;
 	/**
 	 * 社保截止日
diff --git a/yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialDeadlineInfoSearchVo.java b/yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialDeadlineInfoSearchVo.java
index b462f51ea..a057806eb 100644
--- a/yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialDeadlineInfoSearchVo.java
+++ b/yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialDeadlineInfoSearchVo.java
@@ -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;
+
 }
diff --git a/yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TSocialDeadlineInfoController.java b/yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TSocialDeadlineInfoController.java
index 278687afa..ddc6bd7ba 100644
--- a/yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TSocialDeadlineInfoController.java
+++ b/yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TSocialDeadlineInfoController.java
@@ -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);
diff --git a/yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialDeadlineInfoMapper.xml b/yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialDeadlineInfoMapper.xml
index 0f5129e15..8672127f6 100644
--- a/yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialDeadlineInfoMapper.xml
+++ b/yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialDeadlineInfoMapper.xml
@@ -58,51 +58,57 @@
     </sql>
     <sql id="tSocialDeadlineInfo_where">
         <if test="tSocialDeadlineInfo != null">
-                    <if test="tSocialDeadlineInfo.id != null and tSocialDeadlineInfo.id.trim() != ''">
-                        AND a.ID = #{tSocialDeadlineInfo.id}
-                    </if>
-                    <if test="tSocialDeadlineInfo.month != null and tSocialDeadlineInfo.month.trim() != ''">
-                        AND a.MONTH = #{tSocialDeadlineInfo.month}
-                    </if>
-                    <if test="tSocialDeadlineInfo.province != null and tSocialDeadlineInfo.province.trim() != ''">
-                        AND a.PROVINCE = #{tSocialDeadlineInfo.province}
-                    </if>
-                    <if test="tSocialDeadlineInfo.city != null and tSocialDeadlineInfo.city.trim() != ''">
-                        AND a.CITY = #{tSocialDeadlineInfo.city}
-                    </if>
-                    <if test="tSocialDeadlineInfo.town != null and tSocialDeadlineInfo.town.trim() != ''">
-                        AND a.TOWN = #{tSocialDeadlineInfo.town}
-                    </if>
-                    <if test="tSocialDeadlineInfo.socialEndDate != null">
-                        AND a.SOCIAL_END_DATE = #{tSocialDeadlineInfo.socialEndDate}
-                    </if>
-                    <if test="tSocialDeadlineInfo.medicalEndDate != null">
-                        AND a.MEDICAL_END_DATE = #{tSocialDeadlineInfo.medicalEndDate}
-                    </if>
-                    <if test="tSocialDeadlineInfo.createBy != null and tSocialDeadlineInfo.createBy.trim() != ''">
-                        AND a.CREATE_BY = #{tSocialDeadlineInfo.createBy}
-                    </if>
-                    <if test="tSocialDeadlineInfo.createName != null and tSocialDeadlineInfo.createName.trim() != ''">
-                        AND a.CREATE_NAME = #{tSocialDeadlineInfo.createName}
-                    </if>
-                    <if test="tSocialDeadlineInfo.createTime != null">
-                        AND a.CREATE_TIME = #{tSocialDeadlineInfo.createTime}
-                    </if>
-                    <if test="tSocialDeadlineInfo.updateBy != null and tSocialDeadlineInfo.updateBy.trim() != ''">
-                        AND a.UPDATE_BY = #{tSocialDeadlineInfo.updateBy}
-                    </if>
-                    <if test="tSocialDeadlineInfo.updateName != null and tSocialDeadlineInfo.updateName.trim() != ''">
-                        AND a.UPDATE_NAME = #{tSocialDeadlineInfo.updateName}
-                    </if>
-                    <if test="tSocialDeadlineInfo.updateTime != null">
-                        AND a.UPDATE_TIME = #{tSocialDeadlineInfo.updateTime}
-                    </if>
-                    <if test="tSocialDeadlineInfo.status != null and tSocialDeadlineInfo.status.trim() != ''">
-                        AND a.STATUS = #{tSocialDeadlineInfo.status}
-                    </if>
-			<if test="tSocialDeadlineInfo.type != null and tSocialDeadlineInfo.type.trim() != ''">
-				AND a.TYPE = #{tSocialDeadlineInfo.type}
-			</if>
+		<if test="tSocialDeadlineInfo.id != null and tSocialDeadlineInfo.id.trim() != ''">
+			AND a.ID = #{tSocialDeadlineInfo.id}
+		</if>
+		<if test="tSocialDeadlineInfo.month != null and tSocialDeadlineInfo.month.trim() != ''">
+			AND a.MONTH = #{tSocialDeadlineInfo.month}
+		</if>
+		<if test="tSocialDeadlineInfo.province != null and tSocialDeadlineInfo.province.trim() != ''">
+			AND a.PROVINCE = #{tSocialDeadlineInfo.province}
+		</if>
+		<if test="tSocialDeadlineInfo.city != null and tSocialDeadlineInfo.city.trim() != ''">
+			AND a.CITY = #{tSocialDeadlineInfo.city}
+		</if>
+		<if test="tSocialDeadlineInfo.town != null and tSocialDeadlineInfo.town.trim() != ''">
+			AND a.TOWN = #{tSocialDeadlineInfo.town}
+		</if>
+		<if test="tSocialDeadlineInfo.socialEndDate != null">
+			AND a.SOCIAL_END_DATE = #{tSocialDeadlineInfo.socialEndDate}
+		</if>
+		<if test="tSocialDeadlineInfo.medicalEndDate != null">
+			AND a.MEDICAL_END_DATE = #{tSocialDeadlineInfo.medicalEndDate}
+		</if>
+		<if test="tSocialDeadlineInfo.createBy != null and tSocialDeadlineInfo.createBy.trim() != ''">
+			AND a.CREATE_BY = #{tSocialDeadlineInfo.createBy}
+		</if>
+		<if test="tSocialDeadlineInfo.createName != null and tSocialDeadlineInfo.createName.trim() != ''">
+			AND a.CREATE_NAME = #{tSocialDeadlineInfo.createName}
+		</if>
+		<if test="tSocialDeadlineInfo.createTime != null">
+			AND a.CREATE_TIME = #{tSocialDeadlineInfo.createTime}
+		</if>
+		<if test="tSocialDeadlineInfo.updateBy != null and tSocialDeadlineInfo.updateBy.trim() != ''">
+			AND a.UPDATE_BY = #{tSocialDeadlineInfo.updateBy}
+		</if>
+		<if test="tSocialDeadlineInfo.updateName != null and tSocialDeadlineInfo.updateName.trim() != ''">
+			AND a.UPDATE_NAME = #{tSocialDeadlineInfo.updateName}
+		</if>
+		<if test="tSocialDeadlineInfo.updateTime != null">
+			AND a.UPDATE_TIME = #{tSocialDeadlineInfo.updateTime}
+		</if>
+		<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>
         </if>
     </sql>
     <!--tSocialDeadlineInfo简单分页查询-->
-- 
2.18.1