|
@@ -1,36 +1,31 @@
|
|
|
package com.goafanti.common.controller;
|
|
package com.goafanti.common.controller;
|
|
|
|
|
|
|
|
-import java.io.*;
|
|
|
|
|
-import java.util.ArrayList;
|
|
|
|
|
-import java.util.Date;
|
|
|
|
|
-import java.util.List;
|
|
|
|
|
-import java.util.Map;
|
|
|
|
|
-import java.util.UUID;
|
|
|
|
|
-
|
|
|
|
|
-import javax.annotation.Resource;
|
|
|
|
|
-import javax.servlet.http.HttpServletRequest;
|
|
|
|
|
-import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
-
|
|
|
|
|
|
|
+import com.goafanti.admin.service.AdminService;
|
|
|
|
|
+import com.goafanti.admin.service.AttachmentService;
|
|
|
|
|
+import com.goafanti.common.bo.Error;
|
|
|
|
|
+import com.goafanti.common.bo.OutUser;
|
|
|
|
|
+import com.goafanti.common.bo.Result;
|
|
|
|
|
+import com.goafanti.common.constant.AFTConstants;
|
|
|
|
|
+import com.goafanti.common.constant.ErrorConstants;
|
|
|
import com.goafanti.common.dao.TOrderMidMapper;
|
|
import com.goafanti.common.dao.TOrderMidMapper;
|
|
|
-import com.goafanti.common.dao.TOrderTaskMapper;
|
|
|
|
|
-import com.goafanti.common.model.TOrderMid;
|
|
|
|
|
-import com.goafanti.common.model.TOrderTask;
|
|
|
|
|
-import com.goafanti.common.utils.excel.Excel;
|
|
|
|
|
-import com.goafanti.common.utils.pdf.PDFUtils;
|
|
|
|
|
-import com.goafanti.common.utils.word.WordUtils;
|
|
|
|
|
-import com.goafanti.order.bo.TOrderTaskBo;
|
|
|
|
|
-import com.goafanti.order.enums.NewProjectStatus;
|
|
|
|
|
|
|
+import com.goafanti.common.enums.UserType;
|
|
|
|
|
+import com.goafanti.common.model.User;
|
|
|
|
|
+import com.goafanti.common.service.DistrictGlossoryService;
|
|
|
|
|
+import com.goafanti.common.service.IndustryCategoryService;
|
|
|
|
|
+import com.goafanti.common.utils.*;
|
|
|
|
|
+import com.goafanti.common.utils.excel.FileUtils;
|
|
|
|
|
+import com.goafanti.common.utils.excel.NewExcelUtil;
|
|
|
|
|
+import com.goafanti.core.shiro.token.TokenManager;
|
|
|
|
|
+import com.goafanti.core.websocket.SystemWebSocketHandler;
|
|
|
|
|
+import com.goafanti.expenseAccount.service.ExpenseAccountService;
|
|
|
import com.goafanti.order.enums.OrderImgEnums;
|
|
import com.goafanti.order.enums.OrderImgEnums;
|
|
|
-import com.goafanti.order.enums.ProjectStage;
|
|
|
|
|
-import com.goafanti.order.enums.ProjectType;
|
|
|
|
|
-import com.goafanti.order.service.OrderProjectService;
|
|
|
|
|
|
|
+import com.goafanti.user.service.UserService;
|
|
|
import org.apache.commons.collections4.map.HashedMap;
|
|
import org.apache.commons.collections4.map.HashedMap;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.apache.poi.ss.usermodel.Cell;
|
|
import org.apache.poi.ss.usermodel.Cell;
|
|
|
import org.apache.poi.ss.usermodel.Row;
|
|
import org.apache.poi.ss.usermodel.Row;
|
|
|
import org.apache.poi.ss.usermodel.Sheet;
|
|
import org.apache.poi.ss.usermodel.Sheet;
|
|
|
import org.apache.poi.ss.usermodel.Workbook;
|
|
import org.apache.poi.ss.usermodel.Workbook;
|
|
|
-import org.apache.poi.ss.util.CellRangeAddress;
|
|
|
|
|
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
|
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
@@ -44,31 +39,11 @@ import org.springframework.web.bind.annotation.ResponseBody;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
import org.springframework.web.socket.TextMessage;
|
|
import org.springframework.web.socket.TextMessage;
|
|
|
|
|
|
|
|
-import com.goafanti.admin.service.AdminService;
|
|
|
|
|
-import com.goafanti.admin.service.AttachmentService;
|
|
|
|
|
-import com.goafanti.common.bo.Error;
|
|
|
|
|
-import com.goafanti.common.bo.OutUser;
|
|
|
|
|
-import com.goafanti.common.bo.Result;
|
|
|
|
|
-import com.goafanti.common.constant.AFTConstants;
|
|
|
|
|
-import com.goafanti.common.constant.ErrorConstants;
|
|
|
|
|
-import com.goafanti.common.enums.UserType;
|
|
|
|
|
-import com.goafanti.common.model.User;
|
|
|
|
|
-import com.goafanti.common.service.DistrictGlossoryService;
|
|
|
|
|
-import com.goafanti.common.service.FieldGlossoryService;
|
|
|
|
|
-import com.goafanti.common.service.IndustryCategoryService;
|
|
|
|
|
-import com.goafanti.common.utils.DateUtils;
|
|
|
|
|
-import com.goafanti.common.utils.LoggerUtils;
|
|
|
|
|
-import com.goafanti.common.utils.MobileMessageUtils;
|
|
|
|
|
-import com.goafanti.common.utils.PasswordUtil;
|
|
|
|
|
-import com.goafanti.common.utils.PictureUtils;
|
|
|
|
|
-import com.goafanti.common.utils.TimeUtils;
|
|
|
|
|
-import com.goafanti.common.utils.VerifyCodeUtils;
|
|
|
|
|
-import com.goafanti.common.utils.excel.FileUtils;
|
|
|
|
|
-import com.goafanti.common.utils.excel.NewExcelUtil;
|
|
|
|
|
-import com.goafanti.core.shiro.token.TokenManager;
|
|
|
|
|
-import com.goafanti.core.websocket.SystemWebSocketHandler;
|
|
|
|
|
-import com.goafanti.patent.bo.PatentNewBo;
|
|
|
|
|
-import com.goafanti.user.service.UserService;
|
|
|
|
|
|
|
+import javax.annotation.Resource;
|
|
|
|
|
+import javax.servlet.http.HttpServletRequest;
|
|
|
|
|
+import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
+import java.io.*;
|
|
|
|
|
+import java.util.*;
|
|
|
|
|
|
|
|
@Controller
|
|
@Controller
|
|
|
@Scope(value = "prototype")
|
|
@Scope(value = "prototype")
|
|
@@ -115,7 +90,7 @@ public class PublicController extends CertifyApiController {
|
|
|
private DistrictGlossoryService districtGlossoryService;
|
|
private DistrictGlossoryService districtGlossoryService;
|
|
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
|
- private OrderProjectService orderProjectService;
|
|
|
|
|
|
|
+ private ExpenseAccountService expenseAccountService;
|
|
|
|
|
|
|
|
@Value(value = "${patentTemplate}")
|
|
@Value(value = "${patentTemplate}")
|
|
|
private String patentTemplate = null;
|
|
private String patentTemplate = null;
|
|
@@ -780,10 +755,18 @@ public class PublicController extends CertifyApiController {
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- @RequestMapping("/getUser")
|
|
|
|
|
- public Result getUser() {
|
|
|
|
|
- List<OutUser> list=userService.getuser();
|
|
|
|
|
- NewExcelUtil<OutUser> excel=new NewExcelUtil<OutUser>(OutUser.class);
|
|
|
|
|
- return excel.exportExcel(list, "客户列表",uploadPath);
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ @RequestMapping("/getUser")
|
|
|
|
|
+ public Result getUser() {
|
|
|
|
|
+ List<OutUser> list=userService.getuser();
|
|
|
|
|
+ NewExcelUtil<OutUser> excel=new NewExcelUtil<OutUser>(OutUser.class);
|
|
|
|
|
+ return excel.exportExcel(list, "客户列表",uploadPath);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+ @RequestMapping("/supplementCheckNo")
|
|
|
|
|
+ public Result supplementCheckNo() {
|
|
|
|
|
+ Result res=new Result();
|
|
|
|
|
+ res.data(expenseAccountService.pushSupplementCheckNo());
|
|
|
|
|
+ return res;
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|