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

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

+package com.yifu.cloud.plus.v1.yifu.archives.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author huyc
+ * @Date 2023-07-17 16:50:08
+ * @Description 二级指标归属Vo
+ * @Version 1.0
+ */
+@Data
+public class SecondBelongVo implements Serializable {
+	private String departNo;
+	private String secondIndicatorBelong;
+}

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TSettleDomainController.java

@@ -75,6 +75,19 @@ public class TSettleDomainController {
 		return R.ok(tSettleDomainService.getPage(page, tSettleDomain));
 	}
 
+	/**
+	 * 二级指标归属分页查询
+	 *
+	 * @param page          分页对象
+	 * @param tSettleDomain 项目表
+	 * @return
+	 */
+	@Operation(summary = "分页查询", description = "分页查询")
+	@GetMapping("/twoBlongPage")
+	public R<IPage<SecondBelongVo>> getTwoBlongPage(Page<TSettleDomain> page, TSettleDomain tSettleDomain) {
+		return R.ok(tSettleDomainService.getTwoBlongPage(page, tSettleDomain));
+	}
+
 	/**
 	 * 不分页查询
 	 *

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TSettleDomainMapper.java

@@ -23,7 +23,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TCustomerInfo;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.*;
-import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -40,6 +39,8 @@ public interface TSettleDomainMapper extends BaseMapper<TSettleDomain> {
 
 	IPage<TSettleDomain> getPage(Page<TSettleDomain> page, @Param("tSettleDomain") TSettleDomain tSettleDomain);
 
+	IPage<SecondBelongVo> getTwoBlongPage(Page<TSettleDomain> page, @Param("tSettleDomain") TSettleDomain tSettleDomain);
+
 	List<TSettleDomain> getPage(@Param("tSettleDomain") TSettleDomain tSettleDomain);
 
 	/**

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TSettleDomainService.java

@@ -46,6 +46,16 @@ public interface TSettleDomainService extends IService<TSettleDomain> {
 	 **/
 	IPage<TSettleDomain> getPage(Page<TSettleDomain> page, TSettleDomain tSettleDomain);
 
+	/**
+	 * @param page
+	 * @param tSettleDomain
+	 * @Description: 分页列表
+	 * @Author: hgw
+	 * @Date: 2022/12/1 14:22
+	 * @return: com.baomidou.mybatisplus.core.metadata.IPage<com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain>
+	 **/
+	IPage<SecondBelongVo> getTwoBlongPage(Page<TSettleDomain> page, TSettleDomain tSettleDomain);
+
 	/**
 	 * @param tSettleDomain
 	 * @Description: 全部list

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TSettleDomainServiceImpl.java

@@ -43,7 +43,6 @@ import com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils;
 import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -74,6 +73,11 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
 		return baseMapper.getPage(page, tSettleDomain);
 	}
 
+	@Override
+	public IPage<SecondBelongVo> getTwoBlongPage(Page<TSettleDomain> page, TSettleDomain tSettleDomain) {
+		return baseMapper.getTwoBlongPage(page, tSettleDomain);
+	}
+
 	@Override
 	public List<TSettleDomain> getList(TSettleDomain tSettleDomain) {
 		return baseMapper.getPage(tSettleDomain);

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

@@ -96,6 +96,11 @@
 		<result property="lineType" column="LINE_TYPE"/>
 	</resultMap>
 
+	<resultMap id="tSettleDomainTwoMap" type="com.yifu.cloud.plus.v1.yifu.archives.vo.SecondBelongVo">
+		<result property="departNo" column="DEPART_NO"/>
+		<result property="secondIndicatorBelong" column="SECOND_INDICATOR_BELONG"/>
+	</resultMap>
+
 	<sql id="Base_Column_List">
 		a.ID,
 		a.DEPART_NO,
@@ -235,6 +240,24 @@
 		order by CREATE_TIME desc
 	</select>
 
+	<select id="getTwoBlongPage" resultMap="tSettleDomainTwoMap">
+		SELECT
+		a.DEPART_NO,
+		a.SECOND_INDICATOR_BELONG
+		FROM t_settle_domain a
+		WHERE a.DELETE_FLAG = '0' and a.STOP_FLAG = '0'
+		<if test="tSettleDomain != null">
+			<if test="tSettleDomain.departNo != null and tSettleDomain.departNo.trim() != ''">
+				and a.DEPART_NO = #{tSettleDomain.departNo}
+			</if>
+			<if test="tSettleDomain.secondIndicatorBelong != null and tSettleDomain.secondIndicatorBelong.trim() != ''">
+				and a.SECOND_INDICATOR_BELONG like concat('%', #{tSettleDomain.secondIndicatorBelong} ,'%')
+			</if>
+		</if>
+		group by a.SECOND_INDICATOR_BELONG
+		order by CREATE_TIME desc
+	</select>
+
 	<select id="getUnitPage" resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.IdNameNoVo">
 		SELECT
 			a.CUSTOMER_ID as id,

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

@@ -194,6 +194,24 @@ public class SysHouseHoldInfo extends BaseEntity {
 	@ExcelProperty("单位统一信用代码")
 	private String unitCreditCode;
 
+	/**
+	 * 公积金承办银行
+	 */
+	@ExcelAttribute(name = "公积金承办银行" )
+	@Schema(description ="公积金承办银行")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("公积金承办银行")
+	private String fundBank;
+
+	/**
+	 * 比例
+	 */
+	@ExcelAttribute(name = "比例" )
+	@Schema(description ="比例")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("比例")
+	private String fundPer;
+
 	/**
 	 * 审核人部门
 	 */

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

@@ -709,4 +709,26 @@ public class TDispatchInfoController {
 		}
 		return tDispatchInfoService.updateExportFundFlagById(id,status);
 	}
+
+	/**
+	 * @Author huyc
+	 * @Description 导出 导出医保花名册
+	 * @Date 10:05 2023/7/14
+	 * @Param
+	 * @return
+	 **/
+	@PostMapping("/doexportMedicalInfo")
+	@Operation(description = "导出医保花名册")
+	@SysLog("导出医保花名册")
+	@PreAuthorize("@pms.hasPermission('wxhr:tdispatchinfo_doexportFundRecordChange')")
+	public void doexportMedicalInfo(HttpServletResponse response, HttpServletRequest request,
+										 @RequestBody SocialHandleSearchVo searchVo) {
+		YifuUser user = SecurityUtils.getUser();
+		menuUtil.setAuthSql(user, searchVo);
+		if (Common.isNotNull(searchVo.getAuthSql()) && searchVo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
+			searchVo.setAuthSql(searchVo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN"));
+		}
+		searchVo.setCreateBy(user.getId());
+		tDispatchInfoService.doexportFundRecordChange(response, searchVo.getIdStr(),searchVo);
+	}
 }

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

@@ -47,11 +47,14 @@
     <result property="houseType" column="HOUSE_TYPE"/>
     <result property="customerNo" column="CUSTOMER_NO"/>
     <result property="unitCreditCode" column="UNIT_CREDIT_CODE"/>
+	  <result property="fundPer" column="FUND_PER"/>
+	  <result property="fundBank" column="FUND_BANK"/>
   </resultMap>
 
 	<resultMap id="sysHouseHoldSingleInfoMap" type="com.yifu.cloud.plus.v1.yifu.social.entity.SysHouseHoldInfo">
 		<id property="id" column="ID"/>
 		<result property="name" column="NAME"/>
+		<result property="type" column="TYPE"/>
 	</resultMap>
 
     <sql id="Base_Column_List">
@@ -76,6 +79,8 @@
 				a.HOUSE_TYPE,
 				a.CUSTOMER_NO,
 				a.UNIT_CREDIT_CODE,
+				a.FUND_PER,
+				a.FUND_BANK,
 				a.HANDLE_USER_NAME
     </sql>
 
@@ -144,9 +149,10 @@
 	<select id="getAllSingleSocailPage" resultMap="sysHouseHoldSingleInfoMap">
 		SELECT
 		a.ID,
+		a.TYPE,
 		a.NAME
 		FROM sys_house_hold_info a
-		where a.TYPE = '0' and HOUSE_TYPE = '0'
+		where HOUSE_TYPE = '0'
 		order by a.CREATE_TIME desc
 	</select>
 </mapper>