监管

src/main/java/com/izouma/wenlvju/domain/regulation/RecordExpertAudit.java

@@ -0,0 +1,37 @@
+package com.izouma.wenlvju.domain.regulation;
+
+import com.izouma.wenlvju.converter.StringArrayConverter;
+import com.izouma.wenlvju.domain.BaseEntity;
+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 = false")
+@ApiModel("备案检查细则")
+public class RecordExpertAudit extends BaseEntity {
+
+    private Long recordId;
+
+    private String type;
+
+    private boolean value;
+
+    @Column(columnDefinition = "TEXT")
+    @Convert(converter = StringArrayConverter.class)
+    private List<String> img;
+
+    private String supervisor;
+}

src/main/java/com/izouma/wenlvju/repo/regulation/RecordExpertAuditRepo.java

@@ -0,0 +1,18 @@
+package com.izouma.wenlvju.repo.regulation;
+
+import com.izouma.wenlvju.domain.regulation.RecordExpertAudit;
+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 RecordExpertAuditRepo extends JpaRepository<RecordExpertAudit, Long>, JpaSpecificationExecutor<RecordExpertAudit> {
+    @Query("update RecordExpertAudit t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+
+    RecordExpertAudit findByRecordIdAndType(Long recordId, String type);
+}

src/main/java/com/izouma/wenlvju/service/regulation/RecordExpertAuditService.java

@@ -0,0 +1,46 @@
+package com.izouma.wenlvju.service.regulation;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.izouma.wenlvju.domain.RateExpertAudit;
+import com.izouma.wenlvju.domain.regulation.RecordExpertAudit;
+import com.izouma.wenlvju.dto.PageQuery;
+import com.izouma.wenlvju.exception.BusinessException;
+import com.izouma.wenlvju.repo.regulation.RecordExpertAuditRepo;
+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 RecordExpertAuditService {
+
+    private RecordExpertAuditRepo recordExpertAuditRepo;
+
+    public Page<RecordExpertAudit> all(PageQuery pageQuery) {
+        return recordExpertAuditRepo.findAll(JpaUtils.toSpecification(pageQuery, RecordExpertAudit.class), JpaUtils.toPageRequest(pageQuery));
+    }
+
+    public void batchSave(List<RecordExpertAudit> audits) {
+        audits.forEach(record -> {
+            if (record.getId() != null) {
+                RecordExpertAudit orig = recordExpertAuditRepo.findById(record.getId())
+                        .orElseThrow(new BusinessException("无记录"));
+                ObjUtils.merge(orig, record);
+                recordExpertAuditRepo.save(orig);
+            } else {
+                RecordExpertAudit orig = recordExpertAuditRepo.findByRecordIdAndType(record.getRecordId(), record.getType());
+                if (ObjectUtil.isNotNull(orig)) {
+                    ObjUtils.merge(orig, record);
+                    recordExpertAuditRepo.save(orig);
+                } else {
+                    recordExpertAuditRepo.save(record);
+                }
+
+            }
+        });
+    }
+}

src/main/java/com/izouma/wenlvju/web/performance/PerformanceController.java

@@ -59,7 +59,7 @@ public class PerformanceController extends BaseController {
 
     @PostMapping("/backAll")
     public Page<Performance> backAll(@RequestBody PageQuery pageQuery) {
-        Map<Long, Long> programme = programmeRepo.findAllByStatusGreaterThan(0)
+        Map<Long, Long> programme = programmeRepo.findAll()
                 .stream()
                 .collect(Collectors.groupingBy(Programme::getPerformanceId, Collectors.counting()));
         return performanceService.all(pageQuery)

src/main/java/com/izouma/wenlvju/web/regulation/RecordExpertAuditController.java

@@ -0,0 +1,71 @@
+package com.izouma.wenlvju.web.regulation;
+
+import com.alibaba.fastjson.JSONObject;
+import com.izouma.wenlvju.domain.regulation.RecordExpertAudit;
+import com.izouma.wenlvju.dto.PageQuery;
+import com.izouma.wenlvju.exception.BusinessException;
+import com.izouma.wenlvju.repo.regulation.RecordExpertAuditRepo;
+import com.izouma.wenlvju.service.regulation.RecordExpertAuditService;
+import com.izouma.wenlvju.utils.ObjUtils;
+import com.izouma.wenlvju.utils.excel.ExcelUtils;
+import com.izouma.wenlvju.web.BaseController;
+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("/recordExpertAudit")
+@AllArgsConstructor
+public class RecordExpertAuditController extends BaseController {
+    private RecordExpertAuditService recordExpertAuditService;
+    private RecordExpertAuditRepo    recordExpertAuditRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public RecordExpertAudit save(@RequestBody RecordExpertAudit record) {
+        if (record.getId() != null) {
+            RecordExpertAudit orig = recordExpertAuditRepo.findById(record.getId())
+                    .orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return recordExpertAuditRepo.save(orig);
+        }
+        return recordExpertAuditRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<RecordExpertAudit> all(@RequestBody PageQuery pageQuery) {
+        return recordExpertAuditService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public RecordExpertAudit get(@PathVariable Long id) {
+        return recordExpertAuditRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        recordExpertAuditRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<RecordExpertAudit> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+
+    @PreAuthorize("hasAnyRole('ADMIN','DISTRICT','DISTRICT_STAFF','EXPERT')")
+    @PostMapping("/batchSave")
+    public void batchSave(String audits) {
+        List<RecordExpertAudit> recordExpertAudits = JSONObject.parseArray(audits, RecordExpertAudit.class);
+        recordExpertAuditService.batchSave(recordExpertAudits);
+    }
+}
+

src/main/resources/genjson/RecordExpertAudit.json

@@ -0,0 +1 @@
+{"tableName":"RecordExpertAudit","className":"RecordExpertAudit","remark":"备案检查","genTable":true,"genClass":true,"genList":false,"genForm":false,"genRouter":false,"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":"recordId","modelName":"recordId","remark":"recordId","showInList":true,"showInForm":true,"formType":"number"},{"name":"type","modelName":"type","remark":"type","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"value","modelName":"value","remark":"value","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"img","modelName":"img","remark":"img","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"supervisor","modelName":"supervisor","remark":"supervisor","showInList":true,"showInForm":true,"formType":"singleLineText"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.wenlvju","tablePackage":"com.izouma.wenlvju.domain.regulation.RecordExpertAudit","genPackage":"regulation"}

src/main/vue/src/views/performance/ProgrammeList.vue

@@ -180,6 +180,12 @@
             </el-table-column>
             <el-table-column prop="organization" label="承办单位" min-width="160"> </el-table-column>
             <el-table-column prop="examPoint" label="考级点" min-width="160"> </el-table-column>
+            <el-table-column prop="status" label="节目状态" min-width="180"
+                ><template slot-scope="{ row }">
+                    <span v-if="row.status == 0">未提交</span>
+                    <span v-else>已提交</span>
+                </template></el-table-column
+            >
             <el-table-column label="操作" align="left" fixed="right" min-width="320">
                 <template slot-scope="{ row }">
                     <el-button @click="showRow(row)" size="mini" plain>查看</el-button>
@@ -218,8 +224,12 @@
                         >浏览图片</el-button
                     >
                     <el-button type="warning" @click="playVideo(row)" v-else size="mini" plain>浏览视频</el-button>
-                    <el-button @click="audit(row, true)" type="primary" size="mini" plain>通过</el-button>
-                    <el-button @click="audit(row, false)" type="danger" size="mini" plain>不通过</el-button>
+                    <el-button @click="audit(row, true)" type="primary" size="mini" plain v-if="row.status == 1"
+                        >通过</el-button
+                    >
+                    <el-button @click="audit(row, false)" type="danger" size="mini" plain v-if="row.status == 1"
+                        >不通过</el-button
+                    >
                     <!-- <el-button @click="showCode(row)" type="primary" size="mini" plain>查看二维码</el-button> -->
                     <!-- <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button> -->
                 </template>

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

@@ -74,7 +74,7 @@ public class UserRepoTest {
 
     @Test
     public void test3() {
-        System.out.println(jwtTokenUtil.generateToken(JwtUserFactory.create(userRepo.findById(10847L)
+        System.out.println(jwtTokenUtil.generateToken(JwtUserFactory.create(userRepo.findById(1L)
                 .orElseThrow(new BusinessException("用户不存在")))));
     }
 

src/test/java/com/izouma/wenlvju/service/UserServiceTest.java

@@ -11,8 +11,13 @@ public class UserServiceTest extends ApplicationTests {
     private UserService userService;
 
     @Test
-     public void test() {
+    public void test() {
         System.out.println(userService.rateExpert(12506L).getContent());
     }
 
+    @Test
+    public void test1() {
+        System.out.println(userService.loginByPhone("18119706098"));
+    }
+
 }