档案、社保基数

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeExportVO.java

@@ -214,4 +214,8 @@ public class EmployeeExportVO extends BaseEntity {
 	@ExcelProperty(value = "单位编码")
 	private String unitNo;
 
+	@ExcelAttribute(name = "人员档案状态", readConverterExp = "0=草稿,1=已审核")
+	@ExcelProperty(value = "人员档案状态")
+	private String status;
+
 }

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml

@@ -123,6 +123,7 @@
 		<result property="leaveTime" column="LEAVE_TIME"/>
 		<result property="leaveReason" column="LEAVE_REASON"/>
 		<result property="leaveRemark" column="LEAVE_REMARK"/>
+		<result property="status" column="STATUS"/>
 	</resultMap>
 
 	<sql id="baseParam">
@@ -216,6 +217,7 @@
 		a.SALARY_STATUS,
 		a.CREATE_NAME,
 		a.CREATE_TIME,
+		a.STATUS,
 		a.CONTACT_ADDRESS
 	</sql>
 

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/SysBaseSetInfo.java

@@ -452,6 +452,15 @@ public class SysBaseSetInfo extends BaseEntity {
 	@ExcelProperty("社保户名称")
 	private String departName;
 
+	@ExcelAttribute(name = "执行月份")
+	@Schema(description = "执行月份")
+	@ExcelProperty("执行月份")
+	private String doMonth;
+
+	@Schema(description = "适用月")
+	@TableField(exist = false)
+	private String applyDate;
+
 	@Schema(description = "公积金比例List（保存时前端传参用）")
 	@TableField(exist = false)
 	private List<SysPayProportion> fundProList;

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/SysBaseSetInfoServiceImpl.java

@@ -34,6 +34,7 @@ import com.yifu.cloud.plus.v1.yifu.social.service.TSocialLogService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -68,13 +69,28 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
 			return R.failed("获取用户登录信息失败！");
 		}
 		SysBaseSetInfo baseSetInfo = null;
+		SysBaseSetInfo lastBase = null;
 		if (null != sysBaseSetInfo.getTown()) {
 			baseSetInfo = this.getOne(Wrappers.<SysBaseSetInfo>query().lambda()
 					.eq(SysBaseSetInfo::getBaseType, sysBaseSetInfo.getBaseType())
 					.eq(SysBaseSetInfo::getDepartId, sysBaseSetInfo.getDepartId())
 					.eq(SysBaseSetInfo::getTown, sysBaseSetInfo.getTown())
-					.le(SysBaseSetInfo::getApplyStartDate, sysBaseSetInfo.getApplyStartDate())
-					.ge(SysBaseSetInfo::getApplyEndDate, sysBaseSetInfo.getApplyStartDate())
+					.and(obj -> obj
+							.and(obj1 -> obj1
+									.le(SysBaseSetInfo::getApplyStartDate, sysBaseSetInfo.getApplyStartDate())
+									.and(obj2 -> obj2
+											.ge(SysBaseSetInfo::getApplyEndDate, sysBaseSetInfo.getApplyStartDate())
+											.or()
+											.isNull(SysBaseSetInfo::getApplyEndDate)))
+							.or()
+							.ge(SysBaseSetInfo::getApplyEndDate, sysBaseSetInfo.getApplyStartDate()))
+					.last(CommonConstants.LAST_ONE_SQL));
+
+			lastBase = this.getOne(Wrappers.<SysBaseSetInfo>query().lambda()
+					.eq(SysBaseSetInfo::getBaseType, sysBaseSetInfo.getBaseType())
+					.eq(SysBaseSetInfo::getDepartId, sysBaseSetInfo.getDepartId())
+					.eq(SysBaseSetInfo::getTown, sysBaseSetInfo.getTown())
+					.isNull(SysBaseSetInfo::getApplyEndDate)
 					.last(CommonConstants.LAST_ONE_SQL));
 		}
 		if (null != sysBaseSetInfo.getCity() && null == sysBaseSetInfo.getTown()) {
@@ -83,8 +99,23 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
 					.eq(SysBaseSetInfo::getDepartId, sysBaseSetInfo.getDepartId())
 					.eq(SysBaseSetInfo::getCity, sysBaseSetInfo.getCity())
 					.isNull(SysBaseSetInfo::getTown)
-					.le(SysBaseSetInfo::getApplyStartDate, sysBaseSetInfo.getApplyStartDate())
-					.ge(SysBaseSetInfo::getApplyEndDate, sysBaseSetInfo.getApplyStartDate())
+					.and(obj -> obj
+							.and(obj1 -> obj1
+									.le(SysBaseSetInfo::getApplyStartDate, sysBaseSetInfo.getApplyStartDate())
+									.and(obj2 -> obj2
+											.ge(SysBaseSetInfo::getApplyEndDate, sysBaseSetInfo.getApplyStartDate())
+											.or()
+											.isNull(SysBaseSetInfo::getApplyEndDate)))
+							.or()
+							.ge(SysBaseSetInfo::getApplyEndDate, sysBaseSetInfo.getApplyStartDate()))
+					.last(CommonConstants.LAST_ONE_SQL));
+
+			lastBase = this.getOne(Wrappers.<SysBaseSetInfo>query().lambda()
+					.eq(SysBaseSetInfo::getBaseType, sysBaseSetInfo.getBaseType())
+					.eq(SysBaseSetInfo::getDepartId, sysBaseSetInfo.getDepartId())
+					.eq(SysBaseSetInfo::getCity, sysBaseSetInfo.getCity())
+					.isNull(SysBaseSetInfo::getTown)
+					.isNull(SysBaseSetInfo::getApplyEndDate)
 					.last(CommonConstants.LAST_ONE_SQL));
 		}
 		if (null != sysBaseSetInfo.getProvince() && null == sysBaseSetInfo.getCity()) {
@@ -93,14 +124,34 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
 					.eq(SysBaseSetInfo::getDepartId, sysBaseSetInfo.getDepartId())
 					.eq(SysBaseSetInfo::getProvince, sysBaseSetInfo.getProvince())
 					.isNull(SysBaseSetInfo::getCity)
-					.le(SysBaseSetInfo::getApplyStartDate, sysBaseSetInfo.getApplyStartDate())
-					.ge(SysBaseSetInfo::getApplyEndDate, sysBaseSetInfo.getApplyStartDate())
+					.and(obj -> obj
+							.and(obj1 -> obj1
+									.le(SysBaseSetInfo::getApplyStartDate, sysBaseSetInfo.getApplyStartDate())
+									.and(obj2 -> obj2
+											.ge(SysBaseSetInfo::getApplyEndDate, sysBaseSetInfo.getApplyStartDate())
+											.or()
+											.isNull(SysBaseSetInfo::getApplyEndDate)))
+							.or()
+							.ge(SysBaseSetInfo::getApplyEndDate, sysBaseSetInfo.getApplyStartDate()))
+					.last(CommonConstants.LAST_ONE_SQL));
+
+			lastBase = this.getOne(Wrappers.<SysBaseSetInfo>query().lambda()
+					.eq(SysBaseSetInfo::getBaseType, sysBaseSetInfo.getBaseType())
+					.eq(SysBaseSetInfo::getDepartId, sysBaseSetInfo.getDepartId())
+					.eq(SysBaseSetInfo::getProvince, sysBaseSetInfo.getProvince())
+					.isNull(SysBaseSetInfo::getCity)
+					.isNull(SysBaseSetInfo::getApplyEndDate)
 					.last(CommonConstants.LAST_ONE_SQL));
 		}
 		if (null != baseSetInfo) {
 			return R.failed("对应户、地市、有效期的基数配置已存在！");
 		}
 
+		// 将上一个无截止月的增加截止月
+		if (lastBase != null) {
+			lastBase.setApplyEndDate(sysBaseSetInfo.getApplyStartDate());
+			this.updateById(lastBase);
+		}
 		this.saveOrUpdateBaseAndFundPro(sysBaseSetInfo);
 		return R.ok();
 	}
@@ -116,15 +167,23 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
 			return R.failed("根据id未找到基数配置！" + sysBaseSetInfo.getId());
 		}
 		SysBaseSetInfo baseSetInfo = null;
+		//	 where (b.apply_start_date < '2023-01' and ( b.apply_end_date > '2023-01' or b.apply_end_date is null) ) or b.apply_start_date > '2023-01'
 		if (null != sysBaseSetInfo.getTown()) {
 			baseSetInfo = this.getOne(Wrappers.<SysBaseSetInfo>query().lambda()
 					.eq(SysBaseSetInfo::getBaseType, sysBaseSetInfo.getBaseType())
 					.eq(SysBaseSetInfo::getDepartId, sysBaseSetInfo.getDepartId())
 					.eq(SysBaseSetInfo::getTown, sysBaseSetInfo.getTown())
-					.le(SysBaseSetInfo::getApplyStartDate, sysBaseSetInfo.getApplyStartDate())
-					.ge(SysBaseSetInfo::getApplyEndDate, sysBaseSetInfo.getApplyStartDate())
 					.ne(SysBaseSetInfo::getId, sysBaseSetInfo.getId())
 					.eq(SysBaseSetInfo::getStatus, CommonConstants.ZERO_INT)
+					.and(obj -> obj
+							.and(obj1 -> obj1
+									.le(SysBaseSetInfo::getApplyStartDate, sysBaseSetInfo.getApplyStartDate())
+									.and(obj2 -> obj2
+											.ge(SysBaseSetInfo::getApplyEndDate, sysBaseSetInfo.getApplyStartDate())
+											.or()
+											.isNull(SysBaseSetInfo::getApplyEndDate)))
+							.or()
+							.ge(SysBaseSetInfo::getApplyEndDate, sysBaseSetInfo.getApplyStartDate()))
 					.last(CommonConstants.LAST_ONE_SQL));
 		}
 		if (null != sysBaseSetInfo.getCity() && null == sysBaseSetInfo.getTown()) {
@@ -133,8 +192,15 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
 					.eq(SysBaseSetInfo::getDepartId, sysBaseSetInfo.getDepartId())
 					.eq(SysBaseSetInfo::getCity, sysBaseSetInfo.getCity())
 					.isNull(SysBaseSetInfo::getTown)
-					.le(SysBaseSetInfo::getApplyStartDate, sysBaseSetInfo.getApplyStartDate())
-					.ge(SysBaseSetInfo::getApplyEndDate, sysBaseSetInfo.getApplyStartDate())
+					.and(obj -> obj
+							.and(obj1 -> obj1
+									.le(SysBaseSetInfo::getApplyStartDate, sysBaseSetInfo.getApplyStartDate())
+									.and(obj2 -> obj2
+											.ge(SysBaseSetInfo::getApplyEndDate, sysBaseSetInfo.getApplyStartDate())
+											.or()
+											.isNull(SysBaseSetInfo::getApplyEndDate)))
+							.or()
+							.ge(SysBaseSetInfo::getApplyEndDate, sysBaseSetInfo.getApplyStartDate()))
 					.ne(SysBaseSetInfo::getId, sysBaseSetInfo.getId())
 					.eq(SysBaseSetInfo::getStatus, CommonConstants.ZERO_INT)
 					.last(CommonConstants.LAST_ONE_SQL));
@@ -145,8 +211,15 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
 					.eq(SysBaseSetInfo::getDepartId, sysBaseSetInfo.getDepartId())
 					.eq(SysBaseSetInfo::getProvince, sysBaseSetInfo.getProvince())
 					.isNull(SysBaseSetInfo::getCity)
-					.le(SysBaseSetInfo::getApplyStartDate, sysBaseSetInfo.getApplyStartDate())
-					.ge(SysBaseSetInfo::getApplyEndDate, sysBaseSetInfo.getApplyStartDate())
+					.and(obj -> obj
+							.and(obj1 -> obj1
+									.le(SysBaseSetInfo::getApplyStartDate, sysBaseSetInfo.getApplyStartDate())
+									.and(obj2 -> obj2
+											.ge(SysBaseSetInfo::getApplyEndDate, sysBaseSetInfo.getApplyStartDate())
+											.or()
+											.isNull(SysBaseSetInfo::getApplyEndDate)))
+							.or()
+							.ge(SysBaseSetInfo::getApplyEndDate, sysBaseSetInfo.getApplyStartDate()))
 					.ne(SysBaseSetInfo::getId, sysBaseSetInfo.getId())
 					.eq(SysBaseSetInfo::getStatus, CommonConstants.ZERO_INT)
 					.last(CommonConstants.LAST_ONE_SQL));

yifu-social/yifu-social-biz/src/main/resources/mapper/SysBaseSetInfoMapper.xml

@@ -75,6 +75,7 @@
 		<result property="insuranceIsLatestCardinality" column="INSURANCE_IS_LATEST_CARDINALITY"/>
 		<result property="deleteFlag" column="DELETE_FLAG"/>
 		<result property="departName" column="DEPART_NAME"/>
+		<result property="doMonth" column="DO_MONTH"/>
 		<result property="createBy" column="CREATE_BY"/>
 		<result property="updateBy" column="UPDATE_BY"/>
 		<result property="createName" column="CREATE_NAME"/>
@@ -82,65 +83,63 @@
 		<result property="updateTime" column="UPDATE_TIME"/>
 	</resultMap>
 	<sql id="Base_Column_List">
-		a
-		.
-		ID
-		,
-                a.PROVINCE,
-                a.CITY,
-                a.TOWN,
-                a.APPLY_START_DATE,
-                a.APPLY_END_DATE,
-                a.UPPER_LIMIT,
-                a.LOWER_LIMIT,
-                a.PAY_POLICY,
-                a.BASE_TYPE,
-                a.UNIT_PERSION_PRO,
-                a.UNIT_MEDICAL_PRO,
-                a.UNIT_UNEMPLOYMENT_PRO,
-                a.UNIT_INJURY_PRO,
-                a.UNIT_BIRTH_PRO,
-                a.UNIT_PRO_SUM,
-                a.PERSONAL_PERSION_PRO,
-                a.PERSONAL_MEDICAL_PRO,
-                a.PERSONAL_UNEMPLOYMENT_PRO,
-                a.PERSONAL_PRO_SUM,
-                a.IS_ILLNESS,
-                a.IS_CHARGE_PERSONAL,
-                a.CHARGE_COMPANY,
-                a.CHARGE_PERSONAL,
-                a.COLLECT_TYPE,
-                a.PAY_COMPANY,
-                a.PAY_COMPANY_PRO,
-                a.PAY_PERSONAL,
-                a.PAY_PERSONAL_PRO,
-                a.COLLECT_MOTH,
-                a.FUND_PAY_LOWER_LIMIT,
-                a.FUND_PAY_UPPER_LIMIT,
-                a.FUND_PAY_POINT,
-                a.FUND_PAY_TYPE,
-                a.HOUSING_FUND_COMPAMY_PRO,
-                a.HOUSING_FUND_PERSONAL_PRO,
-                a.DEPART_ID,
-                a.STATUS,
-                a.VALUE_TYPE,
-                a.CAN_OVERPAY,
-                a.OVERPAY_NUMBER,
-                a.HAVE_THIS_MONTH,
-                a.INSURANCE_PENSION,
-                a.INSURANCE_MEDICAL,
-                a.INSURANCE_UNEMPLOYMENT,
-                a.INSURANCE_INJURY,
-                a.INSURANCE_BIRTH,
-                a.INSURANCE_BIGAILMENT,
-                a.INSURANCE_IS_LATEST_CARDINALITY,
-                a.DELETE_FLAG,
-                a.DEPART_NAME,
-                a.CREATE_BY,
-                a.UPDATE_BY,
-                a.CREATE_NAME,
-                a.CREATE_TIME,
-                a.UPDATE_TIME
+		a.ID,
+		a.PROVINCE,
+		a.CITY,
+		a.TOWN,
+		a.APPLY_START_DATE,
+		a.APPLY_END_DATE,
+		a.UPPER_LIMIT,
+		a.LOWER_LIMIT,
+		a.PAY_POLICY,
+		a.BASE_TYPE,
+		a.UNIT_PERSION_PRO,
+		a.UNIT_MEDICAL_PRO,
+		a.UNIT_UNEMPLOYMENT_PRO,
+		a.UNIT_INJURY_PRO,
+		a.UNIT_BIRTH_PRO,
+		a.UNIT_PRO_SUM,
+		a.PERSONAL_PERSION_PRO,
+		a.PERSONAL_MEDICAL_PRO,
+		a.PERSONAL_UNEMPLOYMENT_PRO,
+		a.PERSONAL_PRO_SUM,
+		a.IS_ILLNESS,
+		a.IS_CHARGE_PERSONAL,
+		a.CHARGE_COMPANY,
+		a.CHARGE_PERSONAL,
+		a.COLLECT_TYPE,
+		a.PAY_COMPANY,
+		a.PAY_COMPANY_PRO,
+		a.PAY_PERSONAL,
+		a.PAY_PERSONAL_PRO,
+		a.COLLECT_MOTH,
+		a.FUND_PAY_LOWER_LIMIT,
+		a.FUND_PAY_UPPER_LIMIT,
+		a.FUND_PAY_POINT,
+		a.FUND_PAY_TYPE,
+		a.HOUSING_FUND_COMPAMY_PRO,
+		a.HOUSING_FUND_PERSONAL_PRO,
+		a.DEPART_ID,
+		a.STATUS,
+		a.VALUE_TYPE,
+		a.CAN_OVERPAY,
+		a.OVERPAY_NUMBER,
+		a.HAVE_THIS_MONTH,
+		a.INSURANCE_PENSION,
+		a.INSURANCE_MEDICAL,
+		a.INSURANCE_UNEMPLOYMENT,
+		a.INSURANCE_INJURY,
+		a.INSURANCE_BIRTH,
+		a.INSURANCE_BIGAILMENT,
+		a.INSURANCE_IS_LATEST_CARDINALITY,
+		a.DELETE_FLAG,
+		a.DEPART_NAME,
+		a.DO_MONTH,
+		a.CREATE_BY,
+		a.UPDATE_BY,
+		a.CREATE_NAME,
+		a.CREATE_TIME,
+		a.UPDATE_TIME
 	</sql>
 	<sql id="sysBaseSetInfo_where">
 		<if test="sysBaseSetInfo != null">
@@ -295,7 +294,13 @@
 				AND a.DELETE_FLAG = #{sysBaseSetInfo.deleteFlag}
 			</if>
 			<if test="sysBaseSetInfo.departName != null and sysBaseSetInfo.departName.trim() != ''">
-				AND a.DEPART_NAME = #{sysBaseSetInfo.departName}
+				AND a.DEPART_NAME like concat('%',#{sysBaseSetInfo.departName},'%')
+			</if>
+			<if test="sysBaseSetInfo.applyDate != null and sysBaseSetInfo.applyDate.trim() != ''">
+				AND (
+					a.APPLY_START_DATE <![CDATA[ <= ]]> #{sysBaseSetInfo.applyDate}
+					and (a.APPLY_END_DATE is null or a.APPLY_END_DATE >= #{sysBaseSetInfo.applyDate})
+				)
 			</if>
 			<if test="sysBaseSetInfo.createBy != null and sysBaseSetInfo.createBy.trim() != ''">
 				AND a.CREATE_BY = #{sysBaseSetInfo.createBy}