模块开发12

huimv-farm/src/main/java/vip/xiaonuo/quality/controller/ErpBdQuailController.java

@@ -1,9 +1,26 @@
 package vip.xiaonuo.quality.controller;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
+import vip.xiaonuo.common.pojo.CommonResult;
+import vip.xiaonuo.quality.entity.ErpBdQuail;
+import vip.xiaonuo.quality.entity.QualityEffectice;
+import vip.xiaonuo.quality.param.QualityBdParam;
+import vip.xiaonuo.quality.param.QualityEffectiveParam;
+import vip.xiaonuo.quality.service.IErpBdQuailService;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,6 +32,18 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/erp-bd-quail")
+@Api(tags = "质量成品和中间件列表")
+@ApiSupport(author = "wang", order = 1)
+@Validated
 public class ErpBdQuailController {
 
+    @Autowired
+    private IErpBdQuailService bdQuailService;
+
+    @PostMapping("/erp-bd-quail/list")
+    @ApiOperationSupport(order = 1)
+    @ApiOperation("质量成品和中间件列表")
+    public CommonResult<List<ErpBdQuail>> list(@RequestBody QualityBdParam bdParam) {
+        return CommonResult.data(bdQuailService.getBdList(bdParam));
+    }
 }

huimv-farm/src/main/java/vip/xiaonuo/quality/controller/QualityFenxibaogaoController.java

@@ -61,7 +61,7 @@ public class QualityFenxibaogaoController {
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取质量分析报表分页")
     @PostMapping("/biz/fenxibaogao/page")
-    public CommonResult<Page<QualityFenxibaogao>> page(QualityFenxibaogaoPageParam qualityFenxibaogaoPageParam) {
+    public CommonResult<Page<QualityFenxibaogao>> page(@RequestBody QualityFenxibaogaoPageParam qualityFenxibaogaoPageParam) {
         return CommonResult.data(qualityFenxibaogaoService.page(qualityFenxibaogaoPageParam));
     }
 

huimv-farm/src/main/java/vip/xiaonuo/quality/entity/ErpBdQuail.java

@@ -7,6 +7,7 @@ import java.time.LocalDateTime;
 import java.io.Serializable;
 import java.util.Date;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -33,60 +34,73 @@ public class ErpBdQuail implements Serializable {
     /**
      * 质检id
      */
+    @ApiModelProperty(value = "质检id",position = 1)
     private Integer incQcSchemeId;
 
     /**
      * 外键id
      */
+    @ApiModelProperty(value = "外键id",position = 2)
     private Integer fmaterialId;
 
     /**
      * 名称
      */
+    @ApiModelProperty(value = "名称",position = 3)
     private String fname;
 
     /**
      * 检验项目
      */
+    @ApiModelProperty(value = "检验项目",position = 4)
     private String fBglRemark;
 
     /**
      * 单位
      */
+    @ApiModelProperty(value = "单位",position = 5)
     private String fBglText;
 
     /**
      * 标准值
      */
+    @ApiModelProperty(value = "标准值",position = 6)
     private String fBglText1;
 
     /**
      * 物料编码
      */
+    @ApiModelProperty(value = "物料编码",position =7 )
     private String fnumber;
 
     /**
      * 部门id
      */
+    @ApiModelProperty(value = "部门id",position = 8)
     private Integer fuseorgid;
 
     /**
      * 目标值
      */
+    @ApiModelProperty(value = "目标值",position =9 )
     private String ftargetval;
 
     /**
      * 上限值
      */
+    @ApiModelProperty(value = "上限值",position = 10)
     private String fuplimit;
 
     /**
      * 下限值
      */
+    @ApiModelProperty(value = "下限值",position =11 )
     private String fdownlimit;
 
+    @ApiModelProperty(value = "组织id",position =12 )
     private String orgId;
 
+    @ApiModelProperty(value = "创建时间",position =13 )
     private Date createTime;
 
 

huimv-farm/src/main/java/vip/xiaonuo/quality/param/QualityBdParam.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright [2022] [https://www.baiduc.com]
+ *
+ * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
+ *
+ * 1.请不要删除和修改根目录下的LICENSE文件。
+ * 2.请不要删除和修改Snowy源码头部的版权声明。
+ * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。
+ * 4.分发源码时候，请注明软件出处 https://www.baiduc.com
+ * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
+ * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.baiduc.com
+ */
+package vip.xiaonuo.quality.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 人员明细Id参数
+ *
+ * @author 余
+ * @date  2024/11/14 15:02
+ **/
+@Getter
+@Setter
+public class QualityBdParam {
+
+
+    @ApiModelProperty(value = "orgId", required = true)
+    private String orgId;
+
+    @ApiModelProperty(value = "erpFnumber", required = true)
+    private String erpFnumber;
+
+    @ApiModelProperty(value = "fname", required = true)
+    private String fname;
+}

huimv-farm/src/main/java/vip/xiaonuo/quality/param/QualityFenxibaogaoPageParam.java

@@ -27,28 +27,36 @@ import java.util.Date;
 @Getter
 @Setter
 public class QualityFenxibaogaoPageParam {
+//
+//    /** 当前页 */
+//    @ApiModelProperty(value = "当前页码")
+//    private Integer current;
+//
+//    /** 每页条数 */
+//    @ApiModelProperty(value = "每页条数")
+//    private Integer size;
+//
+//    /** 排序字段 */
+//    @ApiModelProperty(value = "排序字段，字段驼峰名称，如：userName")
+//    private String sortField;
+//
+//    /** 排序方式 */
+//    @ApiModelProperty(value = "排序方式，升序：ASCEND；降序：DESCEND")
+//    private String sortOrder;
+//
+//    /** 关键词 */
+//    @ApiModelProperty(value = "关键词")
+//    private String searchKey;
 
-    /** 当前页 */
-    @ApiModelProperty(value = "当前页码")
-    private Integer current;
-
-    /** 每页条数 */
-    @ApiModelProperty(value = "每页条数")
-    private Integer size;
+    @ApiModelProperty(value = "")
+    private String orgId;
 
-    /** 排序字段 */
-    @ApiModelProperty(value = "排序字段，字段驼峰名称，如：userName")
-    private String sortField;
+    @ApiModelProperty(value = "当前页码")
+    private Integer pageNum;
 
-    /** 排序方式 */
-    @ApiModelProperty(value = "排序方式，升序：ASCEND；降序：DESCEND")
-    private String sortOrder;
 
-    /** 关键词 */
-    @ApiModelProperty(value = "关键词")
-    private String searchKey;
+    @ApiModelProperty(value = "当前页码")
+    private Integer pageSize;
 
-    @ApiModelProperty(value = "")
-    private String orgId;
 
 }

huimv-farm/src/main/java/vip/xiaonuo/quality/service/IErpBdQuailService.java

@@ -2,6 +2,9 @@ package vip.xiaonuo.quality.service;
 
 import vip.xiaonuo.quality.entity.ErpBdQuail;
 import com.baomidou.mybatisplus.extension.service.IService;
+import vip.xiaonuo.quality.param.QualityBdParam;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +16,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IErpBdQuailService extends IService<ErpBdQuail> {
 
+    List<ErpBdQuail> getBdList(QualityBdParam bdParam);
+
 }

huimv-farm/src/main/java/vip/xiaonuo/quality/service/impl/ErpBdQuailServiceImpl.java

@@ -1,11 +1,16 @@
 package vip.xiaonuo.quality.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import vip.xiaonuo.quality.entity.ErpBdQuail;
 import vip.xiaonuo.quality.mapper.ErpBdQuailMapper;
+import vip.xiaonuo.quality.param.QualityBdParam;
 import vip.xiaonuo.quality.service.IErpBdQuailService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +22,17 @@ import org.springframework.stereotype.Service;
 @Service
 public class ErpBdQuailServiceImpl extends ServiceImpl<ErpBdQuailMapper, ErpBdQuail> implements IErpBdQuailService {
 
+    @Autowired
+    private ErpBdQuailMapper bdQuailMapper;
+
+    @Override
+    public List<ErpBdQuail> getBdList(QualityBdParam bdParam) {
+        String orgId = bdParam.getOrgId();
+        String erpFnumber = bdParam.getErpFnumber();
+        String fname = bdParam.getFname();
+        QueryWrapper<ErpBdQuail> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("org_id", orgId).eq("fname", fname).eq("fnumber", erpFnumber);
+        return bdQuailMapper.selectList(queryWrapper);
+    }
+
 }

huimv-farm/src/main/java/vip/xiaonuo/quality/service/impl/QualityFenxibaogaoServiceImpl.java

@@ -61,17 +61,10 @@ public class QualityFenxibaogaoServiceImpl extends ServiceImpl<QualityFenxibaoga
     @Override
     public Page<QualityFenxibaogao> page(QualityFenxibaogaoPageParam qualityFenxibaogaoPageParam) {
         QueryWrapper<QualityFenxibaogao> queryWrapper = new QueryWrapper<>();
-        if(ObjectUtil.isAllNotEmpty(qualityFenxibaogaoPageParam.getSortField(), qualityFenxibaogaoPageParam.getSortOrder())) {
-            CommonSortOrderEnum.validate(qualityFenxibaogaoPageParam.getSortOrder());
-            queryWrapper.orderBy(true, qualityFenxibaogaoPageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),
-                    StrUtil.toUnderlineCase(qualityFenxibaogaoPageParam.getSortField()));
-        } else {
-            queryWrapper.lambda().orderByAsc(QualityFenxibaogao::getId);
-        }
         String orgId = qualityFenxibaogaoPageParam.getOrgId();
         queryWrapper.eq(StringUtils.isNotBlank(orgId),"org_id",orgId);
-
-        return this.page(CommonPageRequest.defaultPage(), queryWrapper);
+        Page<QualityFenxibaogao> page = new Page<>(qualityFenxibaogaoPageParam.getPageNum(), qualityFenxibaogaoPageParam.getPageSize());
+        return qualityFenxibaogaoMapper.selectPage(page, queryWrapper);
     }
 
     @Transactional(rollbackFor = Exception.class)