From 600dd1637244fb476c1373c390dfcf23ca26a948 Mon Sep 17 00:00:00 2001
From: bfwms <1>
Date: 星期三, 28 五月 2025 20:16:30 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/BasSteController.java |   48 +++++++++++++++++++++++++++++-------------------
 1 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/BasSteController.java b/src/main/java/com/zy/asrs/controller/BasSteController.java
index 7e342bd..95197ca 100644
--- a/src/main/java/com/zy/asrs/controller/BasSteController.java
+++ b/src/main/java/com/zy/asrs/controller/BasSteController.java
@@ -10,7 +10,9 @@
 import com.core.common.DateUtils;
 import com.core.common.R;
 import com.zy.asrs.entity.BasSte;
+import com.zy.asrs.entity.WrkMast;
 import com.zy.asrs.service.BasSteService;
+import com.zy.asrs.service.WrkMastService;
 import com.zy.common.web.BaseController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -25,6 +27,8 @@
 
     @Autowired
     private BasSteService basSteService;
+    @Autowired
+    private WrkMastService wrkMastService;
 
     @RequestMapping(value = "/basSte/{id}/auth")
     @ManagerAuth
@@ -34,24 +38,26 @@
 
     @RequestMapping(value = "/basSte/list/auth")
     @ManagerAuth
-    public R list(@RequestParam(defaultValue = "1")Integer curr,
-                  @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){
+    public R list(@RequestParam(defaultValue = "1") Integer curr,
+                  @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) {
         EntityWrapper<BasSte> wrapper = new EntityWrapper<>();
         excludeTrash(param);
         convert(param, wrapper);
         allLike(BasSte.class, param.keySet(), wrapper, condition);
-        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+        if (!Cools.isEmpty(orderByField)) {
+            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+        }
         return R.ok(basSteService.selectPage(new Page<>(curr, limit), wrapper));
     }
 
-    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
-        for (Map.Entry<String, Object> entry : map.entrySet()){
+    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+        for (Map.Entry<String, Object> entry : map.entrySet()) {
             String val = String.valueOf(entry.getValue());
-            if (val.contains(RANGE_TIME_LINK)){
+            if (val.contains(RANGE_TIME_LINK)) {
                 String[] dates = val.split(RANGE_TIME_LINK);
                 wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                 wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -68,11 +74,15 @@
         return R.ok();
     }
 
-	@RequestMapping(value = "/basSte/update/auth")
-	@ManagerAuth
-    public R update(BasSte basSte){
-        if (Cools.isEmpty(basSte) || null==basSte.getSteNo()){
+    @RequestMapping(value = "/basSte/update/auth")
+    @ManagerAuth
+    public R update(BasSte basSte) {
+        if (Cools.isEmpty(basSte) || null == basSte.getSteNo()) {
             return R.error();
+        }
+        List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<>());
+        if (wrkMasts == null || wrkMasts.isEmpty()) {
+            basSte.setPakMk("N");
         }
         basSteService.updateById(basSte);
         return R.ok();
@@ -80,8 +90,8 @@
 
     @RequestMapping(value = "/basSte/delete/auth")
     @ManagerAuth
-    public R delete(@RequestParam(value="ids[]") Long[] ids){
-        for (Long id : ids){
+    public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+        for (Long id : ids) {
             basSteService.deleteById(id.intValue());
         }
         return R.ok();
@@ -89,7 +99,7 @@
 
     @RequestMapping(value = "/basSte/export/auth")
     @ManagerAuth
-    public R export(@RequestBody JSONObject param){
+    public R export(@RequestBody JSONObject param) {
         EntityWrapper<BasSte> wrapper = new EntityWrapper<>();
         List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
         Map<String, Object> map = excludeTrash(param.getJSONObject("basSte"));
@@ -105,7 +115,7 @@
         wrapper.like("ste_no", condition);
         Page<BasSte> page = basSteService.selectPage(new Page<>(0, 10), wrapper);
         List<Map<String, Object>> result = new ArrayList<>();
-        for (BasSte basSte : page.getRecords()){
+        for (BasSte basSte : page.getRecords()) {
             Map<String, Object> map = new HashMap<>();
             map.put("id", basSte.getSteNo());
             map.put("value", basSte.getSteNo());
@@ -118,7 +128,7 @@
     @ManagerAuth
     public R query(@RequestBody JSONObject param) {
         Wrapper<BasSte> wrapper = new EntityWrapper<BasSte>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
-        if (null != basSteService.selectOne(wrapper)){
+        if (null != basSteService.selectOne(wrapper)) {
             return R.parse(BaseRes.REPEAT).add(getComment(BasSte.class, String.valueOf(param.get("key"))));
         }
         return R.ok();

--
Gitblit v1.9.1