#

luxiaotao1123

2022-04-19 87889abe8f8a573db91caff303fa81c89050ebe8

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

@@ -1,17 +1,16 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.Pack;
import com.zy.asrs.service.PackService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.Pack;
import com.zy.asrs.service.PackService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -40,7 +39,9 @@
        EntityWrapper<Pack> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
            wrapper.orderBy("create_time", false);
        }
        return R.ok(packService.selectPage(new Page<>(curr, limit), wrapper));
    }

@@ -70,6 +71,8 @@
        if (Cools.isEmpty(pack) || null==pack.getId()){
            return R.error();
        }
        pack.setUpdateBy(getUserId());
        pack.setUpdateTime(new Date());
        packService.updateById(pack);
        return R.ok();
    }