全文搜索

luxiaotao1123

2020-06-22 0aabc79e45222782ce76e04c2c51437be89d610a

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

@@ -5,14 +5,14 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.zy.asrs.entity.WrkMastLog;
import com.zy.asrs.service.WrkMastLogService;
import com.zy.common.web.BaseController;
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.WrkMastLog;
import com.zy.asrs.service.WrkMastLogService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@@ -39,10 +39,12 @@
                  @RequestParam(defaultValue = "10")Integer limit,
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam(required = false)String condition,
                  @RequestParam Map<String, Object> param){
        excludeTrash(param);
        EntityWrapper<WrkMastLog> wrapper = new EntityWrapper<>();
        convert(param, wrapper);
        allLike(WrkMastLog.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){
            if (orderByField.endsWith("$")){
                orderByField = orderByField.substring(0, orderByField.length()-1);
@@ -67,14 +69,14 @@
    }

    @RequestMapping(value = "/wrkMastLog/add/auth")
    @ManagerAuth
    @ManagerAuth(memo = "工作历史档添加")
    public R add(WrkMastLog wrkMastLog) {
        wrkMastLogService.insert(wrkMastLog);
        return R.ok();
    }

   @RequestMapping(value = "/wrkMastLog/update/auth")
   @ManagerAuth
   @ManagerAuth(memo = "工作历史档修改")
    public R update(WrkMastLog wrkMastLog){
        if (Cools.isEmpty(wrkMastLog) || null==wrkMastLog.getId()){
            return R.error();
@@ -84,7 +86,7 @@
    }

    @RequestMapping(value = "/wrkMastLog/delete/auth")
    @ManagerAuth
    @ManagerAuth(memo = "工作历史档删除")
    public R delete(@RequestParam String param){
        List<WrkMastLog> list = JSONArray.parseArray(param, WrkMastLog.class);
        if (Cools.isEmpty(list)){
@@ -97,7 +99,7 @@
    }

    @RequestMapping(value = "/wrkMastLog/export/auth")
    @ManagerAuth
    @ManagerAuth(memo = "工作历史档导出")
    public R export(@RequestBody JSONObject param){
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        EntityWrapper<WrkMastLog> wrapper = new EntityWrapper<>();