傅行帆 пре 6 година
родитељ
комит
6fb26e22c2

+ 3
- 2
CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/BuildingOwnerInfoController.java Прегледај датотеку

@@ -135,9 +135,10 @@ public class BuildingOwnerInfoController extends BaseController {
135 135
  
136 136
     @ApiOperation(value = "上传楼栋信息并入库", notes = "上传楼栋信息并入库")
137 137
     @PostMapping(value = "/building/submitExcel", consumes = "multipart/*", headers = "content-type=multipart/form-data")
138
-    public ResponseBean submitExcel(@RequestParam("file") MultipartFile file) {
138
+    public ResponseBean submitExcel(@RequestParam("file") MultipartFile file, HttpSession session) {
139 139
         ResponseBean responseBean = new ResponseBean();
140
-        responseBean = iBuildingOwnerInfoService.submitExcelData(file);
140
+        UserElement userElement = getUserElement(session);
141
+        responseBean = iBuildingOwnerInfoService.submitExcelData(file,userElement);
141 142
         return responseBean;
142 143
     }
143 144
 

+ 3
- 1
CODE/smart-community/property-api/src/main/java/com/community/huiju/service/IBuildingOwnerInfoService.java Прегледај датотеку

@@ -2,6 +2,7 @@ package com.community.huiju.service;
2 2
 
3 3
 import com.baomidou.mybatisplus.extension.service.IService;
4 4
 import com.community.commom.mode.ResponseBean;
5
+import com.community.commom.session.UserElement;
5 6
 import com.community.huiju.model.TpBuildingOwnerInfo;
6 7
 import org.springframework.web.multipart.MultipartFile;
7 8
 
@@ -64,7 +65,8 @@ public interface IBuildingOwnerInfoService extends IService<TpBuildingOwnerInfo>
64 65
     /**
65 66
      * 上传excel里面的内容
66 67
      * @param file
68
+     * @param userElement
67 69
      * @return
68 70
      */
69
-    ResponseBean submitExcelData(MultipartFile file);
71
+    ResponseBean submitExcelData(MultipartFile file, UserElement userElement);
70 72
 }

+ 6
- 4
CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BuildingOwnerInfoServiceImpl.java Прегледај датотеку

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
7 7
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
8 8
 import com.community.commom.constant.Constant;
9 9
 import com.community.commom.mode.ResponseBean;
10
+import com.community.commom.session.UserElement;
10 11
 import com.community.commom.utils.AccountValidatorUtil;
11 12
 import com.community.commom.utils.BeanTools;
12 13
 
@@ -212,10 +213,11 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
212 213
      * 上传excel里面的内容
213 214
      *
214 215
      * @param file
216
+     * @param userElement
215 217
      * @return
216 218
      */
217 219
     @Override
218
-    public ResponseBean submitExcelData(MultipartFile file) {
220
+    public ResponseBean submitExcelData(MultipartFile file, UserElement userElement) {
219 221
         ResponseBean responseBean = new ResponseBean();
220 222
         responseBean = getExcelData(file);
221 223
         if (!responseBean.getCode().equals(Constant.RESPONSE_SUCCESS)){
@@ -225,11 +227,11 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
225 227
         Map<String,Object> map = (Map<String, Object>) responseBean.getData();
226 228
         List<TpBuildingOwnerInfo> list = (List<TpBuildingOwnerInfo>) map.get("list");
227 229
         list.stream().forEach(BuildingOwnerInfo -> {
228
-            BuildingOwnerInfo.setCommunityId(3);
230
+            BuildingOwnerInfo.setCommunityId(userElement.getCommunityId());
229 231
             BuildingOwnerInfo.setVerifyStatus(Constant.UN_VERIFY_STATUS);
230
-            BuildingOwnerInfo.setCreateUser(1);
232
+            BuildingOwnerInfo.setCreateUser(userElement.getId());
231 233
             BuildingOwnerInfo.setCreateDate(LocalDateTime.now());
232
-            BuildingOwnerInfo.setUpdateUser(1);
234
+            BuildingOwnerInfo.setUpdateUser(userElement.getId());
233 235
             BuildingOwnerInfo.setUpdateDate(LocalDateTime.now());
234 236
         });
235 237
         //批量插入