anderx 3 years ago
parent
commit
6635aab854

+ 0 - 2
src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java

@@ -3,7 +3,6 @@ package com.goafanti.customer.controller;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Type;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -43,7 +42,6 @@ import com.goafanti.common.model.OrganizationContactBook;
 import com.goafanti.common.model.User;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.customer.service.CustomerService;
-import com.goafanti.customer.service.impl.AdminOrgAnnualReportServiceImpl;
 
 @RestController
 @RequestMapping("/api/admin/customer")

+ 4 - 17
src/main/java/com/goafanti/customer/controller/OrganizationAnnualReportController.java

@@ -2,12 +2,9 @@ package com.goafanti.customer.controller;
 
 
 import javax.annotation.Resource;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
-import com.goafanti.admin.service.AdminService;
-import com.goafanti.admin.service.AttachmentService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
@@ -15,25 +12,15 @@ import com.goafanti.common.model.OrganizationAnnualReport;
 import com.goafanti.common.model.OrganizationYearProject;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.customer.service.AdminOrgAnnualReportService;
-import com.goafanti.customer.service.CustomerService;
 
 @RestController
 @RequestMapping("/api/admin/customers")
 public class OrganizationAnnualReportController extends BaseApiController{
-	@Resource
-	private CustomerService customerService;
+
 	@Resource
 	private AdminOrgAnnualReportService adminOrgAnnualReportService;
-	@Resource
-	private AttachmentService aftFileService;
-	@Value(value = "${upload.private.path}")
-	private String	uploadPrivatePath	= null;
-	@Resource
-	private AdminService adminService;
-	
-	@Value(value = "${aesSecretKey}")
-	private String							secretKey	= null;
-	
+
+
 	/**
 	 * 新增客户年报
 	 **/
@@ -129,7 +116,7 @@ public class OrganizationAnnualReportController extends BaseApiController{
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "年份"));
 			return res;
 		}
-		
+
 		res.setData(adminOrgAnnualReportService.addOrgYearProject(o));
 		return res;
 	}

+ 0 - 1
src/main/java/com/goafanti/customer/service/CustomerService.java

@@ -7,7 +7,6 @@ import java.util.Set;
 
 
 import com.goafanti.customer.bo.*;
-import org.apache.poi.hssf.record.BOFRecord;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
 import com.goafanti.common.bo.userDaysBo;