股東表插入、查詢

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserPositionChangeRecordBiz.java

@@ -104,6 +104,26 @@ public class AppUserPositionChangeRecordBiz extends BaseBiz<AppUserPositionChang
         mapper.insert(appUserPositionChangeRecord);
     }
 
+
+    /**
+     * 批量插入记录表
+     *
+     * @param userPositionTemp
+     * @param updUserId
+     */
+    public void addJoinJobRecord(AppUserPositionTemp userPositionTemp, Integer updUserId) {
+        AppUserPositionChangeRecord appUserPositionChangeRecord = new AppUserPositionChangeRecord();
+        appUserPositionChangeRecord.setPhone(userPositionTemp.getPhone());
+        appUserPositionChangeRecord.setUserName(userPositionTemp.getName());
+        appUserPositionChangeRecord.setCrtTime(new Timestamp(System.currentTimeMillis()));
+        appUserPositionChangeRecord.setRelTime(new Timestamp(System.currentTimeMillis()));
+        appUserPositionChangeRecord.setJobRemark(USER_ADD_COMPANY);
+        appUserPositionChangeRecord.setOperatorId(updUserId);
+        appUserPositionChangeRecord.setUserId(userPositionTemp.getId());
+        mapper.insert(appUserPositionChangeRecord);
+    }
+
+
     /**
      * 员工复职
      *
@@ -178,7 +198,7 @@ public class AppUserPositionChangeRecordBiz extends BaseBiz<AppUserPositionChang
     public List<AppUserPositionChangeRecordDTO> findPositionChangeRecord(AppUserPositionTemp userPositionTemp) {
         Example example = new Example(AppUserPositionChangeRecord.class);
         example.createCriteria().andEqualTo("phone", userPositionTemp.getPhone());
-        if (userPositionTemp.getId()!=null){
+        if (userPositionTemp.getId() != null) {
             example.createCriteria().andEqualTo("userId", userPositionTemp.getId());
         }
         List<AppUserPositionChangeRecord> list = selectByExample(example);

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserPositionTempBiz.java

@@ -196,7 +196,7 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         return dataVO;
     }
 
-    public Map<String, Object> importUserPostion(List<String[]> userPostionData) {
+    public Map<String, Object> importUserPostion(List<String[]> userPostionData, Integer operatorId) {
         Map<String, Object> result = new HashMap<>(2);
         List<Map<String, Object>> errorResult = Lists.newArrayList();
         Map<String, Object> errorResultMap;
@@ -277,7 +277,12 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
                     appUserPositionTemp.setId(id);
                     updateSelectiveById(appUserPositionTemp);
                 } else {
-                    insertSelective(appUserPositionTemp);
+                  //  insertSelective(appUserPositionTemp);
+                    AppUserPositionTemp appUserPositionTempNew = new AppUserPositionTemp();
+                    BeanUtils.copyProperties(appUserPositionTemp, appUserPositionTempNew);
+                    appUserPositionTempNew = addUserFindId(appUserPositionTemp);
+                    //记录表插入
+                    appUserPositionChangeRecordBiz.addJoinJobRecord(appUserPositionTempNew, operatorId);
                 }
 
             } catch (BaseException ex) {

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/AppUserPositionController.java

@@ -114,7 +114,7 @@ public class AppUserPositionController {
         try {
             IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
             Integer operatorId = Integer.valueOf(infoFromToken.getId());
-            return ObjectRestResponse.succ(appUserPositionTempBiz.addUserPositionChangeRecord(appUserPositionTempDTO.getChangeStatus(), appUserPositionTempDTO, operatorId)) ;
+            return ObjectRestResponse.succ(appUserPositionTempBiz.addUserPositionChangeRecord(appUserPositionTempDTO.getChangeStatus(), appUserPositionTempDTO, operatorId));
         } catch (Exception e) {
             log.error("修改失败【{}】", e);
             throw new BaseException("修改失败");
@@ -153,14 +153,20 @@ public class AppUserPositionController {
      * @return
      */
     @PostMapping("/excel/import")
-    public ObjectRestResponse<Map<String, Object>> importUserPostion(@RequestPart("file") MultipartFile userPostionExcel) {
-        List<String[]> userPostionData = ExcelImport.getExcelData(userPostionExcel);
-        if (userPostionData.size() < 2) {
-            return ObjectRestResponse.createFailedResult(1001, "导入不能没数据！！！");
+    public ObjectRestResponse<Map<String, Object>> importUserPostion(@RequestPart("file") MultipartFile userPostionExcel, HttpServletRequest request) {
+        try {
+            IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
+            Integer operatorId = Integer.valueOf(infoFromToken.getId());
+            List<String[]> userPostionData = ExcelImport.getExcelData(userPostionExcel);
+            if (userPostionData.size() < 2) {
+                return ObjectRestResponse.createFailedResult(1001, "导入不能没数据！！！");
+            }
+            userPostionData.remove(0);
+            Map<String, Object> result = appUserPositionTempBiz.importUserPostion(userPostionData,operatorId);
+            return ObjectRestResponse.succ(result);
+        } catch (Exception e) {
+            throw new BaseException(e);
         }
-        userPostionData.remove(0);
-        Map<String, Object> result = appUserPositionTempBiz.importUserPostion(userPostionData);
-        return ObjectRestResponse.succ(result);
     }
 
     /**