*

lsh

昨天 e1b47924a7f000f043d40fc9359491b6fa5d7873

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

@@ -10,15 +10,15 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.OrderDetlPakout;
import com.zy.asrs.entity.param.ReportOrderBatchDetlParam;
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 +26,8 @@

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

    @RequestMapping(value = "/orderDetl/{id}/auth")
    @ManagerAuth
@@ -142,16 +144,53 @@
                                    @RequestParam(required = false)String orderByField,
                                    @RequestParam(required = false)String orderByType,
                                    @RequestParam Map<String, Object> param){
        EntityWrapper<OrderDetlPakout> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
            wrapper.orderBy("create_time", false);
        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());
        }
//        wrapper.eq("status", 1);
        Page<OrderDetlPakout> orderDetlPage = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
        return R.ok(orderDetlPage);
    }

//    @RequestMapping(value = "/orderDetl/batch/report/auth")
//    @ManagerAuth(memo = "修改上报项")
//    public R reportBatch(@RequestBody JSONObject param) {
//        String.valueOf(param.get("key"))), param.get("val")
//        System.out.println(param);
//        return R.ok();
//    }

    @RequestMapping(value = "/orderDetl/batch/report/auth")
    @ManagerAuth(memo = "修改上报项")
    public R reportBatch(ReportOrderBatchDetlParam param) {
        List<OrderDetlPakout> orderDetlPakoutList = orderDetlPakoutService.selectList(new EntityWrapper<OrderDetlPakout>()
                .eq("batch", param.getBatch())
        );
        for (OrderDetlPakout orderDetl : orderDetlPakoutList){
            orderDetl.setStatus(param.getStatus());
            orderDetlService.updateById(orderDetl);
        }
        return R.ok();
    }



}