Merge remote-tracking branch 'origin/develop' into develop

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/TenantAccountRecordController.java

@@ -111,11 +111,11 @@ public class TenantAccountRecordController extends BaseController {
     @PostMapping("/import")
     @ApiOperation(value = "机构流水", notes = "TenantAccountRecordQuery")
     @PreAuthorize("@pcs.hasPermissions('tenantAccountRecord/import')")
-    public R<FileImportInfo> importFile(@RequestBody FileImportInfoWrapper.FileImport wrapper) {
+    public HttpResponseResult<FileImportInfo> importFile(@RequestBody FileImportInfoWrapper.FileImport wrapper) {
 
 
         // 读取数据
-        return R.from(excelAnalyseCoreService.analyseReadExcelData(
+        return HttpResponseResult.succeed(excelAnalyseCoreService.analyseReadExcelData(
                 JSON.parseObject(JSON.toJSONString(wrapper), FileImportInfoWrapper.FileImportInfo.class)));
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/TenantAccountRecord.java

@@ -4,11 +4,13 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -21,6 +23,8 @@ import java.math.BigDecimal;
  */
 @Data
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 @ApiModel(" TenantAccountRecord-机构流水表")
 @TableName("tenant_account_record")
 public class TenantAccountRecord implements Serializable {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/execl/entity/TenantAccountRecordImport.java

@@ -40,6 +40,7 @@ public class TenantAccountRecordImport {
     private String settlement;
 
     @ApiModelProperty(value = "入账状态 WAIT 待入账 FROZEN 冻结入账 RECORDED 已入账 CANCEL 退费 ")
+    @ExcelIgnore
     private PostStatusEnum postStatus;
 
     @ExcelIgnore

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/FileImportInfoServiceImpl.java

@@ -48,9 +48,11 @@ public class FileImportInfoServiceImpl extends ServiceImpl<FileImportInfoMapper,
      * @return Boolean
      */
     @Override
-    public Boolean add(FileImportInfoWrapper.FileImportInfo fileImportInfo) {    	
-        
-        return this.save(JSON.parseObject(fileImportInfo.jsonString(), FileImportInfo.class));
+    public Boolean add(FileImportInfoWrapper.FileImportInfo fileImportInfo) {
+        FileImportInfo importInfo = JSON.parseObject(fileImportInfo.jsonString(), FileImportInfo.class);
+        boolean save = this.save(importInfo);
+        fileImportInfo.setId(importInfo.getId());
+        return save;
     }
 
     /**

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/FileImportInfoWrapper.java

@@ -56,9 +56,6 @@ public class FileImportInfoWrapper {
     @ApiModel(" FileImportInfo-文件数据导入")
     public static class FileImportInfo {
 
-        @ApiModelProperty("教材编号")
-        private String lessonId;
-
         @ApiModelProperty("主键ID")
         private Long id;
 

cooleshow-user/user-biz/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -54,7 +54,7 @@
         </choose>
         left join sys_user su on su.id_ = t.user_id_
         <where>
-            t.lock_flag_ = 0 and su.del_flag_ = 0 AND t.tenant_id_ != -1
+            t.lock_flag_ = 0 and su.del_flag_ = 0
             <if test="keyword != null and keyword != ''">
                 and (
                 su.real_name_ like concat('%',#{keyword},'%')
@@ -63,6 +63,9 @@
                 or su.id_ like concat('%',#{keyword},'%')
                 )
             </if>
+            <if test="client.code == 'STUDENT'">
+                AND t.tenant_id_ == -1
+            </if>
         </where>
 
     </select>