Commit 57aa7f82 authored by hongguangwu's avatar hongguangwu

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

parents 3806e44c 04955658
...@@ -68,7 +68,7 @@ public class TAutoFundRuleInfo extends BaseEntity { ...@@ -68,7 +68,7 @@ public class TAutoFundRuleInfo extends BaseEntity {
@Schema(description = "是否自动触发派增(字典:0自动触发派增,1:手动派增)") @Schema(description = "是否自动触发派增(字典:0自动触发派增,1:手动派增)")
private String autoFlag; private String autoFlag;
/** /**
* 派单发起时间(字典:0:起缴日期当日) * 派单发起时间(字典:0:起缴日期当日) 新:0:按起缴日期计算得出
*/ */
@ExcelAttribute(name = "派单发起时间", maxLength = 2) @ExcelAttribute(name = "派单发起时间", maxLength = 2)
@Length(max = 2, message = "派单发起时间不能超过2个字符") @Length(max = 2, message = "派单发起时间不能超过2个字符")
......
...@@ -93,12 +93,14 @@ public class TAutoFundRuleRel extends BaseEntity { ...@@ -93,12 +93,14 @@ public class TAutoFundRuleRel extends BaseEntity {
@Schema(description = "公积金单位个人比例是否一致(0-是,1-否)") @Schema(description = "公积金单位个人比例是否一致(0-是,1-否)")
private String fundPerFlag; private String fundPerFlag;
/** /**
* 起缴日期类型:0 入职日期 1 入职满1年次月 2 人员自定义 * 起缴日期类型:0 入职日期 1 入职满个月 2 入职满2个月 3 入职满3个月 4 入职满4个月 5 入职满5个月 6 入职满6个月 7 入职满7个月
* * 8 入职满8个月 9 入职满9个月 10 入职满10个月 11 入职满11个月 12 入职满12个月
* 原:0 入职日期 1 入职满1年次月 2 人员自定义
*/ */
@ExcelAttribute(name = "起缴日期类型", maxLength = 2) @ExcelAttribute(name = "起缴日期类型", maxLength = 2)
@Length(max = 2, message = "起缴日期类型不能超过2个字符") @Length(max = 2, message = "起缴日期类型不能超过2个字符")
@ExcelProperty("起缴日期类型") @ExcelProperty("起缴日期类型")
@Schema(description = "起缴日期类型:0 入职日期 1 入职满1年次月 2 人员自定义") @Schema(description = "起缴日期类型:0 入职日期 1 入职满个月 2 入职满2个月 3 入职满3个月 4 入职满4个月 5 入职满5个月 6 入职满6个月 7 入职满7个月 8 入职满8个月 9 入职满9个月 10 入职满10个月 11 入职满11个月 12 入职满12个月 ")
private String fundDateType; private String fundDateType;
/** /**
* 缴纳基数类型:0最低、1自定义、2最高、3固定基数 * 缴纳基数类型:0最低、1自定义、2最高、3固定基数
......
...@@ -67,12 +67,12 @@ public class TAutoSocialRuleInfo extends BaseEntity { ...@@ -67,12 +67,12 @@ public class TAutoSocialRuleInfo extends BaseEntity {
@Schema(description = "是否自动触发派增(字典:0自动触发派增,1:手动派增)") @Schema(description = "是否自动触发派增(字典:0自动触发派增,1:手动派增)")
private String autoFlag; private String autoFlag;
/** /**
* 派单发起时间(字典::0:入职满1个月...入职满6个月) * 派单发起时间(字典::0:入职满1个月...入职满6个月) 新:6:按起缴日期计算得出
*/ */
@ExcelAttribute(name = "派单发起时间", maxLength = 2,isNotEmpty = false, errorInfo = "派单发起时间不能为空") @ExcelAttribute(name = "派单发起时间", maxLength = 2,isNotEmpty = false, errorInfo = "派单发起时间不能为空")
@Length(max = 2, message = "派单发起时间不能超过2个字符") @Length(max = 2, message = "派单发起时间不能超过2个字符")
@ExcelProperty("派单发起时间") @ExcelProperty("派单发起时间")
@Schema(description = "派单发起时间(字典::0:入职满1个月...入职满6个月)") @Schema(description = "派单发起时间(字典::0:入职满1个月...入职满6个月 6:按起缴日期计算得出)")
private String startPeriod; private String startPeriod;
/** /**
* 派单发起具体时间字典:0:15:20 * 派单发起具体时间字典:0:15:20
......
...@@ -94,12 +94,14 @@ public class TAutoSocialRuleRel extends BaseEntity { ...@@ -94,12 +94,14 @@ public class TAutoSocialRuleRel extends BaseEntity {
@Schema(description = "社保起缴日期是否一致(0-是,1-否)") @Schema(description = "社保起缴日期是否一致(0-是,1-否)")
private String socialDateFlag; private String socialDateFlag;
/** /**
* 起缴日期:0 入职日期 * 起缴日期类型:0 入职日期 1 入职满个月 2 入职满2个月 3 入职满3个月 4 入职满4个月 5 入职满5个月 6 入职满6个月 7 入职满7个月
*/ * 8 入职满8个月 9 入职满9个月 10 入职满10个月 11 入职满11个月 12 入职满12个月
@ExcelAttribute(name = "起缴日期", maxLength = 2) * 原:0 入职日期
@Length(max = 2, message = "起缴日期不能超过2个字符") */
@ExcelProperty("起缴日期") @ExcelAttribute(name = "起缴日期类型", maxLength = 2)
@Schema(description = "起缴日期:0 入职日期") @Length(max = 2, message = "起缴日期类型不能超过2个字符")
@ExcelProperty("起缴日期类型")
@Schema(description = "起缴日期类型:0 入职日期 1 入职满个月 2 入职满2个月 3 入职满3个月 4 入职满4个月 5 入职满5个月 6 入职满6个月 7 入职满7个月 8 入职满8个月 9 入职满9个月 10 入职满10个月 11 入职满11个月 12 入职满12个月")
private String socialDateType; private String socialDateType;
/** /**
* 缴纳类型:0最低、1自定义、2最高 * 缴纳类型:0最低、1自定义、2最高
......
...@@ -270,14 +270,25 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable { ...@@ -270,14 +270,25 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
private String registerId; private String registerId;
/** /**
* 起缴日期类型:0 入职日期 1 入职满1年次月 2 人员自定义 * 起缴日期类型:0 入职日期 1 入职满1个月 2 入职满2个月 3 入职满3个月 4 入职满4个月 5 入职满5个月 6 入职满6个月 7 入职满7个月 8 入职满8个月 9 入职满9个月 10 入职满10个月 11 入职满11个月 12 入职满12个月
* 原:0 入职日期 1 入职满1年次月 2 人员自定义
*/ */
@ExcelAttribute(name = "起缴日期类型", maxLength = 2) @ExcelAttribute(name = "起缴日期类型", maxLength = 2)
@Length(max = 2, message = "起缴日期类型不能超过2个字符") @Length(max = 2, message = "起缴日期类型不能超过2个字符")
@ExcelProperty("起缴日期类型") @ExcelProperty("起缴日期类型")
@Schema(description = "起缴日期类型:0 入职日期 1 入职满1年次月 2 人员自定义") @Schema(description = "起缴日期类型:0 入职日期 1 入职满1个月 2 入职满2个月 3 入职满3个月 4 入职满4个月 5 入职满5个月 6 入职满6个月 7 入职满7个月 8 入职满8个月 9 入职满9个月 10 入职满10个月 11 入职满11个月 12 入职满12个月")
private String fundDateType; private String fundDateType;
/**
* 起缴日期类型:0 入职日期 1 入职满1个月 2 入职满2个月 3 入职满3个月 4 入职满4个月 5 入职满5个月 6 入职满6个月 7 入职满7个月 8 入职满8个月 9 入职满9个月 10 入职满10个月 11 入职满11个月 12 入职满12个月
* 原:0 入职日期 1 入职满1年次月 2 人员自定义
*/
@ExcelAttribute(name = "起缴日期类型", maxLength = 2)
@Length(max = 2, message = "起缴日期类型不能超过2个字符")
@ExcelProperty("起缴日期类型")
@Schema(description = "起缴日期类型:0 入职日期 1 入职满1个月 2 入职满2个月 3 入职满3个月 4 入职满4个月 5 入职满5个月 6 入职满6个月 7 入职满7个月 8 入职满8个月 9 入职满9个月 10 入职满10个月 11 入职满11个月 12 入职满12个月")
private String socialDateType;
/** /**
* 公积金单位个人比例是否一致(0-是,1-否) * 公积金单位个人比例是否一致(0-是,1-否)
*/ */
......
...@@ -1090,10 +1090,31 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -1090,10 +1090,31 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
preVo.setTypeSub(CommonConstants.ZERO_STRING); preVo.setTypeSub(CommonConstants.ZERO_STRING);
preVo.setProcessStatus(CommonConstants.ZERO_STRING); preVo.setProcessStatus(CommonConstants.ZERO_STRING);
preVo.setDispatchItem("养老、医疗、生育、失业、工伤、大病"); preVo.setDispatchItem("养老、医疗、生育、失业、工伤、大病");
if (CommonConstants.ZERO_STRING.equals(preVo.getIsCreateDate()) && Common.isEmpty(preVo.getSocialStartDate())) { if (CommonConstants.ZERO_STRING.equals(preVo.getIsCreateDate())) {
//原社保起缴日期类型为 0 入职日期 新:0 入职日期 1 入职满1个月 2 入职满2个月 3 入职满3个月 4 入职满4个月 5 入职满5个月
// 6 入职满6个月 7 入职满7个月 8 入职满8个月 9 入职满9个月 10 入职满10个月 11 入职满11个月 12 入职满12个月
if (Common.isEmpty(preVo.getSocialStartDate())) {
if (Common.isNotNull(preVo.getSocialDateType())){
TEmployeeContractDateVo vo = new TEmployeeContractDateVo();
vo.setMonthAfter(Integer.parseInt(preVo.getSocialDateType()));
vo.setYearAfter(0);
vo.setRegistDate(pre.getJoinLeaveDate());
Date date = this.addYearsMonths(vo);
preVo.setSocialStartDate(date);
}else {
preVo.setSocialStartDate(pre.getJoinLeaveDate()); preVo.setSocialStartDate(pre.getJoinLeaveDate());
} }
} }
preVo.setBigailmentStart(preVo.getSocialStartDate());
preVo.setPensionStart(preVo.getSocialStartDate());
preVo.setMedicalStart(preVo.getSocialStartDate());
preVo.setBirthStart(preVo.getSocialStartDate());
preVo.setWorkInjuryStart(preVo.getSocialStartDate());
preVo.setUnemployStart(preVo.getSocialStartDate());
preVo.setSocialStartDate(preVo.getSocialStartDate());
}
}
//公积金待购买数据初始化 //公积金待购买数据初始化
private void initFundPreInfo(EmployeeRegistrationPreVo pre, TDispatchInfoPreVo preVo, private void initFundPreInfo(EmployeeRegistrationPreVo pre, TDispatchInfoPreVo preVo,
......
...@@ -1892,6 +1892,38 @@ public class DateUtil { ...@@ -1892,6 +1892,38 @@ public class DateUtil {
} }
} }
/**
* 设置日期中的天
*
* @param date 原始日期
* @param day 要设置的天数
* @return 修改后的日期
*/
public static Date setDayByDate(Date date, int day) {
Calendar cal = Calendar.getInstance();
if (date != null) {
cal.setTime(date);
} else {
log.warn("Input date is null, will use current date");
return null;
}
// 对day参数进行基本的有效性检查
if (day < 1 || day > 31) {
log.warn("Day must be between 1 and 31, but found: " + day);
return null;
}
// 如果day大于当月最大天数,则将day设置为当月最大天数,如2月为28日,但是day为31,则将day设置为当月最大天数28
int maxDayOfMonth = cal.getActualMaximum(Calendar.DAY_OF_MONTH);
if (day > maxDayOfMonth) {
day = maxDayOfMonth;
}
cal.set(Calendar.DAY_OF_MONTH, day);
return cal.getTime();
}
public static boolean isDate(String dateText) { public static boolean isDate(String dateText) {
if (dateText == null) { if (dateText == null) {
return true; return true;
...@@ -1937,4 +1969,18 @@ public class DateUtil { ...@@ -1937,4 +1969,18 @@ public class DateUtil {
} }
return false; return false;
} }
/**
* @Author fxj
* @Description 判断 日期 date 是否在 registDate 之后,在返回true,否则返回false
* @Date 15:10 2025/12/12
* @Param
* @return
**/
public static boolean isAfter(Date date, Date registDate) {
if (date.getTime() > registDate.getTime()) {
return true;
}
return false;
}
} }
...@@ -58,4 +58,8 @@ public class BaseSearchVO implements Serializable { ...@@ -58,4 +58,8 @@ public class BaseSearchVO implements Serializable {
private String resultIdFour; private String resultIdFour;
private String resultIdFourStatus; private String resultIdFourStatus;
private String name;
private String type;
} }
...@@ -432,4 +432,19 @@ public class SocialDaprUtils { ...@@ -432,4 +432,19 @@ public class SocialDaprUtils {
return res; return res;
} }
/**
* @Author fxj
* @Description 通过户名称及类型 获取到截止日,然后看是否为工作日,如果不是工作日则往前推,知道找到工作日,然后返回工作日
* @Date 14:22 2025/12/12
* @Param
* @return
**/
public R<THouseHoldLimitInnerVo> getWorkDayByDeadLineDay(BaseSearchVO paramVo) {
R<THouseHoldLimitInnerVo> res = HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId()
,"/thouseholdlimit/inner/checkCanBeHandleByDeadLineDay", paramVo, THouseHoldLimitInnerVo.class, SecurityConstants.FROM_IN);
if (Common.isEmpty(res)){
return R.failed("查询截止日对应的工作日信息失败!");
}
return res;
}
} }
...@@ -255,7 +255,7 @@ public class TEmployeeInsurancePreController { ...@@ -255,7 +255,7 @@ public class TEmployeeInsurancePreController {
* @date 2025-04-11 10:46:12 * @date 2025-04-11 10:46:12
* @return void * @return void
*/ */
@SysLog("每天下午三点二十推送待派单数据") @SysLog("每天下午三点二十或上午11点推送待派单数据")
@Inner @Inner
@PostMapping("/inner/pushDisConfrimInsurances") @PostMapping("/inner/pushDisConfrimInsurances")
public void pushDisConfrimInsurances() { public void pushDisConfrimInsurances() {
......
...@@ -649,7 +649,8 @@ public class TDispatchInfoPre extends BaseEntity { ...@@ -649,7 +649,8 @@ public class TDispatchInfoPre extends BaseEntity {
private String fundPerFlag; private String fundPerFlag;
/** /**
* 起缴日期:0 入职日期 * 起缴日期类型:0 入职日期 1 入职满1个月 2 入职满2个月 3 入职满3个月 4 入职满4个月 5 入职满5个月 6 入职满6个月 7 入职满7个月 8 入职满8个月 9 入职满9个月 10 入职满10个月 11 入职满11个月 12 入职满12个月
* 原:0 入职日期 1 入职满1年次月 2 人员自定义
*/ */
@Length(max = 2, message = "起缴日期:0 入职日期 不能超过2 个字符") @Length(max = 2, message = "起缴日期:0 入职日期 不能超过2 个字符")
@ExcelAttribute(name = "起缴日期:0 入职日期", maxLength = 2) @ExcelAttribute(name = "起缴日期:0 入职日期", maxLength = 2)
...@@ -666,4 +667,14 @@ public class TDispatchInfoPre extends BaseEntity { ...@@ -666,4 +667,14 @@ public class TDispatchInfoPre extends BaseEntity {
@Schema(description = "公积金户ID") @Schema(description = "公积金户ID")
private String configHouseId; private String configHouseId;
/**
* 起缴日期类型:0 入职日期 1 入职满1个月 2 入职满2个月 3 入职满3个月 4 入职满4个月 5 入职满5个月 6 入职满6个月 7 入职满7个月 8 入职满8个月 9 入职满9个月 10 入职满10个月 11 入职满11个月 12 入职满12个月
* 原:0 入职日期
*/
@ExcelAttribute(name = "起缴日期类型", maxLength = 2)
@Length(max = 2, message = "起缴日期类型不能超过2个字符")
@ExcelProperty("起缴日期类型")
@Schema(description = "起缴日期类型:0 入职日期 1 入职满个月 2 入职满2个月 3 入职满3个月 4 入职满4个月 5 入职满5个月 6 入职满6个月 7 入职满7个月 8 入职满8个月 9 入职满9个月 10 入职满10个月 11 入职满11个月 12 入职满12个月")
private String socialDateType;
} }
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
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.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
/**
* 户截止日配置表
*
* @author fxj
* @date 2025-12-11 14:19:54
*/
@Data
@TableName("t_house_hold_limit")
@EqualsAndHashCode(callSuper = true)
@Schema(description = "户截止日配置表")
public class THouseHoldLimit extends BaseEntity {
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@ExcelProperty("主键")
@Schema(description = "主键")
private String id;
/**
* 户名
*/
@ExcelAttribute(name = "户名", maxLength = 50)
@Length(max = 50, message = "户名不能超过50个字符")
@ExcelProperty("户名")
@Schema(description = "户名")
private String name;
/**
* 户类型:0社保 1公积金
*/
@ExcelAttribute(name = "户类型:0社保 1公积金", isNotEmpty = true, errorInfo = "户类型:0社保 1公积金不能为空", maxLength = 255)
@NotBlank(message = "户类型:0社保 1公积金不能为空")
@Length(max = 255, message = "户类型:0社保 1公积金不能超过255个字符")
@ExcelProperty("户类型:0社保 1公积金")
@Schema(description = "户类型:0社保 1公积金")
private String type;
/**
* 缴纳地-省
*/
@ExcelAttribute(name = "缴纳地-省", maxLength = 10)
@Length(max = 10, message = "缴纳地-省不能超过10个字符")
@ExcelProperty("缴纳地-省")
@Schema(description = "缴纳地-省")
private String province;
/**
* 缴纳地-市
*/
@ExcelAttribute(name = "缴纳地-市", maxLength = 10)
@Length(max = 10, message = "缴纳地-市不能超过10个字符")
@ExcelProperty("缴纳地-市")
@Schema(description = "缴纳地-市")
private String city;
/**
* 缴纳地-县
*/
@ExcelAttribute(name = "缴纳地-县", maxLength = 10)
@Length(max = 10, message = "缴纳地-县不能超过10个字符")
@ExcelProperty("缴纳地-县")
@Schema(description = "缴纳地-县")
private String town;
/**
* 户ID
*/
@ExcelAttribute(name = "户ID", maxLength = 32)
@Length(max = 32, message = "户ID不能超过32个字符")
@ExcelProperty("户ID")
@Schema(description = "户ID")
private String houseHoldId;
/**
* 派增截止(日)
*/
@ExcelAttribute(name = "派增截止(日)", isNotEmpty = true, errorInfo = "派增截止(日)不能为空", maxLength = 2)
@NotBlank(message = "派增截止(日)不能为空")
@Length(max = 2, message = "派增截止(日)不能超过2个字符")
@ExcelProperty("派增截止(日)")
@Schema(description = "派增截止(日)")
private String deadLineDay;
/**
* 派增办理规则:0当月办当月生效 1 当月办次月生效
*/
@ExcelAttribute(name = "派增办理规则:0当月办当月生效 1 当月办次月生效", isNotEmpty = true, errorInfo = "派增办理规则:0当月办当月生效 1 当月办次月生效不能为空", maxLength = 2)
@NotBlank(message = "派增办理规则:0当月办当月生效 1 当月办次月生效不能为空")
@Length(max = 2, message = "派增办理规则:0当月办当月生效 1 当月办次月生效不能超过2个字符")
@ExcelProperty("派增办理规则:0当月办当月生效 1 当月办次月生效")
@Schema(description = "派增办理规则:0当月办当月生效 1 当月办次月生效")
private String addHandleRule;
}
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.social.vo;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.HeadFontStyle;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* 户截止日配置表
*
* @author fxj
* @date 2025-12-11 14:19:54
*/
@Data
@Schema(description = "户截止日配置表")
public class THouseHoldLimitExportVo implements Serializable {
/**
* 户名
*/
@ExcelAttribute(name = "户名")
@HeadFontStyle(fontHeightInPoints = 11)
@ColumnWidth(10)
@ExcelProperty("户名")
@Schema(description = "户名")
private String name;
/**
* 户类型:0社保 1公积金
*/
@ExcelAttribute(name = "户类型", isDataId = true,readConverterExp = "0=社保,1=公积金")
@HeadFontStyle(fontHeightInPoints = 11)
@ColumnWidth(10)
@ExcelProperty("户类型")
@Schema(description = "户类型")
private String type;
/**
* 缴纳地
*/
@ExcelAttribute(name = "缴纳地")
@HeadFontStyle(fontHeightInPoints = 11)
@ColumnWidth(10)
@ExcelProperty("缴纳地")
@Schema(description = "缴纳地")
private String province;
/**
* 派增截止(日)
*/
@ExcelAttribute(name = "派增截止(日)")
@HeadFontStyle(fontHeightInPoints = 11)
@ColumnWidth(15)
@ExcelProperty("派增截止(日)")
@Schema(description = "派增截止(日)")
private String deadLineDay;
/**
* 派增办理规则:0当月办当月生效 1 当月办次月生效
*/
@ExcelAttribute(name = "派增办理规则", isDataId = true,readConverterExp = "0=当月办当月生效,1=当月办次月生效")
@ExcelProperty("派增办理规则")
@HeadFontStyle(fontHeightInPoints = 11)
@ColumnWidth(15)
@Schema(description = "派增办理规则")
private String addHandleRule;
/**
* 创建者-姓名
*/
@Schema(description = "配置人")
@HeadFontStyle(fontHeightInPoints = 11)
@ColumnWidth(10)
@ExcelProperty("配置人")
private String createName;
/**
* 更新时间
*/
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
@HeadFontStyle(fontHeightInPoints = 11)
@ColumnWidth(20)
@ExcelProperty("最后一次更新时间")
@Schema(description = "最后一次更新时间")
private LocalDateTime updateTime;
}
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.social.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 户截止日配置表
*
* @author fxj
* @date 2025-12-11 14:19:54
*/
@Data
public class THouseHoldLimitInnerVo extends RowIndex implements Serializable {
/**
* 户名
*/
private String name;
/**
* 户类型:0社保 1公积金
*/
private String type;
/**
* 派增截止(日)
*/
private String deadLineDay;
/**
* 派增办理规则:0当月办当月生效 1 当月办次月生效
*/
private String addHandleRule;
/**
* date
*/
private Date wordDate;
/**
* 是否可办理 true:可办理 false:不可办理
*/
private Boolean canBeHandle;
}
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.social.vo;
import com.yifu.cloud.plus.v1.yifu.social.entity.THouseHoldLimit;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
/**
* 户截止日配置表
*
* @author fxj
* @date 2025-12-11 14:19:54
*/
@Data
public class THouseHoldLimitSearchVo extends THouseHoldLimit {
/**
* 多选导出或删除等操作
*/
@Schema(description = "选中ID,多个逗号分割")
private String ids;
/**
* 更新时间区间 [开始时间,结束时间]
*/
@Schema(description = "更新时间起")
private LocalDateTime updateTimeStart;
/**
* 创建时间区间 [开始时间,结束时间]
*/
@Schema(description = "更新时间止")
private LocalDateTime updateTimeEnd;
/**
* @Author fxj
* 查询数据起
**/
@Schema(description = "查询limit 开始")
private int limitStart;
/**
* @Author fxj
* 查询数据止
**/
@Schema(description = "查询limit 数据条数")
private int limitEnd;
}
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.social.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* 户截止日配置表
*
* @author fxj
* @date 2025-12-11 14:19:54
*/
@Data
public class THouseHoldLimitVo extends RowIndex implements Serializable {
/**
* 户名
*/
@ExcelAttribute(name = "户名",isNotEmpty = true, maxLength = 50)
@Schema(description = "户名")
@ExcelProperty("户名")
private String name;
/**
* 户类型:0社保 1公积金
*/
@ExcelAttribute(name = "户类型", isNotEmpty = true, errorInfo = "户类型不能为空", isDataId = true,readConverterExp = "0=社保,1=公积金")
@Schema(description = "户类型:0社保 1公积金")
@ExcelProperty("户类型")
private String type;
/**
* 派增截止(日)
*/
@ExcelAttribute(name = "派增截止(日)",isInteger = true, isNotEmpty = true, errorInfo = "派增截止(日)不能为空", maxLength = 2)
@Schema(description = "派增截止(日)")
@ExcelProperty("派增截止(日)")
private String deadLineDay;
/**
* 派增办理规则:0当月办当月生效 1 当月办次月生效
*/
@ExcelAttribute(name = "派增办理规则", isNotEmpty = true, errorInfo = "派增办理规则不能为空", isDataId = true,readConverterExp = "0=当月办当月生效,1=当月办次月生效")
@Schema(description = "派增办理规则:0当月办当月生效 1 当月办次月生效")
@ExcelProperty("派增办理规则")
private String addHandleRule;
}
...@@ -371,12 +371,12 @@ public class TDispatchInfoPreController { ...@@ -371,12 +371,12 @@ public class TDispatchInfoPreController {
} }
/** /**
* 每天下午三点二十推送待购买数据 公积金可以通用 * 每天下午三点二十或三点或上午11点推送待购买数据 公积金可以通用
* @author huych * @author huych
* @date 2025-10-11 18:51:58 * @date 2025-10-11 18:51:58
* @return void * @return void
*/ */
@SysLog("每天下午三点二十推送待购买数据") @SysLog("每天下午三点二十或三点或上午11点推送待购买数据")
@Inner @Inner
@PostMapping("/inner/pushDisConfrimSocial") @PostMapping("/inner/pushDisConfrimSocial")
public void pushDisConfrimSocial() { public void pushDisConfrimSocial() {
......
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.social.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.BaseSearchVO;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.social.entity.THouseHoldLimit;
import com.yifu.cloud.plus.v1.yifu.social.service.THouseHoldLimitService;
import com.yifu.cloud.plus.v1.yifu.social.vo.TEmployeeInsuranceWorkDayVo;
import com.yifu.cloud.plus.v1.yifu.social.vo.THouseHoldLimitExportVo;
import com.yifu.cloud.plus.v1.yifu.social.vo.THouseHoldLimitInnerVo;
import com.yifu.cloud.plus.v1.yifu.social.vo.THouseHoldLimitSearchVo;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 户截止日配置表
*
* @author fxj
* @date 2025-12-11 14:19:54
*/
@RestController
@RequiredArgsConstructor
@RequestMapping("/thouseholdlimit")
@Tag(name = "户截止日配置表管理")
public class THouseHoldLimitController {
private final THouseHoldLimitService tHouseHoldLimitService;
private final static String ADD_UPDATE_REPEAT_ERROR = "对应户名及户类型的配置已存在!";
/**
* 简单分页查询
*
* @param page 分页对象
* @param tHouseHoldLimit 户截止日配置表
* @return
*/
@Operation(description = "简单分页查询")
@GetMapping("/page")
public R<IPage<THouseHoldLimit>> getTHouseHoldLimitPage(Page<THouseHoldLimit> page, THouseHoldLimitSearchVo tHouseHoldLimit) {
return new R<>(tHouseHoldLimitService.getTHouseHoldLimitPage(page, tHouseHoldLimit));
}
/**
* 通过id查询户截止日配置表
*
* @param id id
* @return R
*/
@Operation(summary = "通过id查询", description = "通过id查询:hasPermission('social_thouseholdlimit_get')")
@GetMapping("/{id}")
@PreAuthorize("@pms.hasPermission('social_thouseholdlimit_get')")
public R<THouseHoldLimit> getById(@PathVariable("id") String id) {
return R.ok(tHouseHoldLimitService.getById(id));
}
/**
* 通过户名称及类型查询到具体截止日期后去看是否为工作日,如果不是工作日则往前推,知道找到工作日,然后返回工作日
* 如果找不到对应截止日期,则返回null
* @param paramVo:户名称 type: 0 社保、1 公积金
* @return R
*/
@Operation(summary = "户名称及类型查询可用的截止日期", description = "通过户名称及类型查询到具体截止日期后去查询是否为工作日,如果不是工作日则往前推,直到找到工作日,然后返回工作日")
@PostMapping("/getWorkDayByDeadLineDay")
public R<THouseHoldLimitInnerVo> getWorkDayByDeadLineDay(@RequestBody BaseSearchVO paramVo) {
return R.ok(tHouseHoldLimitService.getWorkDayByDeadLineDay(paramVo));
}
/**
* 通过户名称及类型查询到具体截止日期后判断是否为工作日,如果不是工作往前推,直到找到工作日,
* 然后和当前日期进行比较,如果当前日期大于截止日期则返回false,否则返回true
* @param paramVo:name 户名称 type: 0 社保、1 公积金
* @return R
*/
@Inner
@Operation(summary = "户名称及类型查询可用的截止日期", description = "通过户名称及类型查询到具体截止日期后去查询是否为工作日,如果不是工作日则往前推,直到找到工作日,然后返回工作日")
@PostMapping("/inner/getWorkDayByDeadLineDay")
public THouseHoldLimitInnerVo getWorkDayByDeadLineDayInner(@RequestBody BaseSearchVO paramVo) {
return tHouseHoldLimitService.getWorkDayByDeadLineDay(paramVo);
}
/**
* 新增户截止日配置表
*
* @param tHouseHoldLimit 户截止日配置表
* @return R
*/
@Operation(summary = "新增户截止日配置表", description = "新增户截止日配置表:hasPermission('social_thouseholdlimit_add')")
@SysLog("新增户截止日配置表")
@PostMapping
@PreAuthorize("@pms.hasPermission('social_thouseholdlimit_add')")
public R<Boolean> save(@RequestBody THouseHoldLimit tHouseHoldLimit) {
//先查验是否已存在对应户名称和户类型的数据
THouseHoldLimit houseHoldLimit = tHouseHoldLimitService
.getOne(Wrappers.<THouseHoldLimit>query().lambda()
.eq(THouseHoldLimit::getName, tHouseHoldLimit.getName())
.eq(THouseHoldLimit::getType, tHouseHoldLimit.getType())
.last(CommonConstants.LAST_ONE_SQL));
if (null != houseHoldLimit){
return R.failed(ADD_UPDATE_REPEAT_ERROR);
}
return R.ok(tHouseHoldLimitService.save(tHouseHoldLimit));
}
/**
* 修改户截止日配置表
*
* @param tHouseHoldLimit 户截止日配置表
* @return R
*/
@Operation(summary = "修改户截止日配置表", description = "修改户截止日配置表:hasPermission('social_thouseholdlimit_edit')")
@SysLog("修改户截止日配置表")
@PutMapping
@PreAuthorize("@pms.hasPermission('social_thouseholdlimit_edit')")
public R<Boolean> updateById(@RequestBody THouseHoldLimit tHouseHoldLimit) {
if (tHouseHoldLimit.getId() == null){
return R.failed(CommonConstants.PARAM_INFO_ERROR);
}
//先查验是否已存在对应户名称和户类型的数据
THouseHoldLimit houseHoldLimit = tHouseHoldLimitService
.getOne(Wrappers.<THouseHoldLimit>query().lambda()
.eq(THouseHoldLimit::getName, tHouseHoldLimit.getName())
.eq(THouseHoldLimit::getType, tHouseHoldLimit.getType())
.ne(THouseHoldLimit::getId, tHouseHoldLimit.getId())
.last(CommonConstants.LAST_ONE_SQL));
if (null != houseHoldLimit){
return R.failed(ADD_UPDATE_REPEAT_ERROR);
}
return R.ok(tHouseHoldLimitService.updateById(tHouseHoldLimit));
}
/**
* 通过id删除户截止日配置表
*
* @param id id
* @return R
*/
@Operation(summary = "通过id删除户截止日配置表", description = "通过id删除户截止日配置表:hasPermission('social_thouseholdlimit_del')")
@SysLog("通过id删除户截止日配置表")
@DeleteMapping("/{id}")
@PreAuthorize("@pms.hasPermission('social_thouseholdlimit_del')")
public R<Boolean> removeById(@PathVariable String id) {
return R.ok(tHouseHoldLimitService.removeById(id));
}
/**
* 户截止日配置表 批量导入
*
* @author fxj
* @date 2025-12-11 14:19:54
**/
@SneakyThrows
@Operation(description = "批量新增户截止日配置表 hasPermission('social_thouseholdlimit-batch-import')")
@SysLog("批量新增户截止日配置表")
@PostMapping("/importListAdd")
public R<List<ErrorMessage>> importListAdd(@RequestBody MultipartFile file) {
YifuUser user = SecurityUtils.getUser();
if (Common.isEmpty(user)){
return R.failed(CommonConstants.USER_FAIL);
}
return tHouseHoldLimitService.importDiy(file.getInputStream(),user);
}
/**
* 户截止日配置表 批量导出
*
* @author fxj
* @date 2025-12-11 14:19:54
**/
@Operation(description = "导出户截止日配置表 hasPermission('social_thouseholdlimit-export')")
@PostMapping("/export")
public void export(HttpServletResponse response, @RequestBody THouseHoldLimitSearchVo searchVo) {
tHouseHoldLimitService.listExport(response, searchVo);
}
}
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.social.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.social.entity.THouseHoldLimit;
import com.yifu.cloud.plus.v1.yifu.social.vo.THouseHoldLimitExportVo;
import com.yifu.cloud.plus.v1.yifu.social.vo.THouseHoldLimitSearchVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 户截止日配置表
*
* @author fxj
* @date 2025-12-11 14:19:54
*/
@Mapper
public interface THouseHoldLimitMapper extends BaseMapper<THouseHoldLimit> {
/**
* 户截止日配置表简单分页查询
*
* @param tHouseHoldLimit 户截止日配置表
* @return
*/
IPage<THouseHoldLimit> getTHouseHoldLimitPage(Page<THouseHoldLimit> page, @Param("tHouseHoldLimit") THouseHoldLimit tHouseHoldLimit);
List<THouseHoldLimitExportVo> exportDiy(@Param("tHouseHoldLimit")THouseHoldLimitSearchVo searchVo);
int exportCountDiy(@Param("tHouseHoldLimit")THouseHoldLimitSearchVo searchVo);
}
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.social.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.BaseSearchVO;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.social.entity.THouseHoldLimit;
import com.yifu.cloud.plus.v1.yifu.social.vo.TEmployeeInsuranceWorkDayVo;
import com.yifu.cloud.plus.v1.yifu.social.vo.THouseHoldLimitExportVo;
import com.yifu.cloud.plus.v1.yifu.social.vo.THouseHoldLimitInnerVo;
import com.yifu.cloud.plus.v1.yifu.social.vo.THouseHoldLimitSearchVo;
import javax.servlet.http.HttpServletResponse;
import java.io.InputStream;
import java.util.List;
/**
* 户截止日配置表
*
* @author fxj
* @date 2025-12-11 14:19:54
*/
public interface THouseHoldLimitService extends IService<THouseHoldLimit> {
/**
* 户截止日配置表简单分页查询
*
* @param tHouseHoldLimit 户截止日配置表
* @return
*/
IPage<THouseHoldLimit> getTHouseHoldLimitPage(Page<THouseHoldLimit> page, THouseHoldLimitSearchVo tHouseHoldLimit);
R<List<ErrorMessage>> importDiy(InputStream inputStream, YifuUser user);
void listExport(HttpServletResponse response, THouseHoldLimitSearchVo searchVo);
THouseHoldLimitInnerVo getWorkDayByDeadLineDay(BaseSearchVO paramVo);
}
<?xml version="1.0" encoding="UTF-8"?>
<!--
~
~ Copyright (c) 2018-2025, lengleng All rights reserved.
~
~ Redistribution and use in source and binary forms, with or without
~ modification, are permitted provided that the following conditions are met:
~
~ Redistributions of source code must retain the above copyright notice,
~ this list of conditions and the following disclaimer.
~ Redistributions in binary form must reproduce the above copyright
~ notice, this list of conditions and the following disclaimer in the
~ documentation and/or other materials provided with the distribution.
~ Neither the name of the yifu4cloud.com developer nor the names of its
~ contributors may be used to endorse or promote products derived from
~ this software without specific prior written permission.
~ Author: lengleng (wangiegie@gmail.com)
~
-->
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yifu.cloud.plus.v1.yifu.social.mapper.THouseHoldLimitMapper">
<resultMap id="tHouseHoldLimitMap" type="com.yifu.cloud.plus.v1.yifu.social.entity.THouseHoldLimit">
<id property="id" column="ID"/>
<result property="name" column="NAME"/>
<result property="type" column="TYPE"/>
<result property="province" column="PROVINCE"/>
<result property="city" column="CITY"/>
<result property="town" column="TOWN"/>
<result property="houseHoldId" column="HOUSE_HOLD_ID"/>
<result property="deadLineDay" column="DEAD_LINE_DAY"/>
<result property="addHandleRule" column="ADD_HANDLE_RULE"/>
<result property="createBy" column="CREATE_BY"/>
<result property="updateBy" column="UPDATE_BY"/>
<result property="createTime" column="CREATE_TIME"/>
<result property="updateTime" column="UPDATE_TIME"/>
<result property="createName" column="CREATE_NAME"/>
</resultMap>
<resultMap id="tHouseHoldLimitExportMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.THouseHoldLimitExportVo">
<result property="name" column="NAME"/>
<result property="type" column="TYPE"/>
<result property="province" column="PROVINCE"/>
<result property="deadLineDay" column="DEAD_LINE_DAY"/>
<result property="addHandleRule" column="ADD_HANDLE_RULE"/>
<result property="updateTime" column="UPDATE_TIME"/>
<result property="createName" column="CREATE_NAME"/>
</resultMap>
<sql id="Base_Column_List">
a.ID,
a.NAME,
a.TYPE,
a.PROVINCE,
a.CITY,
a.TOWN,
a.HOUSE_HOLD_ID,
a.DEAD_LINE_DAY,
a.ADD_HANDLE_RULE,
a.CREATE_BY,
a.UPDATE_BY,
a.CREATE_TIME,
a.UPDATE_TIME,
a.CREATE_NAME
</sql>
<sql id="tHouseHoldLimit_where">
<if test="tHouseHoldLimit != null">
<if test="tHouseHoldLimit.id != null and tHouseHoldLimit.id.trim() != ''">
AND a.ID = #{tHouseHoldLimit.id}
</if>
<if test="tHouseHoldLimit.name != null and tHouseHoldLimit.name.trim() != ''">
AND a.NAME = #{tHouseHoldLimit.name}
</if>
<if test="tHouseHoldLimit.type != null and tHouseHoldLimit.type.trim() != ''">
AND a.TYPE = #{tHouseHoldLimit.type}
</if>
<if test="tHouseHoldLimit.province != null and tHouseHoldLimit.province.trim() != ''">
AND a.PROVINCE = #{tHouseHoldLimit.province}
</if>
<if test="tHouseHoldLimit.city != null and tHouseHoldLimit.city.trim() != ''">
AND a.CITY = #{tHouseHoldLimit.city}
</if>
<if test="tHouseHoldLimit.town != null and tHouseHoldLimit.town.trim() != ''">
AND a.TOWN = #{tHouseHoldLimit.town}
</if>
<if test="tHouseHoldLimit.houseHoldId != null and tHouseHoldLimit.houseHoldId.trim() != ''">
AND a.HOUSE_HOLD_ID = #{tHouseHoldLimit.houseHoldId}
</if>
<if test="tHouseHoldLimit.deadLineDay != null and tHouseHoldLimit.deadLineDay.trim() != ''">
AND a.DEAD_LINE_DAY = #{tHouseHoldLimit.deadLineDay}
</if>
<if test="tHouseHoldLimit.addHandleRule != null and tHouseHoldLimit.addHandleRule.trim() != ''">
AND a.ADD_HANDLE_RULE = #{tHouseHoldLimit.addHandleRule}
</if>
<if test="tHouseHoldLimit.createBy != null and tHouseHoldLimit.createBy.trim() != ''">
AND a.CREATE_BY = #{tHouseHoldLimit.createBy}
</if>
<if test="tHouseHoldLimit.updateBy != null and tHouseHoldLimit.updateBy.trim() != ''">
AND a.UPDATE_BY = #{tHouseHoldLimit.updateBy}
</if>
<if test="tHouseHoldLimit.createTime != null">
AND a.CREATE_TIME = #{tHouseHoldLimit.createTime}
</if>
<if test="tHouseHoldLimit.updateTime != null">
AND a.UPDATE_TIME = #{tHouseHoldLimit.updateTime}
</if>
<if test="tHouseHoldLimit.updateTimeEnd != null">
AND a.UPDATE_TIME <![CDATA[<=]]> #{tHouseHoldLimit.updateTimeEnd}
</if>
<if test="tHouseHoldLimit.updateTimeStart != null">
AND a.UPDATE_TIME <![CDATA[>=]]> #{tHouseHoldLimit.updateTimeStart}
</if>
<if test="tHouseHoldLimit.createName != null and tHouseHoldLimit.createName.trim() != ''">
AND a.CREATE_NAME = #{tHouseHoldLimit.createName}
</if>
</if>
</sql>
<!--tHouseHoldLimit简单分页查询-->
<select id="getTHouseHoldLimitPage" resultMap="tHouseHoldLimitMap">
SELECT
<include refid="Base_Column_List"/>
FROM t_house_hold_limit a
<where>
1=1
<include refid="tHouseHoldLimit_where"/>
</where>
</select>
<select id="exportCountDiy" resultType="int">
SELECT
count(1)
FROM t_house_hold_limit a
<where>
1=1
<include refid="tHouseHoldLimit_where"/>
</where>
</select>
<select id="exportDiy" resultMap="tHouseHoldLimitExportMap">
SELECT
a.NAME,
a.TYPE,
CONCAT_WS('-',p.AREA_NAME,c.AREA_NAME,t.AREA_NAME) as 'PROVINCE',
a.DEAD_LINE_DAY,
a.ADD_HANDLE_RULE,
a.UPDATE_TIME,
a.CREATE_NAME
FROM t_house_hold_limit a
LEFT JOIN sys_area p on p.id=a.PROVINCE
LEFT JOIN sys_area c on c.id=a.CITY
LEFT JOIN sys_area t on t.id=a.TOWN
<where>
1=1
<include refid="tHouseHoldLimit_where"/>
<if test="tHouseHoldLimit != null">
<if test="tHouseHoldLimit.limitStart != null">
limit #{tHouseHoldLimit.limitStart},#{tHouseHoldLimit.limitEnd}
</if>
</if>
</where>
</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