|
|
@@ -12,7 +12,6 @@ import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
import javax.validation.Valid;
|
|
|
|
|
|
-import org.apache.commons.lang3.time.DateFormatUtils;
|
|
|
import org.apache.commons.lang3.time.DateUtils;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
@@ -584,27 +583,15 @@ public class AdminTechProjectApiController extends CertifyApiController {
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
- /** 进入项目立项 **/
|
|
|
- @RequestMapping(value = "/toSetUpProject", method = RequestMethod.GET)
|
|
|
- public Result toSetUpProject(String orderNo,String buyerName){
|
|
|
- Result res = new Result();
|
|
|
- ProjectListBo bo = new ProjectListBo();
|
|
|
- bo.setOrderNo(orderNo);
|
|
|
- bo.setBuyerName(buyerName);
|
|
|
- bo.setSignDate(DateFormatUtils.format(new Date(), AFTConstants.YYYYMMDDHHMMSS));
|
|
|
- res.setData(bo);
|
|
|
- return res;
|
|
|
- }
|
|
|
-
|
|
|
/** 项目立项 **/
|
|
|
@RequestMapping(value = "/setUpProject", method = RequestMethod.GET)
|
|
|
- public Result setUpProject(String orderNo,String signDate,String signComment){
|
|
|
+ public Result setUpProject(String orderNo,String signComment){
|
|
|
Result res = new Result();
|
|
|
if(StringUtils.isBlank(orderNo)){
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "订单编号"));
|
|
|
return res;
|
|
|
}
|
|
|
- orderServiceImpl.updateSetUpProject(orderNo,signDate,signComment);
|
|
|
+ orderServiceImpl.updateSetUpProject(orderNo,signComment);
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
@@ -890,4 +877,21 @@ public class AdminTechProjectApiController extends CertifyApiController {
|
|
|
techProjectService.updateProjectTask(task);
|
|
|
return res;
|
|
|
}
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 撤项或结项
|
|
|
+ * @param contractId
|
|
|
+ * @param operatorType
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/revokeOrComplete",method = RequestMethod.GET)
|
|
|
+ public Result revokeOrComplete(String contractId,Integer operatorType,String completeComment){
|
|
|
+ Result res = new Result();
|
|
|
+ if(StringUtils.isBlank(contractId) || operatorType == null){
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号和操作类型"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+ techProjectService.updateRevokeOrComplete(contractId,operatorType,completeComment);
|
|
|
+ return res;
|
|
|
+ }
|
|
|
}
|