*

lsh

12 小时以前 f0a7fa09eeef7fd9dc97173b5ef8e319d17c7f28

 src/main/java/com/zy/asrs/controller/OrderDetlPakoutController.java

@@ -10,15 +10,14 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.OrderDetlPakout;
import com.zy.asrs.entity.result.OrderPakoutDetailVo;
import com.zy.asrs.service.OrderDetlPakoutService;
import com.zy.asrs.service.impl.OrderDetlPakoutServiceImpl;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;

@RestController
@RequestMapping("order/pakout")
@@ -26,6 +25,8 @@

    @Autowired
    private OrderDetlPakoutService orderDetlService;
    @Autowired
    private OrderDetlPakoutServiceImpl orderDetlPakoutService;

    @RequestMapping(value = "/orderDetl/{id}/auth")
    @ManagerAuth
@@ -135,14 +136,38 @@
        return R.ok();
    }

    @RequestMapping(value = "/cargo/grouping/auth")
    @RequestMapping(value = "/orderDetl/cargo/grouping/auth")
    @ManagerAuth
    public R orderDetlCargoGrouping(@RequestBody JSONObject param) {
        Wrapper<OrderDetlPakout> wrapper = new EntityWrapper<OrderDetlPakout>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != orderDetlService.selectOne(wrapper)){
            return R.parse(BaseRes.REPEAT).add(getComment(OrderDetlPakout.class, String.valueOf(param.get("key"))));
    public R orderDetlCargoGrouping(@RequestParam(defaultValue = "1")Integer curr,
                                    @RequestParam(defaultValue = "10")Integer limit,
                                    @RequestParam(required = false)String orderByField,
                                    @RequestParam(required = false)String orderByType,
                                    @RequestParam Map<String, Object> param){
        try{
            String itemName = null;
            Date modiTimeStart = null, modiTimeEnd = null;
            for (Map.Entry<String, Object> entry : param.entrySet()) {
                String val = String.valueOf(entry.getValue());
                if (Cools.isEmpty(val)) {
                    continue;
                }
                if (val.contains(RANGE_TIME_LINK)) {
                    String[] dates = val.split(RANGE_TIME_LINK);
                    modiTimeStart = DateUtils.convert(dates[0]);
                    modiTimeEnd = DateUtils.convert(dates[1]);
                } else if (entry.getKey().equals("item_name")) {
                    itemName = val;
                }
            }
            List<OrderPakoutDetailVo> OrderPakoutDetailVoList = orderDetlPakoutService.selectOrderPakoutDetailVoList(itemName,modiTimeStart,modiTimeEnd, curr, limit);
            Page<OrderPakoutDetailVo> page = new Page<OrderPakoutDetailVo>(curr, limit).setRecords(OrderPakoutDetailVoList);
            page.setTotal(orderDetlPakoutService.selectOrderPakoutDetailVoListTotal(itemName,modiTimeStart,modiTimeEnd));
            return R.ok(page);

        } catch (Exception e) {
            return R.error("查询失败,请检查参数:"+e.getMessage());
        }
        return R.ok();
    }


}