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

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

@@ -813,4 +813,18 @@ public class TDispatchInfo extends BaseEntity {
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("通信地址" )
 	private String contactAddress;
+
+
+	/**
+	 * @Author fxj
+	 * @Description 社保自动化标识 0 是  1  否
+	 * @Date 15:32 2023/5/9
+	 * @Param
+	 * @return
+	 **/
+	@ExcelAttribute(name = "社保自动化标识", maxLength = 1)
+	@Schema(description = "社保自动化标识 0 是  1  否" )
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("社保自动化标识" )
+	private String autoFlag;
 }

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchInfoExportVo.java

@@ -520,4 +520,13 @@ public class TDispatchInfoExportVo {
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty(value ="首次至缴纳地时间")
 	private Date firstPayTime;
+
+	/**
+	 * 社保自动化标识 0 是  1  否
+	 */
+	@ExcelAttribute(name = "是否自动化审核",isNotEmpty = false)
+	@Schema(description = "是否自动化审核:0 是  1  否" )
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value ="是否自动化审核")
+	private String autoFlag;
 }

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/SysHouseHoldInfoController.java

@@ -181,4 +181,33 @@ public class SysHouseHoldInfoController {
 		return R.ok(houseHoldList);
 	}
 
+	/**
+	 * @param flag 0/1
+	 * @param name 户名
+	 * @return  获取自动化标识
+	 */
+	@GetMapping("/getAutoFlag")
+	@Operation(summary = "获取自动化标识", description = "获取自动化标识")
+	public R<Integer> getAutoFlag(@RequestParam String flag, @RequestParam(required = false) String name) {
+		SysHouseHoldInfo houseHoldInfo;
+		LambdaQueryWrapper<SysHouseHoldInfo> wrapper = Wrappers.lambdaQuery();
+		wrapper.eq(SysHouseHoldInfo::getDelFlag, CommonConstants.ZERO_STRING);
+		if (CommonConstants.ZERO_STRING.equals(flag)) {
+			wrapper.eq(SysHouseHoldInfo::getType, CommonConstants.ZERO_STRING);
+			if (Common.isNotNull(name)) {
+				wrapper.eq(SysHouseHoldInfo::getName, name);
+			}
+		} else {
+			wrapper.eq(SysHouseHoldInfo::getType, CommonConstants.ONE_STRING);
+			if (Common.isNotNull(name)) {
+				wrapper.eq(SysHouseHoldInfo::getName, name);
+			}
+		}
+		houseHoldInfo = sysHouseHoldInfoService.getOne(wrapper);
+		if (Common.isNotNull(houseHoldInfo) && CommonConstants.ZERO_STRING.equals(houseHoldInfo.getAutoStatus())){
+			return R.ok(1);
+		}
+		return R.ok(0);
+	}
+
 }

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

@@ -99,10 +99,12 @@
 	<result property="createTime" column="CREATE_TIME"/>
 	<result property="orderId" column="ORDER_ID"/>
 
-	  <result property="schoolName" column="SCHOOL_NAME"/>
-	  <result property="major" column="MAJOR"/>
-	  <result property="firstPayTime" column="FIRST_PAY_TIME"/>
-	  <result property="graduationTime" column="GRADUATION_TIME"/>
+	<result property="schoolName" column="SCHOOL_NAME"/>
+	<result property="major" column="MAJOR"/>
+	<result property="firstPayTime" column="FIRST_PAY_TIME"/>
+	<result property="graduationTime" column="GRADUATION_TIME"/>
+	<result property="autoFlag" column="AUTO_FLAG"/>
+
 
   </resultMap>
 	<resultMap id="dispatchPageMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoPageVo" extends="tDispatchInfoMap">
@@ -174,6 +176,8 @@
 		<result property="major" column="MAJOR"/>
 		<result property="firstPayTime" column="FIRST_PAY_TIME"/>
 		<result property="graduationTime" column="GRADUATION_TIME"/>
+
+		<result property="autoFlag" column="AUTO_FLAG"/>
 	</resultMap>
 
 	<resultMap id="fundSupplementaryMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.FundSupplementaryExportVo">
@@ -424,7 +428,7 @@
 		a.SCHOOL_NAME,
 		a.MAJOR,
 		a.FIRST_PAY_TIME,
-		a.GRADUATION_TIME
+		a.GRADUATION_TIME,a.AUTO_FLAG
     </sql>
     <sql id="tDispatchInfo_where">
         <if test="tDispatchInfo != null">
@@ -446,6 +450,9 @@
 						   #{item}
 					   </foreach>
 				   </if>
+					<if test="tDispatchInfo.autoFlag != null and tDispatchInfo.autoFlag.trim() != ''">
+						AND a.AUTO_FLAG = #{tDispatchInfo.autoFlag}
+					</if>
                     <if test="tDispatchInfo.id != null and tDispatchInfo.id.trim() != ''">
                         AND a.ID = #{tDispatchInfo.id}
                     </if>
@@ -960,7 +967,8 @@
 		a.SCHOOL_NAME,
 		a.MAJOR,
 		a.FIRST_PAY_TIME,
-		a.GRADUATION_TIME
+		a.GRADUATION_TIME,
+		a.AUTO_FLAG
 
 		from t_dispatch_info a
 		left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID