|
|
@@ -21,6 +21,7 @@ import com.goafanti.order.bo.InputTChangeTask;
|
|
|
import com.goafanti.order.bo.NewOrderChangeBo;
|
|
|
import com.goafanti.order.service.OrderChangeService;
|
|
|
|
|
|
+import java.io.IOException;
|
|
|
import java.util.List;
|
|
|
|
|
|
@RestController
|
|
|
@@ -290,7 +291,6 @@ public class OrderChangeApiController extends CertifyApiController {
|
|
|
* @param timeType
|
|
|
* @param startTime
|
|
|
* @param endTime
|
|
|
- * @param depId
|
|
|
* @param salesmanName
|
|
|
* @param complete
|
|
|
* @param orderNo
|
|
|
@@ -302,7 +302,7 @@ public class OrderChangeApiController extends CertifyApiController {
|
|
|
*/
|
|
|
@RequestMapping(value ="/orderChangeList",method = RequestMethod.GET)
|
|
|
public Result orderChangeList(String userName, Integer processState, Integer timeType, String startTime, String endTime,
|
|
|
- List<String> deps, String salesmanName, Integer complete, String orderNo, String contractNo, Integer type, Integer pageSize, Integer pageNo) {
|
|
|
+ String deps, String salesmanName, Integer complete, String orderNo, String contractNo, Integer type, Integer pageSize, Integer pageNo) {
|
|
|
Result res =new Result();
|
|
|
res.data(orderChangeService.selectOrderChangeList( userName, processState, timeType, startTime, endTime,
|
|
|
deps, salesmanName, complete, orderNo, contractNo, type,pageSize, pageNo));
|
|
|
@@ -434,12 +434,12 @@ public class OrderChangeApiController extends CertifyApiController {
|
|
|
*/
|
|
|
@RequestMapping(value = "/exportMyChange" , method = RequestMethod.GET)
|
|
|
public Result exportMyBill(HttpServletResponse response,String userName,Integer processState,Integer timeType,String startTime,String endTime,
|
|
|
- List<String> deps,String salesmanName,Integer complete,String orderNo, String contractNo,Integer type,Integer pageSize, Integer pageNo) {
|
|
|
+ String deps,String salesmanName,Integer complete,String orderNo, String contractNo,Integer type,Integer pageSize, Integer pageNo) {
|
|
|
Result res=new Result();
|
|
|
try {
|
|
|
- orderChangeService.exportMyChange( response, userName, processState, timeType, startTime, endTime,
|
|
|
- deps, salesmanName, complete, orderNo, contractNo, type, pageSize, pageNo);
|
|
|
- } catch (Exception e) {
|
|
|
+ orderChangeService.exportMyChange(response,userName,processState,timeType,startTime,endTime,deps,salesmanName,complete,
|
|
|
+ orderNo,contractNo,type,pageSize,pageNo);
|
|
|
+ } catch (IOException e) {
|
|
|
res.getError().add(buildError("格式不正确"));
|
|
|
e.printStackTrace();
|
|
|
return res;
|