Merge branch 'feature-licancan' into 'develop'

Feature licancan

See merge request !268

k8s-bash-test/yifu-insurances-deployment.yaml

@@ -63,7 +63,7 @@ spec:                 # 资源规范字段
               #cpu: 300m # CPU，1核心 = 1000m
             requests:             # 容器运行时，最低资源需求，也就是说最少需要多少资源容器才能正常运行
               #cpu: 100m
-              memory: "1024Mi"
+              memory: "500Mi"
           #livenessProbe: # pod 内部健康检查的设置
           #  httpGet: # 通过httpget检查健康，返回200-399之间，则认为容器正常
           #    path: /healthCheck # URI地址

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

@@ -3377,7 +3377,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		}
 		List<InsuredListVo> insuredList;
 		insuredList = this.baseMapper.getInsuredList(param);
-		if (CollectionUtils.isNotEmpty(insuredList)){
+		/*if (CollectionUtils.isNotEmpty(insuredList)){
 			//根据项目编码获取项目名称
 			List<String> collect = insuredList.stream().map(InsuredListVo::getDeptNo).distinct().collect(Collectors.toList());
 			try{
@@ -3400,7 +3400,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					record.setProjectName(CommonConstants.EMPTY_STRING);
 				}
 			}
-		}
+		}*/
 		//处理导出
 		String fileName = "商险已投保人员名册" + DateUtil.getThisTime() + CommonConstants.XLSX;
 		long count = insuredList.size();
@@ -3429,7 +3429,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 						}
 					}
 					if (Common.isNotNull(insuredList)){
-						writeSheet = EasyExcel.writerSheet("sheet").build();
+						writeSheet = EasyExcel.writerSheet("sheet"+index).build();
 						excelWriter.write(insuredList,writeSheet);
 						index++;
 					}
@@ -3439,7 +3439,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					}
 				}
 			}else {
-				WriteSheet writeSheet = EasyExcel.writerSheet("sheet").build();
+				WriteSheet writeSheet = EasyExcel.writerSheet("sheet"+index).build();
 				excelWriter.write(insuredList,writeSheet);
 			}
 			if (Common.isNotNull(insuredList)){