Commit fb48a769 authored by hongguangwu's avatar hongguangwu

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

parents 1c39ce53 3d1b27b8
......@@ -266,6 +266,10 @@ public interface CommonConstants {
char DOWN_LINE_CHAR ='_';
// 冒号 :
String COLON_STRING =":";
// 分号 ;
String SEMICOLON_STRING = ";";
// - 横 分割线 中
String CENTER_SPLIT_LINE_STRING = "-";
// 斜杠
......
......@@ -217,4 +217,13 @@ public class ExcelAttributeConstants {
public static final String GZ_PROBATION = "gz_probation";
// 瓜子的星座
public static final String GZ_CONSTEL = "gz_constel";
// 社保缴纳月份
public static final String SOCIAL_MONTH_TYPE = "social_month_type";
// 社保可补交月份
public static final String SOCIAL_OVERPAY_MOTH = "social_overpay_month";
// 公积金单边小数点
public static final String FUND_POINT_TYPE = "fund_point_type";
}
......@@ -766,4 +766,48 @@ public class Common {
}
return R.ok(errorMessageList);
}
/**
* 创建一个包含指定元素的Set集合
*
* @param elements 要包含在Set中的元素
* @param <T> 元素类型
* @return 包含指定元素的Set集合
*/
public static <T> Set<T> getSet(T... elements) {
Set<T> set = new HashSet<>();
if (elements != null) {
Collections.addAll(set, elements);
}
return set;
}
/**
* 校验字符串是否符合格式 10,10;12,13
* @param str 待校验的字符串
* @return 符合格式返回true,否则返回false
*/
public static boolean validateFormat(String str) {
// 如果字符串为空或null,则不符合格式
if (str == null || str.isEmpty()) {
return false;
}
// 使用正则表达式匹配格式
// 格式要求: 数字,数字;数字,数字;...
// 其中数字为一个或多个数字字符
return str.matches("\\d+,\\d+(;\\d+,\\d+)*");
}
/**
* 校验字符串是否符合格式 2025-11
* @param str 待校验的字符串
* @return 符合格式返回true,否则返回false
*/
public static boolean validateFormatYearMonth(String str) {
// 如果字符串为空或null,则不符合格式
if (str == null || str.isEmpty()) {
return false;
}
return str.matches("\\d{4}-\\d{2}");
}
}
......@@ -1201,6 +1201,52 @@ public class DateUtil {
return str;
}
/**
* 获取指定月份
* @Author fxj
* @Date 2019-10-16
* @param yearMonth 格式 :LocalDateTime
* @param i
* @return
* @Description (获取指定日期后指定 ( i)个月的时间YYYYMM)
**/
public static String getYearAndMonth(Date yearMonth, int i){
String str ="";
if(yearMonth != null) {
Calendar c1 = Calendar.getInstance();
c1.setTime(yearMonth);
c1.set(Calendar.DAY_OF_MONTH, 1);
c1.set(Calendar.MONTH, c1.get(Calendar.MONTH) + i);
int year = c1.get(Calendar.YEAR);
int month = c1.get(Calendar.MONTH) + 1; // Calendar month is 0-based, convert to 1-based
str = year + (month < 10 ? "0" + month : Integer.toString(month));
}
return str;
}
/**
* 获取指定月份
* @Author fxj
* @Date 2019-10-16
* @param yearMonth 格式 :LocalDateTime
* @param i
* @return
* @Description (获取指定日期后指定 ( i)个月的时间YYYYMM)
**/
public static String getYearAndMonth(Date yearMonth, int i,String split){
String str ="";
if(yearMonth != null) {
Calendar c1 = Calendar.getInstance();
c1.setTime(yearMonth);
c1.set(Calendar.DAY_OF_MONTH, 1);
c1.set(Calendar.MONTH, c1.get(Calendar.MONTH) + i);
int year = c1.get(Calendar.YEAR);
int month = c1.get(Calendar.MONTH) + 1; // Calendar month is 0-based, convert to 1-based
str = year +split+ (month < 10 ? "0" + month : Integer.toString(month));
}
return str;
}
/**
* @param i 加减年份
* @Description: 获取当前年月,对年月加减(yyyyMM)
......
package com.yifu.cloud.plus.v1.yifu.social.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.HeadFontStyle;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.social.entity.SysPayProportion;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
* @Author fxj
* @Date 2025/10/11
* @Description
* @Version 1.0
*/
@Data
public class SysBaseSetFundExportVo implements Serializable {
/**
* 公积金户
*/
@ExcelAttribute(name = "公积金户",isNotEmpty = true)
@Schema(description = "公积金户")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("公积金户")
private String departName;
/**
* 公积金类型 0.市直 1. 省直
*/
@ExcelAttribute(name = "公积金类型",isNotEmpty = true,readConverterExp = "0=市直,1=省直")
@Schema(description = "公积金类型 0.市直 1. 省直")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("公积金类型")
private String fundPayType;
/**
* 公积金缴纳地:安徽省-合肥市-肥东县
*/
@ExcelAttribute(name = "公积金缴纳地",isNotEmpty = true)
@Schema(description = "公积金缴纳地")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("公积金缴纳地")
private String provinceStr;
/**
* 0.在用1.终止2过期
*/
@ExcelAttribute(name = "状态",readConverterExp = "0=在用,1=终止,2=过期")
@Schema(description = "状态")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("状态")
private String status;
/**
* 适用周期
*/
@ExcelAttribute(name = "适用周期")
@Schema(description = "适用周期")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("适用周期")
private String applyStartDate;
/**
* 执行月份
*/
@ExcelAttribute(name = "执行月份",isNotEmpty = true)
@Schema(description = "执行月份")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("执行月份")
private String doMonth;
/**
* 基数下限
*/
@ExcelAttribute(name = "基数下限",isNotEmpty = true)
@Schema(description = "基数下限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("基数下限")
private BigDecimal lowerLimit;
/**
* 基数上限
*/
@ExcelAttribute(name = "基数上限",isNotEmpty = true)
@Schema(description = "基数上限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("基数上限")
private BigDecimal upperLimit;
/**
* 单边小数点:1:四舍五入取整 2:元以下舍去 3:见角进元 4:保留两位小数 5:保留一位小数 6:见分进元
*/
@ExcelAttribute(name = "单边小数点",isNotEmpty = true,readConverterExp = "1=四舍五入取整,2=元以下舍去,3=见角进元,4=保留两位小数,5=保留一位小数,6=见分进元")
@Schema(description = "单边小数点")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单边小数点")
private String fundPayPoint;
/**
* 单位公积金比例,个人公积金比例:10,10;12,13
*/
@ExcelAttribute(name = "单位公积金比例,个人公积金比例",isNotEmpty = true)
@Schema(description = "单位公积金比例,个人公积金比例")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位公积金比例,个人公积金比例")
private String housingFundPro;
/**
* 是否可以补缴: 0:是,1:否
*/
@ExcelAttribute(name = "是否可补缴",isNotEmpty = true,readConverterExp = "0=是,1=否")
@Schema(description = "是否可补缴: 0:是,1:否")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("是否可补缴")
private String canOverpay;
/**
* 最大补缴期限:1:一月、2:二月 ...... 12:十二月
*/
@ExcelAttribute(name = "最大补缴期限",readConverterExp = "1=一个月,2=二个月,3=三个月,4=四个月,5=五个月,6=六个月,7=七个月,8=八个月,9=九个月,10=十个月,11=十一个月,12=十二个月")
@Schema(description = "最大补缴期限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("最大补缴期限")
private String overpayNumber;
/**
* 是否含起缴当月: 0:是,1:否
*/
@ExcelAttribute(name = "是否含起缴当月",readConverterExp = "0=是,1=否")
@Schema(description = "是否含起缴当月: 0:是,1:否")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("是否含起缴当月")
private String haveThisMonth;
/**
* 补缴基数:0:最新基数、1:当期基数
*/
@ExcelAttribute(name = "补缴基数",readConverterExp = "0=最新基数,1=当期基数")
@Schema(description = "补缴基数")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("补缴基数")
private String insuranceIsLatestCardinality;
/**
* 补缴政策
*/
@ExcelAttribute(name = "补缴政策")
@Schema(description = "补缴政策")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("补缴政策")
private String payPolicy;
}
package com.yifu.cloud.plus.v1.yifu.social.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.HeadFontStyle;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex;
import com.yifu.cloud.plus.v1.yifu.social.entity.SysPayProportion;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
* @Author fxj
* @Date 2025/11/14
* @Description
* @Version 1.0
*/
@Data
public class SysBaseSetFundInsertVo extends RowIndex implements Serializable {
/**
* 公积金户
*/
@ExcelAttribute(name = "公积金户",isNotEmpty = true)
@Schema(description = "公积金户")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("公积金户")
private String departName;
/**
* 公积金缴纳地:安徽省-合肥市-肥东县
*/
@ExcelAttribute(name = "公积金缴纳地",isNotEmpty = true)
@Schema(description = "公积金缴纳地")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("公积金缴纳地")
private String provinceStr;
/**
* 公积金类型 0.市直 1. 省直
*/
@ExcelAttribute(name = "公积金类型",isNotEmpty = true,readConverterExp = "0=市直,1=省直")
@Schema(description = "公积金类型 0.市直 1. 省直")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("公积金类型")
private String fundPayType;
/**
* 适用起始月份
*/
@ExcelAttribute(name = "适用起始月份",isNotEmpty = true)
@Schema(description = "适用起始月份")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("适用起始月份")
private String applyStartDate;
/**
* 执行月份
*/
@ExcelAttribute(name = "执行月份",isNotEmpty = true)
@Schema(description = "执行月份")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("执行月份")
private String doMonth;
/**
* 基数上限
*/
@ExcelAttribute(name = "基数上限",isNotEmpty = true)
@Schema(description = "基数上限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("基数上限")
private BigDecimal upperLimit;
/**
* 基数下限
*/
@ExcelAttribute(name = "基数下限",isNotEmpty = true)
@Schema(description = "基数下限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("基数下限")
private BigDecimal lowerLimit;
/**
* 单边小数点:1:四舍五入取整 2:元以下舍去 3:见角进元 4:保留两位小数 5:保留一位小数 6:见分进元
*/
@ExcelAttribute(name = "单边小数点",isDataId = true,dataType = ExcelAttributeConstants.FUND_POINT_TYPE,isNotEmpty = true,readConverterExp = "1=四舍五入取整,2=元以下舍去,3=见角进元,4=保留两位小数,5=保留一位小数,6=见分进元")
@Schema(description = "单边小数点")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单边小数点")
private String fundPayPoint;
/**
* 单位公积金比例,个人公积金比例:10,10;12,13
*/
@ExcelAttribute(name = "单位公积金比例,个人公积金比例",isNotEmpty = true)
@Schema(description = "单位公积金比例,个人公积金比例")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位公积金比例,个人公积金比例")
private String housingFundPro;
/**
* 是否可以补缴: 0:是,1:否
*/
@ExcelAttribute(name = "是否可补缴",isNotEmpty = true,readConverterExp = "0=是,1=否")
@Schema(description = "是否可补缴: 0:是,1:否")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("是否可补缴")
private String canOverpay;
/**
* 最大补缴期限:1:一月、2:二月 ...... 12:十二月
*/
@ExcelAttribute(name = "最大补缴期限",isDataId = true,dataType = ExcelAttributeConstants.SOCIAL_OVERPAY_MOTH,readConverterExp = "1=一个月,2=二个月,3=三个月,4=四个月,5=五个月,6=六个月,7=七个月,8=八个月,9=九个月,10=十个月,11=十一个月,12=十二个月")
@Schema(description = "最大补缴期限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("最大补缴期限")
private String overpayNumber;
/**
* 是否含起缴当月: 0:是,1:否
*/
@ExcelAttribute(name = "是否含起缴当月",readConverterExp = "0=是,1=否")
@Schema(description = "是否含起缴当月: 0:是,1:否")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("是否含起缴当月")
private String haveThisMonth;
/**
* 补缴基数:0:最新基数、1:当期基数
*/
@ExcelAttribute(name = "补缴基数",readConverterExp = "0=最新基数,1=当期基数")
@Schema(description = "补缴基数")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("补缴基数")
private String insuranceIsLatestCardinality;
/**
* 补缴政策
*/
@ExcelAttribute(name = "补缴政策")
@Schema(description = "补缴政策")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("补缴政策")
private String payPolicy;
}
/*
* 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 io.swagger.v3.oas.annotations.media.Schema;
import com.yifu.cloud.plus.v1.yifu.social.entity.SysBaseSetInfo;
import lombok.Data;
import java.time.LocalDateTime;
/**
* 基数设置表
*
* @author fxj
* @date 2025-11-04 14:50:51
*/
@Data
public class SysBaseSetInfoSearchVo extends SysBaseSetInfo{
/**
* 多选导出或删除等操作
*/
@Schema(description = "选中ID,多个逗号分割")
private String ids;
/**
* 创建时间区间 [开始时间,结束时间]
*/
@Schema(description = "创建时间区间")
private LocalDateTime[] createTimes;
/**
* @Author fxj
* 查询数据起
**/
@Schema(description = "查询limit 开始")
private int limitStart;
/**
* @Author fxj
* 查询数据止
**/
@Schema(description = "查询limit 数据条数")
private int limitEnd;
}
......@@ -21,6 +21,7 @@ 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.ErrorMessage;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.core.util.bean.BeanCopyUtils;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
......@@ -30,13 +31,17 @@ import com.yifu.cloud.plus.v1.yifu.social.entity.SysBaseSetInfo;
import com.yifu.cloud.plus.v1.yifu.social.entity.SysPayProportion;
import com.yifu.cloud.plus.v1.yifu.social.service.SysBaseSetInfoService;
import com.yifu.cloud.plus.v1.yifu.social.service.SysPayProportionService;
import com.yifu.cloud.plus.v1.yifu.social.vo.SysBaseSetInfoSearchVo;
import com.yifu.cloud.plus.v1.yifu.social.vo.SysBaseSetInfoVo;
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;
......@@ -194,4 +199,53 @@ public class SysBaseSetInfoController {
BeanCopyUtils.copyProperties(baseSetInfo,sysBaseSetInfoVo);
return sysBaseSetInfoVo;
}
/**
* 基数设置表 批量导入社保基数
*
* @author fxj
* @Date 2025-11-04 14:50:51
**/
@SneakyThrows
@Operation(description = "批量新增社保基数设置表")
@SysLog("批量新增社保基数设置表")
@PostMapping("/importListAddSocial")
public R<List<ErrorMessage>> importListAddSocial(@RequestBody MultipartFile file){
return sysBaseSetInfoService.importSocialDiy(file.getInputStream());
}
/**
* 基数设置表 批量导出社保基数
* @author fxj
* @Date 2025-11-04 14:50:51
**/
@Operation(description = "导出社保基数设置表")
@PostMapping("/exportSocial")
public void exportSocial(HttpServletResponse response, @RequestBody SysBaseSetInfo searchVo) {
sysBaseSetInfoService.listSocialExport(response,searchVo);
}
/**
* 基数设置表 批量导入公积金基数
*
* @author fxj
* @Date 2025-11-04 14:50:51
**/
@SneakyThrows
@Operation(description = "批量新增公积金基数设置表")
@SysLog("批量新增公积金基数设置表")
@PostMapping("/importListAddFund")
public R<List<ErrorMessage>> importListAddFund(@RequestBody MultipartFile file){
return sysBaseSetInfoService.importFundDiy(file.getInputStream());
}
/**
* 基数设置表 批量导出公积金基数
* @author fxj
* @Date 2025-11-04 14:50:51
**/
@Operation(description = "导出公积金基数设置表")
@PostMapping("/exportFund")
public void exportFund(HttpServletResponse response, @RequestBody SysBaseSetInfo searchVo) {
sysBaseSetInfoService.listFundExport(response,searchVo);
}
}
......@@ -21,6 +21,8 @@ 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.SysBaseSetInfo;
import com.yifu.cloud.plus.v1.yifu.social.vo.SysBaseSetFundExportVo;
import com.yifu.cloud.plus.v1.yifu.social.vo.SysBaseSetSocialExportVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
......@@ -42,6 +44,10 @@ public interface SysBaseSetInfoMapper extends BaseMapper<SysBaseSetInfo> {
*/
IPage<SysBaseSetInfo> getSysBaseSetInfoPage(Page<SysBaseSetInfo> page, @Param("sysBaseSetInfo") SysBaseSetInfo sysBaseSetInfo);
List<SysBaseSetSocialExportVo> noPageSocialDiy(@Param("sysBaseSetInfo") SysBaseSetInfo sysBaseSetInfo);
List<SysBaseSetFundExportVo> noPageFundDiy(@Param("sysBaseSetInfo") SysBaseSetInfo sysBaseSetInfo);
List<SysBaseSetInfo> getAllByEntity(@Param("sysBaseSetInfo")SysBaseSetInfo sysBaseSetInfo);
/**
......
......@@ -80,4 +80,5 @@ public interface SysHouseHoldInfoMapper extends BaseMapper<SysHouseHoldInfo> {
**/
List<SysHouseHoldInfo> getHouseInfoAutoDoc();
List<SysHouseHoldInfo> getSysHouseHoldNoPage(@Param("sysHouseHoldInfo")SysHouseHoldInfo enity);
}
......@@ -20,9 +20,14 @@ 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.social.entity.SysBaseSetInfo;
import com.yifu.cloud.plus.v1.yifu.social.vo.SysBaseSetInfoSearchVo;
import javax.servlet.http.HttpServletResponse;
import java.io.InputStream;
import java.util.List;
import java.util.Map;
/**
......@@ -68,4 +73,14 @@ public interface SysBaseSetInfoService extends IService<SysBaseSetInfo> {
Map<String, SysBaseSetInfo> getSysBaseSetInfoMap(String baseType);
R<Boolean> updateByIdAsso(String id,int status);
R<List<ErrorMessage>> importSocialDiy(InputStream inputStream);
void listSocialExport(HttpServletResponse response, SysBaseSetInfo searchVo);
R<List<ErrorMessage>> importFundDiy(InputStream inputStream);
void listFundExport(HttpServletResponse response, SysBaseSetInfo searchVo);
}
......@@ -464,4 +464,119 @@
</where>
limit 1
</select>
<select id="noPageSocialDiy" resultType="com.yifu.cloud.plus.v1.yifu.social.vo.SysBaseSetSocialExportVo">
select
a.DEPART_NAME departName,
CONCAT_WS('-',
CASE WHEN a1.id is NOT NULL THEN a1.AREA_NAME ELSE NULL END,
CASE WHEN a2.id is NOT NULL THEN a2.AREA_NAME ELSE NULL END,
CASE WHEN a3.id is NOT NULL THEN a3.AREA_NAME ELSE NULL END
) as province,
a.STATUS 'status',
CONCAT(a.APPLY_START_DATE,'~',IF(a.APPLY_END_DATE is NULL,"永久",a.APPLY_END_DATE)) applyStartDate,
a.APPLY_START_DATE applyStartDate,
a.DO_MONTH doMonth,
a.IS_SAME_BASE isSameBase,
a.LOWER_PERSION lowerPersion,
a.UP_PERSION upPersion,
a.LOWER_INJURY lowerInjury,
a.UP_INJURY upInjury,
a.LOWER_MEDICAL lowerMedical,
a.UP_MEDICAL upMedical,
a.LOWER_BIRTH lowerBirth,
a.UP_BIRTH upBirth,
a.LOWER_UNEMPLOYMENT lowerUnemployment,
a.UP_UNEMPLOYMENT upUnemployment,
a.LOWER_BIG lowerBig,
a.UP_BIG upBig,
a.IS_ILLNESS isIllness,
a.COLLECT_TYPE collectType,
a.IS_CHARGE_PERSONAL isChargePersonal,
a.COLLECT_MOTH collectMoth,
a.VALUE_TYPE valueType,
a.CHARGE_COMPANY chargeCompany,
a.CHARGE_PERSONAL chargePersonal,
a.UNIT_MEDICAL_PRO unitMedicalPro,
a.PERSONAL_MEDICAL_PRO personalMedicalPro,
a.UNIT_BIRTH_PRO unitBirthPro,
a.UNIT_PERSION_PRO unitPersionPro,
a.PERSONAL_PERSION_PRO personalPersionPro,
a.UNIT_INJURY_PRO unitInjuryPro,
a.UNIT_UNEMPLOYMENT_PRO unitUnemploymentPro,
a.PERSONAL_UNEMPLOYMENT_PRO personalUnemploymentPro,
a.PAY_COMPANY_PRO payCompanyPro,
a.PAY_PERSONAL_PRO payPersonalPro,
a.CAN_OVERPAY canOverpay,
a.UNIT_PRO_SUM unitProSum,
a.PERSONAL_PRO_SUM personalProSum,
CONCAT_WS(',',
CASE WHEN a.INSURANCE_PENSION=0 THEN '养老' ELSE NULL END,
CASE WHEN a.INSURANCE_MEDICAL=0 THEN '医疗' ELSE NULL END,
CASE WHEN a.INSURANCE_INJURY=0 THEN '工伤' ELSE NULL END,
CASE WHEN a.INSURANCE_UNEMPLOYMENT=0 THEN '失业' ELSE NULL END,
CASE WHEN a.INSURANCE_BIRTH=0 THEN '生育' ELSE NULL END,
CASE WHEN a.INSURANCE_BIGAILMENT=0 THEN '大病' ELSE NULL END
) as insurancePension,
a.OVERPAY_NUMBER overpayNumber,
a.HAVE_THIS_MONTH haveThisMonth,
a.INSURANCE_IS_LATEST_CARDINALITY insuranceIsLatestCardinality,
a.PAY_POLICY payPolicy
FROM sys_base_set_info a
LEFT JOIN sys_area a1 on a1.id=a.PROVINCE
LEFT JOIN sys_area a2 on a2.id=a.CITY
LEFT JOIN sys_area a3 on a3.id=a.TOWN
<where>
a.DELETE_FLAG='0'
and a.BASE_TYPE ='0'
<include refid="sysBaseSetInfo_where"/>
</where>
order by a.CREATE_TIME desc
</select>
<select id="noPageFundDiy" resultType="com.yifu.cloud.plus.v1.yifu.social.vo.SysBaseSetFundExportVo">
select
a.DEPART_NAME departName,
a.FUND_PAY_TYPE fundPayType,
CONCAT_WS('-',
CASE WHEN a1.id is NOT NULL THEN a1.AREA_NAME ELSE NULL END,
CASE WHEN a2.id is NOT NULL THEN a2.AREA_NAME ELSE NULL END,
CASE WHEN a3.id is NOT NULL THEN a3.AREA_NAME ELSE NULL END
) as provinceStr,
a.STATUS 'status',
CONCAT(a.APPLY_START_DATE,'~',IF(a.APPLY_END_DATE is NULL,"永久",a.APPLY_END_DATE)) applyStartDate,
a.DO_MONTH doMonth,
a.LOWER_LIMIT lowerLimit,
a.UPPER_LIMIT upperLimit,
a.FUND_PAY_POINT fundPayPoint,
fp.pro housingFundPro,
a.CAN_OVERPAY canOverpay,
a.OVERPAY_NUMBER overpayNumber,
a.HAVE_THIS_MONTH haveThisMonth,
a.INSURANCE_IS_LATEST_CARDINALITY insuranceIsLatestCardinality,
a.PAY_POLICY payPolicy
FROM sys_base_set_info a
LEFT JOIN sys_area a1 on a1.id=a.PROVINCE
LEFT JOIN sys_area a2 on a2.id=a.CITY
LEFT JOIN sys_area a3 on a3.id=a.TOWN
LEFT JOIN
(select GROUP_CONCAT(CONCAT(
CASE
WHEN p.COMPANY_PRO = TRUNCATE(p.COMPANY_PRO, 0) THEN FORMAT(p.COMPANY_PRO, 0)
ELSE FORMAT(p.COMPANY_PRO, 2)
END,
',',
CASE
WHEN p.PERSONAL_PRO = TRUNCATE(p.PERSONAL_PRO, 0) THEN FORMAT(p.PERSONAL_PRO, 0)
ELSE FORMAT(p.PERSONAL_PRO, 2)
END) SEPARATOR ';') as pro,p.SYS_BASE_SET_ID from sys_pay_proportion p GROUP BY p.SYS_BASE_SET_ID)
fp on fp.SYS_BASE_SET_ID=a.ID
<where>
a.DELETE_FLAG='0'
and a.BASE_TYPE ='1'
<include refid="sysBaseSetInfo_where"/>
</where>
order by a.CREATE_TIME desc
</select>
</mapper>
......@@ -198,6 +198,18 @@
order by a.CREATE_TIME desc
</select>
<!--sysHouseHoldInfo简单分页查询-->
<select id="getSysHouseHoldNoPage" resultMap="sysHouseHoldInfoMap">
SELECT
<include refid="Base_Column_List"/>
FROM sys_house_hold_info a
<where>
1=1
<include refid="sysHouseHoldInfo_where"/>
</where>
order by a.CREATE_TIME desc
</select>
<!--sysHouseHoldInfo简单分页查询-->
<select id="getAllSingleSocailPage" resultMap="sysHouseHoldSingleInfoMap">
SELECT
......
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