|
|
@@ -85,7 +85,6 @@ public class OrderChangeApiController extends CertifyApiController {
|
|
|
|
|
|
/**
|
|
|
* 变更项目列表
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/selectChangeTask", method = RequestMethod.GET)
|
|
|
public Result selectChangeTask(Integer id){
|
|
|
@@ -99,7 +98,6 @@ public class OrderChangeApiController extends CertifyApiController {
|
|
|
}
|
|
|
/**
|
|
|
* 变更催款列表
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/selectChangeDun", method = RequestMethod.GET)
|
|
|
public Result selectChangeDun(Integer id){
|
|
|
@@ -113,8 +111,6 @@ public class OrderChangeApiController extends CertifyApiController {
|
|
|
}
|
|
|
/**
|
|
|
* 删除变更项目
|
|
|
- * @param t
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/deleteChangeTask", method = RequestMethod.POST)
|
|
|
public Result deleteChangeTask(TChangeTask t){
|
|
|
@@ -129,8 +125,6 @@ public class OrderChangeApiController extends CertifyApiController {
|
|
|
|
|
|
/**
|
|
|
* 修改变更项目
|
|
|
- * @param t
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/updateChangeTask", method = RequestMethod.POST)
|
|
|
public Result updateChangeTask(InputTChangeTask t){
|
|
|
@@ -148,8 +142,6 @@ public class OrderChangeApiController extends CertifyApiController {
|
|
|
}
|
|
|
/**
|
|
|
* 修改变更催款
|
|
|
- * @param t
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/updateChangeDun", method = RequestMethod.POST)
|
|
|
public Result updateChangeDun(TChangeDun t){
|
|
|
@@ -163,8 +155,6 @@ public class OrderChangeApiController extends CertifyApiController {
|
|
|
}
|
|
|
/**
|
|
|
* 删除变更催款
|
|
|
- * @param t
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/deleteChangeDun", method = RequestMethod.POST)
|
|
|
public Result deleteChangeDun(TChangeDun t){
|
|
|
@@ -306,7 +296,6 @@ public class OrderChangeApiController extends CertifyApiController {
|
|
|
* 状态为通过,通过状态下为财务退票,退票完成后改状态为上传附件,实际为营销员上传附件,营销员上传完后触发完成变更,状态才变成完成
|
|
|
* 状态 0草稿 1审核中 2通过 3驳回 4完成 5撤销 6上传附件
|
|
|
* @param processState 流程状态 0=营销员,1=营销经理,2=营销管理员,3=技术员,4=技术经理,5=技术总监,6=财务专员,7=财务总监,8运营保障 9=总裁,10=董事长
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value ="/orderChangeList",method = RequestMethod.GET)
|
|
|
public Result orderChangeList(String userName, Integer processState, Integer timeType, String startTime, String endTime,
|
|
|
@@ -394,9 +383,9 @@ public class OrderChangeApiController extends CertifyApiController {
|
|
|
return res;
|
|
|
}
|
|
|
if (orderChangeService.checkChangeId(nb.getId())){
|
|
|
- StringBuffer str=new StringBuffer("操作异常");
|
|
|
- str=str.append("[").append(nb.getId()).append("]").append("编号变更已经完成");
|
|
|
- res.getError().add(buildError(str.toString(), str.toString()));
|
|
|
+ StringBuilder str=new StringBuilder("操作异常");
|
|
|
+ str.append("[").append(nb.getId()).append("]").append("编号变更已经完成");
|
|
|
+ res.getError().add(buildError(str.toString(), str.toString()));
|
|
|
return res;
|
|
|
}
|
|
|
res.data(orderChangeService.pushCompleteOrderChange(nb));
|
|
|
@@ -437,8 +426,6 @@ public class OrderChangeApiController extends CertifyApiController {
|
|
|
/**
|
|
|
* 导出变更列表
|
|
|
*
|
|
|
- * @param response
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/exportMyChange" , method = RequestMethod.GET)
|
|
|
public Result exportMyBill(HttpServletResponse response,String userName,Integer processState,Integer timeType,String startTime,String endTime,
|
|
|
@@ -533,7 +520,6 @@ public class OrderChangeApiController extends CertifyApiController {
|
|
|
/**
|
|
|
* 变更-新增会员子项目
|
|
|
*
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/addMemberSonProject" ,method = RequestMethod.POST)
|
|
|
public Result addMemberSonProject(InputAddSonProject in ){
|
|
|
@@ -549,7 +535,6 @@ public class OrderChangeApiController extends CertifyApiController {
|
|
|
/**
|
|
|
* 删除会员子项目
|
|
|
*
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/deleteMemberSonProject" ,method = RequestMethod.POST)
|
|
|
public Result deleteMemberSonProject(Integer id){
|
|
|
@@ -566,7 +551,6 @@ public class OrderChangeApiController extends CertifyApiController {
|
|
|
/**
|
|
|
* 新增会员子项目
|
|
|
*
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/updateMemberSonProject" ,method = RequestMethod.POST)
|
|
|
public Result updateMemberSonProject(Integer id,String taskComment){
|