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/mapping/QualityInspectionOrgMapper.xml

@@ -49,9 +49,9 @@
             be1.enumname grainNatureName,
             qqi.grain_grade_id grainGradeId,
             be2.enumname grainGradeName,
-            kkd.ModifyDate modifyDate,
-            kkd.scnf,
-            kkd.gb,
+            kkd.rq modifyDate,
+            be3.enumname scnf,
+            be4.enumname gb,
             qqi.jydw,
             qqi.jyyj,
             qqi.check_result checkResult,
@@ -71,7 +71,8 @@
             qqi.dbsl,
             qqi.sample_status sampleStatus,
             qqi.sample_package_model samplePackageModel,
-            qqi.jysj
+            qqi.jysj,
+            qqi.shrxm
         FROM
             depot_qh.business_qc_quality_inspection qqi
         LEFT JOIN depot_qh.org_info oi ON qqi.org_id = oi.org_id
@@ -83,6 +84,8 @@
         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
         LEFT JOIN depot_qh.basic_enum be2 ON qqi.grain_grade_id = be2.enumId
+        LEFT JOIN depot_qh.basic_enum be3 ON kkd.scnf = be3.enumId
+        LEFT JOIN depot_qh.basic_enum be4 ON kkd.gb = be4.enumId
         WHERE
             id = #{qualityId}
     </select>