陈航-护理技能大赛-问题处理-前后端

ruoyi-modules/mz-business-hljnds/src/main/java/com/ruoyi/business/service/impl/ZwywHldsJfServiceImpl.java

@@ -3,7 +3,9 @@ package com.ruoyi.business.service.impl;
 import com.ruoyi.business.domain.ZwywHldsJf;
 import com.ruoyi.business.mapper.ZwywHldsJfMapper;
 import com.ruoyi.business.service.IZwywHldsJfService;
+import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.mapper.SysDeptJlMapper;
 import com.ruoyi.system.utils.SubCodeUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -84,6 +86,11 @@ public class ZwywHldsJfServiceImpl implements IZwywHldsJfService
     @Override
     public int updateZwywHldsJf(ZwywHldsJf zwywHldsJf)
     {
+        // 同赛区的行政区划可以修改,不能修改其他赛区行政区划数据。
+        String sq = zwywHldsJfMapper.selectById(zwywHldsJf.getId()).getSq();
+        if (!SecurityUtils.getAreaCode().equals(sq)){
+            throw new ServiceException("只能修改本赛区的数据。");
+        }
         return zwywHldsJfMapper.updateById(zwywHldsJf);
     }
 

ruoyi-modules/mz-business-hljnds/src/main/java/com/ruoyi/business/service/impl/ZwywHldsXsxxServiceImpl.java

@@ -110,12 +110,17 @@ public class ZwywHldsXsxxServiceImpl implements IZwywHldsXsxxService
     public int updateZwywHldsXsxx(ZwywHldsXsxx zwywHldsXsxx)
     {
 
-
-//        if (!zwywHldsXsxx.getCreateUserId().equals(String.valueOf(SecurityUtils.getUserId()))){
-        if (!zwywHldsXsxxMapper.selectById(zwywHldsXsxx.getId()).getCreateUserId().equals(String.valueOf(SecurityUtils.getUserId()))){
-            throw  new ServiceException("只允许维护自己创建的数据");
+        if(StringUtils.isNotBlank(zwywHldsXsxx.getSjpxsc()) && StringUtils.isNotBlank(zwywHldsXsxx.getSjxbsmc())
+                && StringUtils.isNotBlank(zwywHldsXsxx.getSjxbsfs()) && StringUtils.isNotBlank(zwywHldsXsxx.getSjwzjl())
+                && StringUtils.isNotBlank(zwywHldsXsxx.getSjryjl())){ // 省级维护【省选拔赛信息:】-CH
+            return zwywHldsXsxxMapper.updateById(zwywHldsXsxx);
+        }else{
+            if (!zwywHldsXsxxMapper.selectById(zwywHldsXsxx.getId()).getCreateUserId().equals(String.valueOf(SecurityUtils.getUserId()))){
+                throw  new ServiceException("只允许维护自己创建的数据");
+            }
+            return zwywHldsXsxxMapper.updateById(zwywHldsXsxx);
         }
-        return zwywHldsXsxxMapper.updateById(zwywHldsXsxx);
+//        if (!zwywHldsXsxx.getCreateUserId().equals(String.valueOf(SecurityUtils.getUserId()))){
     }
 
     /**

ruoyi-ui/src/views/business/hljnds/hjqkgl/index.vue

@@ -136,22 +136,24 @@
               <el-input v-model="form.qjsm" placeholder="请输入说明" :disabled="isIF" />
             </el-form-item>
           </div>
-          <h3>地市级及计划单列市，副省级城市选拔赛信息维护：</h3>
-          <div class="formFlex">
-            <el-form-item label="物质奖励" prop="swzjl" class="formWidth2">
-              <number placeholder="物质奖励" v-model="form.swzjl" :min="0" :max="10000000000" :precision="2"
-                :disabled="isIF" />
-            </el-form-item>
+          <div v-if="level!=2 ">
+            <h3>地市级及计划单列市，副省级城市选拔赛信息维护：</h3>
+            <div class="formFlex">
+              <el-form-item label="物质奖励" prop="swzjl" class="formWidth2">
+                <number placeholder="物质奖励" v-model="form.swzjl" :min="0" :max="10000000000" :precision="2"
+                        :disabled="isIF" />
+              </el-form-item>
 
-            <el-form-item label="荣誉奖励" prop="sryjl" class="formWidth2">
-              <el-select v-model="form.sryjl" placeholder="请选择荣誉奖励" :disabled="isIF">
-                <el-option v-for="dict in dict.type.XZ023" :key="dict.value" :label="dict.label" :value="dict.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="说明" prop="sjsm" class="formWidth3">
-              <el-input v-model="form.sjsm" placeholder="请输入市级说明" :disabled="isIF" />
-            </el-form-item>
+              <el-form-item label="荣誉奖励" prop="sryjl" class="formWidth2">
+                <el-select v-model="form.sryjl" placeholder="请选择荣誉奖励" :disabled="isIF">
+                  <el-option v-for="dict in dict.type.XZ023" :key="dict.value" :label="dict.label" :value="dict.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="说明" prop="sjsm" class="formWidth3">
+                <el-input v-model="form.sjsm" placeholder="请输入市级说明" :disabled="isIF" />
+              </el-form-item>
+            </div>
           </div>
           <div v-if="isIF">
             <h3>省级选拔赛成绩:</h3>

ruoyi-ui/src/views/business/hljnds/jf/index.vue

@@ -217,13 +217,16 @@ export default {
   },
   methods: {
     isShow(row){
-      if(this.isIF&&row.sq===this.user.userData.dept.locationId)
-      {
-        return true
-      }else if(!this.isIF)
-      {
+      if(row.sq == this.user.userData.dept.locationCode){
         return true
       }
+      // if(this.isIF&&row.sq===this.user.userData.dept.locationCode)
+      // {
+      //   return true
+      // }else if(!this.isIF)
+      // {
+      //   return true
+      // }
       return false
     },
     //获取选择信息的数据 👇

ruoyi-ui/src/views/business/hljnds/xscjwh/index.vue

@@ -119,18 +119,20 @@
                 :disabled="isIF" />
             </el-form-item>
           </div>
-          <h3>
-            地市级及计划单列市，副省级城市选拔赛信息维护：
-          </h3>
-          <div class="formFlex">
-            <el-form-item label="选拔赛获奖名次" prop="sxbsmc" class="formWidth2">
-              <number placeholder="选拔赛获奖名次" v-model="form.sxbsmc" :min="0" :max="100" :disabled="isIF" />
-            </el-form-item>
+          <div v-if="level!=2 ">
+            <h3>
+              地市级及计划单列市，副省级城市选拔赛信息维护：
+            </h3>
+            <div class="formFlex">
+              <el-form-item label="选拔赛获奖名次" prop="sxbsmc" class="formWidth2">
+                <number placeholder="选拔赛获奖名次" v-model="form.sxbsmc" :min="0" :max="100" :disabled="isIF" />
+              </el-form-item>
 
-            <el-form-item label="选拔赛分数" prop="sxbsfs" class="formWidth2">
-              <number placeholder="选拔赛分数" v-model="form.sxbsfs" :min="0" :max="10000000000" :precision="2"
-                :disabled="isIF" />
-            </el-form-item>
+              <el-form-item label="选拔赛分数" prop="sxbsfs" class="formWidth2">
+                <number placeholder="选拔赛分数" v-model="form.sxbsfs" :min="0" :max="10000000000" :precision="2"
+                        :disabled="isIF" />
+              </el-form-item>
+            </div>
           </div>
           <div v-if="isIF">
             <h3>

ruoyi-ui/src/views/business/hljnds/xsxx/index.vue

@@ -60,8 +60,11 @@
       <el-table-column label="省级荣誉奖励" align="center" prop="sjwzjl" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200" fixed="right">
         <template slot-scope="scope">
-          <el-button v-if="scope.row.cjrId == user.userData.userId" size="mini" type="text" icon="el-icon-edit"
-            @click="handleUpdate(scope.row)" v-hasPermi="['business:xsxx:edit']">修改
+<!--          <el-button v-if="scope.row.cjrId == user.userData.userId" size="mini" type="text" icon="el-icon-edit"-->
+<!--            @click="handleUpdate(scope.row)" v-hasPermi="['business:xsxx:edit']">修改-->
+<!--          </el-button>-->
+          <el-button  size="mini" type="text" icon="el-icon-edit"
+                     @click="handleUpdate(scope.row)" v-hasPermi="['business:xsxx:edit']">修改
           </el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="particulars(scope.row)"
             v-hasPermi="['business:xsxx:edit']">详情
@@ -204,23 +207,26 @@
               <el-input v-model="form.qjsm" :disabled="isIF" placeholder="请输入说明" />
             </el-form-item>
           </div>
-          <h3>
-            地市级及计划单列市，副省级城市选拔赛信息维护：
-          </h3>
-          <div class="formFlex">
-            <el-form-item label="赛前培训时长" prop="spxsc" class="formWidth">
-              <number placeholder="赛前培训时长" :disabled="isIF" v-model="form.spxsc" :min="0" :max="100" />
-            </el-form-item>
+<!--          <div v-if="level<3">-->
+            <h3>
+              地市级及计划单列市，副省级城市选拔赛信息维护：
+            </h3>
+            <div class="formFlex">
+              <el-form-item label="赛前培训时长" prop="spxsc" class="formWidth">
+                <number placeholder="赛前培训时长" :disabled="isIF" v-model="form.spxsc" :min="0" :max="100" />
+              </el-form-item>
 
-            <el-form-item label="选拔赛获奖名次" prop="sxbsmc" class="formWidth">
-              <number placeholder="选拔赛获奖名次" :disabled="isIF" v-model="form.sxbsmc" :min="0" :max="100" />
-            </el-form-item>
+              <el-form-item label="选拔赛获奖名次" prop="sxbsmc" class="formWidth">
+                <number placeholder="选拔赛获奖名次" :disabled="isIF" v-model="form.sxbsmc" :min="0" :max="100" />
+              </el-form-item>
+
+              <el-form-item label="选拔赛分数" prop="sxbsfs" class="formWidth">
+                <number placeholder="选拔赛分数" :disabled="isIF" v-model="form.sxbsfs" :min="0" :max="10000000000"
+                        :precision="2" />
+              </el-form-item>
+            </div>
+<!--          </div>-->
 
-            <el-form-item label="选拔赛分数" prop="sxbsfs" class="formWidth">
-              <number placeholder="选拔赛分数" :disabled="isIF" v-model="form.sxbsfs" :min="0" :max="10000000000"
-                :precision="2" />
-            </el-form-item>
-          </div>
           <div class="formFlex">
             <el-form-item label="物质奖励(万)" prop="swzjl" class="formWidth">
               <number placeholder="物质奖励" :disabled="isIF" v-model="form.swzjl" :min="0" :max="100" :precision="2" />
@@ -759,9 +765,9 @@ export default {
             sq = data[data.length - 1]
           }
           if (this.form.id != null) {
-            if (this.checkXsxxForm()) {
-              this.$modal.msgWarning('选手身份证号码与出生日期/性别不符!')
-            } else {
+            // if (this.checkXsxxForm()) {
+            //   this.$modal.msgWarning('选手身份证号码与出生日期/性别不符!')
+            // } else {
               this.submitFormLoading = true
               let formData = this.comparisonObject({ ...this.form, sq: sq }, this.copyForm)
               if (formData) {
@@ -789,7 +795,7 @@ export default {
                 this.open = false;
                 this.submitFormLoading = false;
               }
-            }
+            // }
           } else {
             if (this.checkXsxxForm()) {
               this.$modal.msgWarning('身份证号码与出生日期/性别不符!')