Merge branch '20221017_sun项目申报后端接口小改动' of sckj/mz-cloud into master

ruoyi-modules/mz-business-xmsb/src/main/java/com/ruoyi/business/domain/ZwywXmsbFwzx.java

@@ -93,7 +93,7 @@ public class ZwywXmsbFwzx extends BaseEntity
     @Excel(name = "床位总数")
     @ApiModelProperty(value = "床位总数", required = true)
     @NotBlank(message = "{床位总数}",groups = AddGroup.class)
-    @Range(min=0,max=100,message = "{床位总数}")
+    @Range(min=0,max=10000000000L,message = "{床位总数}")
     @NumberV(message = "{床位总数}")
     private String cwzs;
 
@@ -101,7 +101,7 @@ public class ZwywXmsbFwzx extends BaseEntity
     @Excel(name = "护理型床位数")
     @ApiModelProperty(value = "护理型床位数", required = true)
     @NotBlank(message = "{护理型床位数}",groups = AddGroup.class)
-    @Range(min=0,max=100,message = "{护理型床位数}")
+    @Range(min=0,max=10000000000L,message = "{护理型床位数}")
     @NumberV(message = "{护理型床位数}")
     private String hlxcws;
 

ruoyi-modules/mz-business-xmsb/src/main/java/com/ruoyi/business/domain/ZwywXmsbJgjs.java

@@ -98,7 +98,7 @@ public class ZwywXmsbJgjs extends BaseEntity
     @Excel(name = "床位数量")
     @ApiModelProperty(value = "床位数量", required = true)
     @NotBlank(message = "{床位数量}",groups = AddGroup.class)
-    @Range(min=0,max=100,message = "{床位数量}")
+    @Range(min=0,max=10000000000L,message = "{床位数量}")
     @NumberV(message = "{床位数量}")
     private String cwsl;
 
@@ -106,7 +106,7 @@ public class ZwywXmsbJgjs extends BaseEntity
     @Excel(name = "入住老年人数")
     @ApiModelProperty(value = "入住老年人数", required = true)
     @NotBlank(message = "{入住老年人数}",groups = AddGroup.class)
-    @Range(min=0,max=100,message = "{入住老年人数}")
+    @Range(min=0,max=10000000000L,message = "{入住老年人数}")
     @NumberV(message = "{入住老年人数}")
     private String rzrs;
 
@@ -114,7 +114,7 @@ public class ZwywXmsbJgjs extends BaseEntity
     @Excel(name = "特困供养人数")
     @ApiModelProperty(value = "特困供养人数", required = true)
     @NotBlank(message = "{特困供养人数}",groups = AddGroup.class)
-    @Range(min=0,max=100,message = "{特困供养人数}")
+    @Range(min=0,max=10000000000L,message = "{特困供养人数}")
     @NumberV(message = "{特困供养人数}")
     private String tkgyrs;
 
@@ -122,7 +122,7 @@ public class ZwywXmsbJgjs extends BaseEntity
     @Excel(name = "失能半失能")
     @ApiModelProperty(value = "失能半失能", required = true)
     @NotBlank(message = "{失能半失能}",groups = AddGroup.class)
-    @Range(min=0,max=100,message = "{失能半失能}")
+    @Range(min=0,max=10000000000L,message = "{失能半失能}")
     @NumberV(message = "{失能半失能}")
     private String snbsn;
 
@@ -130,7 +130,7 @@ public class ZwywXmsbJgjs extends BaseEntity
     @Excel(name = "自理人数")
     @ApiModelProperty(value = "自理人数", required = true)
     @NotBlank(message = "{自理人数}",groups = AddGroup.class)
-    @Range(min=0,max=100,message = "{自理人数}")
+    @Range(min=0,max=10000000000L,message = "{自理人数}")
     @NumberV(message = "{自理人数}")
     private String zlrs;
 

ruoyi-modules/mz-business-xmsb/src/main/java/com/ruoyi/business/domain/ZwywXmsbSz.java

@@ -81,7 +81,7 @@ public class ZwywXmsbSz extends BaseEntity
     @Excel(name = "总床位数")
     @ApiModelProperty(value = "总床位数", required = true)
     @NotBlank(message = "{总床位数}",groups = AddGroup.class)
-    @Range(min=0,max=100,message = "{总床位数}")
+    @Range(min=0,max=10000000000L,message = "{总床位数}")
     @NumberV(message = "{总床位数}")
     private String zcws;
 
@@ -89,7 +89,7 @@ public class ZwywXmsbSz extends BaseEntity
     @Excel(name = "护理型床位数")
     @ApiModelProperty(value = "护理型床位数", required = true)
     @NotBlank(message = "{护理型床位数}",groups = AddGroup.class)
-    @Range(min=0,max=100,message = "{护理型床位数}")
+    @Range(min=0,max=10000000000L,message = "{护理型床位数}")
     @NumberV(message = "{护理型床位数}")
     private String hlxcws;
 
@@ -97,7 +97,7 @@ public class ZwywXmsbSz extends BaseEntity
     @Excel(name = "专区总床位数")
     @ApiModelProperty(value = "专区总床位数", required = true)
     @NotBlank(message = "{专区总床位数}",groups = AddGroup.class)
-    @Range(min=0,max=100,message = "{专区总床位数}")
+    @Range(min=0,max=10000000000L,message = "{专区总床位数}")
     @NumberV(message = "{专区总床位数}")
     private String zqzcws;
 
@@ -105,7 +105,7 @@ public class ZwywXmsbSz extends BaseEntity
     @Excel(name = "现有失智人员数量")
     @ApiModelProperty(value = "现有失智人员数量", required = true)
     @NotBlank(message = "{现有失智人员数量}",groups = AddGroup.class)
-    @Range(min=0,max=100,message = "{现有失智人员数量}")
+    @Range(min=0,max=10000000000L,message = "{现有失智人员数量}")
     @NumberV(message = "{现有失智人员数量}")
     private String xyszrys;
 
@@ -121,7 +121,7 @@ public class ZwywXmsbSz extends BaseEntity
     @Excel(name = "配备护理人员数")
     @ApiModelProperty(value = "配备护理人员数", required = true)
     @NotBlank(message = "{配备护理人员数}",groups = AddGroup.class)
-    @Range(min=0,max=100,message = "{配备护理人员数}")
+    @Range(min=0,max=10000000000L,message = "{配备护理人员数}")
     @NumberV(message = "{配备护理人员数}")
     private String pbhlrys;
 

ruoyi-modules/mz-business-xmsb/src/main/java/com/ruoyi/business/domain/ZwywXmsbYldy.java

@@ -60,7 +60,7 @@ public class ZwywXmsbYldy extends BaseEntity
     @Excel(name = "全村总人口")
     @ApiModelProperty(value = "全村总人口", required = true)
     @NotBlank(message = "{全村总人口}",groups = AddGroup.class)
-    @Range(min=0,max=100,message = "{全村总人口}")
+    @Range(min=0,max=10000000000L,message = "{全村总人口}")
     @NumberV(message = "{全村总人口}")
     private String qczrk;
 
@@ -68,7 +68,7 @@ public class ZwywXmsbYldy extends BaseEntity
     @Excel(name = "全村老年人口")
     @ApiModelProperty(value = "全村老年人口", required = true)
     @NotBlank(message = "{全村老年人口}",groups = AddGroup.class)
-    @Range(min=0,max=100,message = "{全村老年人口}")
+    @Range(min=0,max=10000000000L,message = "{全村老年人口}")
     @NumberV(message = "{全村老年人口}")
     private String qclnrk;
 
@@ -84,7 +84,7 @@ public class ZwywXmsbYldy extends BaseEntity
     @Excel(name = "设置床位数")
     @ApiModelProperty(value = "设置床位数", required = true)
     @NotBlank(message = "{设置床位数}",groups = AddGroup.class)
-    @Range(min=0,max=100,message = "{设置床位数}")
+    @Range(min=0,max=10000000000L,message = "{设置床位数}")
     @NumberV(message = "{设置床位数}")
     private String szcws;
 

ruoyi-modules/mz-portal/src/main/java/com/ruoyi/portal/controller/PortalSysDeptJlController.java

@@ -113,7 +113,7 @@ public class PortalSysDeptJlController extends BaseController
             res.put("name", fileResult.getData().getName());
             return AjaxResult.success(res);
         }
-        return AjaxResult.error("上传图片异常，请联系管理员");
+        return AjaxResult.error("文件为空");
     }
 
 }

ruoyi-ui/src/views/business/xmsb/fwzx/index.vue

@@ -201,7 +201,7 @@
             placeholder="床位总数"
             v-model.sync="form.cwzs"
             :min="0"
-            :max="100"
+            :max="10000000000"
           />
         </el-form-item>
 
@@ -210,7 +210,7 @@
             placeholder="护理型床位数"
             v-model.sync="form.hlxcws"
             :min="0"
-            :max="100"
+            :max="10000000000"
           />
         </el-form-item>
 

ruoyi-ui/src/views/business/xmsb/fwzxsh/index.vue

@@ -160,7 +160,7 @@
             placeholder="床位总数"
             v-model.sync="form.cwzs"
             :min="0"
-            :max="100"
+            :max="10000000000"
           />
         </el-form-item>
 
@@ -169,7 +169,7 @@
             placeholder="护理型床位数"
             v-model.sync="form.hlxcws"
             :min="0"
-            :max="100"
+            :max="10000000000"
           />
         </el-form-item>
 

ruoyi-ui/src/views/business/xmsb/jgjs/index.vue

@@ -225,7 +225,7 @@
             placeholder="床位数量"
             v-model.sync="form.cwsl"
             :min="0"
-            :max="100"
+            :max="10000000000"
           />
         </el-form-item>
 
@@ -234,7 +234,7 @@
             placeholder="入住老年人数"
             v-model.sync="form.rzrs"
             :min="0"
-            :max="100"
+            :max="10000000000"
           />
         </el-form-item>
 
@@ -243,7 +243,7 @@
             placeholder="特困供养人数"
             v-model.sync="form.tkgyrs"
             :min="0"
-            :max="100"
+            :max="10000000000"
           />
         </el-form-item>
 
@@ -252,7 +252,7 @@
             placeholder="失能半失能"
             v-model.sync="form.snbsn"
             :min="0"
-            :max="100"
+            :max="10000000000"
           />
         </el-form-item>
 
@@ -261,7 +261,7 @@
             placeholder="自理人数"
             v-model.sync="form.zlrs"
             :min="0"
-            :max="100"
+            :max="10000000000"
           />
         </el-form-item>
 

ruoyi-ui/src/views/business/xmsb/jgjssh/index.vue

@@ -133,7 +133,7 @@
         <el-form-item label="地区" prop="xzqhId">
           <RegionCascaderSelect
             endLevel="4"
-            v-model="xzqhId"
+            v-model="form.xzqhId"
             :opts="{ placeholder: '请输入地区' }"
             style="width: 100%"
             valueProp="code"
@@ -183,7 +183,7 @@
             placeholder="床位数量"
             v-model.sync="form.cwsl"
             :min="0"
-            :max="100"
+            :max="10000000000"
           />
         </el-form-item>
 
@@ -192,7 +192,7 @@
             placeholder="入住老年人数"
             v-model.sync="form.rzrs"
             :min="0"
-            :max="100"
+            :max="10000000000"
           />
         </el-form-item>
 
@@ -201,7 +201,7 @@
             placeholder="特困供养人数"
             v-model.sync="form.tkgyrs"
             :min="0"
-            :max="100"
+            :max="10000000000"
           />
         </el-form-item>
 
@@ -210,7 +210,7 @@
             placeholder="失能半失能"
             v-model.sync="form.snbsn"
             :min="0"
-            :max="100"
+            :max="10000000000"
           />
         </el-form-item>
 
@@ -219,7 +219,7 @@
             placeholder="自理人数"
             v-model.sync="form.zlrs"
             :min="0"
-            :max="100"
+            :max="10000000000"
           />
         </el-form-item>
 

ruoyi-ui/src/views/business/xmsb/sz/index.vue

@@ -172,7 +172,7 @@
             placeholder="总床位数"
             v-model.sync="form.zcws"
             :min="0"
-            :max="100"
+            :max="10000000000"
           />
         </el-form-item>
 
@@ -181,7 +181,7 @@
             placeholder="护理型床位数"
             v-model.sync="form.hlxcws"
             :min="0"
-            :max="100"
+            :max="10000000000"
           />
         </el-form-item>
 
@@ -190,7 +190,7 @@
             placeholder="专区总床位数"
             v-model.sync="form.zqzcws"
             :min="0"
-            :max="100"
+            :max="10000000000"
           />
         </el-form-item>
 
@@ -199,7 +199,7 @@
             placeholder="现有失智人员数量"
             v-model.sync="form.xyszrys"
             :min="0"
-            :max="100"
+            :max="10000000000"
           />
         </el-form-item>
 
@@ -218,7 +218,7 @@
             placeholder="配备护理人员数"
             v-model.sync="form.pbhlrys"
             :min="0"
-            :max="100"
+            :max="10000000000"
           />
         </el-form-item>
 

ruoyi-ui/src/views/business/xmsb/szsh/index.vue

@@ -131,7 +131,7 @@
             placeholder="总床位数"
             v-model.sync="form.zcws"
             :min="0"
-            :max="100"
+            :max="10000000000"
           />
         </el-form-item>
 
@@ -140,7 +140,7 @@
             placeholder="护理型床位数"
             v-model.sync="form.hlxcws"
             :min="0"
-            :max="100"
+            :max="10000000000"
           />
         </el-form-item>
 
@@ -149,7 +149,7 @@
             placeholder="专区总床位数"
             v-model.sync="form.zqzcws"
             :min="0"
-            :max="100"
+            :max="10000000000"
           />
         </el-form-item>
 
@@ -158,7 +158,7 @@
             placeholder="现有失智人员数量"
             v-model.sync="form.xyszrys"
             :min="0"
-            :max="100"
+            :max="10000000000"
           />
         </el-form-item>
 
@@ -177,7 +177,7 @@
             placeholder="配备护理人员数"
             v-model.sync="form.pbhlrys"
             :min="0"
-            :max="100"
+            :max="10000000000"
           />
         </el-form-item>
 

ruoyi-ui/src/views/business/xmsb/yldy/index.vue

@@ -189,7 +189,7 @@
             placeholder="全村总人口"
             v-model.sync="form.qczrk"
             :min="0"
-            :max="100"
+            :max="10000000000"
           />
         </el-form-item>
 
@@ -198,7 +198,7 @@
             placeholder="全村老年人口"
             v-model.sync="form.qclnrk"
             :min="0"
-            :max="100"
+            :max="10000000000"
           />
         </el-form-item>
 
@@ -217,7 +217,7 @@
             placeholder="设置床位数"
             v-model.sync="form.szcws"
             :min="0"
-            :max="100"
+            :max="10000000000"
           />
         </el-form-item>
 

ruoyi-ui/src/views/business/xmsb/yldysh/index.vue

@@ -131,7 +131,7 @@
         <el-form-item label="地区" prop="xzqhId">
           <RegionCascaderSelect
             endLevel="4"
-            v-model="xzqhId"
+            v-model="form.xzqhId"
             :opts="{ placeholder: '请输入地区' }"
             style="width: 100%"
             valueProp="code"
@@ -148,7 +148,7 @@
             placeholder="全村总人口"
             v-model.sync="form.qczrk"
             :min="0"
-            :max="100"
+            :max="10000000000"
           />
         </el-form-item>
 
@@ -157,7 +157,7 @@
             placeholder="全村老年人口"
             v-model.sync="form.qclnrk"
             :min="0"
-            :max="100"
+            :max="10000000000"
           />
         </el-form-item>
 
@@ -176,7 +176,7 @@
             placeholder="设置床位数"
             v-model.sync="form.szcws"
             :min="0"
-            :max="100"
+            :max="10000000000"
           />
         </el-form-item>