Merge branch 'dev_2nd_LCYH' of http://git.hzwlsoft.com/laws-nio/laws-weilai into dev_2nd_LCYH

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxLsjlController.java

@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import com.jero.common.system.base.controller.JeroController;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -53,11 +54,16 @@ public class OtaBaCxLsjlController extends JeroController<OtaBaCxLsjl, IOtaBaCxL
                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                    HttpServletRequest req) {
+        Object obj = req.getParameterMap().get("otaId");
+        if(ObjectUtils.isNotEmpty(obj)){
             QueryWrapper<OtaBaCxLsjl> queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxLsjl, req.getParameterMap());
             queryWrapper.orderByDesc("create_time");
             Page<OtaBaCxLsjl> page = new Page<OtaBaCxLsjl>(pageNo, pageSize);
             IPage<OtaBaCxLsjl> pageList = otaBaCxLsjlService.page(page, queryWrapper);
             return Result.OK(pageList);
+        }else{
+            return Result.OK();
+        }
     }
 
     /**

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjLsjlController.java

@@ -4,6 +4,7 @@ import java.util.Arrays;
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import com.jero.common.api.vo.Result;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.ota.entity.OtaBaSjLsjl;
@@ -13,6 +14,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import com.jero.common.system.base.controller.JeroController;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -52,11 +54,16 @@ public class OtaBaSjLsjlController extends JeroController<OtaBaSjLsjl, IOtaBaSjL
                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                    HttpServletRequest req) {
+        Object obj = req.getParameterMap().get("otaId");
+        if (ObjectUtils.isNotEmpty(obj)) {
             QueryWrapper<OtaBaSjLsjl> queryWrapper = QueryGenerator.initQueryWrapper(otaBaSjLsjl, req.getParameterMap());
             queryWrapper.orderByDesc("create_time");
             Page<OtaBaSjLsjl> page = new Page<OtaBaSjLsjl>(pageNo, pageSize);
             IPage<OtaBaSjLsjl> pageList = otaBaSjLsjlService.page(page, queryWrapper);
             return Result.OK(pageList);
+        } else {
+            return Result.OK();
+        }
     }
 
     /**
@@ -67,7 +74,7 @@ public class OtaBaSjLsjlController extends JeroController<OtaBaSjLsjl, IOtaBaSjL
     @AutoLog(value = "升级备案-历史记录-列表查询")
     @ApiOperation(value = "升级备案-历史记录-列表查询", notes = "升级备案-历史记录-列表查询")
     @GetMapping(value = "/list")
-	public Result<List<OtaBaSjLsjl>> queryList() {
+    public Result<List<OtaBaSjLsjl>> queryList(@RequestBody OtaBaSjLsjl OtaBaSjLsjl) {
         List<OtaBaSjLsjl> list = otaBaSjLsjlService.queryList();
         return Result.OK(list);
     }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjLsjl.java

@@ -69,6 +69,7 @@ public class OtaBaSjLsjl implements Serializable {
 	/**数据状态*/
 	@Excel(name = "数据状态", width = 15)
     @ApiModelProperty(value = "数据状态")
+    @Dict(dicCode = "recordstatus")
     private java.lang.String sjzt;
 
 }