"feature-zhaJi:修改结算月变更的bug"

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceDetailController.java

@@ -479,7 +479,7 @@ public class TInsuranceDetailController {
 	 */
 	@Operation(summary = "根据身份证查询所有的商险列表", description = "根据身份证查询所有的商险列表")
 	@GetMapping("/getInsuranceListByIdCard")
-	public R<IPage<InsuranceListByIdCardVo>> getInsuranceListByIdCard(Page page, String idCard) {
-		return new R<>(tInsuranceDetailService.getInsuranceListByIdCard(page, idCard));
+	public R<IPage<InsuranceListByIdCardVo>> getInsuranceListByIdCard(Page page, String idCard,String deptNo) {
+		return new R<>(tInsuranceDetailService.getInsuranceListByIdCard(page, idCard,deptNo));
 	}
 }

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/TInsuranceDetailMapper.java

@@ -186,7 +186,7 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
 	 * @date 2022-08-01
 	 * @return
 	 */
-	IPage<InsuranceListByIdCardVo> getInsuranceListByIdCard(Page<TInsuranceDetail> page, @Param("idCard") String idCard);
+	IPage<InsuranceListByIdCardVo> getInsuranceListByIdCard(Page<TInsuranceDetail> page, @Param("idCard") String idCard, @Param("deptNo")String deptNo);
 
 	List<TInsuranceDetail> selectListByempIdcardNo(String empIdcardNo);
 

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/TInsuranceDetailService.java

@@ -330,6 +330,6 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
 	 * @param
 	 * @return {@link R}
 	 */
-	IPage<InsuranceListByIdCardVo> getInsuranceListByIdCard(Page<TInsuranceDetail> page, String idCard);
+	IPage<InsuranceListByIdCardVo> getInsuranceListByIdCard(Page<TInsuranceDetail> page, String idCard,String deptNo);
 
 }

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceDetailServiceImpl.java

@@ -3065,7 +3065,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			//先更新本地状态再集中推送至EKP
 			//当前保单结算信息不为空且已推送的情况下，推送EKP进行变更
 			List<EKPInteractiveParam> deptDetail = getDeptDetail(successList);
-			threadPool.execute(() -> {
+//			threadPool.execute(() -> {
 			for (EKPInteractiveParam ekpInteractiveParam : deptDetail) {
 					String settleMonth = ekpInteractiveParam.getSettleMonth();
 					TInsuranceDetail byId = getById(ekpInteractiveParam.getId());
@@ -3131,9 +3131,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 						tInsuranceOperateService.save(insuranceOperate);
 					}
 				}
-			});
+		//	});
 		}
-
 		return R.ok(errorList,"导入成功");
 	}
 
@@ -4522,8 +4521,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	 * @return {@link R}
 	 */
 	@Override
-	public IPage<InsuranceListByIdCardVo> getInsuranceListByIdCard(Page<TInsuranceDetail> page, String idCard) {
-		IPage<InsuranceListByIdCardVo> insuranceListByIdCard = baseMapper.getInsuranceListByIdCard(page, idCard);
+	public IPage<InsuranceListByIdCardVo> getInsuranceListByIdCard(Page<TInsuranceDetail> page, String idCard,String deptNo) {
+		IPage<InsuranceListByIdCardVo> insuranceListByIdCard = baseMapper.getInsuranceListByIdCard(page, idCard,deptNo);
 		List<InsuranceListByIdCardVo> records = insuranceListByIdCard.getRecords();
 		if (CollectionUtils.isNotEmpty(records)){
 			for (InsuranceListByIdCardVo record : records) {

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceDetailMapper.xml

@@ -888,6 +888,7 @@
 		<where>
 			1=1
 			AND EMP_IDCARD_NO = #{idCard}
+			and DEPT_NO = #{deptNo}
 		</where>
 		ORDER BY CREATE_TIME desc
 	</select>