Merge branch 'dev-hujianchun-bug' of province-qinghai/province-all into dev

unis-plugin/unis-plugin-biz/src/main/java/com/unis/mobileInfo/modular/qcqualityinspection/enums/GradeEnum.java

@@ -0,0 +1,41 @@
+package com.unis.mobileInfo.modular.qcqualityinspection.enums;
+
+public enum GradeEnum {
+
+    FIRST("一等", "1"),
+    TWO("二等", "2"),
+    THREE("三等", "3"),
+    FOUR("四等", "4"),
+    FIVE("五等", "5"),
+    ENDURES("等外", "6");
+
+
+    GradeEnum(String key, String value) {
+        this.key = key;
+        this.value = value;
+    }
+
+    private String key;
+    private String value;
+
+
+    public String getKey() {
+        return key;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+
+    //获取对应值
+    public static String getIntValue(String key) {
+        GradeEnum[] values = GradeEnum.values();
+        for (GradeEnum value : values) {
+            if (value.getKey().equals(key)) {
+                return value.getValue();
+            }
+        }
+        return null;
+    }
+}

unis-plugin/unis-plugin-biz/src/main/java/com/unis/mobileInfo/modular/qcqualityinspection/service/impl/BusinessQcQualityInspectionServiceImpl.java

@@ -31,6 +31,7 @@ import com.unis.basic.info.modular.storehouseInfo.mapper.StorehouseInfoMapper;
 import com.unis.basic.info.modular.unitInfo.mapper.EnumMapper;
 import com.unis.basic.info.modular.warehouseInfo.entity.WarehouseInfo;
 import com.unis.basic.info.modular.warehouseInfo.mapper.WarehouseInfoMapper;
+import com.unis.mobileInfo.modular.qcqualityinspection.enums.GradeEnum;
 import com.unis.mobileInfo.modular.qcqualityinspection.param.*;
 import com.unis.mobileInfo.modular.qcqualityinspection.vo.ReserveQualityCityPageVO;
 import com.unis.mobileInfo.modular.qcqualityinspection.vo.ReserveQualityOrgPageVO;
@@ -231,9 +232,10 @@ public class BusinessQcQualityInspectionServiceImpl extends ServiceImpl<Business
     public Page<ReserveQualityStoreHousePageVO> reserveQualityStoreHousePage(ReserveQualityStoreHousePageParam pageParam) {
 
         Page<BusinessQcQualityInspection> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
+        String ypdj = GradeEnum.getIntValue(pageParam.getYpdj());
 
         return businessQcQualityInspectionMapper.selectMyPage(page, pageParam.getBasicStorehouseName(), pageParam.getGrainVarietyName(),
-                pageParam.getReceiveYear(), pageParam.getYpdj(), pageParam.getOrgId());
+                pageParam.getReceiveYear(), ypdj, pageParam.getOrgId());
     }