Merge branch 'develop' into feature-licancan

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

@@ -247,10 +247,10 @@
 				AND a.EMP_ID = #{tEmployeeContractInfo.empId}
 			</if>
 			<if test="tEmployeeContractInfo.empName != null and tEmployeeContractInfo.empName.trim() != ''">
-				AND a.EMP_NAME = #{tEmployeeContractInfo.empName}
+				AND a.EMP_NAME like concat('%',#{tEmployeeContractInfo.empName},'%')
 			</if>
 			<if test="tEmployeeContractInfo.empIdcard != null and tEmployeeContractInfo.empIdcard.trim() != ''">
-				AND a.EMP_IDCARD = #{tEmployeeContractInfo.empIdcard}
+				AND a.EMP_IDCARD like concat('%',#{tEmployeeContractInfo.empIdcard},'%')
 			</if>
 			<if test="tEmployeeContractInfo.contractName != null and tEmployeeContractInfo.contractName.trim() != ''">
 				AND a.CONTRACT_NAME = #{tEmployeeContractInfo.contractName}

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

@@ -295,7 +295,7 @@
 					AND a.EMP_NAME like concat('%',#{tEmployeeInfo.empName},'%')
 				</if>
 				<if test="tEmployeeInfo.empIdcard != null and tEmployeeInfo.empIdcard.trim() != ''">
-					AND a.EMP_IDCARD = #{tEmployeeInfo.empIdcard}
+					AND a.EMP_IDCARD like concat('%',#{tEmployeeInfo.empIdcard},'%')
 				</if>
 				<if test="tEmployeeInfo.nameOrIdcard != null and tEmployeeInfo.nameOrIdcard.trim() != ''">
 					AND (

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

@@ -246,10 +246,10 @@
 				AND a.EMP_NATRUE in (${tEmployeeProject.empNatrue})
 			</if>
 			<if test="tEmployeeProject.empName != null and tEmployeeProject.empName.trim() != ''">
-				AND a.EMP_NAME = #{tEmployeeProject.empName}
+				AND a.EMP_NAME like concat('%',#{tEmployeeProject.empName},'%')
 			</if>
 			<if test="tEmployeeProject.empIdcard != null and tEmployeeProject.empIdcard.trim() != ''">
-				AND a.EMP_IDCARD = #{tEmployeeProject.empIdcard}
+				AND a.EMP_IDCARD like concat('%',#{tEmployeeProject.empIdcard},'%')
 			</if>
 			<if test="tEmployeeProject.bankName != null and tEmployeeProject.bankName.trim() != ''">
 				AND a.BANK_NAME = #{tEmployeeProject.bankName}
@@ -430,10 +430,10 @@
 				AND a.EMP_NATRUE in (${tEmployeeProject.empNatrue})
 			</if>
 			<if test="tEmployeeProject.empName != null and tEmployeeProject.empName.trim() != ''">
-				AND a.EMP_NAME = #{tEmployeeProject.empName}
+				AND a.EMP_NAME like concat('%',#{tEmployeeProject.empName},'%')
 			</if>
 			<if test="tEmployeeProject.empIdcard != null and tEmployeeProject.empIdcard.trim() != ''">
-				AND a.EMP_IDCARD = #{tEmployeeProject.empIdcard}
+				AND a.EMP_IDCARD like concat('%',#{tEmployeeProject.empIdcard},'%')
 			</if>
 			<if test="tEmployeeProject.bankName != null and tEmployeeProject.bankName.trim() != ''">
 				AND a.BANK_NAME = #{tEmployeeProject.bankName}

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/concurrent/threadpool/YFSocialImportThreadPoolExecutor.java

@@ -13,8 +13,8 @@ import java.util.concurrent.TimeUnit;
 
 public class YFSocialImportThreadPoolExecutor extends ThreadPoolExecutor {
 
-    private static final int CORE_POOL_SIZE = 8;
-    private static final int MAX_POOL_SIZE = 12;
+    private static final int CORE_POOL_SIZE = 30;
+    private static final int MAX_POOL_SIZE = 30;
     private static final long KEEP_ALIVE_TIME = 15;
     private static final int CAPACITY = 1024;
 

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

@@ -149,7 +149,7 @@ public class TPaymentInfoController {
 	@PostMapping("/importListAdd")
 	@PreAuthorize("@pms.hasPermission('social_tpaymentinfo_batchImport')")
 	public R<List<ErrorMessage>> importListAdd(@RequestBody MultipartFile file, @RequestParam String random) {
-		return tPaymentInfoService.importSocialDiy(file.getInputStream(), random);
+		return tPaymentInfoService.importSocialDiy(file.getInputStream());
 	}
 
 	/**

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

@@ -49,7 +49,7 @@ public interface TPaymentInfoService extends IService<TPaymentInfo> {
 	 * @param inputStream
 	 * @return
 	 */
-	R<List<ErrorMessage>> importSocialDiy(InputStream inputStream, String random);
+	R<List<ErrorMessage>> importSocialDiy(InputStream inputStream);
 
 	/**
 	 * 批量新增缴费库-合肥三险

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

@@ -279,13 +279,13 @@
                         AND a.EMP_ID = #{tDispatchInfo.empId}
                     </if>
                     <if test="tDispatchInfo.empName != null and tDispatchInfo.empName.trim() != ''">
-                        AND a.EMP_NAME = #{tDispatchInfo.empName}
+                        AND a.EMP_NAME like concat('%',#{tDispatchInfo.empName},'%')
                     </if>
                     <if test="tDispatchInfo.empNo != null and tDispatchInfo.empNo.trim() != ''">
                         AND a.EMP_NO = #{tDispatchInfo.empNo}
                     </if>
                     <if test="tDispatchInfo.empIdcard != null and tDispatchInfo.empIdcard.trim() != ''">
-                        AND a.EMP_IDCARD = #{tDispatchInfo.empIdcard}
+                        AND a.EMP_IDCARD like concat('%',#{tDispatchInfo.empIdcard},'%')
                     </if>
                     <if test="tDispatchInfo.empType != null and tDispatchInfo.empType.trim() != ''">
                         AND a.EMP_TYPE = #{tDispatchInfo.empType}
@@ -485,10 +485,10 @@
 				</foreach>
 			</if>
 			<if test="tDispatchInfo.empName != null and tDispatchInfo.empName.trim() != ''">
-				AND a.EMP_NAME = #{tDispatchInfo.empName}
+				AND a.EMP_NAME like concat('%',#{tDispatchInfo.empName},'%')
 			</if>
 			<if test="tDispatchInfo.empIdcard != null and tDispatchInfo.empIdcard.trim() != ''">
-				AND a.EMP_IDCARD = #{tDispatchInfo.empIdcard}
+				AND a.EMP_IDCARD like concat('%',#{tDispatchInfo.empIdcard},'%')
 			</if>
 			<if test="tDispatchInfo.settleDomainName != null and tDispatchInfo.settleDomainName.trim() != ''">
 				AND a.SETTLE_DOMAIN_NAME like CONCAT(#{tDispatchInfo.settleDomainName}, '%')
@@ -917,10 +917,10 @@
 					</if>
 				</if>
 				<if test="tDispatchInfo.empName != null and tDispatchInfo.empName.trim() != ''">
-					AND a.EMP_NAME = #{tDispatchInfo.empName}
+					AND a.EMP_NAME like concat('%',#{tDispatchInfo.empName},'%')
 				</if>
 				<if test="tDispatchInfo.empIdcard != null and tDispatchInfo.empIdcard.trim() != ''">
-					AND a.EMP_IDCARD = #{tDispatchInfo.empIdcard}
+					AND a.EMP_IDCARD like concat('%',#{tDispatchInfo.empIdcard},'%')
 				</if>
 				<if test="tDispatchInfo.status != null and tDispatchInfo.status.trim() != ''">
 					AND a.STATUS = #{tDispatchInfo.status}
@@ -1030,10 +1030,10 @@
 					AND a.FUND_TOWN = #{tDispatchInfo.fundTown}
 				</if>
 				<if test="tDispatchInfo.empName != null and tDispatchInfo.empName.trim() != ''">
-					AND a.EMP_NAME = #{tDispatchInfo.empName}
+					AND a.EMP_NAME like concat('%',#{tDispatchInfo.empName},'%')
 				</if>
 				<if test="tDispatchInfo.empIdcard != null and tDispatchInfo.empIdcard.trim() != ''">
-					AND a.EMP_IDCARD = #{tDispatchInfo.empIdcard}
+					AND a.EMP_IDCARD like concat('%',#{tDispatchInfo.empIdcard},'%')
 				</if>
 				<if test="tDispatchInfo.status != null and tDispatchInfo.status.trim() != ''">
 					AND a.STATUS = #{tDispatchInfo.status}

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

@@ -242,7 +242,7 @@
 				AND a.ID = #{tPaymentInfo.id}
 			</if>
 			<if test="tPaymentInfo.empName != null and tPaymentInfo.empName.trim() != ''">
-				AND a.EMP_NAME = #{tPaymentInfo.empName}
+				AND a.EMP_NAME like concat('%',#{tPaymentInfo.empName},'%')
 			</if>
 			<if test="tPaymentInfo.empNo != null and tPaymentInfo.empNo.trim() != ''">
 				AND a.EMP_NO like CONCAT(#{tPaymentInfo.empNo},'%')
@@ -251,7 +251,7 @@
 				AND a.EMP_ID = #{tPaymentInfo.empId}
 			</if>
 			<if test="tPaymentInfo.empIdcard != null and tPaymentInfo.empIdcard.trim() != ''">
-				AND a.EMP_IDCARD = #{tPaymentInfo.empIdcard}
+				AND a.EMP_IDCARD like concat('%',#{tPaymentInfo.empIdcard},'%')
 			</if>
 			<if test="tPaymentInfo.unitId != null and tPaymentInfo.unitId.trim() != ''">
 				AND a.UNIT_ID = #{tPaymentInfo.unitId}
@@ -471,13 +471,13 @@
 				AND a.ID = #{tPaymentInfo.id}
 			</if>
 			<if test="tPaymentInfo.empName != null and tPaymentInfo.empName.trim() != ''">
-				AND a.EMP_NAME = #{tPaymentInfo.empName}
+				AND a.EMP_NAME like concat('%',#{tPaymentInfo.empName},'%')
 			</if>
 			<if test="tPaymentInfo.empNo != null and tPaymentInfo.empNo.trim() != ''">
 				AND a.EMP_NO like CONCAT(#{tPaymentInfo.empNo},'%')
 			</if>
 			<if test="tPaymentInfo.empIdcard != null and tPaymentInfo.empIdcard.trim() != ''">
-				AND a.EMP_IDCARD = #{tPaymentInfo.empIdcard}
+				AND a.EMP_IDCARD like concat('%',#{tPaymentInfo.empIdcard},'%')
 			</if>
 			<if test="tPaymentInfo.settleDomainName != null and tPaymentInfo.settleDomainName.trim() != ''">
 				AND a.SETTLE_DOMAIN_NAME = #{tPaymentInfo.settleDomainName}

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

@@ -546,10 +546,10 @@
 				AND a.EMP_NO = #{tSocialFundInfo.empNo}
 			</if>
 			<if test="tSocialFundInfo.empName != null and tSocialFundInfo.empName.trim() != ''">
-				AND a.EMP_NAME = #{tSocialFundInfo.empName}
+				AND a.EMP_NAME like concat('%',#{tSocialFundInfo.empName},'%')
 			</if>
 			<if test="tSocialFundInfo.empIdcard != null and tSocialFundInfo.empIdcard.trim() != ''">
-				AND a.EMP_IDCARD = #{tSocialFundInfo.empIdcard}
+				AND a.EMP_IDCARD like concat('%',#{tSocialFundInfo.empIdcard},'%')
 			</if>
 			<if test="tSocialFundInfo.empType != null and tSocialFundInfo.empType.trim() != ''">
 				AND a.EMP_TYPE = #{tSocialFundInfo.empType}