|
|
@@ -28,12 +28,12 @@ import com.goafanti.order.service.OutsourceOrgService;
|
|
|
@RestController
|
|
|
@RequestMapping(value = "/api/admin/outsourceOrg")
|
|
|
public class OutsourceOrgApiController extends CertifyApiController {
|
|
|
-
|
|
|
+
|
|
|
@Resource
|
|
|
private OutsourceOrgService outsourceOrgService;
|
|
|
@Resource
|
|
|
private OrderNewService orderNewService;
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/addOutsourceOrg", method=RequestMethod.POST)
|
|
|
public Result addOutsourceOrg(OutsourceOrganization o) {
|
|
|
Result res=new Result();
|
|
|
@@ -56,7 +56,7 @@ public class OutsourceOrgApiController extends CertifyApiController {
|
|
|
return res;
|
|
|
}
|
|
|
res.data(outsourceOrgService.updateOutsourceOrg(o));
|
|
|
-
|
|
|
+
|
|
|
return res;
|
|
|
}
|
|
|
@RequestMapping(value = "/deleteOutsourceOrg", method=RequestMethod.POST)
|
|
|
@@ -102,7 +102,7 @@ public class OutsourceOrgApiController extends CertifyApiController {
|
|
|
res.data(outsourceOrgService.selectOrderOutsourceOrg(orderNo));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 订单发起外包
|
|
|
*/
|
|
|
@@ -121,7 +121,7 @@ public class OutsourceOrgApiController extends CertifyApiController {
|
|
|
}
|
|
|
return res.data(orderNewService.updateOrderNew(o.getOrderNo(),orderStatus,null,1,o));
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 项目发起外包(发起外包项目)
|
|
|
*/
|
|
|
@@ -136,7 +136,7 @@ public class OutsourceOrgApiController extends CertifyApiController {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "项目外包信息","项目外包信息"));
|
|
|
return res;
|
|
|
}
|
|
|
- if(orderNewService.checkOfficialType(o)){
|
|
|
+ if(o.getType()==1&&orderNewService.checkOfficialType(o)){
|
|
|
res.getError().add(buildError(ErrorConstants.DATA_EMPTY_ERROR, "后台官费分类","后台官费分类"));
|
|
|
return res;
|
|
|
}
|
|
|
@@ -152,7 +152,7 @@ public class OutsourceOrgApiController extends CertifyApiController {
|
|
|
res.data(outsourceOrgService.orderOutsourceList(name, contractNo, starTime, endTime,tid,refundStatus,type, pageNo, pageSize));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 外包审核列表(营销管理员列表)
|
|
|
*/
|
|
|
@@ -184,7 +184,7 @@ public class OutsourceOrgApiController extends CertifyApiController {
|
|
|
res.data(outsourceOrgService.updateAuditOutsource(o));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 外包审核日志
|
|
|
*/
|
|
|
@@ -200,7 +200,7 @@ public class OutsourceOrgApiController extends CertifyApiController {
|
|
|
}
|
|
|
/**
|
|
|
* 下载文档
|
|
|
- *
|
|
|
+ *
|
|
|
* @param response
|
|
|
* @return
|
|
|
*/
|
|
|
@@ -214,11 +214,11 @@ public class OutsourceOrgApiController extends CertifyApiController {
|
|
|
String name=path.substring(path.lastIndexOf("_")+1, path.lastIndexOf("."));
|
|
|
String fileName = name + suffix;
|
|
|
downloadFile(response, fileName, path);
|
|
|
- }
|
|
|
+ }
|
|
|
return res;
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
* 超级管理员驳回
|
|
|
*/
|
|
|
@@ -236,6 +236,6 @@ public class OutsourceOrgApiController extends CertifyApiController {
|
|
|
res.data(outsourceOrgService.updateSuperAdminReject(id));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
}
|