1.新增分区查询 2.任务档新增分区字段

zwl

3 天以前 fb57e7836338304b16c09fec4fb5c68fb688c39e

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

@@ -11,6 +11,7 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +24,9 @@

    @Autowired
    private WrkMastService wrkMastService;

    @Autowired
    private LocMastService locMastService;

    @RequestMapping(value = "/wrkMast/{id}/auth")
    @ManagerAuth
@@ -61,10 +65,21 @@
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
                if (entry.getKey().equals("loc_no") || entry.getKey().equals("source_loc_no")) {
                    List<String> locNos = locMastService.selectLocNosByNoOrAlias(val);
                    if (locNos.isEmpty()) {
                        wrapper.eq(entry.getKey(), "__NO_MATCH__");
                    } else {
                        wrapper.in(entry.getKey(), locNos);
                    }
                } else if (entry.getKey().equals("area_id")) {
                    wrapper.eq(entry.getKey(), val);
                } else {
                wrapper.like(entry.getKey(), val);
            }
        }
    }
    }

    @RequestMapping(value = "/wrkMast/add/auth")
    @ManagerAuth(memo = "工作档添加")