Merge branch 'main' of http://182.92.169.222:3000/zhc077/hnjd_comp

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java

@@ -1264,21 +1264,36 @@ public class AnnualCompetitionProjectRegistrationController {
                         map2.put("xmid",listacp.get(k).getId());
                         //状态
                         Date date = new Date();
+                        if(listacp.get(k).getApplyStartTime()!=null&&listacp.get(k).getApplyEndTime()!=null){
                             if(date.getTime()>=listacp.get(k).getApplyStartTime().getTime()&&date.getTime()<=listacp.get(k).getApplyEndTime().getTime()){
                                 map2.put("zt","报名");
                             }
+                        }
+
+                        if(listacp.get(k).getTopicStartTime()!=null&&listacp.get(k).getTopicEndTime()!=null){
                             if(date.getTime()>=listacp.get(k).getTopicStartTime().getTime()&&date.getTime()<=listacp.get(k).getTopicEndTime().getTime()){
                                 map2.put("zt","选题");
                             }
+                        }
+
+                        if(listacp.get(k).getUploadStartTime()!=null&&listacp.get(k).getUploadEndTime()!=null){
                             if(date.getTime()>=listacp.get(k).getUploadStartTime().getTime()&&date.getTime()<=listacp.get(k).getUploadEndTime().getTime()){
                                 map2.put("zt","上传作品");
                             }
+                        }
+
+                        if(listacp.get(k).getScoreStartTime()!=null&&listacp.get(k).getScoreEndTime()!=null){
                             if(date.getTime()>=listacp.get(k).getScoreStartTime().getTime()&&date.getTime()<=listacp.get(k).getScoreEndTime().getTime()){
                                 map2.put("zt","评分");
                             }
+                        }
+
+                        if(listacp.get(k).getScoreEndTime()!=null){
                             if(date.getTime()>listacp.get(k).getScoreEndTime().getTime()){
                                 map2.put("zt","已结束");
                             }
+                        }
+
                         xmListMap.add(map2);
                     }
                 }else {
@@ -1292,21 +1307,35 @@ public class AnnualCompetitionProjectRegistrationController {
                         map3.put("xmid",listacp.get(o).getId());
                         //状态
                         Date date = new Date();
+                        if(listacp.get(o).getApplyStartTime()!=null&&listacp.get(o).getApplyEndTime()!=null){
                             if(date.getTime()>=listacp.get(o).getApplyStartTime().getTime()&&date.getTime()<=listacp.get(o).getApplyEndTime().getTime()){
                                 map3.put("zt","报名");
                             }
+                        }
+
+                        if(listacp.get(o).getTopicStartTime()!=null&&listacp.get(o).getTopicEndTime()!=null){
                             if(date.getTime()>=listacp.get(o).getTopicStartTime().getTime()&&date.getTime()<=listacp.get(o).getTopicEndTime().getTime()){
                                 map3.put("zt","选题");
                             }
+                        }
+
+                        if(listacp.get(o).getUploadStartTime()!=null&&listacp.get(o).getUploadEndTime()!=null){
                             if(date.getTime()>=listacp.get(o).getUploadStartTime().getTime()&&date.getTime()<=listacp.get(o).getUploadEndTime().getTime()){
                                 map3.put("zt","上传作品");
                             }
+                        }
+
+                        if(listacp.get(o).getScoreStartTime()!=null&&listacp.get(o).getScoreEndTime()!=null){
                             if(date.getTime()>=listacp.get(o).getScoreStartTime().getTime()&&date.getTime()<=listacp.get(o).getScoreEndTime().getTime()){
                                 map3.put("zt","评分");
                             }
+                        }
+
+                        if(listacp.get(o).getScoreEndTime()!=null){
                             if(date.getTime()>listacp.get(o).getScoreEndTime().getTime()){
                                 map3.put("zt","已结束");
                             }
+                        }
                         xmListMap.add(map3);
                     }
                 }

jeecgboot-vue3-master/src/views/awardpersion/AwardPersionList.vue

@@ -39,8 +39,8 @@
         <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
         <a-button type="primary" @click="cxhq" preIcon="ant-design:sync-outlined"> 重新获取</a-button>
         <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-        <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXlsMb"> 导出模板</a-button>
+        <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXlstj"> 导出推荐</a-button>
-        <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXlstj"> 导入推荐</a-button>
+        <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXlsMb"> 导入模板</a-button>
         <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>

jeecgboot-vue3-master/src/views/scorepersion/ScorePersionList.vue

@@ -37,8 +37,8 @@
         <a-button type="primary" @click="cxhq" preIcon="ant-design:sync-outlined"> 重新获取</a-button>
         <a-button type="primary" @click="tpfp" preIcon="ant-design:sync-outlined"> 同分复评</a-button>
         <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-<!--        <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXlsMb"> 导出模板</a-button>-->
+        <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXlsMb"> 导入模板</a-button>
-<!--        <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>-->
+        <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
             <a-menu>