质检数据录入添加orgId条件

unis-plugin/unis-plugin-biz/src/main/java/com/unis/reserveLayout/modular/qualityInspectionOrg/controller/QualityInspectionController.java

@@ -42,7 +42,7 @@ public class QualityInspectionController {
     @ApiOperationSupport(order = 1)
     @ApiOperation("质检数据录入-分页")
     @GetMapping("/pageList")
-    public CommonResult<Page<BusinessQcQualityInspection>> pageList(QualityInspectionPageParam pageParam) {
+    public CommonResult<Page<BusinessQcQualityInspection>> pageList(@Validated QualityInspectionPageParam pageParam) {
         return CommonResult.data(qualityInspectionService.pageList(pageParam));
     }
 

unis-plugin/unis-plugin-biz/src/main/java/com/unis/reserveLayout/modular/qualityInspectionOrg/mapper/QualityInspectionMapper.java

@@ -15,7 +15,7 @@ import java.util.Map;
  * @create 2024-06-11 17:23
  */
 public interface QualityInspectionMapper extends BaseMapper<BusinessQcQualityInspection> {
-    Page<BusinessQcQualityInspection> pageList(Page<Object> objectPage, @Param("storehouseName") String storehouseName);
+    Page<BusinessQcQualityInspection> pageList(Page<Object> objectPage, @Param("storehouseName") String storehouseName, @Param("orgId") Integer orgId);
 
     String selectOnly(Map<String, Object> map);
 

unis-plugin/unis-plugin-biz/src/main/java/com/unis/reserveLayout/modular/qualityInspectionOrg/mapper/mapping/QualityInspectionMapper.xml

@@ -26,8 +26,9 @@
         LEFT JOIN depot_qh.basic_enum be ON qqi.grain_variety_id = be.enumId
         LEFT JOIN depot_qh.basic_enum be1 ON qqi.grain_nature_id = be1.enumId
         <where>
+            qqi.org_id = #{orgId}
             <if test="storehouseName != null and storehouseName != ''">
-                bs.storehouse_name LIKE concat("%",#{storehouseName},"%")
+               and bs.storehouse_name LIKE concat("%",#{storehouseName},"%")
             </if>
         </where>
     </select>

unis-plugin/unis-plugin-biz/src/main/java/com/unis/reserveLayout/modular/qualityInspectionOrg/param/QualityInspectionPageParam.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * @author qingsong.han
  * @description:
@@ -21,4 +23,8 @@ public class QualityInspectionPageParam {
 
     @ApiModelProperty(value = "仓房名称")
     private String storehouseName;
+
+    @ApiModelProperty(value = "机构编码")
+    @NotNull(message = "orgId不能为空")
+    private Integer orgId;
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/reserveLayout/modular/qualityInspectionOrg/service/impl/QualityInspectionServiceImpl.java

@@ -124,7 +124,7 @@ public class QualityInspectionServiceImpl extends ServiceImpl<QualityInspectionM
 
     @Override
     public Page<BusinessQcQualityInspection> pageList(QualityInspectionPageParam pageParam) {
-        return qualityInspectionMapper.pageList(new Page<>(pageParam.getCurrent(), pageParam.getSize()), pageParam.getStorehouseName());
+        return qualityInspectionMapper.pageList(new Page<>(pageParam.getCurrent(), pageParam.getSize()), pageParam.getStorehouseName(), pageParam.getOrgId());
     }
 
     @Override