Quellcode durchsuchen

非公出协单修改后审核BUG修复

anderx vor 2 Tagen
Ursprung
Commit
ebef96ff3c

Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
EasyCodeConfig.json


+ 8 - 10
pom.xml

@@ -425,12 +425,7 @@
 			<artifactId>itext</artifactId>
 			<version>2.1.7</version>
 		</dependency>
-		<!-- https://mvnrepository.com/artifact/com.itextpdf/itext-asian -->
-		<dependency>
-			<groupId>com.itextpdf</groupId>
-			<artifactId>itext-asian</artifactId>
-			<version>5.2.0</version>
-		</dependency>
+
 		<!-- https://mvnrepository.com/artifact/com.lowagie/itext-rtf -->
 		<dependency>
 			<groupId>com.lowagie</groupId>
@@ -438,15 +433,18 @@
 			<version>2.1.7</version>
 		</dependency>
 		<!--pdf-->
+		<!-- https://mvnrepository.com/artifact/com.itextpdf/itext-asian -->
+		<!-- 保留1处itext-asian依赖,删除重复项 -->
 		<dependency>
 			<groupId>com.itextpdf</groupId>
-			<artifactId>itextpdf</artifactId>
-			<version>5.5.13</version>
+			<artifactId>itext-asian</artifactId>
+			<version>5.2.0</version>
 		</dependency>
+		<!-- itextpdf核心依赖,无重复,保留 -->
 		<dependency>
 			<groupId>com.itextpdf</groupId>
-			<artifactId>itext-asian</artifactId>
-			<version>5.2.0</version>
+			<artifactId>itextpdf</artifactId>
+			<version>5.5.13</version>
 		</dependency>
 
 		<!-- 图片缩略图 -->

+ 7 - 7
src/main/java/com/goafanti/Interview/controller/UserArchivesInterviewController.java

@@ -43,7 +43,7 @@ public class UserArchivesInterviewController extends BaseController {
      */
     @PostMapping("/add")
     public Result add(UserArchivesInterview in) {
-        Result res = new Result<>();
+        Result res = new Result();
         if (in.getUid()==null){
             res.getError().add(buildError("客户ID不能为空"));
             return res;
@@ -60,7 +60,7 @@ public class UserArchivesInterviewController extends BaseController {
      */
     @GetMapping("/get")
     public Result<UserArchivesInterview> queryById(Integer id) {
-        return new Result<>().data(this.userArchivesInterviewService.queryById(id));
+        return new Result().data(this.userArchivesInterviewService.queryById(id));
     }
 
 
@@ -72,7 +72,7 @@ public class UserArchivesInterviewController extends BaseController {
      */
     @PostMapping("/update")
     public Result edit(UserArchivesInterview userArchivesInterview) {
-        return new Result<>().data(this.userArchivesInterviewService.update(userArchivesInterview));
+        return new Result().data(this.userArchivesInterviewService.update(userArchivesInterview));
     }
 
     /**
@@ -83,7 +83,7 @@ public class UserArchivesInterviewController extends BaseController {
      */
     @GetMapping("/delete")
     public Result deleteById(Integer id) {
-        return new Result<>().data(this.userArchivesInterviewService.deleteById(id));
+        return new Result().data(this.userArchivesInterviewService.deleteById(id));
     }
 
     /**
@@ -94,7 +94,7 @@ public class UserArchivesInterviewController extends BaseController {
      */
     @GetMapping("/list")
     public Result list(UserArchivesInterview in, Integer pageNo, Integer pageSize) {
-        Result res = new Result<>();
+        Result res = new Result();
         if (!TokenManager.hasRole(AFTConstants.SUPERADMIN)){
             if (in.getUid()==null){
                 res.getError().add(buildError("客户ID不能为空"));
@@ -110,7 +110,7 @@ public class UserArchivesInterviewController extends BaseController {
      */
     @PostMapping("/updateUser")
     public Result updateUser(UpdateUserBo in, InputUserData in2 ) {
-        Result res = new Result<>();
+        Result res = new Result();
         in.setAid(TokenManager.getAdminId());
         if (in2.getOrgCode()!=null){
             in2.setOrgCode(in2.getOrgCode().trim());
@@ -137,7 +137,7 @@ public class UserArchivesInterviewController extends BaseController {
      */
     @GetMapping("/selectByPrdid")
     public Result selectByPrdid(Integer prdid) {
-        Result res = new Result<>();
+        Result res = new Result();
         if (!TokenManager.hasRole(AFTConstants.SUPERADMIN)){
             if (prdid==null){
                 res.getError().add(buildError("客户ID不能为空"));

+ 5 - 5
src/main/java/com/goafanti/Interview/controller/UserInterviewProjectController.java

@@ -36,7 +36,7 @@ public class UserInterviewProjectController extends BaseController {
      */
     @PostMapping("/add")
     public Result add(UserInterviewProject userInterviewProject) {
-        return new Result<>().data(this.userInterviewProjectService.insert(userInterviewProject));
+        return new Result().data(this.userInterviewProjectService.insert(userInterviewProject));
     }
 
 
@@ -48,7 +48,7 @@ public class UserInterviewProjectController extends BaseController {
      */
     @GetMapping("/get")
     public Result<UserInterviewProject> queryById(Integer id) {
-        return new Result<>().data(this.userInterviewProjectService.queryById(id));
+        return new Result().data(this.userInterviewProjectService.queryById(id));
     }
 
 
@@ -60,7 +60,7 @@ public class UserInterviewProjectController extends BaseController {
      */
     @PostMapping("/update")
     public Result edit(UserInterviewProject userInterviewProject) {
-        return new Result<>().data(this.userInterviewProjectService.update(userInterviewProject));
+        return new Result().data(this.userInterviewProjectService.update(userInterviewProject));
     }
 
     /**
@@ -71,7 +71,7 @@ public class UserInterviewProjectController extends BaseController {
      */
     @GetMapping("/delete")
     public Result deleteById(Integer id) {
-        return new Result<>().data(this.userInterviewProjectService.deleteById(id));
+        return new Result().data(this.userInterviewProjectService.deleteById(id));
     }
 
     /**
@@ -82,7 +82,7 @@ public class UserInterviewProjectController extends BaseController {
      */
     @GetMapping("/list")
     public Result<UserInterviewProjectBo> list(UserInterviewProject in, Integer pageNo, Integer pageSize) {
-        return new Result<>().data(this.userInterviewProjectService.list(in, pageNo, pageSize));
+        return new Result().data(this.userInterviewProjectService.list(in, pageNo, pageSize));
     }
 
 }

+ 6 - 6
src/main/java/com/goafanti/admin/controller/AdminSalesTeamController.java

@@ -63,7 +63,7 @@ public class AdminSalesTeamController extends CertifyApiController {
      */
     @GetMapping("/get")
     public Result<SalesTeam> queryById(Integer id) {
-        return new Result<>().data(this.salesTeamService.queryById(id));
+        return new Result().data(this.salesTeamService.queryById(id));
     }
 
 
@@ -75,7 +75,7 @@ public class AdminSalesTeamController extends CertifyApiController {
      */
     @PostMapping("/update")
     public Result edit(SalesTeam salesTeam) {
-        return new Result<>().data(this.salesTeamService.update(salesTeam));
+        return new Result().data(this.salesTeamService.update(salesTeam));
     }
 
     /**
@@ -86,7 +86,7 @@ public class AdminSalesTeamController extends CertifyApiController {
      */
     @GetMapping("/delete")
     public Result deleteById(Integer id) {
-        return new Result<>().data(this.salesTeamService.deleteById(id));
+        return new Result().data(this.salesTeamService.deleteById(id));
     }
 
     /**
@@ -96,7 +96,7 @@ public class AdminSalesTeamController extends CertifyApiController {
      */
     @GetMapping("/pageList")
     public Result<Pagination<SalesTeamBo>> pageList(SalesTeam in, Integer pageNo, Integer pageSize) {
-        return new Result<>().data(this.salesTeamService.pageList(in, pageNo, pageSize));
+        return new Result().data(this.salesTeamService.pageList(in, pageNo, pageSize));
     }
 
     /**
@@ -106,7 +106,7 @@ public class AdminSalesTeamController extends CertifyApiController {
      */
     @GetMapping("/list")
     public Result<Pagination<SalesTeamBo>> list(Integer lvl) {
-        return new Result<>().data(this.salesTeamService.list(lvl));
+        return new Result().data(this.salesTeamService.list(lvl));
     }
 
     /**
@@ -115,7 +115,7 @@ public class AdminSalesTeamController extends CertifyApiController {
      */
     @GetMapping("/lvlList")
     public Result<List<SalesTeamBo>> lvlList() {
-        return new Result<>().data(this.salesTeamService.lvlList());
+        return new Result().data(this.salesTeamService.lvlList());
     }
 
 }

+ 5 - 5
src/main/java/com/goafanti/businessCard/controller/AdminBusinessCardController.java

@@ -35,7 +35,7 @@ public class AdminBusinessCardController extends BaseController {
      */
     @PostMapping("/add")
     public Result add(AdminBusinessCard adminBusinessCard) {
-        return new Result<>().data(this.adminBusinessCardService.insert(adminBusinessCard));
+        return new Result().data(this.adminBusinessCardService.insert(adminBusinessCard));
     }
 
 
@@ -47,7 +47,7 @@ public class AdminBusinessCardController extends BaseController {
      */
     @GetMapping("/get")
     public Result<AdminBusinessCard> queryById(Integer id) {
-        return new Result<>().data(this.adminBusinessCardService.queryById(id));
+        return new Result().data(this.adminBusinessCardService.queryById(id));
     }
 
 
@@ -59,7 +59,7 @@ public class AdminBusinessCardController extends BaseController {
      */
     @PostMapping("/update")
     public Result edit(AdminBusinessCard adminBusinessCard) {
-        return new Result<>().data(this.adminBusinessCardService.update(adminBusinessCard));
+        return new Result().data(this.adminBusinessCardService.update(adminBusinessCard));
     }
 
     /**
@@ -70,7 +70,7 @@ public class AdminBusinessCardController extends BaseController {
      */
     @GetMapping("/delete")
     public Result deleteById(Integer id) {
-        return new Result<>().data(this.adminBusinessCardService.deleteById(id));
+        return new Result().data(this.adminBusinessCardService.deleteById(id));
     }
 
     /**
@@ -81,7 +81,7 @@ public class AdminBusinessCardController extends BaseController {
      */
     @GetMapping("/list")
     public Result<AdminBusinessCard> list(AdminBusinessCard in, Integer pageNo, Integer pageSize) {
-        return new Result<>().data(this.adminBusinessCardService.list(in, pageNo, pageSize));
+        return new Result().data(this.adminBusinessCardService.list(in, pageNo, pageSize));
     }
 
 }

+ 4 - 2
src/main/java/com/goafanti/common/bo/Result.java

@@ -22,6 +22,8 @@ public class Result<T> {
 		this.data = data;
 	}
 
+
+
 	/**
 	 * @return the data
 	 */
@@ -52,14 +54,14 @@ public class Result<T> {
 		this.error = error;
 	}
 
-	public Result error(Error e) {
+	public Result<T> error(Error e) {
 		if (e != null) {
 			this.error.add(e);
 		}
 		return this;
 	}
 
-	public Result data(T o) {
+	public Result<T> data(T o) {
 		this.data = o;
 		return this;
 	}

+ 6 - 6
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -988,7 +988,7 @@ public class PublicController extends CertifyApiController {
 	@PostMapping("/callCompleted")
 	@ResponseBody
 	public Result callCompleted(@RequestBody InputCallCompleter in) {
-		return new Result<>().data(userOutboundService.pushCallCompleted(in));
+		return new Result().data(userOutboundService.pushCallCompleted(in));
 	}
 
 	/**
@@ -998,7 +998,7 @@ public class PublicController extends CertifyApiController {
 	@PostMapping("/pullAllCall")
 	@ResponseBody
 	public Result pullAllCall() {
-		return new Result<>().data(userOutboundService.pushAllCall());
+		return new Result().data(userOutboundService.pushAllCall());
 	}
 
 
@@ -1009,7 +1009,7 @@ public class PublicController extends CertifyApiController {
 //	@ResponseBody
 //	public Result ImageOCR(@RequestParam(value = "file", required = false) MultipartFile file) {
 //
-//		return new Result<>().data(imageService.ImageOCR(file));
+//		return new Result().data(imageService.ImageOCR(file));
 //	}
 
 	/**
@@ -1018,7 +1018,7 @@ public class PublicController extends CertifyApiController {
 	 */
 	@RequestMapping("/pushUserFirstInterview")
 	public Result pushUserFirstInterview(){
-		return new Result<>().data(userArchivesInterviewService.pushUserFirstInterview());
+		return new Result().data(userArchivesInterviewService.pushUserFirstInterview());
 	}
 
 	/**
@@ -1027,7 +1027,7 @@ public class PublicController extends CertifyApiController {
 	 */
 	@RequestMapping(value = "/pushUserFirstInterview", method = RequestMethod.GET)
 	public Result pushOrderNewUser(){
-		return new Result<>().data(orderNewService.pushOrderNewUser());
+		return new Result().data(orderNewService.pushOrderNewUser());
 	}
 
 
@@ -1042,6 +1042,6 @@ public class PublicController extends CertifyApiController {
 //				"E:/tmp/0811-PDF.pdf"
 //		);
 //		DocumentToPDFMerger.mergePdfFiles(list,  "E:/tmp/"+System.currentTimeMillis()+".pdf");
-		return new Result<>();
+		return new Result();
 	}
 }

+ 11 - 11
src/main/java/com/goafanti/customer/controller/UserArchivesController.java

@@ -36,7 +36,7 @@ public class UserArchivesController  extends BaseController {
      */
     @PostMapping("/add")
     public Result add(UserArchives userArchives) {
-        return new Result<>().data(this.userArchivesService.insert(userArchives));
+        return new Result().data(this.userArchivesService.insert(userArchives));
     }
     
     
@@ -48,7 +48,7 @@ public class UserArchivesController  extends BaseController {
      */
     @GetMapping("/get")
     public Result<UserArchives> queryById( Integer id) {
-        return new Result<>().data(this.userArchivesService.queryById(id));
+        return new Result().data(this.userArchivesService.queryById(id));
     }
 
 
@@ -61,7 +61,7 @@ public class UserArchivesController  extends BaseController {
      */
     @PostMapping("/update")
     public Result edit(UserArchives userArchives,Integer channelType) {
-        return new Result<>().data(this.userArchivesService.update(userArchives,channelType));
+        return new Result().data(this.userArchivesService.update(userArchives,channelType));
     }
 
     /**
@@ -72,7 +72,7 @@ public class UserArchivesController  extends BaseController {
      */
     @GetMapping("/delete")
     public Result deleteById(Integer id) {
-        return new Result<>().data(this.userArchivesService.deleteById(id));
+        return new Result().data(this.userArchivesService.deleteById(id));
     }
     
         /**
@@ -81,7 +81,7 @@ public class UserArchivesController  extends BaseController {
      */
     @GetMapping("/list")
     public Result<UserArchives> list(UserArchives in, Integer pageNo, Integer pageSize) {
-        return new Result<>().data(this.userArchivesService.list(in,  pageNo,  pageSize));
+        return new Result().data(this.userArchivesService.list(in,  pageNo,  pageSize));
     }
 
     /**
@@ -92,7 +92,7 @@ public class UserArchivesController  extends BaseController {
      */
     @GetMapping("/queryByUid")
     public Result<UserArchives> queryByUid( String id) {
-        return new Result<>().data(this.userArchivesService.queryByUid(id));
+        return new Result().data(this.userArchivesService.queryByUid(id));
     }
 
 
@@ -104,7 +104,7 @@ public class UserArchivesController  extends BaseController {
      */
     @GetMapping("/queryByUidAll")
     public Result queryByUidAll( String id) {
-        Result res = new Result<>();
+        Result res = new Result();
         if (userArchivesService.checkPermission(id)){
             res.error(buildError("查看超时,请要分享人重新分享。"));
             return res;
@@ -122,7 +122,7 @@ public class UserArchivesController  extends BaseController {
      */
     @GetMapping("/superQueryByUidAll")
     public Result superQueryByUidAll( String id) {
-        Result res = new Result<>();
+        Result res = new Result();
         res.data(this.userArchivesService.queryByUidAll(id));
         return res;
     }
@@ -134,7 +134,7 @@ public class UserArchivesController  extends BaseController {
      */
     @GetMapping("/selectUserArchives")
     public Result selectUserArchives( InputSelectUserArchives in) {
-        Result res = new Result<>();
+        Result res = new Result();
         if (in.getNewChannel()==null)in.setNewChannel(0);
         res.data(this.userArchivesService.selectUserArchives(in));
         return res;
@@ -155,7 +155,7 @@ public class UserArchivesController  extends BaseController {
      */
     @PostMapping("/addAwardsUid")
     public Result addAwardsUid( String uid) {
-        Result res = new Result<>();
+        Result res = new Result();
         res.data(this.userArchivesService.addAwards(uid,1));
         return res;
     }
@@ -165,7 +165,7 @@ public class UserArchivesController  extends BaseController {
      */
     @PostMapping("/selectAwardsUid")
     public Result selectAwardsUid( String uid) {
-        Result res = new Result<>();
+        Result res = new Result();
         res.data(this.userArchivesService.updateAwards(uid,2));
         return res;
     }

+ 6 - 6
src/main/java/com/goafanti/customer/controller/UserOutboundApiController.java

@@ -35,7 +35,7 @@ public class UserOutboundApiController  extends BaseApiController {
      */
     @PostMapping("/checkUser")
     public Result checkUser(Integer type) {
-        return new Result<>().data(this.userOutboundService.checkUser(type));
+        return new Result().data(this.userOutboundService.checkUser(type));
     }
 
 
@@ -93,7 +93,7 @@ public class UserOutboundApiController  extends BaseApiController {
      */
     @GetMapping("/agentList")
     public Result agentList() {
-        return new Result<>().data(this.userOutboundService.agentList());
+        return new Result().data(this.userOutboundService.agentList());
     }
 
 
@@ -103,7 +103,7 @@ public class UserOutboundApiController  extends BaseApiController {
      */
     @GetMapping("/getDefaultMobile")
     public Result getDefaultMobile(String uid) {
-        return new Result<>().data(this.userOutboundService.getDefaultMobile(uid));
+        return new Result().data(this.userOutboundService.getDefaultMobile(uid));
     }
 
 
@@ -113,7 +113,7 @@ public class UserOutboundApiController  extends BaseApiController {
      */
     @GetMapping("/userCallList")
     public Result userCallList(InputUserCallList in) {
-        return new Result<>().data(this.userOutboundService.userCallList(in));
+        return new Result().data(this.userOutboundService.userCallList(in));
     }
 
     /**
@@ -122,7 +122,7 @@ public class UserOutboundApiController  extends BaseApiController {
      */
     @GetMapping("/callAllList")
     public Result callAllList(InputUserCallList in) {
-        return new Result<>().data(this.userOutboundService.callAllList(in));
+        return new Result().data(this.userOutboundService.callAllList(in));
     }
 
 
@@ -132,6 +132,6 @@ public class UserOutboundApiController  extends BaseApiController {
      */
     @GetMapping("/listCallDay")
     public Result<Pagination<AdminCallDay>> listCallDay(InputListCallDayBo in) {
-        return new Result<>().data(this.adminCallDayService.listCallDay(in));
+        return new Result().data(this.adminCallDayService.listCallDay(in));
     }
 }

+ 6 - 6
src/main/java/com/goafanti/customer/controller/UserSuperEvaluateController.java

@@ -36,7 +36,7 @@ public class UserSuperEvaluateController extends BaseApiController{
      */
     @PostMapping("/add")
     public Result add(UserSuperEvaluate userSuperEvaluate) {
-        return new Result<>().data(this.userSuperEvaluateService.insert(userSuperEvaluate));
+        return new Result().data(this.userSuperEvaluateService.insert(userSuperEvaluate));
     }
     
     
@@ -48,7 +48,7 @@ public class UserSuperEvaluateController extends BaseApiController{
      */
     @GetMapping("/get")
     public Result<UserSuperEvaluate> queryById( Integer id) {
-        return new Result<>().data(this.userSuperEvaluateService.queryById(id));
+        return new Result().data(this.userSuperEvaluateService.queryById(id));
     }
 
 
@@ -61,7 +61,7 @@ public class UserSuperEvaluateController extends BaseApiController{
      */
     @PostMapping("/update")
     public Result edit(UserSuperEvaluate userSuperEvaluate) {
-        return new Result<>().data(this.userSuperEvaluateService.update(userSuperEvaluate));
+        return new Result().data(this.userSuperEvaluateService.update(userSuperEvaluate));
     }
 
     /**
@@ -72,7 +72,7 @@ public class UserSuperEvaluateController extends BaseApiController{
      */
     @GetMapping("/delete")
     public Result deleteById(Integer id) {
-        return new Result<>().data(this.userSuperEvaluateService.deleteById(id));
+        return new Result().data(this.userSuperEvaluateService.deleteById(id));
     }
     
         /**
@@ -83,9 +83,9 @@ public class UserSuperEvaluateController extends BaseApiController{
     @GetMapping("/list")
     public Result list(UserSuperEvaluate in , Integer pageNo, Integer pageSize) {
         if (StringUtils.isBlank(in.getUid())){
-            return new Result<>().error(buildError("客户选择不能为空"));
+            return new Result().error(buildError("客户选择不能为空"));
         }
-        return new Result<>().data(this.userSuperEvaluateService.list(in,  pageNo,  pageSize));
+        return new Result().data(this.userSuperEvaluateService.list(in,  pageNo,  pageSize));
     }
 
 }

+ 9 - 7
src/main/java/com/goafanti/customer/service/impl/UserOutboundServiceImpl.java

@@ -93,10 +93,11 @@ public class UserOutboundServiceImpl extends BaseMybatisDao<CallLogMapper> imple
     @Override
     public Result pushCallNumber(InputCallNumber in) {
         String msg =null;
+        Result res = new Result();
         if (StringUtils.isNotBlank(in.getUid())){
             User u =userMapper.queryById(in.getUid());
             if (u.getCallStatus()==1){
-                return new Result().error(new Error("该用户正在通话中"));
+                return res.error(new Error("该用户正在通话中"));
             }
         }
         String url= default_url +"/openapi/"+version+"/callNumber";
@@ -124,16 +125,17 @@ public class UserOutboundServiceImpl extends BaseMybatisDao<CallLogMapper> imple
                     u.setCallStatus(1);
                     userMapper.update(u);
                 }
-                return new Result().data("呼叫成功");
+                return res.data("呼叫成功");
             }
-            return new Result().error(new Error(msg));
+            return res.error(new Error(msg));
         }
-        return new Result().error(new Error("通信异常"));
+        return res.error(new Error("通信异常"));
     }
 
     @Override
     public Result blindTransferByAgent(InputCallNumber in) {
         String url= default_url +"/openapi/"+version+"/blindTransferByAgent";
+        Result res = new Result();
         Map<String,Object> param=new HashMap<>();
         param.put("authentication",getAuthentication());
         Map<String,Object> request=new HashMap<>();
@@ -149,10 +151,10 @@ public class UserOutboundServiceImpl extends BaseMybatisDao<CallLogMapper> imple
         String msg = result.getString("msg");
         String error = result.getString("error");
         if ("0".equals(error)){
-            return new Result().data("转移成功");
+            return res.data("转移成功");
         }else {
             LoggerUtils.debug(getClass(),"msg="+msg);
-            return new Result().error(new Error(msg));
+            return res.error(new Error(msg));
         }
 
     }
@@ -211,7 +213,7 @@ public class UserOutboundServiceImpl extends BaseMybatisDao<CallLogMapper> imple
         callLogMapper.insert(callLog);
         pushCountUser(uid,id);
         //需要关闭客户呼叫中
-//        SseResult res =  SseMap.sseEmitterMap.get(TokenManager.getAdminId());
+//        SseResult<T> res =  SseMap.sseEmitterMap.get(TokenManager.getAdminId());
 
         try {
 //        res.sseEmitter.send(callResult);

+ 7 - 7
src/main/java/com/goafanti/order/controller/TaskScoreController.java

@@ -37,7 +37,7 @@ public class TaskScoreController extends BaseController {
      */
     @PostMapping("/add")
     public Result add(TaskScore taskScore) {
-        return new Result<>().data(this.taskScoreService.insert(taskScore));
+        return new Result().data(this.taskScoreService.insert(taskScore));
     }
 
 
@@ -49,7 +49,7 @@ public class TaskScoreController extends BaseController {
      */
     @GetMapping("/get")
     public Result<TaskScore> queryById(Integer id) {
-        return new Result<>().data(this.taskScoreService.queryById(id));
+        return new Result().data(this.taskScoreService.queryById(id));
     }
 
     /**
@@ -60,7 +60,7 @@ public class TaskScoreController extends BaseController {
      */
     @GetMapping("/queryByTid")
     public Result<TaskScore> queryByTid(Integer tid) {
-        return new Result<>().data(this.taskScoreService.queryByTid(tid));
+        return new Result().data(this.taskScoreService.queryByTid(tid));
     }
 
 
@@ -72,7 +72,7 @@ public class TaskScoreController extends BaseController {
      */
     @PostMapping("/update")
     public Result edit(TaskScore taskScore) {
-        return new Result<>().data(this.taskScoreService.update(taskScore));
+        return new Result().data(this.taskScoreService.update(taskScore));
     }
 
     /**
@@ -83,7 +83,7 @@ public class TaskScoreController extends BaseController {
      */
     @PostMapping("/updateByTid")
     public Result updateByTid(TaskScore taskScore) {
-        return new Result<>().data(this.taskScoreService.updateByTid(taskScore));
+        return new Result().data(this.taskScoreService.updateByTid(taskScore));
     }
 
     /**
@@ -94,7 +94,7 @@ public class TaskScoreController extends BaseController {
      */
     @GetMapping("/delete")
     public Result deleteById(Integer id) {
-        return new Result<>().data(this.taskScoreService.deleteById(id));
+        return new Result().data(this.taskScoreService.deleteById(id));
     }
 
     /**
@@ -104,7 +104,7 @@ public class TaskScoreController extends BaseController {
      */
     @GetMapping("/list")
     public Result<OutAdminTaskScore> list(InputTaskScore in) {
-        return new Result<>().data(this.taskScoreService.list(in));
+        return new Result().data(this.taskScoreService.list(in));
     }
 
     /**

+ 5 - 6
src/main/java/com/goafanti/order/service/ProjectStatisticsService.java

@@ -1,21 +1,20 @@
 package com.goafanti.order.service;
 
-import java.io.IOException;
-
-import javax.servlet.http.HttpServletResponse;
-
 import com.goafanti.common.bo.Result;
 import com.goafanti.order.bo.InputProjectStatistics;
 import com.goafanti.order.bo.InputProvincialStatistics;
+import org.apache.poi.ss.formula.functions.T;
+
+import javax.servlet.http.HttpServletResponse;
 
 public interface ProjectStatisticsService {
 
 	Object selectTaskList(InputProjectStatistics ps);
 
-	Result exporTaskList(InputProjectStatistics ib,HttpServletResponse response) ;
+	Result<T> exporTaskList(InputProjectStatistics ib, HttpServletResponse response) ;
 
 	Object selectProvincialStatistics(InputProvincialStatistics is);
 
-	Result exporProvincialList(InputProvincialStatistics ib);
+	Result<T> exporProvincialList(InputProvincialStatistics ib);
 
 }

+ 5 - 5
src/main/java/com/goafanti/standard/controller/StandardPlatformLinkController.java

@@ -34,7 +34,7 @@ public class StandardPlatformLinkController {
      */
     @GetMapping("/list")
     public Result<StandardPlatformLink> list(InputStandardPlatformLink in ) {
-        return new Result<>().data(this.standardPlatformLinkService.list(in));
+        return new Result().data(this.standardPlatformLinkService.list(in));
     }
 
     /**
@@ -45,7 +45,7 @@ public class StandardPlatformLinkController {
      */
     @GetMapping("/get")
     public Result<StandardPlatformLink> queryById(Integer id) {
-        return new Result<>().data(this.standardPlatformLinkService.queryById(id));
+        return new Result().data(this.standardPlatformLinkService.queryById(id));
     }
 
     /**
@@ -56,7 +56,7 @@ public class StandardPlatformLinkController {
      */
     @PostMapping("/add")
     public Result add(StandardPlatformLink standardPlatformLink) {
-        return new Result<>().data(this.standardPlatformLinkService.insert(standardPlatformLink));
+        return new Result().data(this.standardPlatformLinkService.insert(standardPlatformLink));
     }
 
     /**
@@ -67,7 +67,7 @@ public class StandardPlatformLinkController {
      */
     @PostMapping("/update")
     public Result edit(StandardPlatformLink standardPlatformLink) {
-        return new Result<>().data(this.standardPlatformLinkService.update(standardPlatformLink));
+        return new Result().data(this.standardPlatformLinkService.update(standardPlatformLink));
     }
 
     /**
@@ -78,7 +78,7 @@ public class StandardPlatformLinkController {
      */
     @GetMapping("/delete")
     public Result deleteById(Integer id) {
-        return new Result<>().data(this.standardPlatformLinkService.deleteById(id));
+        return new Result().data(this.standardPlatformLinkService.deleteById(id));
     }
 
 }

+ 13 - 13
src/main/java/com/goafanti/techproject/controller/TaskDetailsController.java

@@ -44,7 +44,7 @@ public class TaskDetailsController extends BaseController {
      */
     @PostMapping("/add")
     public Result<TaskDetails> add(TaskDetails taskDetails,Integer type) {
-        Result<TaskDetails> res = new Result<>();
+        Result<TaskDetails> res = new Result();
         if (taskDetailsService.checkTid(taskDetails)){
             res.getError().add(buildError(ErrorConstants.PARAM_BEING_ERROR,"项目进度与年份"));
             return res;
@@ -61,7 +61,7 @@ public class TaskDetailsController extends BaseController {
      */
     @GetMapping("/get")
     public Result<TaskDetails> queryById(Integer id) {
-        return new Result<>().data(this.taskDetailsService.queryById(id));
+        return new Result().data(this.taskDetailsService.queryById(id));
     }
 
     /**
@@ -72,7 +72,7 @@ public class TaskDetailsController extends BaseController {
      */
     @GetMapping("/getByTid")
     public Result<TaskDetails> getByTid(Integer id) {
-        return new Result<>().data(this.taskDetailsService.pushByTid(id));
+        return new Result().data(this.taskDetailsService.pushByTid(id));
     }
 
 
@@ -84,7 +84,7 @@ public class TaskDetailsController extends BaseController {
      */
     @PostMapping("/update")
     public Result update(TaskDetails taskDetails,Integer type) {
-        return new Result<>().data(this.taskDetailsService.update(taskDetails,type));
+        return new Result().data(this.taskDetailsService.update(taskDetails,type));
     }
 
     /**
@@ -97,7 +97,7 @@ public class TaskDetailsController extends BaseController {
         TaskDetails newTd=new TaskDetails();
         newTd.setId(id);
         newTd.setDownloadTime(new Date());
-        return new Result<>().data(this.taskDetailsService.updateDownload(newTd));
+        return new Result().data(this.taskDetailsService.updateDownload(newTd));
     }
 
 
@@ -109,7 +109,7 @@ public class TaskDetailsController extends BaseController {
      */
     @GetMapping("/delete")
     public Result deleteById(Integer id) {
-        return new Result<>().data(this.taskDetailsService.deleteById(id));
+        return new Result().data(this.taskDetailsService.deleteById(id));
     }
 
     /**
@@ -120,7 +120,7 @@ public class TaskDetailsController extends BaseController {
      */
     @GetMapping("/list")
     public Result<TaskDetails> list(TaskDetails in, Integer pageNo, Integer pageSize) {
-        return new Result<>().data(this.taskDetailsService.list(in, pageNo, pageSize));
+        return new Result().data(this.taskDetailsService.list(in, pageNo, pageSize));
     }
 
     /**
@@ -131,7 +131,7 @@ public class TaskDetailsController extends BaseController {
      */
     @GetMapping("/detailsList")
     public Result<TaskDetailsBo> detailsList(InputTaskDetailsBo in) {
-        return new Result<>().data(this.taskDetailsService.pushDetailsList(in));
+        return new Result().data(this.taskDetailsService.pushDetailsList(in));
     }
 
 
@@ -164,7 +164,7 @@ public class TaskDetailsController extends BaseController {
      */
     @PostMapping("/addTaskFeature")
     public Result<TaskFeature> addTaskFeature(InputTaskFeature in ) {
-        Result<TaskFeature> res = new Result<>();
+        Result<TaskFeature> res = new Result();
         return res.data(this.taskDetailsService.addFeature(in));
     }
 
@@ -176,7 +176,7 @@ public class TaskDetailsController extends BaseController {
      */
     @PostMapping("/updateTaskFeature")
     public Result<TaskFeature> updateTaskFeature(InputTaskFeature in) {
-        return new Result<>().data(this.taskDetailsService.updateFeature(in));
+        return new Result().data(this.taskDetailsService.updateFeature(in));
     }
 
     /**
@@ -186,7 +186,7 @@ public class TaskDetailsController extends BaseController {
      */
     @PostMapping("/deleteTaskFeature")
     public Result deleteTaskFeature(Integer id) {
-        return new Result<>().data(this.taskDetailsService.deleteTaskFeature(id));
+        return new Result().data(this.taskDetailsService.deleteTaskFeature(id));
     }
 
 
@@ -197,7 +197,7 @@ public class TaskDetailsController extends BaseController {
      */
     @GetMapping("/logList")
     public Result<List<TaskDetailsLog>> logList(Integer id,Integer pageNo, Integer pageSize) {
-        return new Result<>().data(this.taskDetailsService.logList(id, pageNo,pageSize));
+        return new Result().data(this.taskDetailsService.logList(id, pageNo,pageSize));
     }
 
 
@@ -207,7 +207,7 @@ public class TaskDetailsController extends BaseController {
      */
     @GetMapping("/logDetails")
     public Result logDetails(Integer id) {
-        return new Result<>().data(this.taskDetailsService.logDetails(id));
+        return new Result().data(this.taskDetailsService.logDetails(id));
     }
 
 }

+ 2 - 1
src/main/java/com/goafanti/weChat/controller/AdminReleaseApiController.java

@@ -15,6 +15,7 @@ import com.goafanti.common.utils.excel.NewExcelUtil;
 import com.goafanti.weChat.bo.*;
 import com.goafanti.weChat.service.PublicReleaseService;
 import org.apache.commons.beanutils.BeanUtils;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -252,7 +253,7 @@ public class AdminReleaseApiController extends CertifyApiController{
 	 * 公出审核、外出审核 客户归属人
 	 */
 	@RequestMapping(value = "/marketersExamine", method = RequestMethod.POST)
-	public Result marketersExamine(Integer id ,Integer status,String remarks,Integer evaluateType){
+	public Result<T> marketersExamine(Integer id , Integer status, String remarks, Integer evaluateType){
 		Result res =new Result();
 		if (id==null) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"公出编号"));

+ 5 - 5
src/main/java/com/goafanti/weChat/controller/PublicAssistAdviceController.java

@@ -34,7 +34,7 @@ public class PublicAssistAdviceController {
      */
     @PostMapping("/add")
     public Result add(PublicAssistAdvice publicAssistAdvice) {
-        return new Result<>().data(this.publicAssistAdviceService.insert(publicAssistAdvice));
+        return new Result().data(this.publicAssistAdviceService.insert(publicAssistAdvice));
     }
     
     
@@ -46,7 +46,7 @@ public class PublicAssistAdviceController {
      */
     @GetMapping("/get")
     public Result<PublicAssistAdvice> queryById( Integer id) {
-        return new Result<>().data(this.publicAssistAdviceService.queryById(id));
+        return new Result().data(this.publicAssistAdviceService.queryById(id));
     }
 
 
@@ -59,7 +59,7 @@ public class PublicAssistAdviceController {
      */
     @PostMapping("/update")
     public Result edit(PublicAssistAdvice publicAssistAdvice) {
-        return new Result<>().data(this.publicAssistAdviceService.update(publicAssistAdvice));
+        return new Result().data(this.publicAssistAdviceService.update(publicAssistAdvice));
     }
 
     /**
@@ -70,7 +70,7 @@ public class PublicAssistAdviceController {
      */
     @GetMapping("/delete")
     public Result deleteById(Integer id) {
-        return new Result<>().data(this.publicAssistAdviceService.deleteById(id));
+        return new Result().data(this.publicAssistAdviceService.deleteById(id));
     }
 
 
@@ -82,7 +82,7 @@ public class PublicAssistAdviceController {
     @GetMapping("/list")
     public Result<PublicAssistAdvice> list(Integer id, Integer type) {
         if (type==null)type=0;
-        return new Result<>().data(this.publicAssistAdviceService.list(id,type));
+        return new Result().data(this.publicAssistAdviceService.list(id,type));
     }
 
 }