#新增生产日期和到期日期，和超期检索

lty

1 天以前 d599942e79ea0198898bdfde049b908418debf54

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

@@ -19,6 +19,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.time.LocalDate;
import java.util.*;

@RestController
@@ -86,14 +87,23 @@
                  @RequestParam(required = false)String orderByType,
                  @RequestParam(required = false)String condition,
                  @RequestParam Map<String, Object> param,
                  @RequestParam(required = false)Boolean unreason){
                  @RequestParam(required = false)Boolean unreason,
                  @RequestParam(required = false)Boolean expired){
        if (!Cools.isEmpty(unreason) && unreason) {

            return R.ok(locDetlService.selectPage(new Page<>(curr, limit), new EntityWrapper<LocDetl>()
                    .where(" DATALENGTH( batch ) != 11 or\n" +
                            "            batch LIKE '%[a-z]%'")));
        }
        if (!Cools.isEmpty(expired) && expired) {
            return R.ok(locDetlService.selectPage(
                    new Page<>(curr, limit),
                    new EntityWrapper<LocDetl>()
                            .where("deadline < {0}", LocalDate.now())  // 新增的过期判断
            ));
        }
        param.remove("unreason");
        param.remove("expired");
        String row = "";
        EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
        if (param.get("row") != null) {