小程序端 福利领取基本功能

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

@@ -30,10 +30,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
@@ -274,14 +271,29 @@ public class AppThreeController extends BaseController {
         return AjaxResult.error("取消失败");
     }
 
+    /*福利领取部分*/
 
-    /*福利领取*/
+    /**
+     * 查询可领取的福利列表
+     *
+     * @return
+     */
     @RequestMapping("/welfareOrders")
     public TableDataInfo welfareOrders() {
         startPage();
         return getDataTable(welfareApplyRecordService.list(new QueryWrapper<HsWelfareApplyRecord>()
+                .eq("user_code", getUsername())
                 .groupBy("source")));
     }
 
+    @RequestMapping("/sumbitWelfare")
+    public AjaxResult submitWelfare(@RequestBody HsWelfareApplyRecord welfareApplyRecord) {
+        if (null == welfareApplyRecord) {
+            return AjaxResult.error();
+        }
+        welfareApplyRecord.setNowStatus("3");
+        return toAjax(welfareApplyRecordService.updateById(welfareApplyRecord));
+    }
+
 }
  

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

@@ -80,7 +80,9 @@ public class HsWelfareApplyRecordController extends BaseController {
         ExcelUtil<HsWelfareApplyRecord> util = new ExcelUtil<>(HsWelfareApplyRecord.class);
         //获取数据库对应数据
         List<HsWelfareApplyRecord> list = util.importExcel(file.getInputStream(), 0);
-        return AjaxResult.success(hsWelfareApplyRecordService.importData(list, file.getOriginalFilename()));
+        String originalFilename = file.getOriginalFilename();
+        originalFilename = originalFilename.substring(0, originalFilename.indexOf("."));
+        return AjaxResult.success(hsWelfareApplyRecordService.importData(list, originalFilename));
     }
 
     /**