Merge branch 'develop' into feature-zhaji

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

@@ -19,6 +19,7 @@ package com.yifu.cloud.plus.v1.yifu.social.entity;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -30,6 +31,7 @@ import org.hibernate.validator.constraints.Length;
 import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 收入明细表-全部明细
@@ -194,4 +196,7 @@ public class TIncomeDetail {
 	@ExcelProperty("管理费风险金的结算方式：1预估2实缴")
 	private String mrSettleType;
 
+	// 查询时框定范围使用
+	@TableField(exist = false)
+	private List<String> idCardList;
 }

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

@@ -131,6 +131,12 @@
 			<if test="tIncomeDetail.redData != null and tIncomeDetail.redData.trim() != ''">
 				AND a.RED_DATA = #{tIncomeDetail.redData}
 			</if>
+			<if test="tIncomeDetail.idCardList != null and tIncomeDetail.idCardList.size() > 0">
+				AND a.EMP_IDCARD in
+				<foreach item="item" index="index" collection="tIncomeDetail.idCardList" open="(" separator="," close=")">
+					#{item}
+				</foreach>
+			</if>
 		</if>
 	</sql>