监管报告

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

@@ -25,10 +25,10 @@ public class Record extends BaseEntity {
     @Searchable
     private String examinationName;
 
-    @ApiModelProperty(value = "考级活动时间")
+    @ApiModelProperty(value = "考级活动开始时间")
     private LocalDate examinationStartTime;
 
-    @ApiModelProperty(value = "考级活动时间")
+    @ApiModelProperty(value = "考级活动结束时间")
     private LocalDate examinationEndTime;
 
     @SearchableOne

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

@@ -0,0 +1,38 @@
+package com.izouma.wenlvju.domain.regulation;
+
+import com.izouma.wenlvju.domain.BaseEntity;
+import com.izouma.wenlvju.enums.ReportType;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@Entity
+public class Report extends BaseEntity {
+    private String title;
+
+    @Enumerated(EnumType.STRING)
+    private ReportType type;
+
+    @ApiModelProperty(value = "年")
+    private String year;
+
+    @ApiModelProperty(value = "季度")
+    private String quarterly;
+
+    @ApiModelProperty(value = "月份")
+    private String month;
+
+    @Column(columnDefinition = "TEXT")
+    private String file;
+}

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

@@ -0,0 +1,8 @@
+package com.izouma.wenlvju.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+public class ReportDTO {
+    @ApiModelProperty(value = "投诉条数")
+    private int complain;
+}

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

@@ -0,0 +1,16 @@
+package com.izouma.wenlvju.enums;
+
+public enum ReportType {
+    /*
+    年度报告
+     */
+    ANNUAL,
+    /*
+    季度报告
+     */
+    QUARTERLY,
+    /*
+    月度报告
+     */
+    MONTHLY
+}

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

@@ -7,6 +7,8 @@ import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 
 import javax.transaction.Transactional;
+import java.time.LocalDate;
+import java.util.List;
 
 public interface RecordRepo extends JpaRepository<Record, Long>, JpaSpecificationExecutor<Record> {
     @Query("update Record t set t.del = true where t.id = ?1")
@@ -16,6 +18,8 @@ public interface RecordRepo extends JpaRepository<Record, Long>, JpaSpecificatio
 
     Record findFirstByDelIsTrue();
 
+    List<Record> findAllByExaminationStartTimeBetween(LocalDate startTime, LocalDate endTime);
+
 //    List<Record> findAllBySupervisorUserId(Long supervisorUserId);
 
 }

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

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

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

@@ -0,0 +1,51 @@
+package com.izouma.wenlvju.service.regulation;
+
+import com.izouma.wenlvju.domain.Record;
+import com.izouma.wenlvju.domain.regulation.Report;
+import com.izouma.wenlvju.dto.PageQuery;
+import com.izouma.wenlvju.repo.RecordRepo;
+import com.izouma.wenlvju.repo.regulation.ReportRepo;
+import com.izouma.wenlvju.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Service
+@AllArgsConstructor
+public class ReportService {
+
+    private ReportRepo reportRepo;
+    private RecordRepo recordRepo;
+
+    public Page<Report> all(PageQuery pageQuery) {
+        return reportRepo.findAll(JpaUtils.toSpecification(pageQuery, Report.class), JpaUtils.toPageRequest(pageQuery));
+    }
+
+    /**
+     * 生成报告
+     */
+    public void generate(Report report) {
+        List<Record> records = new ArrayList<>();
+        switch (report.getType()) {
+            case ANNUAL:
+                int year = Integer.parseInt(report.getYear());
+                LocalDate start = LocalDate.of(year, 1, 1);
+                LocalDate end = LocalDate.of(year, 12, 31);
+                recordRepo.findAllByExaminationStartTimeBetween(start, end);
+
+                break;
+            case QUARTERLY:
+                break;
+            case MONTHLY:
+                break;
+        }
+
+//        records.forEach();
+    }
+}

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

@@ -0,0 +1,63 @@
+package com.izouma.wenlvju.web.regulation;
+
+import com.izouma.wenlvju.web.BaseController;
+import com.izouma.wenlvju.domain.regulation.Report;
+import com.izouma.wenlvju.service.regulation.ReportService;
+import com.izouma.wenlvju.dto.PageQuery;
+import com.izouma.wenlvju.exception.BusinessException;
+import com.izouma.wenlvju.repo.regulation.ReportRepo;
+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("/report")
+@AllArgsConstructor
+public class ReportController extends BaseController {
+    private ReportService reportService;
+    private ReportRepo reportRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public Report save(@RequestBody Report record) {
+        if (record.getId() != null) {
+            Report orig = reportRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return reportRepo.save(orig);
+        }
+        return reportRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<Report> all(@RequestBody PageQuery pageQuery) {
+        return reportService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public Report get(@PathVariable Long id) {
+        return reportRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        reportRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<Report> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

src/main/resources/genjson/Report.json

@@ -0,0 +1 @@
+{"tableName":"Report","className":"Report","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":"title","modelName":"title","remark":"标题","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"type","modelName":"type","remark":"报告类型","showInList":true,"showInForm":true,"formType":"select","apiFlag":"1","optionsValue":"[{\"label\":\"年度报告\",\"value\":\"ANNUAL\"},{\"label\":\"季度报告\",\"value\":\"QUARTERLY\"},{\"label\":\"月度报告\",\"value\":\"MONTHLY\"}]"},{"name":"file","modelName":"file","remark":"文件","showInList":true,"showInForm":true,"formType":"singleLineText"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.wenlvju","tablePackage":"com.izouma.wenlvju.domain.regulation.Report","genPackage":"regulation"}

src/main/vue/src/components/RegulationDrawer.vue

@@ -184,25 +184,13 @@ export default {
                     { body: 'json' }
                 )
                 .then(res => {
-                    if (res.content.lenght > 0) {
+                    if (res.content.length > 0) {
                         this.checks = res.content;
                     }
-                    // if (!res.empty) {
-                    // checks.set(row, res.content);
-
-                    // } else {
-                    //     return Promise.reject();
-                    // }
                 })
                 .catch(e => {
-                    // checks.set(row, []);
                     console.log(e);
                 });
-            // .then(() => {
-            //     this.checkMap = new Map(checks);
-            //     console.log(this.checkMap);
-            //     console.log(this.checkMap.get(row));
-            // });
             this.$http
                 .post(
                     'recordExpertAudit/all',
@@ -240,8 +228,8 @@ export default {
                     this.$nextTick(() => {
                         this.$http.post('/recordExpertAudit/batchSave', this.dataCon, { body: 'json' });
                     });
-                    this.$message.success('受理成功');
-                    this.getData();
+                    this.$message.success('保存成功');
+                    this.edit = false;
                 })
                 .catch(e => {
                     console.log(e);

src/main/vue/src/router.js

@@ -837,6 +837,22 @@ const router = new Router({
                     meta: {
                         title: '短信平台'
                     }
+                },
+                {
+                    path: '/reportEdit',
+                    name: 'ReportEdit',
+                    component: () => import(/* webpackChunkName: "reportEdit" */ '@/views/ReportEdit.vue'),
+                    meta: {
+                        title: '监管报告编辑'
+                    }
+                },
+                {
+                    path: '/reportList',
+                    name: 'ReportList',
+                    component: () => import(/* webpackChunkName: "reportList" */ '@/views/ReportList.vue'),
+                    meta: {
+                        title: '监管报告'
+                    }
                 }
                 /**INSERT_LOCATION**/
             ]

src/main/vue/src/views/ReportEdit.vue

@@ -0,0 +1,106 @@
+<template>
+    <div class="edit-view">
+        <el-form
+            :model="formData"
+            :rules="rules"
+            ref="form"
+            label-width="80px"
+            label-position="right"
+            size="small"
+            style="max-width: 500px;"
+        >
+            <el-form-item prop="title" label="标题">
+                <el-input v-model="formData.title"></el-input>
+            </el-form-item>
+            <el-form-item prop="type" label="报告类型">
+                <el-select v-model="formData.type" clearable filterable placeholder="请选择">
+                    <el-option v-for="item in typeOptions" :key="item.value" :label="item.label" :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item prop="file" label="文件">
+                <el-input v-model="formData.file"></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: 'ReportEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('report/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: {},
+            typeOptions: [
+                { label: '年度报告', value: 'ANNUAL' },
+                { label: '季度报告', value: 'QUARTERLY' },
+                { label: '月度报告', value: 'MONTHLY' }
+            ]
+        };
+    },
+    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('/report/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(`/report/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/ReportList.vue

@@ -0,0 +1,219 @@
+<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> -->
+            <el-form :model="form" inline size="mini">
+                <el-form-item label="报告类型">
+                    <el-select v-model="form.type" clearable style="width: 125px">
+                        <el-option
+                            v-for="item in typeOptions"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="年度">
+                    <el-select v-model="form.year" clearable style="width: 115px">
+                        <el-option v-for="item in years" :key="item" :value="item" :label="item + `年`"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="季度" v-if="form.type != 'ANNUAL'">
+                    <el-select v-model="form.quarterly" clearable style="width: 110px">
+                        <el-option v-for="item in quarterlys" :key="item" :value="item" :label="item"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="月份" v-if="form.type != 'ANNUAL' && form.type != 'QUARTERLY'">
+                    <el-select v-model="form.month" clearable style="width: 95px">
+                        <el-option v-for="item in months" :key="item" :value="item" :label="item + `月`"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @change="getData">查询</el-button>
+                    <el-button type="primary">生成</el-button>
+                </el-form-item>
+            </el-form>
+        </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="title" label="标题"> </el-table-column>
+            <el-table-column prop="type" label="报告类型" :formatter="typeFormatter"> </el-table-column>
+            <el-table-column prop="file" 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="download(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: 'ReportList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/report/all',
+            downloading: false,
+            typeOptions: [
+                { label: '年度报告', value: 'ANNUAL' },
+                { label: '季度报告', value: 'QUARTERLY' },
+                { label: '月度报告', value: 'MONTHLY' }
+            ],
+            form: {},
+            years: ['2021', '2022', '2023', '2024'],
+            quarterlys: ['一季度', '二季度', '三季度', '四季度'],
+            months: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12']
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        typeFormatter(row, column, cellValue, index) {
+            let selectedOption = this.typeOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
+            }
+            return '';
+        },
+        beforeGetData() {
+            let data = { query: {} };
+            if (this.form.type) {
+                data.query.type = this.form.type;
+            }
+            if (this.form.year) {
+                data.query.year = this.form.year;
+            }
+            if (this.form.quarterly) {
+                data.query.quarterly = this.form.quarterly;
+            }
+            if (this.form.month) {
+                data.query.month = this.form.month;
+            }
+            return data;
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: '/reportEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/reportEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/report/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(`/report/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>