更新

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyCommonServiceImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.DutyCarDto;
+import com.yeejoin.amos.boot.module.common.api.dto.DutyPersonDto;
 import com.yeejoin.amos.boot.module.common.api.dto.DutyPersonShiftDto;
 import com.yeejoin.amos.boot.module.common.api.entity.DutyPersonShift;
 import com.yeejoin.amos.boot.module.common.api.entity.DutyShift;
@@ -178,28 +179,19 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
     }
 
     @Override
-    public List<DutyCarDto> downloadList(String beginDate, String endDate, HttpServletResponse response) throws ParseException {
+    public List downloadList(String beginDate, String endDate, HttpServletResponse response) throws ParseException {
         List<Map<String, Object>> maps = this.list(beginDate, endDate);
         JSONArray jsonArray = new JSONArray();
         jsonArray.addAll(maps);
-        List<DutyCarDto> list = jsonArray.toJavaList(DutyCarDto.class);
+        List<?> list = new ArrayList<>();
+        String groupCode = this.getGroupCode();
+        String fileName;
+        if ("dutyCar".equals(groupCode)) {
+            list = jsonArray.toJavaList(DutyCarDto.class);
+        } else {
+            list = jsonArray.toJavaList(DutyPersonDto.class);
+        }
         return list;
-//        String groupCode = this.getGroupCode();
-//        String fileName;
-//        List<Map<String, Object>> contentList = new ArrayList<>();
-//        if (0 < maps.size()) {
-//            for (Map<String, Object> map : maps) {
-//
-//            }
-//        }
-//        if ("dutyCar".equals(groupCode)) {
-//            fileName = "车辆执勤值班表";
-//
-//        } else {
-//            fileName = "消防人员值班表";
-//
-//        }
-//        return null;
     }
 
     @Override