评星定级

src/main/java/com/izouma/wenlvju/service/UserService.java

@@ -217,10 +217,15 @@ public class UserService {
     public User regOrganization(OrganizationRegDTO dto) {
         User user = new User();
         BeanUtil.copyProperties(dto, user);
+        user.setNickname(dto.getUsername());
         User byPhone = userRepo.findByPhoneAndDelFalse(user.getPhone());
         if (ObjectUtil.isNotNull(byPhone)) {
             throw new BusinessException("该手机号已注册");
         }
+        User byUsername = userRepo.findByUsernameAndDelFalse(dto.getUsername());
+        if (ObjectUtil.isNotNull(byUsername)) {
+            throw new BusinessException("该用户名已使用");
+        }
         if (StringUtils.isNotBlank(dto.getPassword())) {
             user.setPassword(new BCryptPasswordEncoder().encode(dto.getPassword()));
         }

src/main/java/com/izouma/wenlvju/web/RateController.java

@@ -41,6 +41,9 @@ public class RateController extends BaseController {
     public Rate save(@RequestBody Rate record) {
         if (record.getId() != null) {
             Rate orig = rateRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            if (RateStatus.SUBMIT_GRADE.equals(record.getStatus())) {
+                record.setUndertakeExamination(orig.isUndertakeExamination());
+            }
             ObjUtils.merge(orig, record);
             return rateRepo.save(orig);
         }
@@ -66,6 +69,7 @@ public class RateController extends BaseController {
 
     @PostMapping("/all2")
     public Page<Rate> all2(@RequestBody PageQuery pageQuery) {
+        pageQuery.setSort("createdAt,desc");
         Map<Long, Organization> organizationMap = organizationRepo.findAll()
                 .stream()
                 .collect(Collectors.toMap(Organization::getId, organization -> organization));
@@ -73,8 +77,8 @@ public class RateController extends BaseController {
             Organization organization = organizationMap.get(rate.getOrganizationId());
             if (ObjectUtil.isNotEmpty(organization)) {
                 rate.setOrganizer(organization.getName());
-                String address= "南京市" + organization.getDistrict();
-                if (StrUtil.isNotBlank(organization.getAddress())){
+                String address = "南京市" + organization.getDistrict();
+                if (StrUtil.isNotBlank(organization.getAddress())) {
                     address += organization.getAddress();
                 }
                 rate.setAddress(address);

src/main/vue/src/views/Login.vue

@@ -14,9 +14,9 @@
                     <el-form-item prop="password" :rules="{ required: true, message: '请输入密码', trigger: 'blur' }">
                         <el-input v-model="registerInfo.password" placeholder="密码" type="password"></el-input>
                     </el-form-item>
-                    <el-form-item prop="nickname" :rules="{ required: true, message: '请输入昵称', trigger: 'blur' }">
+                    <!-- <el-form-item prop="nickname" :rules="{ required: true, message: '请输入昵称', trigger: 'blur' }">
                         <el-input v-model="registerInfo.nickname" placeholder="昵称"> </el-input>
-                    </el-form-item>
+                    </el-form-item> -->
                     <el-form-item prop="phone" :rules="{ required: true, message: '请输入手机号', trigger: 'blur' }">
                         <el-input v-model="registerInfo.phone" placeholder="手机号"> </el-input>
                     </el-form-item>

src/main/vue/src/views/RateList.vue

@@ -219,7 +219,7 @@ export default {
             //         submit: true
             //     }
             // };
-            let data = { sort: 'createdAt,desc', query: { submit: true } };
+            let data = { query: { submit: true } };
             if (this.search) {
                 data.search = this.search;
             }

src/main/vue/src/views/organization/GradeList.vue

@@ -9,6 +9,7 @@
             cell-class-name="table-cell"
             :height="tableHeight1"
             :span-method="objectSpanMethod"
+            show-summary
         >
             <el-table-column prop="parentLabel" label="一级指标" min-width="25" align="center">
                 <template slot-scope="{ row }">

src/main/vue/src/views/organization/RateEdit.vue

@@ -4,7 +4,7 @@
             :model="formData"
             :rules="rules"
             ref="form"
-            label-width="50px"
+            label-width="0"
             label-position="right"
             size="small"
             style="max-width: 600px;"
@@ -14,17 +14,21 @@
                 <div class="info-item">
                     <div class="name">机构名称</div>
                     <div class="val">
+                        <!-- <el-form-item prop="name"> -->
                         <el-input v-model="formData.name" placeholder="请输入机构名称" :readonly="readonly"></el-input>
+                        <!-- </el-form-item> -->
                     </div>
                 </div>
                 <div class="info-item">
                     <div class="name">负责人邮箱</div>
                     <div class="val">
+                        <!-- <el-form-item prop="name"> -->
                         <el-input
                             v-model="formData.ownerEmail"
                             placeholder="请输入负责人邮箱"
                             :readonly="readonly"
                         ></el-input>
+                        <!-- </el-form-item> -->
                     </div>
                 </div>
                 <div class="info-item">
@@ -184,7 +188,7 @@
                         "
                         :loading="saving"
                         type="warning"
-                        v-if="formData.status == 'FIRST_REVIEW_DENY'"
+                        v-if="formData.status == 'FIRST_REVIEW_DENY' && readonly"
                         >编辑</el-button
                     >
                     <el-button @click="onSave(true)" :loading="saving" type="primary" v-if="!formData.submit"
@@ -457,6 +461,10 @@ export default {
         .val {
             width: 190px;
         }
+
+        .input {
+            margin-top: 10px;
+        }
     }
     .tag {
         margin: 98px 240px;

src/main/vue/src/views/organization/RateOrganizerList.vue

@@ -49,7 +49,7 @@
             </el-table-column>
             <el-table-column label="操作" align="center" fixed="right" min-width="150">
                 <template slot-scope="{ row }">
-                    <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑资料</el-button>
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>查看资料</el-button>
                     <el-button
                         @click="word(row)"
                         type="primary"
@@ -57,7 +57,7 @@
                         size="mini"
                         class="filter-item"
                         v-if="row.status == 'SUBMIT_PAPER_MATERIALS'"
-                        >导出
+                        >下载材料
                     </el-button>
                     <!-- <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button> -->
                 </template>