福利领取初始人员信息导入模板，报名操作同步报名状态字典

willalp-admin/src/main/java/com/willalp/web/controller/app/AppThreeController.java

@@ -374,10 +374,10 @@ public class AppThreeController extends BaseController {
             return AjaxResult.error();
         }
         HsWelfareApplyRecord applyRecord = welfareApplyRecordService.getById(welfareApplyRecord.getId());
-        if ("3".equals(applyRecord.getNowStatus())) {
+        if ("2".equals(applyRecord.getNowStatus())) {
             return AjaxResult.error("不可重复报名");
         }
-        welfareApplyRecord.setNowStatus("3");
+        welfareApplyRecord.setNowStatus("2");
         return toAjax(welfareApplyRecordService.updateById(welfareApplyRecord));
     }
 

willalp-admin/src/main/java/com/willalp/web/controller/clockingin/HsWelfareApplyRecordController.java

@@ -85,7 +85,7 @@ public class HsWelfareApplyRecordController extends BaseController {
     @GetMapping("/importTemp")
     public AjaxResult importTemp() {
         ExcelUtil<HsWelfareApplyRecord> util = new ExcelUtil<>(HsWelfareApplyRecord.class);
-        return util.importTemplateExcel("福利领取人员导入模板");
+        return util.exportExcel(hsWelfareApplyRecordService.importInitDataTemp(), "福利领取初始人员信息模板");
     }
 
     @Log(title = "福利报名记录", businessType = BusinessType.IMPORT)

willalp-clocking-in/src/main/java/com/willalp/event/mapper/HsWelfareApplyRecordMapper.java

@@ -38,4 +38,11 @@ public interface HsWelfareApplyRecordMapper extends BaseMapper<HsWelfareApplyRec
      * @return
      */
     int doUnregistered(@Param("source") String source);
+
+    /**
+     * 导入初始数据模板
+     *
+     * @return
+     */
+    List<HsWelfareApplyRecord> importInitDataTemp();
 }

willalp-clocking-in/src/main/java/com/willalp/event/mapper/xml/HsWelfareApplyRecordMapper.xml

@@ -76,5 +76,10 @@
           AND hwar.source = #{source}
         GROUP BY address
     </select>
+    <select id="importInitDataTemp" resultType="com.willalp.event.domain.HsWelfareApplyRecord">
+        SELECT user_code, user_name
+        FROM hs_org_personnel_files
+        WHERE is_delete = 0
+    </select>
 
 </mapper>

willalp-clocking-in/src/main/java/com/willalp/event/service/IHsWelfareApplyRecordService.java

@@ -22,6 +22,14 @@ public interface IHsWelfareApplyRecordService extends IService<HsWelfareApplyRec
     List<HsWelfareApplyRecord> selectHsWelfareApplyRecordList(HsWelfareApplyRecord hsWelfareApplyRecord);
 
 
+    /**
+     * 导入初始数据模板
+     *
+     * @return
+     */
+    List<HsWelfareApplyRecord> importInitDataTemp();
+
+
     /**
      * 导出数据并翻译
      *

willalp-clocking-in/src/main/java/com/willalp/event/service/impl/HsWelfareApplyRecordServiceImpl.java

@@ -43,6 +43,11 @@ public class HsWelfareApplyRecordServiceImpl extends ServiceImpl<HsWelfareApplyR
         return hsWelfareApplyRecordMapper.selectHsWelfareApplyRecordList(hsWelfareApplyRecord);
     }
 
+    @Override
+    public List<HsWelfareApplyRecord> importInitDataTemp() {
+        return hsWelfareApplyRecordMapper.importInitDataTemp();
+    }
+
     @Override
     public List<HsWelfareApplyRecord> exportDataAndInterpret(HsWelfareApplyRecord hsWelfareApplyRecord) {
         List<HsWelfareApplyRecord> list = hsWelfareApplyRecordMapper.selectHsWelfareApplyRecordList(hsWelfareApplyRecord);

willalp-ui/src/views/event/applyRecord/index.vue

@@ -1,15 +1,6 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
-      <!--      <el-form-item label="Excel来源" prop="source">-->
-      <!--        <el-input-->
-      <!--          v-model="queryParams.source"-->
-      <!--          placeholder="请输入Excel来源"-->
-      <!--          clearable-->
-      <!--          size="small"-->
-      <!--          @keyup.enter.native="handleQuery"-->
-      <!--        />-->
-      <!--      </el-form-item>-->
       <el-form-item label="用户编号" prop="userCode">
         <el-input
           v-model="queryParams.userCode"
@@ -124,7 +115,7 @@
             <el-table v-loading="loading" :data="sourceList" @selection-change="handleSelectionChange"
                       @row-click="rowClick">
               <el-table-column label="文件名" align="center" prop="source"/>
-              <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="130">
+              <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
                   <el-button
                     size="mini"
@@ -140,6 +131,13 @@
                     @click="sourceDoUnregistered(scope.row.source)"
                   >发布
                   </el-button>
+                  <el-button
+                    size="mini"
+                    type="text"
+                    icon="el-icon-delete"
+                    @click="sourceDoUnregistered(scope.row.source)"
+                  >删除
+                  </el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -181,7 +179,6 @@
                     type="text"
                     icon="el-icon-edit"
                     @click="handleUpdate(scope.row)"
-                    v-hasPermi="['event:applyRecord:edit']"
                   >修改
                   </el-button>
                   <el-button
@@ -189,7 +186,6 @@
                     type="text"
                     icon="el-icon-delete"
                     @click="handleDelete(scope.row)"
-                    v-hasPermi="['event:applyRecord:remove']"
                   >删除
                   </el-button>
                 </template>