|
|
@@ -1,18 +1,9 @@
|
|
|
package com.hz.employmentsite.controller;
|
|
|
|
|
|
-import com.github.pagehelper.PageInfo;
|
|
|
-import com.google.zxing.BarcodeFormat;
|
|
|
-import com.google.zxing.EncodeHintType;
|
|
|
-import com.google.zxing.MultiFormatWriter;
|
|
|
import com.google.zxing.WriterException;
|
|
|
-import com.google.zxing.client.j2se.MatrixToImageWriter;
|
|
|
-import com.google.zxing.common.BitMatrix;
|
|
|
-import com.hz.employmentsite.filter.exception.BaseResponse;
|
|
|
-import com.hz.employmentsite.filter.exception.RespGenerstor;
|
|
|
import com.hz.employmentsite.util.ExcelHelper;
|
|
|
import com.hz.employmentsite.util.JsonMapper;
|
|
|
import com.hz.employmentsite.util.QrCodeUtils;
|
|
|
-import com.hz.employmentsite.vo.baseSettings.SiteInfoVo;
|
|
|
import lombok.Data;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
@@ -23,7 +14,6 @@ import java.io.OutputStream;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
|
|
|
@RestController
|
|
|
@RequestMapping("/api/common")
|
|
|
@@ -59,7 +49,7 @@ public class CommonController {
|
|
|
data.setTitles(titles);
|
|
|
|
|
|
List<List<Object>> rows = new ArrayList();
|
|
|
- for (HashMap<String, String> item : errorExcelVo.dataList) {
|
|
|
+ for (HashMap<String, Object> item : errorExcelVo.dataList) {
|
|
|
List<Object> row = new ArrayList();
|
|
|
for (String key : keyList) {
|
|
|
row.add(item.get(key));
|
|
|
@@ -75,7 +65,7 @@ public class CommonController {
|
|
|
@Data
|
|
|
public static class ResponseErrorExcelVo {
|
|
|
public List<HashMap<String, String>> columnList;
|
|
|
- public List<HashMap<String, String>> dataList;
|
|
|
+ public List<HashMap<String, Object>> dataList;
|
|
|
}
|
|
|
|
|
|
@ResponseBody
|
