奖项设置

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

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

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

@@ -1,18 +1,32 @@
 package com.izouma.wenlvju.dto;
 
 
+import cn.hutool.core.bean.BeanUtil;
+import com.izouma.wenlvju.domain.performance.ProgrammeAward;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
+@NoArgsConstructor
 public class ProgrammeAwardDTO {
 
+    private Long performanceId;
+
+    private String specialty;
+
+    private long programmeNum;
+
     private String award;
 
     @ApiModelProperty(value = "占比")
     private Double percentage;
 
-    private int num;
+    private Long num;
 
     private String remark;
+
+    public ProgrammeAwardDTO(ProgrammeAward programmeAward) {
+        BeanUtil.copyProperties(this, programmeAward);
+    }
 }

src/main/java/com/izouma/wenlvju/repo/performance/ProgrammeAwardRepo.java

@@ -0,0 +1,19 @@
+package com.izouma.wenlvju.repo.performance;
+
+import com.izouma.wenlvju.domain.performance.ProgrammeAward;
+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;
+import java.util.List;
+
+public interface ProgrammeAwardRepo extends JpaRepository<ProgrammeAward, Long>, JpaSpecificationExecutor<ProgrammeAward> {
+    @Query("update ProgrammeAward t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+
+    List<ProgrammeAward> findAllByPerformanceId(Long performanceId);
+}

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

@@ -0,0 +1,87 @@
+package com.izouma.wenlvju.service.performance;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.izouma.wenlvju.domain.ArtType;
+import com.izouma.wenlvju.domain.Award;
+import com.izouma.wenlvju.domain.performance.Programme;
+import com.izouma.wenlvju.domain.performance.ProgrammeAward;
+import com.izouma.wenlvju.dto.PageQuery;
+import com.izouma.wenlvju.dto.ProgrammeAwardDTO;
+import com.izouma.wenlvju.repo.ArtTypeRepo;
+import com.izouma.wenlvju.repo.AwardRepo;
+import com.izouma.wenlvju.repo.performance.ProgrammeAwardRepo;
+import com.izouma.wenlvju.repo.performance.ProgrammeRepo;
+import com.izouma.wenlvju.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Service
+@AllArgsConstructor
+public class ProgrammeAwardService {
+
+    private ProgrammeAwardRepo programmeAwardRepo;
+    private ArtTypeRepo        artTypeRepo;
+    private ProgrammeRepo      programmeRepo;
+    private AwardRepo          awardRepo;
+
+    public Page<ProgrammeAward> all(PageQuery pageQuery) {
+        return programmeAwardRepo.findAll(JpaUtils.toSpecification(pageQuery, ProgrammeAward.class), JpaUtils.toPageRequest(pageQuery));
+    }
+
+    public List<ProgrammeAwardDTO> getAll(Long performanceId) {
+        PageQuery pageQuery = new PageQuery();
+        pageQuery.setSize(100);
+        pageQuery.setSort("specialtyId,asc");
+        pageQuery.getQuery().put("performanceId", performanceId);
+        List<ProgrammeAward> programmeAwards = this.all(pageQuery).getContent();
+
+        List<ArtType> all = artTypeRepo.findAll();
+        Map<Long, String> artTypeMap = all
+                .stream()
+                .collect(Collectors.toMap(ArtType::getId, ArtType::getName));
+
+        if (CollUtil.isNotEmpty(programmeAwards)) {
+            return programmeAwards.stream()
+                    .map(award -> {
+                        ProgrammeAwardDTO dto = new ProgrammeAwardDTO(award);
+                        dto.setSpecialty(artTypeMap.get(award.getSpecialtyId()));
+                        return dto;
+                    })
+                    .collect(Collectors.toList());
+        }
+
+        List<Programme> programmeList = programmeRepo.findAllByPerformanceIdAndStatus(performanceId, 3);
+        List<ArtType> artTypes = all.stream()
+                .filter(artType -> ObjectUtil.isNull(artType.getParent()))
+                .collect(Collectors.toList());
+        List<Award> awardList = awardRepo.findAll();
+        List<ProgrammeAwardDTO> dtos = new ArrayList<>();
+
+        artTypes.forEach(artType -> {
+            List<Long> artTypeIds = all.stream()
+                    .filter(at -> at.getCode().startsWith(artType.getCode()))
+                    .map(ArtType::getId)
+                    .collect(Collectors.toList());
+            long count = programmeList.stream()
+                    .filter(programme -> artTypeIds.contains(programme.getSpecialtyId()))
+                    .count();
+
+            awardList.forEach(award -> {
+                ProgrammeAwardDTO dto = new ProgrammeAwardDTO();
+                dto.setSpecialty(artType.getName());
+                dto.setAward(award.getName());
+                dto.setPerformanceId(performanceId);
+                dto.setProgrammeNum(count);
+                dtos.add(dto);
+            });
+        });
+        return dtos;
+    }
+}

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

@@ -32,7 +32,6 @@ 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;
 
@@ -96,9 +95,7 @@ public class ProgrammeService {
         }
 
         List<Long> settingIds = new ArrayList<>();
-        content.forEach(programme -> {
-            settingIds.add(programme.getLevelSettingId());
-        });
+        content.forEach(programme -> settingIds.add(programme.getLevelSettingId()));
 
         Map<Long, String> performanceMap = performanceRepo.findAll()
                 .stream()

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

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

src/main/resources/genjson/ProgrammeAward.json

@@ -0,0 +1 @@
+{"tableName":"ProgrammeAward","className":"ProgrammeAward","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":"performanceId","modelName":"performanceId","remark":"活动","showInList":true,"showInForm":true,"formType":"number"},{"name":"specialtyId","modelName":"specialtyId","remark":"专业","showInList":true,"showInForm":true,"formType":"number"},{"name":"awardId","modelName":"awardId","remark":"奖项","showInList":true,"showInForm":true,"formType":"number"},{"name":"percentage","modelName":"percentage","remark":"占比","showInList":true,"showInForm":true,"formType":"number"},{"name":"num","modelName":"num","remark":"数量","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"remark","modelName":"remark","remark":"备注","showInList":true,"showInForm":true,"formType":"singleLineText"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.wenlvju","tablePackage":"com.izouma.wenlvju.domain.performance.ProgrammeAward","genPackage":"performance"}

src/main/vue/src/router.js

@@ -746,13 +746,35 @@ const router = new Router({
                     name: 'AwardEdit',
                     component: () => import(/* webpackChunkName: "awardEdit" */ '@/views/AwardEdit.vue'),
                     meta: {
-                        title: '奖项设置编辑'
+                        title: '奖项类别设置编辑'
                     }
                 },
                 {
                     path: '/awardList',
                     name: 'AwardList',
                     component: () => import(/* webpackChunkName: "awardList" */ '@/views/AwardList.vue'),
+                    meta: {
+                        title: '奖项类别设置'
+                    }
+                },
+                {
+                    path: '/programmeAwardEdit',
+                    name: 'ProgrammeAwardEdit',
+                    component: () =>
+                        import(
+                            /* webpackChunkName: "programmeAwardEdit" */ '@/views/performance/ProgrammeAwardEdit.vue'
+                        ),
+                    meta: {
+                        title: '奖项设置编辑'
+                    }
+                },
+                {
+                    path: '/programmeAwardList',
+                    name: 'ProgrammeAwardList',
+                    component: () =>
+                        import(
+                            /* webpackChunkName: "programmeAwardList" */ '@/views/performance/ProgrammeAwardList.vue'
+                        ),
                     meta: {
                         title: '奖项设置'
                     }

src/main/vue/src/views/performance/ProgrammeAwardEdit.vue

@@ -0,0 +1,107 @@
+<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="performanceId" label="活动">
+                <el-input-number type="number" v-model="formData.performanceId"></el-input-number>
+            </el-form-item>
+            <el-form-item prop="specialtyId" label="专业">
+                <el-input-number type="number" v-model="formData.specialtyId"></el-input-number>
+            </el-form-item>
+            <el-form-item prop="awardId" label="奖项">
+                <el-input-number type="number" v-model="formData.awardId"></el-input-number>
+            </el-form-item>
+            <el-form-item prop="percentage" label="占比">
+                <el-input-number type="number" v-model="formData.percentage"></el-input-number>
+            </el-form-item>
+            <el-form-item prop="num" label="数量">
+                <el-input v-model="formData.num"></el-input>
+            </el-form-item>
+            <el-form-item prop="remark" label="备注">
+                <el-input v-model="formData.remark"></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: 'ProgrammeAwardEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('programmeAward/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('/programmeAward/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(`/programmeAward/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/performance/ProgrammeAwardList.vue

@@ -0,0 +1,304 @@
+<template>
+    <div class="list-view">
+        <div class="filters-container">
+            <el-form :model="form" size="mini" inline>
+                <el-col :span="24">
+                    <el-form-item label="活动名称">
+                        <el-select
+                            v-model="form.performanceId"
+                            clearable
+                            filterable
+                            placeholder="活动名称"
+                            style="width: 300px"
+                        >
+                            <el-option
+                                v-for="item in performances"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            >
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+
+                <el-form-item>
+                    <el-button @click="canEdit = true" type="primary" v-if="!canEdit">编辑</el-button>
+                    <el-button @click="canEdit = false" type="warning" v-if="canEdit">取消</el-button>
+                    <el-button @click="getData" type="primary">批量生成各种奖项</el-button>
+                    <el-button @click="getData" 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="specialty" label="专业" min-width="80"> </el-table-column>
+            <el-table-column prop="programmeNum" label="节目数量" min-width="80"> </el-table-column>
+            <el-table-column prop="award" label="奖项" min-width="80"> </el-table-column>
+            <el-table-column prop="percentage" label="占比" min-width="100">
+                <template slot-scope="{ row }">
+                    <span v-if="!canEdit">{{ row.percentage }}</span>
+                    <el-input-number
+                        v-else
+                        v-model="row.percentage"
+                        size="mini"
+                        label=""
+                        :min="0"
+                        :max="100"
+                        :step="1"
+                        :controls="true"
+                        controls-position="both"
+                    >
+                    </el-input-number>
+                </template>
+            </el-table-column>
+            <el-table-column prop="num" label="数量" min-width="100">
+                <template slot-scope="{ row }">
+                    <span v-if="!canEdit">{{ row.num }}</span>
+                    <el-input-number
+                        v-else
+                        v-model="row.num"
+                        size="mini"
+                        label=""
+                        :min="0"
+                        :max="100"
+                        :step="1"
+                        :controls="true"
+                        controls-position="both"
+                    >
+                    </el-input-number>
+                </template>
+            </el-table-column>
+            <el-table-column prop="remark" label="备注" min-width="120">
+                <template slot-scope="{ row }">
+                    <span v-if="!canEdit">{{ row.remark }}</span>
+                    <el-input v-else size="mini" v-model="row.remark" placeholder="请输入备注" clearable></el-input>
+                </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="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: 'ProgrammeAwardList',
+    // mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            // url: '/programmeAward/getAll',
+            downloading: false,
+            form: {},
+            performances: [],
+            tableData: [],
+            tableHeight: 200,
+            columnKeys: ['specialty', 'programmeNum'],
+            canEdit: false
+        };
+    },
+    created() {
+        this.getData();
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    mounted() {
+        this.tableHeight = document.querySelector('.el-table').getBoundingClientRect().height;
+    },
+    methods: {
+        beforeGetData() {
+            // return { search: this.search };
+        },
+        getData() {
+            this.$http
+                .post('/programmeAward/getAll', { performanceId: 1013 })
+                .then(res => {
+                    this.tableData = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: '/programmeAwardEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/programmeAwardEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/programmeAward/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(`/programmeAward/del/${row.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        },
+        backMap(list, key = 'specialty', preActive = 0) {
+            let _map = new Map();
+            list.forEach((item, index) => {
+                let info = {
+                    active: index + preActive,
+                    childNum: 1,
+                    list: []
+                };
+                if (_map.has(item[key])) {
+                    info = _map.get(item[key]);
+                    info.list.push(item);
+                    info.childNum = info.list.length;
+                } else {
+                    info.list.push(item);
+                }
+
+                _map.set(item[key], info);
+            });
+
+            let keyIndex = this.columnKeys.indexOf(key);
+            if (keyIndex !== this.columnKeys.length - 1) {
+                [..._map.keys()].forEach(item => {
+                    let info = _map.get(item);
+                    let childMap = this.backMap(info.list, this.columnKeys[keyIndex + 1], info.active);
+                    _map.set(item, {
+                        ...info,
+                        childMap: childMap
+                    });
+                });
+            }
+
+            return _map;
+        },
+        getInfo(mapInfo = new Map(), keys = ['programmeNum']) {
+            let info = {};
+            keys.forEach(item => {
+                if (mapInfo.has(item)) {
+                    info = mapInfo.get(item);
+                    mapInfo = mapInfo.get(item).childMap;
+                }
+            });
+            return info;
+        },
+        objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+            let keyIndex = columnIndex;
+            // if (column.label === '操作') {
+            //     keyIndex = 2;
+            // }
+
+            if (keyIndex < this.columnKeys.length) {
+                let keys = [...this.columnKeys].slice(0, keyIndex + 1).map(item => {
+                    return row[item];
+                });
+                let info = this.getInfo(this.showTable, keys);
+                if (rowIndex === info.active) {
+                    return {
+                        rowspan: info.childNum,
+                        colspan: 1
+                    };
+                } else {
+                    return {
+                        rowspan: 0,
+                        colspan: 0
+                    };
+                }
+            }
+        }
+    }
+};
+</script>
+<style lang="less" scoped></style>

src/main/vue/src/views/performance/ProgrammeScoreList.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="list-view">
         <div class="filters-container">
-            <el-form :model="form" size="mini" inline label-width="100px">
+            <el-form :model="form" size="mini" inline>
                 <el-row>
                     <el-form-item label="活动名称">
                         <el-select
@@ -56,13 +56,14 @@
             row-class-name="table-row"
             cell-class-name="table-cell"
             :height="tableHeight"
+            :span-method="objectSpanMethod"
         >
             <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="arrangeName" label="分组" min-width="160"> </el-table-column>
             <el-table-column prop="name" label="节目名称" min-width="70"> </el-table-column>
             <el-table-column prop="specialty" label="参赛专业"> </el-table-column>
-            <el-table-column prop="participant" label="参赛专业"> </el-table-column>
+            <el-table-column prop="participant" label="参赛人员"> </el-table-column>
             <el-table-column prop="quantity" label="表演人数" min-width="70"> </el-table-column>
             <el-table-column prop="signedIn" label="状态" :formatter="signedInFormatter"> </el-table-column>
             <el-table-column prop="score" label="成绩"> </el-table-column>
@@ -124,28 +125,6 @@
             >
             </el-pagination>
         </div>
-
-        <el-dialog title="签到处理" :visible.sync="dialogSign" width="600px" center>
-            <el-form :form="signForm" label-width="100px">
-                <el-form-item label="签到处理">
-                    <el-select v-model="signForm.signedIn">
-                        <el-option
-                            v-for="item in signedInOptions"
-                            :label="item.label"
-                            :value="item.value"
-                            :key="item.value"
-                        ></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="情况说明">
-                    <el-input v-model="signForm.description" type="textarea" :rows="5" style="width: 400px"></el-input>
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="signIn">确定</el-button>
-                    <el-button @click="dialogSign = false">取消</el-button>
-                </el-form-item>
-            </el-form>
-        </el-dialog>
     </div>
 </template>
 <script>
@@ -178,7 +157,8 @@ export default {
             signForm: {},
             addresses: [],
             morning: true,
-            date: new Date()
+            date: new Date(),
+            columnKeys: ['arrangeName']
         };
     },
     created() {
@@ -214,6 +194,9 @@ export default {
     computed: {
         selection() {
             return this.$refs.table.selection.map(i => i.id);
+        },
+        showTable() {
+            return this.backMap(this.tableData);
         }
     },
     methods: {
@@ -303,6 +286,73 @@ export default {
                 .catch(e => {
                     this.$message.error(e.error);
                 });
+        },
+        backMap(list, key = 'arrangeName', preActive = 0) {
+            let _map = new Map();
+            list.forEach((item, index) => {
+                let info = {
+                    active: index + preActive,
+                    childNum: 1,
+                    list: []
+                };
+                if (_map.has(item[key])) {
+                    info = _map.get(item[key]);
+                    info.list.push(item);
+                    info.childNum = info.list.length;
+                } else {
+                    info.list.push(item);
+                }
+
+                _map.set(item[key], info);
+            });
+
+            let keyIndex = this.columnKeys.indexOf(key);
+            if (keyIndex !== this.columnKeys.length - 1) {
+                [..._map.keys()].forEach(item => {
+                    let info = _map.get(item);
+                    let childMap = this.backMap(info.list, this.columnKeys[keyIndex + 1], info.active);
+                    _map.set(item, {
+                        ...info,
+                        childMap: childMap
+                    });
+                });
+            }
+
+            return _map;
+        },
+        getInfo(mapInfo = new Map(), keys = ['date']) {
+            let info = {};
+            keys.forEach(item => {
+                if (mapInfo.has(item)) {
+                    info = mapInfo.get(item);
+                    mapInfo = mapInfo.get(item).childMap;
+                }
+            });
+            return info;
+        },
+        objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+            let keyIndex = columnIndex;
+            // if (column.label === '操作') {
+            //     keyIndex = 2;
+            // }
+
+            if (keyIndex < this.columnKeys.length) {
+                let keys = [...this.columnKeys].slice(0, keyIndex + 1).map(item => {
+                    return row[item];
+                });
+                let info = this.getInfo(this.showTable, keys);
+                if (rowIndex === info.active) {
+                    return {
+                        rowspan: info.childNum,
+                        colspan: 1
+                    };
+                } else {
+                    return {
+                        rowspan: 0,
+                        colspan: 0
+                    };
+                }
+            }
         }
     }
 };