修改返回值

lyh

2025-01-20 7f22977ffdae8677b86538ea8fb33c88f3af8445

修改返回值

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DocInfoController.java

@@ -176,7 +176,7 @@
    @AutoLog(value = "文件表-查询可指派的文档信息列表")
    @ApiOperation(value = "文件表-查询可指派的文档信息列表", notes = "文件表-查询可指派的文档信息列表")
    @GetMapping("/find/list")
    public QueryListResponseResult<DocInfo> findList(DocInfoQueryRequest docQuery) {
    public Result<?> findList(DocInfoQueryRequest docQuery) {
        return docInfoService.findList(docQuery);
    }


 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProcessStream.java

@@ -48,7 +48,7 @@
    @TableField(value = "create_time", fill = FieldFill.INSERT)
    private Date createTime;
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
    @TableField(value = "create_time", fill = FieldFill.INSERT)
    @TableField(value = "update_time", fill = FieldFill.INSERT)
    private Date updateTime;
    @JsonIgnore
    @TableField(value = "create_by", select = false, fill = FieldFill.INSERT)

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/WorkStep.java

@@ -70,7 +70,7 @@
    @TableField(value = "create_time", fill = FieldFill.INSERT)
    private Date createTime;
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
    @TableField(value = "create_time", fill = FieldFill.INSERT)
    @TableField(value = "update_time", fill = FieldFill.INSERT)
    private Date updateTime;
    @JsonIgnore
    @TableField(value = "create_by", select = false, fill = FieldFill.INSERT)

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IDocInfoService.java

@@ -207,7 +207,7 @@
     * @param docQuery
     * @return
     */
    QueryListResponseResult<DocInfo> findList(DocInfoQueryRequest docQuery);
    Result<?> findList(DocInfoQueryRequest docQuery);

    /**
     * 获取一组工序下的文档信息列表

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java

@@ -790,7 +790,7 @@
    }

    @Override
    public QueryListResponseResult<DocInfo> findList(DocInfoQueryRequest docQuery) {
    public Result<?> findList(DocInfoQueryRequest docQuery) {
        if(docQuery == null || !ValidateUtil.validateString(docQuery.getAttributionId())
                || !ValidateUtil.validateInteger(docQuery.getAttributionType()) ||
                !ValidateUtil.validateString(docQuery.getDocClassCode())) {
@@ -817,7 +817,7 @@
        queryWrapper.ge(StrUtil.isNotEmpty(docQuery.getStartTime()),"date_format(u.create_time,'%Y-%m-%d %H:%i:%s')",docQuery.getStartTime());
        queryWrapper.le(StrUtil.isNotEmpty(docQuery.getEndTime()),"date_format(u.create_time,'%Y-%m-%d %H:%i:%s')",docQuery.getEndTime());
        List<DocInfo> docInfoIPage = super.getBaseMapper().findDocExtList(queryWrapper);
        return new QueryListResponseResult<>(CommonCode.SUCCESS, docInfoIPage);
        return Result.ok(docInfoIPage);
    }

    @Override