From 8e943b7104561c3b14cf223016698709c5ade4b5 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 03 二月 2026 15:37:26 +0800
Subject: [PATCH] #pda料箱组托和换码

---
 src/main/java/com/zy/asrs/controller/DocTypeController.java |   27 +++++++++++++++++----------
 1 files changed, 17 insertions(+), 10 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..5faf7e4 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,18 +59,25 @@
     @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();
+        return R.ok("response.save_success");
     }
 
 	@RequestMapping(value = "/docType/update/auth")
 	@ManagerAuth
     public R update(DocType docType){
         if (Cools.isEmpty(docType) || null==docType.getDocId()){
-            return R.error();
+            return R.error("response.param_error");
         }
+        docType.setUpdateBy(getUserId());
+        docType.setUpdateTime(new Date());
         docTypeService.updateById(docType);
-        return R.ok();
+        return R.ok("response.update_success");
     }
 
     @RequestMapping(value = "/docType/delete/auth")
@@ -80,7 +86,7 @@
          for (Long id : ids){
             docTypeService.deleteById(id);
         }
-        return R.ok();
+        return R.ok("response.delete_success");
     }
 
     @RequestMapping(value = "/docType/export/auth")
@@ -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