hanfucheng před 4 měsíci
rodič
revize
2317f1ec49

+ 1 - 1
data-ui/src/views/data/other/weatherstation/index.vue

@@ -110,7 +110,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="地址" prop="weatherstationAddress">
-              <el-input v-model="form.weatherstationAddress" placeholder="请输入地址" :disabled="disabled"/>
+              <el-input v-model="form.weatherstationAddress" placeholder="请输入地址" :disabled="disabled" maxlength="50"/>
             </el-form-item>
           </el-col>
           <el-col :span="24">

+ 5 - 1
src/main/java/com/sooka/sponest/data/other/hydroenergy/service/impl/CenterdataTResourcesHydroenergyServiceImplImpl.java

@@ -48,7 +48,11 @@ public class CenterdataTResourcesHydroenergyServiceImplImpl extends BaseServiceI
     @DataScopeMutiDept(deptAlias = "d")
     public List<CenterdataTResourcesHydroenergy> selectCenterdataTResourcesHydroenergyList(CenterdataTResourcesHydroenergy centerdataTResourcesHydroenergy) {
         setSookaDataBase(centerdataTResourcesHydroenergy);
-        return centerdataTResourcesHydroenergyMapper.selectCenterdataTResourcesHydroenergyList(centerdataTResourcesHydroenergy);
+        List<CenterdataTResourcesHydroenergy> centerdataTResourcesHydroenergies = centerdataTResourcesHydroenergyMapper.selectCenterdataTResourcesHydroenergyList(centerdataTResourcesHydroenergy);
+        for (CenterdataTResourcesHydroenergy hydroenergy : centerdataTResourcesHydroenergies) {
+            hydroenergy.setHydroenergyTypeLabel(DictUtils.getDictDataByValue("centerdata_hydroenergy_type",hydroenergy.getHydroenergyType()));
+        }
+        return centerdataTResourcesHydroenergies;
     }
 
     /**

+ 5 - 1
src/main/java/com/sooka/sponest/data/other/land/service/impl/CenterdataTResourcesLandServiceImplImpl.java

@@ -48,7 +48,11 @@ public class CenterdataTResourcesLandServiceImplImpl extends BaseServiceImpl imp
     @DataScopeMutiDept(deptAlias = "d", userAlias = "u")
     public List<CenterdataTResourcesLand> selectCenterdataTResourcesLandList(CenterdataTResourcesLand centerdataTResourcesLand) {
         setSookaDataBase(centerdataTResourcesLand);
-        return centerdataTResourcesLandMapper.selectCenterdataTResourcesLandList(centerdataTResourcesLand);
+        List<CenterdataTResourcesLand> centerdataTResourcesLands = centerdataTResourcesLandMapper.selectCenterdataTResourcesLandList(centerdataTResourcesLand);
+        for (CenterdataTResourcesLand land : centerdataTResourcesLands) {
+            land.setLandTypeLabel(DictUtils.getDictDataByValue("centerdata_landType",land.getLandType()));
+        }
+        return centerdataTResourcesLands;
     }
 
     /**