feat(controller): 支持到处包含手机号字段

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmScorePackageSettleNoteController.java

@@ -124,6 +124,7 @@ public class WmScorePackageSettleNoteController {
 			excelModel.setNumber(i + 1);
 			excelModel.setScorePackageName(scorePackage.getScorePackageName());
 			excelModel.setRealName(settleNoteOutput.getRealName());
+			excelModel.setUsername(settleNoteOutput.getUsername());
 			excelModel.setTaskTypeName(settleNoteOutput.getTaskTypeName());
 			excelModel.setXmbm(settleNoteOutput.getXmbm());
 			excelModel.setCreateTime(settleNoteOutput.getCreateTime());

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/model/excel/WmSettlePackageSettleExcelModel.java

@@ -31,6 +31,13 @@ public class WmSettlePackageSettleExcelModel {
 	@ExcelProperty("任务成员")
 	private String realName;
 
+	/**
+	 * 手机号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("手机号")
+	private String username;
+
 	/**
 	 * 任务类型
 	 */

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/enums/SettleStatusEnum.java

@@ -17,10 +17,8 @@ public enum SettleStatusEnum {
 	SETTLE_STATUS_SUBMIT("3", "已提交"),
 	SETTLE_STATUS_NO("4", "未结算"),
 	SETTLE_STATUS_PART("5", "部分成功"),
-	SETTLE_STATUS_WAIT("9", "待结算"),
-
+	SETTLE_STATUS_WAIT("9", "申请结算"),
 	SETTLE_STATUS_NULL("", "");
-	;
 
 	private String val;
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmDaDrugEntDrugtableServiceImpl.java

@@ -99,7 +99,7 @@ public class WmDaDrugEntDrugtableServiceImpl extends ServiceImpl<WmDaDrugEntDrug
 	public Set<String> listDrugProducerByDeptId(Integer deptId) {
 		Set<Integer> drugIds = reDeptDrugService.list(Wrappers.<ReDeptDrug>lambdaQuery()
 				.eq(deptId != null, ReDeptDrug::getDeptId, deptId))
-				.stream()
+				.stream()/**/
 				.mapToInt(ReDeptDrug::getDrugId)
 				.boxed()
 				.collect(Collectors.toSet());