签到bug/奖项类别设置

src/main/java/com/izouma/wenlvju/domain/performance/Programme.java

@@ -1,6 +1,7 @@
 package com.izouma.wenlvju.domain.performance;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.izouma.wenlvju.annotations.Searchable;
 import com.izouma.wenlvju.annotations.SearchableOne;
 import com.izouma.wenlvju.converter.VideoObjectConverter;
 import com.izouma.wenlvju.domain.BaseEntity;
@@ -29,6 +30,7 @@ import java.time.LocalDateTime;
 public class Programme extends BaseEntity {
     private Long performanceId;
 
+    @Searchable
     @SearchableOne
     @ApiModelProperty(value = "节目名称")
     private String name;

src/main/java/com/izouma/wenlvju/domain/performance/ProgrammeAward.java

@@ -0,0 +1,33 @@
+package com.izouma.wenlvju.domain.performance;
+
+import com.izouma.wenlvju.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+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 ProgrammeAward extends BaseEntity {
+
+    private Long specialtyId;
+
+    private Long awardId;
+
+    @ApiModelProperty(value = "占比")
+    private Double percentage;
+
+    private int num;
+
+    private String remark;
+}

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

@@ -0,0 +1,14 @@
+package com.izouma.wenlvju.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AwardDTO {
+    private String specialty;
+
+    private long programmeNum;
+
+    private List<ProgrammeAwardDTO> programmeAwardDTOS;
+}

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

@@ -0,0 +1,18 @@
+package com.izouma.wenlvju.dto;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ProgrammeAwardDTO {
+
+    private String award;
+
+    @ApiModelProperty(value = "占比")
+    private Double percentage;
+
+    private int num;
+
+    private String remark;
+}

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

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

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

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

src/main/java/com/izouma/wenlvju/service/performance/ProgrammeService.java

@@ -32,6 +32,7 @@ import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.poi.util.TempFile;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
+import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -94,10 +95,8 @@ public class ProgrammeService {
             return all.map(ProgrammeDTO::new);
         }
 
-//        List<Long> ids = new ArrayList<>();
         List<Long> settingIds = new ArrayList<>();
         content.forEach(programme -> {
-//            ids.add(programme.getId());
             settingIds.add(programme.getLevelSettingId());
         });
 
@@ -410,7 +409,15 @@ public class ProgrammeService {
     查看按分组查看节目
      */
     public Page<ArrangeProgrammeDTO> byArrange(PageQuery pageQuery) {
-        Page<Programme> all = this.all(pageQuery);
+//        Specification<Programme> specification = JpaUtils.toSpecification(pageQuery, Programme.class);
+//        specification.and((root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.and(criteriaBuilder.isNull(root.get("arrangeId"))));
+
+        Page<Programme> all = programmeRepo.findAll((root, criteriaQuery, criteriaBuilder) -> {
+            List<Predicate> and = JpaUtils.toPredicates(pageQuery, Programme.class, root, criteriaQuery, criteriaBuilder);
+            and.add(criteriaBuilder.isNotNull(root.get("arrangeId")));
+            return criteriaBuilder.and(and.toArray(new Predicate[0]));
+        }, JpaUtils.toPageRequest(pageQuery));
+
         Set<Long> arrangeIds = all.getContent().stream().map(Programme::getArrangeId).collect(Collectors.toSet());
         Map<Long, Arrange> arrangeMap = arrangeRepo.findAllById(arrangeIds)
                 .stream()
@@ -427,6 +434,7 @@ public class ProgrammeService {
             dto.setArrangeName(arrange.getName());
             dto.setWriterDirector(arrange.getWriterDirector());
             dto.setWriterPhone(arrange.getPhone());
+
             dto.setOrganization(organizationMap.get(programme.getOrganizationId()));
             dto.setGradingOrganization(gradingOrganizationMap.get(programme.getGradingOrganizationId()));
             return dto;

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

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

src/main/resources/genjson/Award.json

@@ -0,0 +1 @@
+{"tableName":"Award","className":"Award","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":"description","modelName":"description","remark":"奖项描述","showInList":true,"showInForm":true,"formType":"textarea"},{"name":"level","modelName":"level","remark":"级别","showInList":true,"showInForm":true,"formType":"select","apiFlag":"1","optionsValue":"[{\"label\":\"最高奖励\",\"value\":\"1\"},{\"label\":\"第二奖励\",\"value\":\"2\"},{\"label\":\"第三奖励\",\"value\":\"3\"},{\"label\":\"第四奖励\",\"value\":\"4\"},{\"label\":\"第五奖励\",\"value\":\"5\"}]"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.wenlvju","tablePackage":"com.izouma.wenlvju.domain.Award"}

src/main/vue/src/router.js

@@ -740,6 +740,22 @@ const router = new Router({
                     meta: {
                         title: '分配评委'
                     }
+                },
+                {
+                    path: '/awardEdit',
+                    name: 'AwardEdit',
+                    component: () => import(/* webpackChunkName: "awardEdit" */ '@/views/AwardEdit.vue'),
+                    meta: {
+                        title: '奖项设置编辑'
+                    }
+                },
+                {
+                    path: '/awardList',
+                    name: 'AwardList',
+                    component: () => import(/* webpackChunkName: "awardList" */ '@/views/AwardList.vue'),
+                    meta: {
+                        title: '奖项设置'
+                    }
                 }
                 /**INSERT_LOCATION**/
             ]

src/main/vue/src/views/AwardEdit.vue

@@ -0,0 +1,108 @@
+<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="name" label="奖项名称">
+                <el-input v-model="formData.name"></el-input>
+            </el-form-item>
+            <el-form-item prop="description" label="奖项描述">
+                <el-input type="textarea" v-model="formData.description"></el-input>
+            </el-form-item>
+            <el-form-item prop="level" label="级别">
+                <el-select v-model="formData.level" clearable filterable placeholder="请选择">
+                    <el-option v-for="item in levelOptions" :key="item.value" :label="item.label" :value="item.value">
+                    </el-option>
+                </el-select>
+            </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: 'AwardEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('award/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: {},
+            levelOptions: [
+                { label: '最高奖励', value: 1 },
+                { label: '第二奖励', value: 2 },
+                { label: '第三奖励', value: 3 },
+                { label: '第四奖励', value: 4 },
+                { label: '第五奖励', value: 5 }
+            ]
+        };
+    },
+    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('/award/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(`/award/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/AwardList.vue

@@ -0,0 +1,172 @@
+<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="description" label="奖项描述"> </el-table-column>
+            <el-table-column prop="level" label="级别" :formatter="levelFormatter"> </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: 'AwardList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/award/all',
+            downloading: false,
+            levelOptions: [
+                { label: '最高奖励', value: 1 },
+                { label: '第二奖励', value: 2 },
+                { label: '第三奖励', value: 3 },
+                { label: '第四奖励', value: 4 },
+                { label: '第五奖励', value: 5 }
+            ]
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        levelFormatter(row, column, cellValue, index) {
+            let selectedOption = this.levelOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
+            }
+            return '';
+        },
+        beforeGetData() {
+            return { search: this.search };
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: '/awardEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/awardEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/award/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(`/award/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/performance/ProgrammeSignList.vue

@@ -23,13 +23,7 @@
                     </el-form-item>
                 </el-col>
                 <el-form-item label="活动日期">
-                    <el-date-picker
-                        v-model="form.date"
-                        value-format="yyyy-MM-dd HH:mm:ss"
-                        type="date"
-                        default-time="00:00:00"
-                        placeholder="选择日期"
-                    >
+                    <el-date-picker v-model="form.date" type="date" default-time="00:00:00" placeholder="选择日期">
                     </el-date-picker>
                 </el-form-item>
                 <el-form-item label="活动地点">