Explorar el Código

feat(controller): 结算包结算导出显示手机号字段

lixuesong hace 4 años
padre
commit
bab1bfa12a

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

@@ -133,7 +133,7 @@ public class WmScorePackageSettleNoteController {
 			excelModel.setSubType(SubjectTypeEnum.resolve(settleNoteOutput.getSubType()).getDesc());
 			excelModel.setSubTime(settleNoteOutput.getSubTime());
 			excelModel.setNotifyTime(settleNoteOutput.getNotifyTime());
-			excelModel.setSettleNoteStatus(SettleStatusEnum.resolve(String.valueOf(settleNoteOutput.getSettleNoteStatus())).getName());
+			excelModel.setSettleNoteStatus(SettleStatusEnum.resolve(String.valueOf(settleNoteOutput.getSettleNoteStatus())).getName2());
 			exportList.add(excelModel);
 		}
 

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

@@ -12,21 +12,25 @@ import lombok.Getter;
 public enum SettleStatusEnum {
 
 	// 结算状态
-	SETTLE_STATUS_SUCCESS("1", "结算成功"),
-	SETTLE_STATUS_FAIL("2", "结算失败"),
-	SETTLE_STATUS_SUBMIT("3", "已提交"),
-	SETTLE_STATUS_NO("4", "未结算"),
-	SETTLE_STATUS_PART("5", "部分成功"),
-	SETTLE_STATUS_WAIT("9", "申请结算"),
-	SETTLE_STATUS_NULL("", "");
+	SETTLE_STATUS_NOTSETTLE("0", "", "未结算"),
+	SETTLE_STATUS_SUCCESS("1", "结算成功", "结算成功"),
+	SETTLE_STATUS_FAIL("2", "结算失败", "结算失败"),
+	SETTLE_STATUS_SUBMIT("3", "已提交", "已提交结算"),
+	SETTLE_STATUS_NO("4", "未结算", ""),
+	SETTLE_STATUS_PART("5", "部分成功", ""),
+	SETTLE_STATUS_WAIT("9", "申请结算", "申请结算"),
+	SETTLE_STATUS_NULL("", "", "");
 
 	private String val;
 
 	private String name;
 
-	SettleStatusEnum(String val, String name) {
+	private String name2;
+
+	SettleStatusEnum(String val, String name, String name2) {
 		this.val = val;
 		this.name = name;
+		this.name2 = name2;
 	}
 
 	public static SettleStatusEnum resolve(String val){

+ 1 - 0
hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmScorePackageSettleNoteMapper.xml

@@ -132,6 +132,7 @@
 		t.task_user_id,
 		tt.task_type_name,
 		u.realname real_name,
+		u.username,
 		c.temp3 xmbm,
 		e.id noteId,
 		e.invoice_type,