From d290c28f525eee3da63a95c63a1c42c69d6cdb46 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期三, 21 九月 2022 11:12:30 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/DocTypeController.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/DocTypeController.java b/src/main/java/com/zy/asrs/controller/DocTypeController.java
index 96c3270..72ce073 100644
--- a/src/main/java/com/zy/asrs/controller/DocTypeController.java
+++ b/src/main/java/com/zy/asrs/controller/DocTypeController.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.DocType;
-import com.zy.asrs.service.DocTypeService;
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.DocType;
+import com.zy.asrs.service.DocTypeService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -60,6 +59,11 @@
@RequestMapping(value = "/docType/add/auth")
@ManagerAuth
public R add(DocType docType) {
+ docType.setStatus(1);
+ docType.setCreateBy(getUserId());
+ docType.setCreateTime(new Date());
+ docType.setUpdateBy(getUserId());
+ docType.setUpdateTime(new Date());
docTypeService.insert(docType);
return R.ok();
}
@@ -70,6 +74,8 @@
if (Cools.isEmpty(docType) || null==docType.getDocId()){
return R.error();
}
+ docType.setUpdateBy(getUserId());
+ docType.setUpdateTime(new Date());
docTypeService.updateById(docType);
return R.ok();
}
@@ -99,12 +105,13 @@
public R query(String condition) {
EntityWrapper<DocType> wrapper = new EntityWrapper<>();
wrapper.like("doc_name", condition);
- Page<DocType> page = docTypeService.selectPage(new Page<>(0, 10), wrapper);
+ wrapper.eq("status", 1);
+ Page<DocType> page = docTypeService.selectPage(new Page<>(0, 30), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (DocType docType : page.getRecords()){
Map<String, Object> map = new HashMap<>();
map.put("id", docType.getDocId());
- map.put("value", docType.getDocId());
+ map.put("value", docType.getDocName());
result.add(map);
}
return R.ok(result);
--
Gitblit v1.9.1