|
|
@@ -1,22 +1,20 @@
|
|
|
package com.goafanti.order.controller;
|
|
|
|
|
|
|
|
|
-import java.io.IOException;
|
|
|
-import java.text.ParseException;
|
|
|
-import java.text.SimpleDateFormat;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Arrays;
|
|
|
-import java.util.List;
|
|
|
-
|
|
|
-import javax.servlet.http.HttpServletRequest;
|
|
|
-import javax.servlet.http.HttpServletResponse;
|
|
|
-import javax.validation.Valid;
|
|
|
-
|
|
|
-import com.goafanti.common.model.TOrderTask;
|
|
|
+import com.goafanti.common.bo.Result;
|
|
|
+import com.goafanti.common.constant.AFTConstants;
|
|
|
+import com.goafanti.common.constant.ErrorConstants;
|
|
|
+import com.goafanti.common.controller.CertifyApiController;
|
|
|
+import com.goafanti.common.enums.OfficialPatentType;
|
|
|
+import com.goafanti.common.model.TTaskHours;
|
|
|
import com.goafanti.common.utils.ParamUtils;
|
|
|
+import com.goafanti.common.utils.StringUtils;
|
|
|
+import com.goafanti.common.utils.excel.NewExcelUtil;
|
|
|
import com.goafanti.core.mybatis.page.Pagination;
|
|
|
+import com.goafanti.core.shiro.token.TokenManager;
|
|
|
import com.goafanti.order.bo.*;
|
|
|
import com.goafanti.order.service.OrderNewService;
|
|
|
+import com.goafanti.order.service.OrderProjectService;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
@@ -26,16 +24,14 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
-import com.goafanti.common.bo.Result;
|
|
|
-import com.goafanti.common.constant.AFTConstants;
|
|
|
-import com.goafanti.common.constant.ErrorConstants;
|
|
|
-import com.goafanti.common.controller.CertifyApiController;
|
|
|
-import com.goafanti.common.enums.OfficialPatentType;
|
|
|
-import com.goafanti.common.model.TTaskHours;
|
|
|
-import com.goafanti.common.utils.StringUtils;
|
|
|
-import com.goafanti.common.utils.excel.NewExcelUtil;
|
|
|
-import com.goafanti.core.shiro.token.TokenManager;
|
|
|
-import com.goafanti.order.service.OrderProjectService;
|
|
|
+import javax.servlet.http.HttpServletRequest;
|
|
|
+import javax.servlet.http.HttpServletResponse;
|
|
|
+import javax.validation.Valid;
|
|
|
+import java.io.IOException;
|
|
|
+import java.text.ParseException;
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
+import java.util.ArrayList;
|
|
|
+import java.util.List;
|
|
|
|
|
|
@RestController
|
|
|
@RequestMapping(value = "/api/admin/orderProject")
|
|
|
@@ -801,19 +797,7 @@ public class OrderProjectApiController extends CertifyApiController {
|
|
|
}
|
|
|
|
|
|
|
|
|
- @RequestMapping(value = "/updateTag",method = RequestMethod.POST)
|
|
|
- public Result updateTag(Integer id,Integer tag){
|
|
|
- Result res=new Result();
|
|
|
- if (id==null){
|
|
|
- res.getError().add(buildErrorMessageParams(ErrorConstants.PARAM_EMPTY_ERROR,"项目编号"));
|
|
|
- return res;
|
|
|
- }
|
|
|
- if (tag==null){
|
|
|
- res.getError().add(buildErrorMessageParams(ErrorConstants.PARAM_EMPTY_ERROR,"项目标签"));
|
|
|
- return res;
|
|
|
- }
|
|
|
- orderProjectService.updateTag(id,tag);
|
|
|
- }
|
|
|
+
|
|
|
|
|
|
|
|
|
|