From 136ac37916bf487a3498bbdbc761fd6d908209d4 Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Mon, 8 Jul 2024 17:26:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E4=B8=AD?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E8=AF=84=E5=88=86=E6=A0=87=E5=87=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ScoreStaController.java        |  30 ++
 .../topic/controller/TopicController.java     |  29 ++
 .../committee/AnnualCompPointList.vue         |  13 +
 .../src/views/topic/Topic.api.ts              |   8 +
 .../src/views/topic/TopicList5.vue            | 292 ++++++++++++++++++
 5 files changed, 372 insertions(+)
 create mode 100644 jeecgboot-vue3-master/src/views/topic/TopicList5.vue

diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/scoresta/controller/ScoreStaController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/scoresta/controller/ScoreStaController.java
index 0534484d..b276a960 100644
--- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/scoresta/controller/ScoreStaController.java
+++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/scoresta/controller/ScoreStaController.java
@@ -126,6 +126,36 @@ public class ScoreStaController extends JeecgController<ScoreSta, IScoreStaServi
 		return Result.OK("添加成功！");
 	}
 
+	 /**
+	  *   添加题目对应的评分标准
+	  *
+	  * @return
+	  */
+	 @AutoLog(value = "添加题目对应的评分标准-添加")
+	 @ApiOperation(value="添加题目对应的评分标准-添加", notes="添加题目对应的评分标准-添加")
+	 //@RequiresPermissions("scoresta:score_sta:add")
+	 @GetMapping(value = "/addScoreSta")
+	 public Result<String> addScoreSta(@RequestParam(name="topicid",required=true) String topicid,@RequestParam(name="acpid",required=true) String acpid,HttpServletRequest req) {
+		 ScoreSta scoreSta = new ScoreSta();
+		 QueryWrapper<ScoreSta> queryWrapper = QueryGenerator.initQueryWrapper(scoreSta, req.getParameterMap());
+		 queryWrapper.eq("annual_compid",acpid);
+		 queryWrapper.eq("topicid",topicid);
+		 List<ScoreSta> list = scoreStaService.list(queryWrapper);
+		 if(list.size()==0){
+			 AnnualCompPoint annualCompPoint = annualCompPointService.getById(acpid);
+			 AnnualComp annualComp = annualCompService.getById(annualCompPoint.getAnnualCompId());
+			 scoreSta.setAnnualId(annualComp.getAnnualid());
+			 scoreSta.setAnnalComp(annualComp.getId());
+			 scoreSta.setAnnualCompid(acpid);
+			 scoreSta.setTopicid(topicid);
+			 scoreStaService.save(scoreSta);
+			 return Result.OK(scoreSta.getId());
+		 }else{
+			 return Result.OK(list.get(0).getId());
+		 }
+
+	 }
+
 	/**
 	 *  编辑
 	 *
diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/topic/controller/TopicController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/topic/controller/TopicController.java
index 749523b7..e2e7136c 100644
--- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/topic/controller/TopicController.java
+++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/topic/controller/TopicController.java
@@ -233,6 +233,35 @@ public class TopicController extends JeecgController<Topic, ITopicService> {
         return Result.OK(list);
     }
 
+    @ApiOperation(value = "题目评分标准", notes = "题目评分标准-分页列表查询")
+    @GetMapping(value = "/list5")
+    public Result<IPage<Topic>> list5(@RequestParam(name="acpid",required=true) String acpid,Topic topic,
+                                              @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                              @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                              HttpServletRequest req) {
+/*        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String orgCode = user.getOrgCode();
+        topic.setSysOrgCode(orgCode);*/
+        QueryWrapper<Topic> queryWrapper = QueryGenerator.initQueryWrapper(topic, req.getParameterMap());
+        queryWrapper.eq("annual_compid",acpid);
+        Page<Topic> page = new Page<Topic>(pageNo, pageSize);
+        IPage<Topic> pageList = topicService.page(page, queryWrapper);
+        if(pageList.getRecords().size()==0){
+            Topic topic1 = new Topic();
+            topic1.setAnnualCompid(acpid);
+            AnnualCompPoint annualCompPoint = annualCompPointService.getById(acpid);
+            topic1.setNumber("ZC");
+            topic1.setName(annualCompPoint.getObjName());
+            topic1.setStatus(2);
+            topic1.setIsopen("Y");
+            topicService.save(topic1);
+            IPage<Topic> pageList1 = topicService.page(page, queryWrapper);
+            return Result.OK(pageList1);
+        }else {
+            return Result.OK(pageList);
+        }
+    }
+
     @PostMapping(value = "/select")
     public Result<String> select(@RequestBody Topic topic) {
         QueryWrapper<Topic> queryWrapper= new QueryWrapper<>();
diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue
index a1ab7c67..94b75e36 100644
--- a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue
+++ b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue
@@ -199,6 +199,15 @@
       query: {annualCompPointId: record.id}
     });
   }
+  /**
+   * 评分标准
+   */
+  function pfbz(record: Recordable) {
+    router.push({
+      path: '/topic/topic/list5',
+      query: {acpid: record.id}
+    });
+  }
 
   /**
    * 个人积分汇总
@@ -365,6 +374,10 @@
       label: '作品管理',
       onClick: workManage.bind(null, record),
     });
+    actions.unshift({
+      label: '评分标准',
+      onClick: pfbz.bind(null, record),
+    });
     // if (record.requireUploadWorks === 'Y' && record.annualCompState === "2") {
     //   actions.unshift({
     //     label: '上传作品',
diff --git a/jeecgboot-vue3-master/src/views/topic/Topic.api.ts b/jeecgboot-vue3-master/src/views/topic/Topic.api.ts
index 5ef8f2f0..688d928c 100644
--- a/jeecgboot-vue3-master/src/views/topic/Topic.api.ts
+++ b/jeecgboot-vue3-master/src/views/topic/Topic.api.ts
@@ -8,6 +8,7 @@ enum Api {
   list1 = '/topic/topic/list1',
   list2 = '/topic/topic/list2',
   list3 = '/topic/topic/list3',
+  list5 = '/topic/topic/list5',
   select = '/topic/topic/select',
   save = '/topic/topic/add',
   edit = '/topic/topic/edit',
@@ -15,6 +16,12 @@ enum Api {
   deleteBatch = '/topic/topic/deleteBatch',
   importExcel = '/topic/topic/importExcel',
   exportXls = '/topic/topic/exportXls',
+  addScoreSta = '/scoresta/scoreSta/addScoreSta',
+}
+
+export const addScoreSta = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.addScoreSta;
+  return defHttp.get({ url: url, params }, { isTransformResponse: false });
 }
 
 /**
@@ -36,6 +43,7 @@ export const list = (params) => defHttp.get({url: Api.list, params});
 export const list1 = (params) => defHttp.get({url: Api.list1, params});
 export const list2 = (params) => defHttp.get({url: Api.list2, params});
 export const list3 = (params) => defHttp.get({url: Api.list3, params});
+export const list5 = (params) => defHttp.get({url: Api.list5, params});
 export const Update = (params) => defHttp.post({url: Api.edit, params});
 export const select = (params) => defHttp.post({url: Api.select, params});
 
diff --git a/jeecgboot-vue3-master/src/views/topic/TopicList5.vue b/jeecgboot-vue3-master/src/views/topic/TopicList5.vue
new file mode 100644
index 00000000..c9992421
--- /dev/null
+++ b/jeecgboot-vue3-master/src/views/topic/TopicList5.vue
@@ -0,0 +1,292 @@
+<template>
+  <div>
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+<!--      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+          <a-col :lg="8">
+            <a-form-item label="年度比赛项目" name="annualCompid">
+              <j-search-select
+                placeholder="请选择年度比赛项目"
+                v-model:value="queryParam.annualCompid" dict="annual_comp_point,obj_name,id"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :lg="8">
+            <a-form-item label="题目名称">
+              <j-input placeholder="请输入题目名称" v-model:value="queryParam.name"/>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :lg="8">
+              <a-form-item label="题目状态" name="status">
+                <j-dict-select-tag placeholder="请选择题目状态" v-model:value="queryParam.status" dictCode="topic_status"/>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="8">
+              <a-form-item label="开关" name="isopen">
+                <j-dict-select-tag placeholder="请选择开关" v-model:value="queryParam.isopen"  dictCode="is_open" />
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
+                <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
+                  {{ toggleSearchStatus ? '收起' : '展开' }}
+                  <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
+                </a>
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>-->
+    </div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+<!--      <template #tableTitle>-->
+<!--        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>-->
+<!--&lt;!&ndash;        <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>&ndash;&gt;-->
+<!--&lt;!&ndash;        <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>&ndash;&gt;-->
+<!--        <a-dropdown v-if="selectedRowKeys.length > 0">-->
+<!--          <template #overlay>-->
+<!--            <a-menu>-->
+<!--              <a-menu-item key="1" @click="batchHandleDelete">-->
+<!--                <Icon icon="ant-design:delete-outlined"></Icon>-->
+<!--                删除-->
+<!--              </a-menu-item>-->
+<!--            </a-menu>-->
+<!--          </template>-->
+<!--          <a-button>批量操作-->
+<!--            <Icon icon="mdi:chevron-down"></Icon>-->
+<!--          </a-button>-->
+<!--        </a-dropdown>-->
+<!--      </template>-->
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+        <div v-html="text"></div>
+      </template>
+      <!--省市区字段回显插槽-->
+      <template #pcaSlot="{text}">
+        {{ getAreaTextByCode(text) }}
+      </template>
+      <template #fileSlot="{text}">
+        <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <TopicModal ref="registerModal" @success="handleSuccess"></TopicModal>
+    <TopicModal1 ref="registerModal1" @success="handleSuccess"></TopicModal1>
+  </div>
+</template>
+
+<script lang="ts" name="topic-topic" setup>
+import { ref, reactive } from 'vue';
+import { BasicTable, useTable, TableAction } from '/@/components/Table';
+import { useListPage } from '/@/hooks/system/useListPage';
+import { columns } from './Topic.data';
+import {
+  list5,
+  deleteOne,
+  batchDelete,
+  getImportUrl,
+  getExportUrl,
+  saveOrUpdate,
+  Update,
+  addScoreSta
+} from './Topic.api';
+import { downloadFile } from '/@/utils/common/renderUtils';
+import TopicModal from './components/TopicModal.vue'
+import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+import JSwitch from '/@/components/Form/src/jeecg/components/JSwitch.vue';
+import JSearchSelect from '/@/components/Form/src/jeecg/components/JSearchSelect.vue';
+import JInput from "/@/components/Form/src/jeecg/components/JInput.vue";
+import TopicModal1 from "/@/views/topic/components/TopicModal1.vue";
+import { useRoute,useRouter } from 'vue-router';
+const route = useRoute();
+const router = useRouter();
+  const formRef = ref();
+  const queryParam = reactive<any>({});
+  const toggleSearchStatus = ref<boolean>(false);
+const registerModal = ref();
+const registerModal1 = ref();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '评分标准',
+      api: list5,
+      columns,
+      canResize:false,
+      useSearchForm: false,
+      actionColumn: {
+        width: 160,
+        fixed: 'right',
+      },
+      beforeFetch: (params) => {
+        return Object.assign(params, {acpid:route.query.acpid});
+      },
+    },
+    exportConfig: {
+      name: "评分标准",
+      url: getExportUrl,
+      params: queryParam,
+    },
+	  importConfig: {
+	    url: getImportUrl,
+	    success: handleSuccess
+	  },
+  });
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+  const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 7 },
+  });
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  });
+
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add();
+  }
+
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.edit(record);
+  }
+function handleEdit1(record: Recordable) {
+  // registerModal.value.disableSubmit = false;
+  // if (record.status===1)
+  record.status=2;
+  Update(record)
+  reload()
+}
+async function handleEdit2(record: Recordable) {
+  // if (record.status===1)
+    let topicid = record.id;
+    let acpid = route.query.acpid;
+  await addScoreSta({topicid:topicid,acpid:acpid}, false)
+    .then((res) => {
+      if (res.success) {
+        console.log(res.result)
+        let id =res.result;
+        router.push({ path: '/scorestapoint/ScoreStaPointList', query: {id} })
+      }
+    });
+
+
+}
+function handleEdit3(record: Recordable) {
+  registerModal1.value.disableSubmit = true;
+  registerModal1.value.edit(record);
+}
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
+
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    const actions =  [
+      {
+        label: '评分标准',
+        onClick: handleEdit2.bind(null, record),
+      },
+/*      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      }*/
+    ];
+
+    return actions;
+  }
+
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
+
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+
+  /**
+   *  popup组件值改变事件
+   */
+  function setFieldsValue(map) {
+    Object.keys(map).map((key) => {
+      queryParam[key] = map[key];
+    });
+  }
+
+
+
+</script>
+
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+    .query-group-cust{
+      width: calc(50% - 15px);
+      min-width: 100px !important;
+    }
+    .query-group-split-cust{
+      width: 30px;
+      display: inline-block;
+      text-align: center
+    }
+  }
+</style>