Merge remote-tracking branch 'origin/develop' into develop

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

@@ -448,6 +448,13 @@ public class TPaymentInfoExportVo extends RowIndex implements Serializable {
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("个人公积金基数")
 	private BigDecimal personalProidentSet;
+	/**
+	 * 个人公积金费用
+	 */
+	@ExcelAttribute(name = "个人公积金费用")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("个人公积金费用")
+	private BigDecimal personalProvidentSum;
 
 	/**
 	 * 社保创建人姓名

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

@@ -52,7 +52,6 @@ public class SysHouseHoldInfoController {
 
     private final SysHouseHoldInfoService sysHouseHoldInfoService;
 
-    
     /**
      * 简单分页查询
      * @param page 分页对象
@@ -64,6 +63,7 @@ public class SysHouseHoldInfoController {
     public R<IPage<SysHouseHoldInfo>> getSysHouseHoldInfoPage(Page<SysHouseHoldInfo> page, SysHouseHoldInfo sysHouseHoldInfo) {
         return new R<>(sysHouseHoldInfoService.getSysHouseHoldInfoPage(page,sysHouseHoldInfo));
     }
+
     /**
      * 不分页查询
      * @param sysHouseHoldInfo 社保户公积金户数据
@@ -139,10 +139,13 @@ public class SysHouseHoldInfoController {
 		if (CommonConstants.ZERO_STRING.equals(flag)) {
 			wrapper.eq(SysHouseHoldInfo::getType, CommonConstants.ZERO_STRING);
 			if (Common.isNotNull(name)) {
-				wrapper.eq(SysHouseHoldInfo::getName, CommonConstants.ZERO_STRING);
+				wrapper.like(SysHouseHoldInfo::getName, name);
 			}
 		} else {
 			wrapper.eq(SysHouseHoldInfo::getType, CommonConstants.ONE_STRING);
+			if (Common.isNotNull(name)) {
+				wrapper.like(SysHouseHoldInfo::getName, name);
+			}
 		}
 		houseHoldList = sysHouseHoldInfoService.list(wrapper);
 		return R.ok(houseHoldList);

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

@@ -53,11 +53,12 @@ public class TSocialfundHouseResController {
      * @param tSocialfundHouseRes 社保公积金户权限配置表
      * @return
      */
-    @Operation(description = "简单分页查询")
+    @Operation(description = "社保公积金审核简单分页查询")
     @GetMapping("/page")
     public R<IPage<TSocialfundHouseRes>> getTSocialfundHouseResPage(Page<TSocialfundHouseRes> page, TSocialfundHouseRes tSocialfundHouseRes) {
         return new R<>(tSocialfundHouseResService.getTSocialfundHouseResPage(page,tSocialfundHouseRes));
     }
+
     /**
      * 导出查询
      * @param tSocialfundHouseRes 社保公积金户权限配置表

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

@@ -50,7 +50,6 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
     public IPage<TSocialfundHouseRes> getTSocialfundHouseResPage(Page<TSocialfundHouseRes> page, TSocialfundHouseRes tSocialfundHouseRes){
         return baseMapper.getTSocialfundHouseResPage(page,tSocialfundHouseRes);
     }
-
 	/**
      * 社保公积金户权限配置表批量导出
      * @param searchVo 社保公积金户权限配置表
@@ -63,7 +62,7 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
 
 	@Override
 	public R saveSocialAuth(TSocialfundHouseRes searchVo) {
-		LambdaQueryWrapper<TSocialfundHouseRes> wrapper = Wrappers.lambdaQuery();
+		LambdaQueryWrapper<TSocialfundHouseRes> wrapper = new LambdaQueryWrapper<>();
 		if (Common.isNotNull(searchVo.getSocialHousehold())) {
 			wrapper.eq(TSocialfundHouseRes::getSocialHousehold, searchVo.getSocialHousehold());
 		}
@@ -81,5 +80,4 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
 			return R.ok();
 		}
 	}
-
 }

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

@@ -155,6 +155,7 @@
 		<result property="socialCreateTime" column="SOCIAL_CREATE_TIME"/>
 		<result property="fundCreateName" column="FUND_CREATE_NAME"/>
 		<result property="fundCreateTime" column="FUND_CREATE_TIME"/>
+		<result property="personalProvidentSum" column="PERSONAL_PROVIDENT_SUM"/>
 		<result property="keyGroup" column="keyGroup"/>
 	</resultMap>
 	<sql id="Base_Column_List">
@@ -678,6 +679,7 @@
 		w.SOCIAL_PAY_ADDR,
 		w.SOCIAL_PAY_MONTH,
 		w.SOCIAL_CREATE_MONTH,
+		SUM( w.PERSONAL_PROVIDENT_SUM) AS PERSONAL_PROVIDENT_SUM,
 		SUM( w.SUM_ALL ) AS SUM_ALL,
 		MAX( w.PROVIDENT_PAY_MONTH ) AS PROVIDENT_PAY_MONTH,
 		MAX( w.PROVIDENT_CREATE_MONTH ) AS PROVIDENT_CREATE_MONTH,
@@ -712,6 +714,7 @@
 		w.PERSONAL_UNEMPLOYMENT_MONEY,
 		w.PERSONAL_BIGMAILMENT_MONEY,
 		MAX( w.PROVIDENT_NO ) AS PROVIDENT_NO,
+		MAX( w.PERSONAL_PROIDENT_SET ) AS PERSONAL_PROIDENT_SET,
 		SUM( w.UNIT_PROVIDENT_SET ) AS UNIT_PROVIDENT_SET,
 		SUM( w.PROVIDENT_PERCENT ) AS PROVIDENT_PERCENT,
 		w.SOCIAL_CREATE_NAME,
@@ -733,6 +736,7 @@
 		a.SOCIAL_PAY_ADDR,
 		a.SOCIAL_PAY_MONTH,
 		a.SOCIAL_CREATE_MONTH,
+		a.PERSONAL_PROVIDENT_SUM,
 		SUM( a.SUM_ALL ) AS SUM_ALL,
 		a.PROVIDENT_PAY_MONTH,
 		a.PROVIDENT_CREATE_MONTH,
@@ -751,11 +755,11 @@
 		a.INAUGURAL_TEAM,
 		SUM( a.COMPANY_ACCRUAL ) AS COMPANY_ACCRUAL,
 		SUM( a.PERSONAL_ACCRUAL ) AS PERSONAL_ACCRUAL,
-		a.UNIT_PENSION_SET,
-		a.UNIT_MEDICAL_SET,
-		a.UNIT_UNEMPLOYMENT_SET,
-		a.UNIT_INJURY_SET,
-		a.UNIT_BIRTH_SET,
+		MAX(a.UNIT_PENSION_SET ) AS UNIT_PENSION_SET,
+		MAX(a.UNIT_MEDICAL_SET ) AS UNIT_MEDICAL_SET,
+		MAX(a.UNIT_UNEMPLOYMENT_SET ) AS UNIT_UNEMPLOYMENT_SET,
+		MAX(a.UNIT_INJURY_SET ) AS UNIT_INJURY_SET,
+		MAX(a.UNIT_BIRTH_SET ) AS UNIT_BIRTH_SET,
 		SUM( a.UNIT_PENSION_MONEY ) AS UNIT_PENSION_MONEY,
 		SUM( a.UNIT_MEDICAL_MONEY ) AS UNIT_MEDICAL_MONEY,
 		SUM( a.UNIT_UNEMPLOYMENT_MONEY ) AS UNIT_UNEMPLOYMENT_MONEY,
@@ -796,6 +800,7 @@
 		a.SOCIAL_PAY_ADDR,
 		a.SOCIAL_PAY_MONTH,
 		a.SOCIAL_CREATE_MONTH,
+		SUM(a.PERSONAL_PROVIDENT_SUM) AS PERSONAL_PROVIDENT_SUM,
 		SUM( a.SUM_ALL ) AS SUM_ALL,
 		a.PROVIDENT_PAY_MONTH,
 		a.PROVIDENT_CREATE_MONTH,
@@ -837,7 +842,7 @@
 		NULL AS SOCIAL_CREATE_TIME,
 		a.CREATE_NAME AS FUND_CREATE_NAME,
 		DATE_FORMAT(a.CREATE_TIME,'%Y-%m-%d') AS FUND_CREATE_TIME,
-		a.UNIT_PROVIDENT_SUM
+		SUM( a.UNIT_PROVIDENT_SUM ) AS UNIT_PROVIDENT_SUM
 		FROM t_payment_info a
 		<where>
 			a.FUND_ID is not null

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

@@ -72,9 +72,13 @@
 				<if test="tSocialfundHouseRes.userDeptName != null and tSocialfundHouseRes.userDeptName.trim() != ''">
 					AND a.USER_DEPT_NAME like concat('%',#{tSocialfundHouseRes.userDeptName},'%')
 				</if>
+				<if test="tSocialfundHouseRes.houseNameType != null and tSocialfundHouseRes.houseNameType.trim() != ''">
+					AND a.HOUSE_NAME_TYPE = #{tSocialfundHouseRes.houseNameType}
+				</if>
 			</if>
 		</if>
     </sql>
+
     <!--tSocialfundHouseRes简单分页查询-->
     <select id="getTSocialfundHouseResPage" resultMap="tSocialfundHouseResMap">
         SELECT
@@ -84,12 +88,18 @@
             1=1
             <include refid="tSocialfundHouseRes_where"/>
         </where>
+		order by a.CREATE_TIME desc
     </select>
 
 	<!--tSocialfundHouseResa导出查询-->
 	<select id="getexportList" resultMap="tSocialfundHouseResMap">
 		SELECT
-		<include refid="Base_Column_List"/>
+		a.SOCIAL_HOUSEHOLD,
+		a.FUND_HOUSEHOLD,
+		a.STATUS,
+		a.USER_NAME,
+		a.USER_DEPT_NAME,
+		a.HOUSE_NAME_TYPE
 		FROM t_socialfund_house_res a
 		<where>
 			1=1