feat(controller): 结算包结算-导出

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

@@ -96,7 +96,7 @@ public class WmScorePackageSettleNoteController {
 	@GetMapping("/settle/export")
 	public List<WmSettlePackageSettleExcelModel> exportWmTaskForSettle(WmScorePackageSettleNote note) {
 		if (StringUtils.isEmpty(note.getPackageId())) {
-			return null;
+			return new ArrayList<>();
 		}
 		if (note.getStartSubTime() != null && note.getEndSubTime() != null) {
 			// 开始时间精确到0:00:00

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

@@ -16,6 +16,7 @@ public enum SubjectTypeEnum {
 	ENABLE_FLAG_FALSE("0", "无效"),
 	ENABLE_FLAG_TRUE("1", "有效"),
 
+	TYPE_NULL("", "")
 	;
 
 	/**
@@ -34,7 +35,7 @@ public enum SubjectTypeEnum {
 				return subjectTypeEnum;
 			}
 		}
-		return null;
+		return TYPE_NULL;
 	}
 
 }

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

@@ -88,7 +88,6 @@
 		t.create_time,
 		t.score_package_id,
 		t.task_user_id,
-		tt.task_type_name,
 		u.realname real_name,
 		c.temp3 xmbm,
 		e.id noteId,
@@ -106,9 +105,6 @@
 		LEFT JOIN wm_task_content c on t.task_content_id = c.id
 		LEFT JOIN wm_score_package_settle_note e on t.id = e.task_id
 		LEFT JOIN sys_user u on t.task_user_id = u.user_id
-		LEFT JOIN (
-			SELECT id, task_type_name FROM wm_task_type WHERE del_flag=0 AND enable_flag=0 AND task_type_level=1
-		) tt ON tt.id = t.task_type_id
 		WHERE  1= 1
 		<if test="query.userId!=null and query.userId!=''">
 			AND t.task_user_id =#{query.userId}
@@ -133,6 +129,7 @@
 		t.create_time,
 		t.score_package_id,
 		t.task_user_id,
+		tt.task_type_name,
 		u.realname real_name,
 		c.temp3 xmbm,
 		e.id noteId,
@@ -150,6 +147,9 @@
 		LEFT JOIN wm_task_content c on t.task_content_id = c.id
 		LEFT JOIN wm_score_package_settle_note e on t.id = e.task_id
 		LEFT JOIN sys_user u on t.task_user_id = u.user_id
+		LEFT JOIN (
+			SELECT id, task_type_name FROM wm_task_type WHERE del_flag=0 AND enable_flag=0 AND task_type_level=1
+		) tt ON tt.id = t.task_type_id
 		WHERE  1= 1
 		<if test="query.userId!=null and query.userId!=''">
 			AND t.task_user_id =#{query.userId}