Merge branch 'dev-2.12.0' of province-qinghai/province-all into dev

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

@@ -29,7 +29,7 @@ import java.util.List;
  * @date  2024/06/07 10:46
  **/
 public interface QualityInspectionOrgMapper extends BaseMapper<QualityInspectionOrg> {
-    Page<QualityInspectionWhole> wholeWarehouseQualityInspectionPage(Page<Object> objectPage,@Param("storehouseName") String storehouseName);
+    Page<QualityInspectionWhole> wholeWarehouseQualityInspectionPage(Page<Object> objectPage,@Param("storehouseName") String storehouseName, @Param("orgId") Integer orgId);
 
     QualityInspectionWholeDetail getQualityInspection(@Param("qualityId") Integer qualityId);
 

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

@@ -23,8 +23,11 @@
         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>
+            <if test="orgId != null and orgId != ''">
+                qqi.org_id = #{orgId}
+            </if>
             <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/QualityInspectionOrgPageParam.java

@@ -53,4 +53,7 @@ public class QualityInspectionOrgPageParam {
 
     @ApiModelProperty(value = "仓房名称(整仓质检)")
     private String storehouseName;
+
+    @ApiModelProperty(value = "机构编码")
+    private Integer orgId;
 }

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

@@ -102,7 +102,7 @@ public class QualityInspectionOrgServiceImpl extends ServiceImpl<QualityInspecti
 
     @Override
     public Page<QualityInspectionWhole> wholeWarehouseQualityInspectionPage(QualityInspectionOrgPageParam param) {
-        return qualityInspectionOrgMapper.wholeWarehouseQualityInspectionPage(new Page<>(param.getCurrent(), param.getSize()), param.getStorehouseName());
+        return qualityInspectionOrgMapper.wholeWarehouseQualityInspectionPage(new Page<>(param.getCurrent(), param.getSize()), param.getStorehouseName(), param.getOrgId());
     }
 
     @Override