新增描述字段

zfjg-api/zfjg-api-manage/src/main/java/com/zfjg/manage/api/domain/other/WReport.java

@@ -88,5 +88,7 @@ public class WReport implements Serializable {
     @TableField(exist = false)
     private int count;
 
+    private String remark;
+
 
 }

zfjg-api/zfjg-api-manage/src/main/java/com/zfjg/manage/api/dto/other/WReportDto.java

@@ -50,4 +50,6 @@ public class WReportDto {
     private Date sTime;
 
     private String year;
+
+    private String remark;
 }

zfjg-api/zfjg-api-manage/src/main/java/com/zfjg/manage/api/vo/other/WReportVo.java

@@ -43,4 +43,6 @@ public class WReportVo {
     private String  userId;
 
     private String year;
+
+    private String remark;
 }

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/controller/other/WReportController.java

@@ -107,6 +107,7 @@ public class WReportController extends BaseController {
             wReportDto.setId(it.getId());
             wReportDto.setOrgId(it.getOrgId());
             wReportDto.setWUser(it.getWUser());
+            wReportDto.setRemark(it.getRemark());
             wReportDto.setOrgName(ListUtil.of(it.getOrgName()));
             wReportDto.setSTime(it.getSTime());
             wReportDto.setFiles(Optional.ofNullable(it.getFDown()).map(item -> Arrays.asList(item.split("\\|\\|\\|"))).orElseGet(ArrayList::new));

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/service/impl/other/WReportServiceImpl.java

@@ -236,7 +236,7 @@ public class WReportServiceImpl extends ServiceImpl<WReportMapper, WReport> impl
             queryWrapper.lt("create_time", wReportQuery.getEndTime());
         }
         queryWrapper.groupBy("org_id", "w_user");
-        queryWrapper.select("count(*) as count","ANY_VALUE(id) as id","ANY_VALUE(year) as year",  "ANY_VALUE(org_id) as org_id","ANY_VALUE(user_id) as user_id", "ANY_VALUE(org_name) as org_name", "ANY_VALUE(w_user) as w_user", "ANY_VALUE(create_time) as create_time", "ANY_VALUE(w_type) as w_type", "sum(w_type_c) as w_type_c", "ANY_VALUE(n_type) as n_type", "sum(n_type_c) as n_type_c", "ANY_VALUE(s_type) as s_type", "sum(s_type_c) as s_type_c");
+        queryWrapper.select("count(*) as count","ANY_VALUE(id) as id","ANY_VALUE(year) as year","ANY_VALUE(remark) as remark",  "ANY_VALUE(org_id) as org_id","ANY_VALUE(user_id) as user_id", "ANY_VALUE(org_name) as org_name", "ANY_VALUE(w_user) as w_user", "ANY_VALUE(create_time) as create_time", "ANY_VALUE(w_type) as w_type", "sum(w_type_c) as w_type_c", "ANY_VALUE(n_type) as n_type", "sum(n_type_c) as n_type_c", "ANY_VALUE(s_type) as s_type", "sum(s_type_c) as s_type_c");
         queryWrapper.orderByDesc("create_time");
 //        queryWrapper.select("id", "org_id", "org_name", "w_user", "create_time", "w_type", "w_type_c", "n_type", "n_type_c", "s_type", "as s_type_c");
         List<WReport> wReports = this.list(queryWrapper);
@@ -252,6 +252,7 @@ public class WReportServiceImpl extends ServiceImpl<WReportMapper, WReport> impl
             wReportVo.setYear(it.getYear());
             wReportVo.setOrgName(it.getOrgName());
             wReportVo.setWUser(it.getWUser());
+            wReportVo.setRemark(it.getRemark());
             Integer i = Optional.ofNullable(it.getWTypeC()).orElse(0);
             Integer i1 = Optional.ofNullable(it.getNTypeC()).orElse(0);
             Integer i2 = Optional.ofNullable(it.getSTypeC()).orElse(0);
@@ -292,7 +293,7 @@ public class WReportServiceImpl extends ServiceImpl<WReportMapper, WReport> impl
             queryWrapper.lt("create_time", wReportQuery.getEndTime());
         }
         queryWrapper.groupBy("org_id");
-        queryWrapper.select("ANY_VALUE(id) as id", "ANY_VALUE(org_id) as org_id", "ANY_VALUE(org_name) as org_name", "ANY_VALUE(w_user) as w_user", "ANY_VALUE(create_time) as create_time", "ANY_VALUE(w_type) as w_type", "sum(w_type_c) as w_type_c", "ANY_VALUE(n_type) as n_type", "sum(n_type_c) as n_type_c", "ANY_VALUE(s_type) as s_type", "sum(s_type_c) as s_type_c");
+        queryWrapper.select("ANY_VALUE(id) as id", "ANY_VALUE(org_id) as org_id", "ANY_VALUE(org_name) as org_name","ANY_VALUE(remark) as remark",  "ANY_VALUE(w_user) as w_user", "ANY_VALUE(create_time) as create_time", "ANY_VALUE(w_type) as w_type", "sum(w_type_c) as w_type_c", "ANY_VALUE(n_type) as n_type", "sum(n_type_c) as n_type_c", "ANY_VALUE(s_type) as s_type", "sum(s_type_c) as s_type_c");
 //        queryWrapper.select("id", "org_id", "org_name", "w_user", "create_time", "w_type", "w_type_c", "n_type", "n_type_c", "s_type", "as s_type_c");
         List<WReport> wReports = this.list(queryWrapper);
 
@@ -302,6 +303,7 @@ public class WReportServiceImpl extends ServiceImpl<WReportMapper, WReport> impl
         List<WReportVo> wReportVos = wReports.stream().map(it -> {
             WReportVo wReportVo = new WReportVo();
             wReportVo.setId(it.getId());
+            wReportVo.setRemark(it.getRemark());
             wReportVo.setOrgId(it.getOrgId());
             wReportVo.setYear(it.getYear());
             wReportVo.setOrgName(it.getOrgName());