Merge branch 'dev' of http://git.izouma.com/licailing/wenlvju into dev

src/main/java/com/izouma/wenlvju/converter/ReviewTimeListConverter.java

@@ -0,0 +1,25 @@
+package com.izouma.wenlvju.converter;
+
+import com.alibaba.fastjson.JSON;
+import com.izouma.wenlvju.dto.ReviewTime;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.persistence.AttributeConverter;
+import java.util.List;
+
+public class ReviewTimeListConverter implements AttributeConverter<List<ReviewTime>, String> {
+    @Override
+    public String convertToDatabaseColumn(List<ReviewTime> list) {
+        if (list != null)
+            return JSON.toJSONString(list);
+        return null;
+    }
+
+    @Override
+    public List<ReviewTime> convertToEntityAttribute(String s) {
+        if (StringUtils.isNotEmpty(s)) {
+            return JSON.parseArray(s, ReviewTime.class);
+        }
+        return null;
+    }
+}

src/main/java/com/izouma/wenlvju/domain/Collaborate.java

@@ -0,0 +1,36 @@
+package com.izouma.wenlvju.domain;
+
+import com.izouma.wenlvju.converter.LongArrayConverter;
+import com.izouma.wenlvju.converter.StringArrayConverter;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
+
+import javax.persistence.Column;
+import javax.persistence.Convert;
+import javax.persistence.Entity;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@Entity
+@Where(clause = "del = 0")
+@ApiModel(value = "承办单位合作")
+public class Collaborate extends BaseEntity {
+    private Long rateId;
+
+    private Long gradingOrganizationId;
+
+    @Column(columnDefinition = "TEXT")
+    @Convert(converter = StringArrayConverter.class)
+    private List<String> consent;
+
+    @Column(columnDefinition = "TEXT")
+    @Convert(converter = LongArrayConverter.class)
+    private List<Long> artTypeId;
+}

src/main/java/com/izouma/wenlvju/domain/GradingOrganization.java

@@ -0,0 +1,23 @@
+package com.izouma.wenlvju.domain;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
+
+import javax.persistence.Entity;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@Entity
+@Where(clause = "del = 0")
+@ApiModel(value = "考级机构")
+public class GradingOrganization extends BaseEntity {
+    private String code;
+
+    private String name;
+}

src/main/java/com/izouma/wenlvju/domain/Organization.java

@@ -26,6 +26,9 @@ public class Organization extends BaseEntity {
     @ApiModelProperty(value = "承办单位名称")
     private String name;
 
+    @ApiModelProperty(value = "考级机构名称")
+    private String examinationAgency;
+
     @ApiModelProperty(value = "统一社会信用代码")
     private String uscc;
 
@@ -52,4 +55,7 @@ public class Organization extends BaseEntity {
     @ApiModelProperty(value = "证件号码")
     private String IDNo;
 
+    @ApiModelProperty(value = "经营范围")
+    private String businessScope;
+
 }

src/main/java/com/izouma/wenlvju/domain/Rate.java

@@ -2,8 +2,10 @@ package com.izouma.wenlvju.domain;
 
 import com.izouma.wenlvju.converter.LongArrayConverter;
 import com.izouma.wenlvju.converter.RateAuditListConverter;
+import com.izouma.wenlvju.converter.ReviewTimeListConverter;
 import com.izouma.wenlvju.converter.StringArrayConverter;
 import com.izouma.wenlvju.dto.RateAudit;
+import com.izouma.wenlvju.dto.ReviewTime;
 import com.izouma.wenlvju.enums.OrganizationGrade;
 import com.izouma.wenlvju.enums.RateStatus;
 import io.swagger.annotations.ApiModel;
@@ -88,9 +90,14 @@ public class Rate extends BaseEntity {
 
     @Column(columnDefinition = "TEXT")
     @Convert(converter = StringArrayConverter.class)
-    @ApiModelProperty(value = "消防卫生")
+    @ApiModelProperty(value = "消防安全")
     private List<String> fire;
 
+    @Column(columnDefinition = "TEXT")
+    @Convert(converter = StringArrayConverter.class)
+    @ApiModelProperty(value = "卫生防疫")
+    private List<String> hygiene;
+
     @Column(columnDefinition = "TEXT")
     @Convert(converter = StringArrayConverter.class)
     @ApiModelProperty(value = "财务报表")
@@ -117,6 +124,9 @@ public class Rate extends BaseEntity {
     @ApiModelProperty(value = "审核结束时间")
     private LocalDate reviewEndTime;
 
+    @ApiModelProperty(value = "审查时间")
+    private LocalDateTime reviewTime;
+
     /*
     复审结果
     市级录入成绩
@@ -140,4 +150,8 @@ public class Rate extends BaseEntity {
     @Column(columnDefinition = "TEXT")
     @Convert(converter = RateAuditListConverter.class)
     private List<RateAudit> rateAudits = new ArrayList<>();
+
+    @Column(columnDefinition = "TEXT")
+    @Convert(converter = ReviewTimeListConverter.class)
+    private List<ReviewTime> reviewTimes = new ArrayList<>();
 }

src/main/java/com/izouma/wenlvju/domain/RateExpertAudit.java

@@ -20,40 +20,46 @@ import java.util.List;
 @Entity
 @Where(clause = "del = false")
 public class RateExpertAudit extends BaseEntity {
-    private Long userId;
+//    private Long userId;
 
     private Long rateId;
 
-    @ApiModelProperty(value = "考级组织")
-    private int examOrganization;
-    @ApiModelProperty(value = "考点设置")
-    private int examSite;
-    @ApiModelProperty(value = "考场设置")
-    private int examRoom;
-    @ApiModelProperty(value = "环境要求")
-    private int environment;
-    @ApiModelProperty(value = "安全保障")
-    private int safety;
-    @ApiModelProperty(value = "宣传报备")
-    private int promote;
-    @ApiModelProperty(value = "考级报名")
-    private int signUp;
-    @ApiModelProperty(value = "考试准备")
-    private int examPreparation;
-    @ApiModelProperty(value = "考场服务")
-    private int examService;
-    @ApiModelProperty(value = "考务考官")
-    private int examiner;
-    @ApiModelProperty(value = "考级规范")
-    private int specification;
-    @ApiModelProperty(value = "视频器材")
-    private int video;
-    @ApiModelProperty(value = "考试成绩")
+    private String type;
+
+    private int expertScore;
+
     private int score;
-    @ApiModelProperty(value = "艺术培训")
-    private int artTrain;
-    @ApiModelProperty(value = "艺术成果")
-    private int artResult;
+
+//    @ApiModelProperty(value = "考级组织")
+//    private int examOrganization;
+//    @ApiModelProperty(value = "考点设置")
+//    private int examSite;
+//    @ApiModelProperty(value = "考场设置")
+//    private int examRoom;
+//    @ApiModelProperty(value = "环境要求")
+//    private int environment;
+//    @ApiModelProperty(value = "安全保障")
+//    private int safety;
+//    @ApiModelProperty(value = "宣传报备")
+//    private int promote;
+//    @ApiModelProperty(value = "考级报名")
+//    private int signUp;
+//    @ApiModelProperty(value = "考试准备")
+//    private int examPreparation;
+//    @ApiModelProperty(value = "考场服务")
+//    private int examService;
+//    @ApiModelProperty(value = "考务考官")
+//    private int examiner;
+//    @ApiModelProperty(value = "考级规范")
+//    private int specification;
+//    @ApiModelProperty(value = "视频器材")
+//    private int video;
+//    @ApiModelProperty(value = "考试成绩")
+//    private int score;
+//    @ApiModelProperty(value = "艺术培训")
+//    private int artTrain;
+//    @ApiModelProperty(value = "艺术成果")
+//    private int artResult;
 
     @Column(columnDefinition = "TEXT")
     @Convert(converter = StringArrayConverter.class)

src/main/java/com/izouma/wenlvju/domain/Record.java

@@ -1,6 +1,5 @@
 package com.izouma.wenlvju.domain;
 
-import com.alibaba.excel.annotation.ExcelProperty;
 import com.izouma.wenlvju.annotations.Searchable;
 import com.izouma.wenlvju.enums.RecordStatus;
 import com.izouma.wenlvju.enums.RegulatoryStatus;

src/main/java/com/izouma/wenlvju/domain/Setting.java

@@ -0,0 +1,27 @@
+package com.izouma.wenlvju.domain;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
+
+import javax.persistence.Entity;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@Entity
+@Where(clause = "del = 0")
+@ApiModel(value = "设置")
+public class Setting extends BaseEntity {
+    private Long parent;
+
+    private String name;
+
+    private String code;
+
+    private int flag;
+}

src/main/java/com/izouma/wenlvju/dto/OrganizationRegDTO.java

@@ -28,6 +28,8 @@ public class OrganizationRegDTO {
     private String businessLicense;
 
     private String district;
+
+    private String examinationAgency;
 //    private List<String> district1;
 
 }

src/main/java/com/izouma/wenlvju/dto/ReviewTime.java

@@ -0,0 +1,21 @@
+package com.izouma.wenlvju.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class ReviewTime {
+    private LocalDateTime reviewTime;
+
+    @ApiModelProperty(value = "操作时间")
+    private LocalDateTime operatingTime;
+
+}

src/main/java/com/izouma/wenlvju/enums/RateStatus.java

@@ -1,6 +1,10 @@
 package com.izouma.wenlvju.enums;
 
 public enum RateStatus {
+    /*
+    草稿
+     */
+    DRAFT,
     /*
     等待初审
      */

src/main/java/com/izouma/wenlvju/repo/GradingOrganizationRepo.java

@@ -0,0 +1,16 @@
+package com.izouma.wenlvju.repo;
+
+import com.izouma.wenlvju.domain.GradingOrganization;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface GradingOrganizationRepo extends JpaRepository<GradingOrganization, Long>, JpaSpecificationExecutor<GradingOrganization> {
+    @Query("update GradingOrganization t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

src/main/java/com/izouma/wenlvju/repo/RateExpertAuditRepo.java

@@ -7,6 +7,7 @@ import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 
 import javax.transaction.Transactional;
+import java.util.List;
 
 public interface RateExpertAuditRepo extends JpaRepository<RateExpertAudit, Long>, JpaSpecificationExecutor<RateExpertAudit> {
     @Query("update RateExpertAudit t set t.del = true where t.id = ?1")
@@ -14,5 +15,7 @@ public interface RateExpertAuditRepo extends JpaRepository<RateExpertAudit, Long
     @Transactional
     void softDelete(Long id);
 
-    RateExpertAudit findByRateId(Long rateId);
+    List<RateExpertAudit> findAllByRateId(Long rateId);
+
+    RateExpertAudit findByRateIdAndType(Long rateId, String type);
 }

src/main/java/com/izouma/wenlvju/repo/SettingRepo.java

@@ -0,0 +1,16 @@
+package com.izouma.wenlvju.repo;
+
+import com.izouma.wenlvju.domain.Setting;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface SettingRepo extends JpaRepository<Setting, Long>, JpaSpecificationExecutor<Setting> {
+    @Query("update Setting t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

src/main/java/com/izouma/wenlvju/security/WebSecurityConfig.java

@@ -63,6 +63,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 .antMatchers("/v2/api-docs", "/swagger-ui.html", "/swagger-resources/**", "/webjars/**").permitAll()
                 .antMatchers("/user/register").permitAll()
                 .antMatchers("/user/regOrganization").permitAll()
+                .antMatchers("/gradingOrganization/all").permitAll()
                 .antMatchers("/district").permitAll()
                 .antMatchers("/district/NJ").permitAll()
                 .antMatchers("/upload/**").permitAll()

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

@@ -0,0 +1,20 @@
+package com.izouma.wenlvju.service;
+
+import com.izouma.wenlvju.domain.GradingOrganization;
+import com.izouma.wenlvju.dto.PageQuery;
+import com.izouma.wenlvju.repo.GradingOrganizationRepo;
+import com.izouma.wenlvju.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class GradingOrganizationService {
+
+    private GradingOrganizationRepo gradingOrganizationRepo;
+
+    public Page<GradingOrganization> all(PageQuery pageQuery) {
+        return gradingOrganizationRepo.findAll(JpaUtils.toSpecification(pageQuery, GradingOrganization.class), JpaUtils.toPageRequest(pageQuery));
+    }
+}

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

@@ -1,13 +1,18 @@
 package com.izouma.wenlvju.service;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.izouma.wenlvju.domain.RateExpertAudit;
 import com.izouma.wenlvju.dto.PageQuery;
+import com.izouma.wenlvju.exception.BusinessException;
 import com.izouma.wenlvju.repo.RateExpertAuditRepo;
 import com.izouma.wenlvju.utils.JpaUtils;
+import com.izouma.wenlvju.utils.ObjUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 @AllArgsConstructor
 public class RateExpertAuditService {
@@ -17,4 +22,24 @@ public class RateExpertAuditService {
     public Page<RateExpertAudit> all(PageQuery pageQuery) {
         return rateExpertAuditRepo.findAll(JpaUtils.toSpecification(pageQuery, RateExpertAudit.class), JpaUtils.toPageRequest(pageQuery));
     }
+
+    public void batchSave(List<RateExpertAudit> audits) {
+        audits.forEach(record -> {
+            if (record.getId() != null) {
+                RateExpertAudit orig = rateExpertAuditRepo.findById(record.getId())
+                        .orElseThrow(new BusinessException("无记录"));
+                ObjUtils.merge(orig, record);
+                rateExpertAuditRepo.save(orig);
+            } else {
+                RateExpertAudit orig = rateExpertAuditRepo.findByRateIdAndType(record.getRateId(), record.getType());
+                if (ObjectUtil.isNotNull(orig)) {
+                    ObjUtils.merge(orig, record);
+                    rateExpertAuditRepo.save(orig);
+                } else {
+                    rateExpertAuditRepo.save(record);
+                }
+
+            }
+        });
+    }
 }

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

@@ -0,0 +1,20 @@
+package com.izouma.wenlvju.service;
+
+import com.izouma.wenlvju.domain.Setting;
+import com.izouma.wenlvju.dto.PageQuery;
+import com.izouma.wenlvju.repo.SettingRepo;
+import com.izouma.wenlvju.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class SettingService {
+
+    private SettingRepo settingRepo;
+
+    public Page<Setting> all(PageQuery pageQuery) {
+        return settingRepo.findAll(JpaUtils.toSpecification(pageQuery, Setting.class), JpaUtils.toPageRequest(pageQuery));
+    }
+}

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()));
         }
@@ -234,6 +239,7 @@ public class UserService {
                         .name(dto.getOrganizationName())
 //                        .district1(dto.getDistrict1())
                         .district(dto.getDistrict())
+                        .examinationAgency(dto.getExaminationAgency())
                         .build());
 
         return user;

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

@@ -0,0 +1,60 @@
+package com.izouma.wenlvju.web;
+import com.izouma.wenlvju.domain.GradingOrganization;
+import com.izouma.wenlvju.service.GradingOrganizationService;
+import com.izouma.wenlvju.dto.PageQuery;
+import com.izouma.wenlvju.exception.BusinessException;
+import com.izouma.wenlvju.repo.GradingOrganizationRepo;
+import com.izouma.wenlvju.utils.ObjUtils;
+import com.izouma.wenlvju.utils.excel.ExcelUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/gradingOrganization")
+@AllArgsConstructor
+public class GradingOrganizationController extends BaseController {
+    private GradingOrganizationService gradingOrganizationService;
+    private GradingOrganizationRepo gradingOrganizationRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public GradingOrganization save(@RequestBody GradingOrganization record) {
+        if (record.getId() != null) {
+            GradingOrganization orig = gradingOrganizationRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return gradingOrganizationRepo.save(orig);
+        }
+        return gradingOrganizationRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<GradingOrganization> all(@RequestBody PageQuery pageQuery) {
+        return gradingOrganizationService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public GradingOrganization get(@PathVariable Long id) {
+        return gradingOrganizationRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        gradingOrganizationRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<GradingOrganization> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

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/java/com/izouma/wenlvju/web/RateExpertAuditController.java

@@ -1,13 +1,14 @@
 package com.izouma.wenlvju.web;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.izouma.wenlvju.domain.RateExpertAudit;
 import com.izouma.wenlvju.service.RateExpertAuditService;
 import com.izouma.wenlvju.dto.PageQuery;
 import com.izouma.wenlvju.exception.BusinessException;
 import com.izouma.wenlvju.repo.RateExpertAuditRepo;
 import com.izouma.wenlvju.utils.ObjUtils;
-import com.izouma.wenlvju.utils.SecurityUtils;
 import com.izouma.wenlvju.utils.excel.ExcelUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
@@ -34,14 +35,20 @@ public class RateExpertAuditController extends BaseController {
             ObjUtils.merge(orig, record);
             return rateExpertAuditRepo.save(orig);
         }
-        RateExpertAudit byRateId = rateExpertAuditRepo.findByRateId(record.getRateId());
-        if (ObjectUtil.isNotNull(byRateId)){
+        List<RateExpertAudit> byRateId = rateExpertAuditRepo.findAllByRateId(record.getRateId());
+        if (CollUtil.isNotEmpty(byRateId)) {
             throw new BusinessException("已评分");
         }
-        record.setUserId(SecurityUtils.getAuthenticatedUser().getId());
+//        record.setUserId(SecurityUtils.getAuthenticatedUser().getId());
         return rateExpertAuditRepo.save(record);
     }
 
+    @PostMapping("/batchSave")
+    public void batchSave(String audits) {
+        List<RateExpertAudit> rateExpertAudits = JSONObject.parseArray(audits, RateExpertAudit.class);
+        rateExpertAuditService.batchSave(rateExpertAudits);
+    }
+
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/all")

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

@@ -0,0 +1,60 @@
+package com.izouma.wenlvju.web;
+import com.izouma.wenlvju.domain.Setting;
+import com.izouma.wenlvju.service.SettingService;
+import com.izouma.wenlvju.dto.PageQuery;
+import com.izouma.wenlvju.exception.BusinessException;
+import com.izouma.wenlvju.repo.SettingRepo;
+import com.izouma.wenlvju.utils.ObjUtils;
+import com.izouma.wenlvju.utils.excel.ExcelUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/setting")
+@AllArgsConstructor
+public class SettingController extends BaseController {
+    private SettingService settingService;
+    private SettingRepo settingRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public Setting save(@RequestBody Setting record) {
+        if (record.getId() != null) {
+            Setting orig = settingRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return settingRepo.save(orig);
+        }
+        return settingRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<Setting> all(@RequestBody PageQuery pageQuery) {
+        return settingService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public Setting get(@PathVariable Long id) {
+        return settingRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        settingRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<Setting> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

src/main/resources/genjson/GradingOrganization.json

@@ -0,0 +1 @@
+{"tableName":"GradingOrganization","className":"GradingOrganization","remark":"考级机构","genTable":true,"genClass":true,"genList":true,"genForm":true,"genRouter":true,"javaPath":"/Users/qiufangchao/Desktop/project/wenlvju/src/main/java/com/izouma/wenlvju","viewPath":"/Users/qiufangchao/Desktop/project/wenlvju/src/main/vue/src/views","routerPath":"/Users/qiufangchao/Desktop/project/wenlvju/src/main/vue/src","resourcesPath":"/Users/qiufangchao/Desktop/project/wenlvju/src/main/resources","dataBaseType":"Mysql","fields":[{"name":"name","modelName":"name","remark":"名称","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"code","modelName":"code","remark":"代码","showInList":true,"showInForm":true,"formType":"singleLineText"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.wenlvju","tablePackage":"com.izouma.wenlvju.domain.GradingOrganization"}

src/main/resources/genjson/Setting.json

@@ -0,0 +1 @@
+{"tableName":"Setting","className":"Setting","remark":"设置","genTable":true,"genClass":true,"genList":true,"genForm":true,"genRouter":true,"javaPath":"/Users/qiufangchao/Desktop/project/wenlvju/src/main/java/com/izouma/wenlvju","viewPath":"/Users/qiufangchao/Desktop/project/wenlvju/src/main/vue/src/views","routerPath":"/Users/qiufangchao/Desktop/project/wenlvju/src/main/vue/src","resourcesPath":"/Users/qiufangchao/Desktop/project/wenlvju/src/main/resources","dataBaseType":"Mysql","fields":[{"name":"name","modelName":"name","remark":"名称","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"code","modelName":"code","remark":"编码","showInList":true,"showInForm":true,"formType":"singleLineText"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.wenlvju","tablePackage":"com.izouma.wenlvju.domain.Setting"}

src/main/vue/src/components/FileUpload.vue

@@ -26,7 +26,7 @@
                         @click="preview(file)"
                     ></i>
                     <i class="opt-icon el-icon-download" v-if="file.status === 'success'" @click="download(file)"></i>
-                    <i class="opt-icon el-icon-delete" @click="removeFile(file)"></i>
+                    <i class="opt-icon el-icon-delete" @click="removeFile(file)" v-if="!readonly"></i>
                 </i>
             </div>
             <el-progress
@@ -63,7 +63,7 @@ export default {
         limit: {
             type: Number,
             default() {
-                return 10000;
+                return 50000;
             }
         },
         value: {},

src/main/vue/src/mixins/rateStatus.js

@@ -2,10 +2,11 @@ export default {
     data() {
         return {
             statusOptions: [
+                { label: '草稿', value: 'DRAFT' },
                 { label: '等待初审', value: 'FIRST_REVIEW_PENDING' },
-                { label: '待分配专家组', value: 'ASSIGN_EXPERT' },
-                { label: '待专家组考察', value: 'REVIEW_PENDING' },
                 { label: '初审驳回', value: 'FIRST_REVIEW_DENY' },
+                { label: '已上报', value: 'ASSIGN_EXPERT' },
+                { label: '待专家组考察', value: 'REVIEW_PENDING' },
                 { label: '最终评审', value: 'SUBMIT_GRADE' },
                 { label: '待提交纸质材料', value: 'SUBMIT_PAPER_MATERIALS' },
                 { label: '完成', value: 'COMPLETE' }

src/main/vue/src/router.js

@@ -116,7 +116,7 @@ const router = new Router({
                     name: 'organization',
                     component: () => import(/* webpackChunkName: "userList" */ '@/views/organization/Organization.vue'),
                     meta: {
-                        title: '评星定级'
+                        title: '等级评定'
                     }
                 },
                 {
@@ -271,7 +271,7 @@ const router = new Router({
                     name: 'RateEdit',
                     component: () => import(/* webpackChunkName: "rateEdit" */ '@/views/organization/RateEdit.vue'),
                     meta: {
-                        title: '评星定级编辑'
+                        title: '等级评定申请'
                     }
                 },
                 {
@@ -280,7 +280,7 @@ const router = new Router({
                     component: () =>
                         import(/* webpackChunkName: "rateList" */ '@/views/organization/RateOrganizerList.vue'),
                     meta: {
-                        title: '评星定级'
+                        title: '等级评定'
                     }
                 },
                 {
@@ -288,7 +288,7 @@ const router = new Router({
                     name: 'RateExpertList',
                     component: () => import(/* webpackChunkName: "rateList" */ '@/views/RateExpertList.vue'),
                     meta: {
-                        title: '评星定级'
+                        title: '等级评定'
                     }
                 },
                 {
@@ -296,7 +296,7 @@ const router = new Router({
                     name: 'RateAudit',
                     component: () => import(/* webpackChunkName: "rateAudit" */ '@/views/RateAudit.vue'),
                     meta: {
-                        title: '评星定级详情'
+                        title: '等级评定申请'
                     }
                 },
                 {
@@ -312,7 +312,7 @@ const router = new Router({
                     name: 'RateList',
                     component: () => import(/* webpackChunkName: "rateList" */ '@/views/RateList.vue'),
                     meta: {
-                        title: '评星定级'
+                        title: '等级评定'
                     }
                 },
                 {
@@ -380,6 +380,40 @@ const router = new Router({
                     meta: {
                         title: '评分细则'
                     }
+                },
+                {
+                    path: '/gradingOrganizationEdit',
+                    name: 'GradingOrganizationEdit',
+                    component: () =>
+                        import(/* webpackChunkName: "gradingOrganizationEdit" */ '@/views/GradingOrganizationEdit.vue'),
+                    meta: {
+                        title: '考级机构编辑'
+                    }
+                },
+                {
+                    path: '/gradingOrganizationList',
+                    name: 'GradingOrganizationList',
+                    component: () =>
+                        import(/* webpackChunkName: "gradingOrganizationList" */ '@/views/GradingOrganizationList.vue'),
+                    meta: {
+                        title: '考级机构'
+                    }
+                },
+                {
+                    path: '/settingEdit',
+                    name: 'SettingEdit',
+                    component: () => import(/* webpackChunkName: "settingEdit" */ '@/views/SettingEdit.vue'),
+                    meta: {
+                        title: '设置编辑'
+                    }
+                },
+                {
+                    path: '/settingList',
+                    name: 'SettingList',
+                    component: () => import(/* webpackChunkName: "settingList" */ '@/views/SettingList.vue'),
+                    meta: {
+                        title: '设置'
+                    }
                 }
                 /**INSERT_LOCATION**/
             ]

src/main/vue/src/views/GradingOrganizationEdit.vue

@@ -0,0 +1,95 @@
+<template>
+    <div class="edit-view">
+        <el-form
+            :model="formData"
+            :rules="rules"
+            ref="form"
+            label-width="52px"
+            label-position="right"
+            size="small"
+            style="max-width: 500px;"
+        >
+            <el-form-item prop="name" label="名称">
+                <el-input v-model="formData.name"></el-input>
+            </el-form-item>
+            <el-form-item prop="code" label="代码">
+                <el-input v-model="formData.code"></el-input>
+            </el-form-item>
+            <el-form-item>
+                <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
+                <el-button @click="onDelete" :loading="saving" type="danger" v-if="formData.id">删除 </el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+export default {
+    name: 'GradingOrganizationEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('gradingOrganization/get/' + this.$route.query.id)
+                .then(res => {
+                    this.formData = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        }
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {}
+        };
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let data = { ...this.formData };
+
+            this.saving = true;
+            this.$http
+                .post('/gradingOrganization/save', data, { body: 'json' })
+                .then(res => {
+                    this.saving = false;
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.saving = false;
+                    this.$message.error(e.error);
+                });
+        },
+        onDelete() {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/gradingOrganization/del/${this.formData.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error((e || {}).error || '删除失败');
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped></style>

src/main/vue/src/views/GradingOrganizationList.vue

@@ -0,0 +1,157 @@
+<template>
+    <div class="list-view">
+        <div class="filters-container">
+            <el-input placeholder="输入关键字" v-model="search" clearable class="filter-item"></el-input>
+            <el-button @click="getData" type="primary" icon="el-icon-search" class="filter-item">搜索 </el-button>
+            <el-button @click="addRow" type="primary" icon="el-icon-plus" class="filter-item">添加 </el-button>
+            <el-button
+                @click="download"
+                type="primary"
+                icon="el-icon-download"
+                :loading="downloading"
+                class="filter-item"
+                >导出EXCEL
+            </el-button>
+        </div>
+        <el-table
+            :data="tableData"
+            row-key="id"
+            ref="table"
+            header-row-class-name="table-header-row"
+            header-cell-class-name="table-header-cell"
+            row-class-name="table-row"
+            cell-class-name="table-cell"
+            :height="tableHeight"
+        >
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
+            <el-table-column prop="id" label="ID" width="100"> </el-table-column>
+            <el-table-column prop="name" label="名称"> </el-table-column>
+            <el-table-column prop="code" label="代码"> </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="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <el-button @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div> -->
+            <el-pagination
+                background
+                @size-change="onSizeChange"
+                @current-change="onCurrentChange"
+                :current-page="page"
+                :page-sizes="[10, 20, 30, 40, 50]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="totalElements"
+            >
+            </el-pagination>
+        </div>
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
+
+export default {
+    name: 'GradingOrganizationList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/gradingOrganization/all',
+            downloading: false
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        beforeGetData() {
+            return { search: this.search };
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: '/gradingOrganizationEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/gradingOrganizationEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/gradingOrganization/excel', {
+                    responseType: 'blob',
+                    params: { size: 10000 }
+                })
+                .then(res => {
+                    console.log(res);
+                    this.downloading = false;
+                    const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                    const link = document.createElement('a');
+                    link.href = downloadUrl;
+                    link.setAttribute('download', res.headers['content-disposition'].split('filename=')[1]);
+                    document.body.appendChild(link);
+                    link.click();
+                    link.remove();
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.downloading = false;
+                    this.$message.error(e.error);
+                });
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/gradingOrganization/del/${row.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped></style>

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

@@ -2,39 +2,106 @@
     <div class="container" :style="{ backgroundImage: 'url(' + require('../assets/login_bg.jpg') + ')' }">
         <transition :name="`slide-${register ? 'in' : 'out'}`">
             <div class="login-wrapper" @keyup.enter="doRegister" v-if="register" key="register">
-                <div class="title">南京市社会艺术水平考级系统注册</div>
+                <div class="title">南京市社会艺术水平考级管理服务系统注册</div>
                 <el-page-header @back="register = false" title="登录" style="width: 350px; line-height: 55px">
                     <div class="register-title" slot="content">注册账号</div>
                 </el-page-header>
 
                 <el-form :model="registerInfo" style="width: 350px" ref="registerForm">
-                    <el-form-item prop="username" :rules="{ required: true, message: '请输入用户名', trigger: 'blur' }">
-                        <el-input v-model="registerInfo.username" placeholder="用户名"> </el-input>
+                    <el-form-item
+                        prop="username"
+                        label="用户名"
+                        :rules="{ required: true, message: '请输入用户名', trigger: 'blur' }"
+                    >
+                        <el-input class="input-width" v-model="registerInfo.username" placeholder="用户名"> </el-input>
                     </el-form-item>
-                    <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
+                        prop="password"
+                        label="密码"
+                        :rules="{ required: true, message: '请输入密码', trigger: 'blur' }"
+                    >
+                        <el-input
+                            class="input-width"
+                            v-model="registerInfo.password"
+                            placeholder="密码"
+                            type="password"
+                        ></el-input>
                     </el-form-item>
-                    <el-form-item prop="nickname" :rules="{ required: true, message: '请输入昵称', trigger: 'blur' }">
-                        <el-input v-model="registerInfo.nickname" placeholder="昵称"> </el-input>
+                    <el-form-item
+                        prop="password"
+                        label="确认密码"
+                        :rules="{ required: true, message: '请输入密码', trigger: 'blur' }"
+                    >
+                        <el-input
+                            class="input-width"
+                            v-model="registerInfo.password"
+                            placeholder="密码"
+                            type="password"
+                        ></el-input>
                     </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
+                        prop="organizationName"
+                        label="承办单位名称"
+                        :rules="{ required: true, message: '请输入承办单位名称', trigger: 'blur' }"
+                    >
+                        <el-input
+                            class="input-width"
+                            v-model="registerInfo.organizationName"
+                            placeholder="承办单位名称"
+                        >
+                        </el-input>
+                    </el-form-item>
+                    <el-form-item
+                        prop="phone"
+                        label="手机号"
+                        :rules="{
+                            required: true,
+                            message: '请输入正确的手机号',
+                            pattern: /^1[3-9]\d{9}$/,
+                            trigger: 'blur'
+                        }"
+                    >
+                        <el-input class="input-width" v-model="registerInfo.phone" placeholder="手机号"> </el-input>
                     </el-form-item>
-                    <el-form-item prop="email" :rules="{ required: true, message: '请输入电子邮箱', trigger: 'blur' }">
-                        <el-input v-model="registerInfo.email" placeholder="电子邮箱"> </el-input>
+                    <el-form-item
+                        prop="email"
+                        label="电子邮箱"
+                        :rules="{
+                            required: true,
+                            message: '请输入正确的电子邮箱',
+                            pattern: /^[A-Za-z0-9\u4e00-\u9fa5]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/,
+                            trigger: 'blur'
+                        }"
+                    >
+                        <el-input class="input-width" v-model="registerInfo.email" placeholder="电子邮箱"> </el-input>
                     </el-form-item>
                     <el-form-item
-                        prop="organizationName"
-                        :rules="{ required: true, message: '请输入机构名称', trigger: 'blur' }"
+                        prop="examinationAgency"
+                        label="所属考级机构"
+                        :rules="{ required: true, message: '请选择所属考级机构', trigger: 'blur' }"
                     >
-                        <el-input v-model="registerInfo.organizationName" placeholder="机构名称"> </el-input>
+                        <el-select
+                            v-model="registerInfo.examinationAgency"
+                            placeholder="请选择所属考级机构"
+                            style="width: 350px"
+                        >
+                            <el-option
+                                v-for="(item, index) in examination"
+                                :key="index"
+                                :value="item.value"
+                                :label="item.label"
+                            ></el-option>
+                        </el-select>
+                        <!-- <el-input v-model="registerInfo.organizationName" placeholder="发证机构"> </el-input> -->
                     </el-form-item>
                     <el-form-item
                         prop="district"
+                        label="注册地址"
                         :rules="{ required: true, message: '请选择注册地址', trigger: 'blur' }"
                     >
                         <!-- <district-choose v-model="registerInfo.district"></district-choose> -->
-                        <el-select v-model="registerInfo.district">
+                        <el-select v-model="registerInfo.district" placeholder="请选择注册地址" style="width: 350px">
                             <el-option
                                 v-for="(item, index) in districtOptions"
                                 :key="index"
@@ -57,7 +124,7 @@
                 </el-form>
             </div>
             <div class="login-wrapper" @keyup.enter="login" v-else key="login">
-                <div class="title">南京市社会艺术水平考级系统</div>
+                <div class="title">南京市社会艺术水平考级管理服务系统</div>
                 <el-tabs v-model="activeName" stretch class="tab-list">
                     <el-tab-pane label="用户名登陆" name="first">
                         <el-form size="medium" :model="userInfo" style="width: 380px" ref="form">
@@ -162,7 +229,8 @@ export default {
             activeName: 'first',
             time: 0,
             sending: false,
-            districtOptions: []
+            districtOptions: [],
+            examination: []
         };
     },
     created() {
@@ -182,6 +250,22 @@ export default {
                 console.log(e);
                 this.$message.error(e.error);
             });
+        this.$http
+            .post('/gradingOrganization/all', { size: 1000 }, { body: 'json' })
+            .then(res => {
+                if (res.content.length > 0) {
+                    res.content.forEach(item => {
+                        this.examination.push({
+                            label: item.name,
+                            value: item.id
+                        });
+                    });
+                }
+            })
+            .catch(e => {
+                console.log(e);
+                this.$message.error(e.error);
+            });
     },
     methods: {
         login() {
@@ -414,6 +498,9 @@ export default {
         padding: 14px 12px;
     }
 }
+.input-width {
+    width: 285px;
+}
 </style>
 <style lang="less">
 .login-wrapper {

src/main/vue/src/views/RateAudit.vue

@@ -6,14 +6,14 @@
             label-width="50px"
             label-position="right"
             size="small"
-            style="max-width: 600px;"
+            style="max-width: 620px;"
         >
             <div class="info-content">
                 <div class="tag" v-if="grade">{{ grade }}</div>
                 <div class="info-item">
-                    <div class="name">机构名称</div>
+                    <div class="name">承办单位名称</div>
                     <div class="val">
-                        <el-input v-model="formData.name" placeholder="请输入机构名称" readonly></el-input>
+                        <el-input v-model="formData.name" placeholder="请输入承办单位名称" readonly></el-input>
                     </div>
                 </div>
                 <div class="info-item">
@@ -286,7 +286,7 @@ export default {
             font-weight: 400;
             color: #565b66;
             line-height: 22px;
-            min-width: 65px;
+            min-width: 76px;
             margin-right: 10px;
             text-align: right;
         }

src/main/vue/src/views/RateExpertList.vue

@@ -29,7 +29,7 @@
             <el-table-column prop="createdAt" label="申请时间"></el-table-column>
             <el-table-column prop="year" label="年度"> </el-table-column>
             <el-table-column prop="status" label="状态" :formatter="statusFormatter"> </el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" min-width="150">
+            <!-- <el-table-column label="操作" align="center" fixed="right" min-width="150">
                 <template slot-scope="{ row }">
                     <el-button
                         v-if="row.status === 'FIRST_REVIEW_PASS'"
@@ -52,9 +52,8 @@
                         拒绝
                     </el-button>
                     <el-button @click="editRow(row)" type="primary" size="mini" plain>查看附件</el-button>
-                    <!-- <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button> -->
                 </template>
-            </el-table-column>
+            </el-table-column> -->
         </el-table>
         <div class="pagination-wrapper">
             <!-- <div class="multiple-mode-wrapper">
@@ -82,23 +81,17 @@
 <script>
 import { mapState } from 'vuex';
 import pageableTable from '@/mixins/pageableTable';
+import rateStatus from '@/mixins/rateStatus';
 
 export default {
     name: 'RateList',
-    mixins: [pageableTable],
+    mixins: [pageableTable, rateStatus],
     data() {
         return {
             multipleMode: false,
             search: '',
             url: '/rate/all2',
-            downloading: false,
-            statusOptions: [
-                { label: '初审中', value: 'FIRST_REVIEW_PENDING' },
-                { label: '初审通过', value: 'FIRST_REVIEW_PASS' },
-                { label: '初审拒绝', value: 'FIRST_REVIEW_DENY' },
-                { label: '专家通过', value: 'EXPERT_PASS' },
-                { label: '专家拒绝', value: 'EXPERT_DENY' }
-            ]
+            downloading: false
         };
     },
     computed: {
@@ -108,13 +101,6 @@ export default {
         ...mapState(['userInfo'])
     },
     methods: {
-        statusFormatter(row, column, cellValue, index) {
-            let selectedOption = this.statusOptions.find(i => i.value === cellValue);
-            if (selectedOption) {
-                return selectedOption.label;
-            }
-            return '';
-        },
         beforeGetData() {
             return {
                 sort: 'createdAt,desc',

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

@@ -32,7 +32,7 @@
             <el-table-column prop="score" label="分数">
                 <template slot-scope="{ row }">
                     <span v-if="row.score">{{ row.score }}</span>
-                    <span v-else>审核中</span>
+                    <span v-else>暂无</span>
                 </template>
             </el-table-column>
             <el-table-column prop="grade" label="等级">
@@ -40,7 +40,7 @@
                     <span v-if="row.grade == 'EXCELLENT'"><el-tag type="success">优秀</el-tag></span>
                     <span v-else-if="row.grade == 'ELIGIBLE'"><el-tag type="warning">合格</el-tag></span>
                     <span v-else-if="row.grade == 'NOT_ELIGIBLE'"><el-tag type="danger">不合格</el-tag></span>
-                    <span v-else><el-tag type="info">审核中</el-tag></span>
+                    <span v-else><el-tag type="info">暂无</el-tag></span>
                 </template>
             </el-table-column>
             <el-table-column label="操作" align="right" fixed="right" min-width="200">
@@ -53,7 +53,7 @@
                         size="mini"
                         plain
                     >
-                        通过
+                        同意上报
                     </el-button>
                     <el-button
                         v-if="row.status === 'FIRST_REVIEW_PENDING'"
@@ -63,7 +63,7 @@
                         size="mini"
                         plain
                     >
-                        驳回
+                        退回
                     </el-button>
                     <el-button v-if="row.status === 'SUBMIT_GRADE'" @click="openScore(row)" type="warning" plain
                         >填写分数</el-button
@@ -84,7 +84,7 @@
                         @click="saveComplete(row)"
                         >完成</el-button
                     >
-                    <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="deleteRow(row)" type="danger" size="mini" plain>删除</el-button> -->
                 </template>
             </el-table-column>
@@ -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/SettingEdit.vue

@@ -0,0 +1,95 @@
+<template>
+    <div class="edit-view">
+        <el-form
+            :model="formData"
+            :rules="rules"
+            ref="form"
+            label-width="52px"
+            label-position="right"
+            size="small"
+            style="max-width: 500px;"
+        >
+            <el-form-item prop="name" label="名称">
+                <el-input v-model="formData.name"></el-input>
+            </el-form-item>
+            <el-form-item prop="code" label="编码">
+                <el-input v-model="formData.code"></el-input>
+            </el-form-item>
+            <el-form-item>
+                <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
+                <el-button @click="onDelete" :loading="saving" type="danger" v-if="formData.id">删除 </el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+export default {
+    name: 'SettingEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('setting/get/' + this.$route.query.id)
+                .then(res => {
+                    this.formData = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        }
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {}
+        };
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let data = { ...this.formData };
+
+            this.saving = true;
+            this.$http
+                .post('/setting/save', data, { body: 'json' })
+                .then(res => {
+                    this.saving = false;
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.saving = false;
+                    this.$message.error(e.error);
+                });
+        },
+        onDelete() {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/setting/del/${this.formData.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error((e || {}).error || '删除失败');
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped></style>

src/main/vue/src/views/SettingList.vue

@@ -0,0 +1,157 @@
+<template>
+    <div class="list-view">
+        <div class="filters-container">
+            <el-input placeholder="输入关键字" v-model="search" clearable class="filter-item"></el-input>
+            <el-button @click="getData" type="primary" icon="el-icon-search" class="filter-item">搜索 </el-button>
+            <el-button @click="addRow" type="primary" icon="el-icon-plus" class="filter-item">添加 </el-button>
+            <el-button
+                @click="download"
+                type="primary"
+                icon="el-icon-download"
+                :loading="downloading"
+                class="filter-item"
+                >导出EXCEL
+            </el-button>
+        </div>
+        <el-table
+            :data="tableData"
+            row-key="id"
+            ref="table"
+            header-row-class-name="table-header-row"
+            header-cell-class-name="table-header-cell"
+            row-class-name="table-row"
+            cell-class-name="table-cell"
+            :height="tableHeight"
+        >
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
+            <el-table-column prop="id" label="ID" width="100"> </el-table-column>
+            <el-table-column prop="name" label="名称"> </el-table-column>
+            <el-table-column prop="code" label="编码"> </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="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <el-button @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div> -->
+            <el-pagination
+                background
+                @size-change="onSizeChange"
+                @current-change="onCurrentChange"
+                :current-page="page"
+                :page-sizes="[10, 20, 30, 40, 50]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="totalElements"
+            >
+            </el-pagination>
+        </div>
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
+
+export default {
+    name: 'SettingList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/setting/all',
+            downloading: false
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        beforeGetData() {
+            return { search: this.search };
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: '/settingEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/settingEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/setting/excel', {
+                    responseType: 'blob',
+                    params: { size: 10000 }
+                })
+                .then(res => {
+                    console.log(res);
+                    this.downloading = false;
+                    const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                    const link = document.createElement('a');
+                    link.href = downloadUrl;
+                    link.setAttribute('download', res.headers['content-disposition'].split('filename=')[1]);
+                    document.body.appendChild(link);
+                    link.click();
+                    link.remove();
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.downloading = false;
+                    this.$message.error(e.error);
+                });
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/setting/del/${row.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped></style>

src/main/vue/src/views/UserList.vue

@@ -74,16 +74,22 @@ export default {
         };
     },
     computed: {
-        ...mapState([]),
+        ...mapState(['userInfo']),
         selection() {
             return this.$refs.table.selection.map(i => i.id);
         }
     },
     methods: {
         beforeGetData() {
+            let data = { sort: 'createdAt,desc', query: {} };
             if (this.search) {
-                return { search: this.search };
+                data.search = this.search;
             }
+            console.log(this.getAdmin());
+            if (!this.getAdmin()) {
+                data.query.id = this.userInfo.id;
+            }
+            return data;
         },
         toggleMultipleMode(multipleMode) {
             this.multipleMode = multipleMode;
@@ -167,6 +173,16 @@ export default {
                         this.$message.error(e.error);
                     });
             }
+        },
+        getAdmin() {
+            let data = this.userInfo.authorities;
+            let flag = false;
+            data.forEach(element => {
+                if (element.name === 'ROLE_ADMIN') {
+                    flag = true;
+                }
+            });
+            return flag;
         }
     }
 };

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/Organization.vue

@@ -16,7 +16,12 @@ export default {
     created() {
         let data = this.$route.query.status;
         console.log(data != 'SUBMIT_GRADE');
-        if (data == 'SUBMIT_GRADE' || data == 'REVIEW_PENDING' || data == 'SUBMIT_PAPER_MATERIALS') {
+        if (
+            data == 'SUBMIT_GRADE' ||
+            data == 'REVIEW_PENDING' ||
+            data == 'SUBMIT_PAPER_MATERIALS' ||
+            data == 'COMPLETE'
+        ) {
             this.status = false;
         }
     },

src/main/vue/src/views/organization/OrganizationInfo.vue

@@ -7,7 +7,7 @@
             label-width="50px"
             label-position="right"
             size="small"
-            style="max-width: 600px;"
+            style="max-width: 640px;"
         >
             <div class="info-content">
                 <div class="info-item">
@@ -17,9 +17,16 @@
                     </div>
                 </div>
                 <div class="info-item">
-                    <div class="name">昵称</div>
+                    <div class="name">所属考级机构</div>
                     <div class="val">
-                        <el-input v-model="userInfo.nickname" placeholder="请输入昵称"></el-input>
+                        <el-select v-model="examinationAgency" placeholder="所属考级机构">
+                            <el-option
+                                v-for="(item, index) in examination"
+                                :key="index"
+                                :value="item"
+                                :label="item"
+                            ></el-option>
+                        </el-select>
                     </div>
                 </div>
 
@@ -39,9 +46,9 @@
 
             <div class="info-content">
                 <div class="info-item">
-                    <div class="name">机构名称</div>
+                    <div class="name">承办单位名称</div>
                     <div class="val">
-                        <el-input v-model="formData.name" placeholder="请输入机构名称"></el-input>
+                        <el-input v-model="formData.name" placeholder="请输入承办单位名称"></el-input>
                     </div>
                 </div>
                 <div class="info-item">
@@ -101,6 +108,17 @@
                         ></el-input>
                     </div>
                 </div>
+                <div class="info-item address">
+                    <div class="name">经营范围</div>
+                    <div class="val">
+                        <el-input
+                            type="textarea"
+                            :autosize="{ minRows: 3, maxRows: 4 }"
+                            placeholder="请输入经营范围"
+                            v-model="formData.businessScope"
+                        ></el-input>
+                    </div>
+                </div>
                 <div class="info-item">
                     <div class="name">营业执照</div>
                     <div class="val">
@@ -135,6 +153,7 @@ export default {
         //         this.$message.error(e.error);
         //     });
         this.formData = this.organization;
+        this.examinationAgency = this.organization.examinationAgency;
         this.$http
             .get('/district/NJ', { size: 1000, query: { del: false } })
             .then(res => {
@@ -159,7 +178,9 @@ export default {
             rules: {},
             districtOptions: [],
             readonly: true,
-            district: []
+            district: [],
+            examination: ['中国音乐学院', '中国艺术科技研究所', '北京舞蹈学院'],
+            examinationAgency: ''
         };
     },
     methods: {
@@ -175,6 +196,7 @@ export default {
         },
         submit() {
             let data = { ...this.formData };
+            data.examinationAgency = this.examinationAgency;
             this.saving = true;
             this.$http
                 .post('/organization/save', data, { body: 'json' })
@@ -251,7 +273,7 @@ export default {
             width: 100%;
             align-items: flex-start;
             .val {
-                width: 465px;
+                width: 485px;
             }
         }
 
@@ -261,7 +283,7 @@ export default {
             font-weight: 400;
             color: #565b66;
             line-height: 22px;
-            min-width: 65px;
+            min-width: 75px;
             margin-right: 10px;
             text-align: right;
         }

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

@@ -4,82 +4,125 @@
             :model="formData"
             :rules="rules"
             ref="form"
-            label-width="50px"
+            label-width="110px"
             label-position="right"
             size="small"
-            style="max-width: 600px;"
+            style="max-width: 640px;"
         >
+            <el-divider direction="horizontal" content-position="left">基本信息</el-divider>
             <div class="info-content">
                 <!-- <div class="tag" v-if="grade">{{ grade }}</div> -->
                 <div class="info-item">
-                    <div class="name">机构名称</div>
+                    <!-- <div class="name">机构名称</div> -->
                     <div class="val">
-                        <el-input v-model="formData.name" placeholder="请输入机构名称" :readonly="readonly"></el-input>
+                        <el-form-item prop="name" label="承办单位名称">
+                            <el-input v-model="formData.name" placeholder="请输入承办单位名称" readonly></el-input>
+                        </el-form-item>
                     </div>
                 </div>
                 <div class="info-item">
-                    <div class="name">负责人邮箱</div>
+                    <!-- <div class="name">负责人邮箱</div> -->
                     <div class="val">
-                        <el-input
-                            v-model="formData.ownerEmail"
-                            placeholder="请输入负责人邮箱"
-                            :readonly="readonly"
-                        ></el-input>
+                        <el-form-item prop="name" label="负责人邮箱">
+                            <el-input v-model="formData.ownerEmail" placeholder="请输入负责人邮箱" readonly></el-input>
+                        </el-form-item>
                     </div>
                 </div>
                 <div class="info-item">
-                    <div class="name">负责人</div>
+                    <!-- <div class="name">负责人</div> -->
                     <div class="val">
-                        <el-input v-model="formData.owner" placeholder="请输入负责人" :readonly="readonly"></el-input>
+                        <el-form-item prop="owner" label="负责人">
+                            <el-input v-model="formData.owner" placeholder="请输入负责人" readonly></el-input>
+                        </el-form-item>
                     </div>
                 </div>
                 <div class="info-item">
-                    <div class="name">负责人电话</div>
+                    <!-- <div class="name">负责人电话</div> -->
                     <div class="val">
-                        <el-input
-                            v-model="formData.ownerPhone"
-                            placeholder="请输入负责人电话"
-                            :readonly="readonly"
-                        ></el-input>
+                        <el-form-item prop="ownerPhone" label="负责人电话">
+                            <el-input v-model="formData.ownerPhone" placeholder="请输入负责人电话" readonly></el-input>
+                        </el-form-item>
                     </div>
                 </div>
                 <div class="info-item">
-                    <div class="name">地址</div>
+                    <!-- <div class="name">地址</div> -->
                     <div class="val">
-                        <el-select v-model="formData.district" style="width:100%">
-                            <el-option
-                                v-for="item in districts"
-                                :key="item.id"
-                                :value="item.name"
-                                :label="item.name"
-                                :disabled="readonly"
-                            ></el-option>
-                        </el-select>
+                        <el-form-item prop="district" label="地址">
+                            <el-select v-model="formData.district" style="width:100%">
+                                <el-option
+                                    v-for="item in districts"
+                                    :key="item.id"
+                                    :value="item.name"
+                                    :label="item.name"
+                                    :disabled="readonly"
+                                ></el-option>
+                            </el-select>
+                        </el-form-item>
                     </div>
                 </div>
 
                 <div class="info-item address">
-                    <div class="name">单位概况</div>
+                    <!-- <div class="name">单位概况</div> -->
                     <div class="val">
-                        <el-input
-                            :readonly="readonly"
-                            type="textarea"
-                            :autosize="{ minRows: 4, maxRows: 6 }"
-                            placeholder="请输入单位概况"
-                            v-model="formData.introduction"
-                        ></el-input>
+                        <el-form-item prop="introduction" label="单位概况">
+                            <el-input
+                                :readonly="readonly"
+                                type="textarea"
+                                :autosize="{ minRows: 4, maxRows: 6 }"
+                                placeholder="请输入单位概况"
+                                v-model="formData.introduction"
+                            ></el-input>
+                        </el-form-item>
                     </div>
                 </div>
                 <div class="info-item address">
-                    <div class="name">考级活动</div>
+                    <!-- <div class="name">考级活动</div> -->
                     <div class="val">
-                        <el-radio-group v-model="formData.undertakeExamination" size="small" :disabled="readonly">
-                            <el-radio class="name" :label="true">承办过</el-radio>
-                            <el-radio class="name" :label="false">未承办过</el-radio>
-                        </el-radio-group>
+                        <el-form-item prop="undertakeExamination" label="考级活动">
+                            <el-radio-group v-model="formData.undertakeExamination" size="small" :disabled="readonly">
+                                <el-radio class="name" :label="true">承办过</el-radio>
+                                <el-radio class="name" :label="false">未承办过</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
                     </div>
                 </div>
-                <div class="info-item address" v-if="formData.undertakeExamination">
+                <div class="info-item">
+                    <div class="val">
+                        <el-form-item prop="district" label="考级机构">
+                            <el-select v-model="formData.district" style="width:190px">
+                                <el-option
+                                    v-for="item in districts"
+                                    :key="item.id"
+                                    :value="item.name"
+                                    :label="item.name"
+                                    :disabled="readonly"
+                                ></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </div>
+                    <div class="val">
+                        <el-form-item prop="district" label="代理专业">
+                            <el-select v-model="formData.district" style="width:190px">
+                                <el-option
+                                    v-for="item in districts"
+                                    :key="item.id"
+                                    :value="item.name"
+                                    :label="item.name"
+                                    :disabled="readonly"
+                                ></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </div>
+                </div>
+                <div class="info-item address">
+                    <div class="val">
+                        <el-form-item prop="privacyPolicy" label="合作协议">
+                            <file-upload v-model="formData.privacyPolicy" :readonly="readonly"></file-upload>
+                            <!-- <single-upload v-model="formData.privacyPolicy"></single-upload> -->
+                        </el-form-item>
+                    </div>
+                </div>
+                <!-- <div class="info-item address" v-if="formData.undertakeExamination">
                     <div class="name"></div>
                     <div class="val">
                         <el-tag
@@ -113,46 +156,68 @@
                             >
                         </div>
                     </div>
-                </div>
+                </div> -->
             </div>
+            <el-divider direction="horizontal" content-position="left">企业资质</el-divider>
             <div class="info-content">
                 <div class="info-item address">
-                    <div class="name">法人资格</div>
+                    <!-- <div class="name">法人资格</div> -->
                     <div class="val">
-                        <file-upload v-model="formData.privacyPolicy" :readonly="readonly"></file-upload>
-                        <!-- <single-upload v-model="formData.privacyPolicy"></single-upload> -->
+                        <el-form-item prop="privacyPolicy" label="法人资格">
+                            <file-upload v-model="formData.privacyPolicy" :readonly="readonly"></file-upload>
+                            <!-- <single-upload v-model="formData.privacyPolicy"></single-upload> -->
+                        </el-form-item>
                     </div>
                 </div>
                 <div class="info-item address">
-                    <div class="name">业务内容</div>
+                    <!-- <div class="name">业务内容</div> -->
                     <div class="val">
-                        <file-upload v-model="formData.business" :readonly="readonly"></file-upload>
+                        <el-form-item prop="business" label="业务内容">
+                            <file-upload v-model="formData.business" :readonly="readonly"></file-upload>
+                        </el-form-item>
                     </div>
                 </div>
                 <div class="info-item address">
-                    <div class="name">社会信誉</div>
+                    <!-- <div class="name">社会信誉</div> -->
                     <div class="val">
-                        <file-upload v-model="formData.credits" :readonly="readonly"></file-upload>
+                        <el-form-item prop="credits" label="社会信誉">
+                            <file-upload v-model="formData.credits" :readonly="readonly"></file-upload>
+                        </el-form-item>
                     </div>
                 </div>
             </div>
+            <el-divider direction="horizontal" content-position="left">物质条件</el-divider>
             <div class="info-content">
                 <div class="info-item address">
-                    <div class="name">消防卫生</div>
+                    <!-- <div class="name">消防卫生</div> -->
                     <div class="val">
-                        <file-upload v-model="formData.fire" :readonly="readonly"></file-upload>
+                        <el-form-item prop="fire" label="消防安全">
+                            <file-upload v-model="formData.fire" :readonly="readonly"></file-upload>
+                        </el-form-item>
                     </div>
                 </div>
                 <div class="info-item address">
-                    <div class="name">财务报表</div>
+                    <!-- <div class="name">消防卫生</div> -->
                     <div class="val">
-                        <file-upload v-model="formData.finance" :readonly="readonly"></file-upload>
+                        <el-form-item prop="hygiene" label="卫生防疫">
+                            <file-upload v-model="formData.hygiene" :readonly="readonly"></file-upload>
+                        </el-form-item>
                     </div>
                 </div>
                 <div class="info-item address">
-                    <div class="name">房产证明</div>
+                    <!-- <div class="name">财务报表</div> -->
                     <div class="val">
-                        <file-upload v-model="formData.property" :readonly="readonly"></file-upload>
+                        <el-form-item prop="finance" label="财务报表">
+                            <file-upload v-model="formData.finance" :readonly="readonly"></file-upload>
+                        </el-form-item>
+                    </div>
+                </div>
+                <div class="info-item address">
+                    <!-- <div class="name">房产证明</div> -->
+                    <div class="val">
+                        <el-form-item prop="property" label="房产证明">
+                            <file-upload v-model="formData.property" :readonly="readonly"></file-upload>
+                        </el-form-item>
                     </div>
                 </div>
             </div>
@@ -184,7 +249,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"
@@ -202,7 +267,7 @@
                                 (formData.status == 'FIRST_REVIEW_PENDING' || formData.status == 'FIRST_REVIEW_DENY') &&
                                 readonly
                         "
-                        >取消申请
+                        >撤回
                     </el-button>
                     <el-button @click="$router.go(-1)">返回</el-button>
                 </div>
@@ -288,7 +353,14 @@ export default {
             rules: {
                 name: [{ required: true, message: '请输入机构名称', trigger: 'blur' }],
                 owner: [{ required: true, message: '请输入负责人', trigger: 'blur' }],
-                ownerEmail: [{ required: true, message: '请输入邮箱', trigger: 'blur' }],
+                ownerEmail: [
+                    {
+                        required: true,
+                        pattern: /^[A-Za-z0-9\u4e00-\u9fa5]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/,
+                        message: '请输入邮箱',
+                        trigger: 'blur'
+                    }
+                ],
                 ownerPhone: [
                     {
                         required: true,
@@ -297,12 +369,12 @@ export default {
                         trigger: 'blur'
                     }
                 ],
+                district: [{ required: true, message: '请选择注册地址', trigger: 'blur' }],
                 introduction: [{ required: true, message: '请输入单位概况', trigger: 'blur' }],
                 undertakeExamination: [{ required: true, message: '请选择是否承办过考级活动', trigger: 'blur' }],
                 privacyPolicy: [
                     {
                         required: true,
-                        regexp: /^[_.@A-Za-z0-9-]*$/,
                         message: '请上传法人资格',
                         trigger: 'blur'
                     }
@@ -310,7 +382,6 @@ export default {
                 business: [
                     {
                         required: true,
-                        regexp: /^[_.@A-Za-z0-9-]*$/,
                         message: '请上传业务内容',
                         trigger: 'blur'
                     }
@@ -318,7 +389,6 @@ export default {
                 credits: [
                     {
                         required: true,
-                        regexp: /^[_.@A-Za-z0-9-]*$/,
                         message: '请上传社会信誉',
                         trigger: 'blur'
                     }
@@ -326,15 +396,20 @@ export default {
                 fire: [
                     {
                         required: true,
-                        regexp: /^[_.@A-Za-z0-9-]*$/,
-                        message: '请上传消防卫生',
+                        message: '请上传消防安全',
+                        trigger: 'blur'
+                    }
+                ],
+                hygiene: [
+                    {
+                        required: true,
+                        message: '请上传卫生防疫',
                         trigger: 'blur'
                     }
                 ],
                 finance: [
                     {
                         required: true,
-                        regexp: /^[_.@A-Za-z0-9-]*$/,
                         message: '请上传财务报表',
                         trigger: 'blur'
                     }
@@ -342,12 +417,12 @@ export default {
                 property: [
                     {
                         required: true,
-                        regexp: /^[_.@A-Za-z0-9-]*$/,
                         message: '请上传房产证明',
                         trigger: 'blur'
                     }
                 ]
-            }
+            },
+            collaborates: []
         };
     },
     methods: {
@@ -383,6 +458,9 @@ export default {
             if (this.formData.status == 'EXPERT_DENY') {
                 data.status = 'SUBMIT_GRADE';
             }
+            if (!isSubmit) {
+                data.status = 'DRAFT';
+            }
             data.submit = isSubmit;
             this.saving = true;
             this.$http
@@ -422,8 +500,8 @@ export default {
 </script>
 <style lang="less" scoped>
 .info-content {
-    background: #f5f7fa;
-    padding: 30px 25px 25px;
+    // background: #f5f7fa;
+    padding: 20px 10px 25px;
     margin: 2px auto;
     display: flex;
     flex-wrap: wrap;
@@ -433,13 +511,13 @@ export default {
         width: 50%;
         display: flex;
         align-items: center;
-        margin-bottom: 10px;
+        // margin-bottom: 10px;
 
         &.address {
             width: 100%;
             align-items: flex-start;
             .val {
-                width: 465px;
+                width: 600px;
             }
         }
 
@@ -455,7 +533,12 @@ export default {
         }
 
         .val {
-            width: 190px;
+            // width: 190px;
+            width: 300px;
+        }
+
+        .input {
+            margin-top: 10px;
         }
     }
     .tag {
@@ -473,13 +556,14 @@ export default {
     }
 }
 .el-tag + .el-tag {
-    margin-left: 10px;
+    margin-left: 30px;
     // margin-bottom: 10px;
 }
 .el-tag-height {
     line-height: 30px;
     height: 32px !important;
     margin-bottom: 10px;
+    margin-left: 30px;
 }
 .button-new-tag {
     // margin-left: 10px;

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

@@ -30,13 +30,13 @@
             <el-table-column prop="submit" label="提交">
                 <template slot-scope="{ row }">
                     <span v-if="row.submit">已提交</span>
-                    <span v-else>未提交</span>
+                    <span v-else>草稿</span>
                 </template>
             </el-table-column>
             <el-table-column prop="score" label="分数">
                 <template slot-scope="{ row }">
                     <span v-if="row.score">{{ row.score }}</span>
-                    <span v-else>审核中</span>
+                    <span v-else>暂无</span>
                 </template>
             </el-table-column>
             <el-table-column prop="grade" label="等级">
@@ -44,12 +44,12 @@
                     <span v-if="row.grade == 'EXCELLENT'"><el-tag type="success">优秀</el-tag></span>
                     <span v-else-if="row.grade == 'ELIGIBLE'"><el-tag type="warning">合格</el-tag></span>
                     <span v-else-if="row.grade == 'NOT_ELIGIBLE'"><el-tag type="danger">不合格</el-tag></span>
-                    <span v-else><el-tag type="info">审核中</el-tag></span>
+                    <span v-else><el-tag type="info">暂无</el-tag></span>
                 </template>
             </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>

src/test/java/com/izouma/wenlvju/repo/RateExpertAuditRepoTest.java

@@ -15,7 +15,7 @@ public class RateExpertAuditRepoTest extends ApplicationTests {
     public void test() {
         rateExpertAuditRepo.save(RateExpertAudit.builder()
                 .rateId(136L)
-                .userId(25L)
+                //.userId(25L)
                 .remark("测试备注")
                 .img(CollUtil.newArrayList("https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/image/2021-04-09-11-17-06YrVCsdEQ.png",
                         "https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/image/2021-04-08-14-45-42CvVMClla.jpg"))