Merge remote-tracking branch 'origin/feature-20240104' into feature-20240104

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxMode.java

@@ -49,7 +49,7 @@ public class WxMode extends BaseEntity
 
     /** 模式类型(每个仪器有不一样的模式类型) */
     @Excel(name = "模式类型(每个仪器有不一样的模式类型)")
-    private Long modeType;
+    private String modeType;
 
     /** 模式分类(每个仪器有不一样的模式分类) */
     @Excel(name = "模式分类(每个仪器有不一样的模式分类)")
@@ -165,12 +165,12 @@ public class WxMode extends BaseEntity
     {
         return modeVideo;
     }
-    public void setModeType(Long modeType)
+    public void setModeType(String modeType)
     {
         this.modeType = modeType;
     }
 
-    public Long getModeType()
+    public String getModeType()
     {
         return modeType;
     }

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/export/WxUserMemberExport.java

@@ -62,33 +62,33 @@ public class WxUserMemberExport {
     @Excel(name = "仪器数量", sort = 9)
     private Integer devicesNum;
 
-    @Excel(name = "小程序标签", sort = 10)
+    @Excel(name = "仪器名称", sort = 10)
+    private String devicesName;
+
+    @Excel(name = "小程序标签", sort = 11)
     String miniProgramTags;
 
-    @Excel(name = "外部标签", sort = 11)
+    @Excel(name = "外部标签", sort = 12)
     String wecomTags;
 
     /**
      * 积分
      */
-    @Excel(name = "积分", sort = 12)
+    @Excel(name = "积分", sort = 13)
     private Integer credit;
 
     /**
      * 即将过期积分
      */
-    @Excel(name = "即将过期积分", sort = 13)
+    @Excel(name = "即将过期积分", sort = 14)
     private Integer expireCredit;
 
     /**
      * unionid
      */
-    @Excel(name = "unionid", sort = 14)
+    @Excel(name = "unionid", sort = 15)
     private String unionid;
 
-    @Excel(name = "仪器名称", sort = 15)
-    private String devicesName;
-
 
     public WxUserMemberExport() {
     }

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxModeRet.java

@@ -67,7 +67,7 @@ public class WxModeRet {
      * 模式类型(每个仪器有不一样的模式类型)
      */
     @Excel(name = "模式类型(每个仪器有不一样的模式类型)")
-    private Long modeType;
+    private String modeType;
 
     /**
      * 模式分类(每个仪器有不一样的模式分类)
@@ -195,11 +195,11 @@ public class WxModeRet {
         return modeVideo;
     }
 
-    public void setModeType(Long modeType) {
+    public void setModeType(String modeType) {
         this.modeType = modeType;
     }
 
-    public Long getModeType() {
+    public String getModeType() {
         return modeType;
     }
 

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxClockLogServiceImpl.java

@@ -97,7 +97,7 @@ public class WxClockLogServiceImpl implements IWxClockLogService {
                 WxUserMember query = wxUserMemberMapper.selectWxUserMemberById(wxUserMember.getId());
                 WxUserMember updateEntity = new WxUserMember();
                 updateEntity.setId(query.getId());
-                updateEntity.setCredit(updateEntity.getCredit() + credit.intValue());
+                updateEntity.setCredit(query.getCredit() + credit.intValue());
                 updateEntity.setUpdateBy(wxUserMember.getNickname());
                 updateEntity.setUpdateTime(DateUtils.getNowDate());
                 wxUserMemberMapper.updateWxUserMember(updateEntity);

flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserMemberController.java

@@ -112,7 +112,7 @@ public class WxUserMemberController extends BaseController {
             exportList.add(export);
         }
         ExcelUtil<WxUserMemberExport> util = new ExcelUtil(WxUserMemberExport.class);
-        util.exportExcel(response, exportList, "用户数据", exportFields);
+        util.exportExcel(response, exportList, "会员数据", exportFields);
     }
 
     /**

flossom-ui/src/views/system/instrument/index.vue

@@ -408,6 +408,7 @@
 						:on-success="manualUploadSuccess"
 						:on-error="uploadError"
 						:file-list="manualFile.fileList"
+            :before-upload="handleBeforeUpload"
 					>
 						<el-button size="small" type="primary">点击上传</el-button>
 						<div slot="tip" class="el-upload__tip">
@@ -425,6 +426,7 @@
 						:on-success="scanUploadSuccess"
 						:on-error="uploadError"
 						:file-list="scanFile.fileList"
+            :before-upload="handleBeforeUpload"
 					>
 						<el-button size="small" type="primary">点击上传</el-button>
 						<div slot="tip" class="el-upload__tip">
@@ -437,7 +439,7 @@
 				</el-form-item>
 				<el-form-item label="保修日期" prop="guarantee">
 					<el-input-number
-						:min="0"
+						:min="1"
 						:precision="0"
 						v-model="form.guarantee"
 					></el-input-number>
@@ -1502,6 +1504,15 @@ export default {
 				sortMode: [],
 			},
 			newModeOptionList: [],
+      fileType: {
+        type: Array,
+        default: () => ["bmp", "gif", "jpg", "jpeg", "png", "mp4", "avi", "rmvb"],
+      },
+      // 大小限制(MB)
+      fileSize: {
+        type: Number,
+        default: 1,
+      },
 		}
 	},
 	created() {
@@ -2430,6 +2441,29 @@ export default {
 			}
 			this.newModeOptionList = temp
 		},
+    // 上传前校检格式和大小
+    handleBeforeUpload(file) {
+      // 校检文件类型
+      if (this.fileType) {
+        const fileName = file.name.split('.');
+        const fileExt = fileName[fileName.length - 1];
+        const isTypeOk = this.fileType.default().indexOf(fileExt) >= 0;
+        if (!isTypeOk) {
+          this.$modal.msgError(`文件格式不正确`);
+          return false;
+        }
+      }
+
+      // 校检文件大小
+      if (this.fileSize) {
+        const isLt = file.size / 1024 / 1024 < this.fileSize;
+        if (!isLt) {
+          this.$modal.msgError(`上传文件大小不能超过 ${this.fileSize.default} MB!`);
+          return false;
+        }
+      }
+      return true;
+    },
 	},
 }
 </script>

flossom-ui/src/views/system/member/index.vue

@@ -2506,7 +2506,7 @@ export default {
           {
             ...this.exportFieldsForm,
           },
-          `微信会员_${new Date().getTime()}.xlsx`
+          `会员数据_${new Date().getTime()}.xlsx`
         )
         this.cancelExportFieldsDialog()
       }
@@ -2525,7 +2525,7 @@ export default {
               exportFields: exportFields,
             }),
           },
-          `微信会员_${new Date().getTime()}.xlsx`
+          `会员数据_${new Date().getTime()}.xlsx`
         )
         this.cancelExportFieldsDialog()
       }

flossom-ui/src/views/system/mode/index.vue

@@ -181,7 +181,7 @@
         </el-row>
         <el-row>
           <el-col :span ="12">
-            <el-form-item label="舱体模式" prop="isCabinMode" v-if="form.instrumentModel == 'WL200' & form.modeType != 10">
+            <el-form-item label="舱体模式" prop="isCabinMode" v-if="form.instrumentModel == 'WL200' & form.modeType != '10'">
               <el-select v-model="form.isCabinMode">
                 <el-option label="是" :value="1"></el-option>
                 <el-option label="否" :value="0"></el-option>
@@ -189,7 +189,7 @@
             </el-form-item>
           </el-col>
           <el-col :span ="12">
-            <el-form-item label="自定义组合" prop="isCustomMode" v-if="(form.modeType != 10&&form.instrumentType==2)" label-width="100px">
+            <el-form-item label="自定义组合" prop="isCustomMode" v-if="(form.modeType != '10'&&form.instrumentType==2)" label-width="100px">
               <el-select v-model="form.isCustomMode">
                 <el-option label="是" :value="1"></el-option>
                 <el-option label="否" :value="0"></el-option>