From 300d75d257dbe60401dfb97123ae39e32f37380e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 28 二月 2024 18:28:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 35 ++++++++++-
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java | 4
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java | 6 +
admin/src/views/business/userAction.vue | 21 +++---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java | 16 +----
h5/pages/cropping/cropping.vue | 39 ++++++------
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 1
h5/pages/userinfo/userinfo.vue | 41 ++++++++++++-
8 files changed, 108 insertions(+), 55 deletions(-)
diff --git a/admin/src/views/business/userAction.vue b/admin/src/views/business/userAction.vue
index 29c359f..a23c5a9 100644
--- a/admin/src/views/business/userAction.vue
+++ b/admin/src/views/business/userAction.vue
@@ -80,15 +80,16 @@
<el-table-column label="鍘嗗彶鐘舵��">
<template slot-scope="{row}">
<span v-if="row.beforeStatus === 0">瑙ｅ喕</span>
- <span v-if="row.beforeStatus === 1">鍐荤粨</span>
- <span v-if="row.beforeStatus === 2">鎷夐粦</span>
- <span v-if="row.beforeStatus === 3">鎭㈠</span>
- <span v-if="row.beforeStatus === 4">璁句负鎷滆浜�</span>
- <span v-if="row.beforeStatus === 5">鍙栨秷鎷滆浜�</span>
- <span v-if="row.beforeStatus === 6">璁句负楂樼骇瀹℃壒浜�</span>
- <span v-if="row.beforeStatus === 7">鍙栨秷楂樼骇瀹℃壒浜�</span>
- <span v-if="row.beforeStatus === 8">鎵嬪姩绂诲満</span>
- <span v-if="row.beforeStatus === 8">鍒犻櫎</span>
+ <span v-else-if="row.beforeStatus === 1">鍐荤粨</span>
+ <span v-else-if="row.beforeStatus === 2">鎷夐粦</span>
+ <span v-else-if="row.beforeStatus === 3">鎭㈠</span>
+ <span v-else-if="row.beforeStatus === 4">璁句负鎷滆浜�</span>
+ <span v-else-if="row.beforeStatus === 5">鍙栨秷鎷滆浜�</span>
+ <span v-else-if="row.beforeStatus === 6">璁句负楂樼骇瀹℃壒浜�</span>
+ <span v-else-if="row.beforeStatus === 7">鍙栨秷楂樼骇瀹℃壒浜�</span>
+ <span v-else-if="row.beforeStatus === 8">鎵嬪姩绂诲満</span>
+ <span v-else-if="row.beforeStatus === 9">鍒犻櫎</span>
+ <span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔">
@@ -102,7 +103,7 @@
<span v-if="row.type === 6">璁句负楂樼骇瀹℃壒浜�</span>
<span v-if="row.type === 7">鍙栨秷楂樼骇瀹℃壒浜�</span>
<span v-if="row.type === 8">鎵嬪姩绂诲満</span>
- <span v-if="row.type === 8">鍒犻櫎</span>
+ <span v-if="row.type === 9">鍒犻櫎</span>
</template>
</el-table-column>
<el-table-column prop="createDate" label="鎿嶄綔鏃堕棿"></el-table-column>
diff --git a/h5/pages/cropping/cropping.vue b/h5/pages/cropping/cropping.vue
index cae2d62..8d590ad 100644
--- a/h5/pages/cropping/cropping.vue
+++ b/h5/pages/cropping/cropping.vue
@@ -14,7 +14,7 @@
</view>
</view>
</template>
-
+
<script>
export default {
data() {
@@ -104,17 +104,19 @@
this.preImgW = w;
// 璁剧疆钂欏眰
this.setBgBox();
- // 鍥惧儚棰勮
- this.previewCanvas({
- w,
- h,
- path
- });
+ setTimeout(() => {
+ // 鍥惧儚棰勮
+ this.previewCanvas({
+ w,
+ h,
+ path
+ });
+ }, 500)
}
}
});
},
-
+
// 璁剧疆钂欏眰
setBgBox() {
const {
@@ -148,6 +150,7 @@
h,
path
}) {
+ console.log(path, w, h)
const ctx = uni.createCanvasContext('mycanvas');
ctx.drawImage(path, 0, 0, w, h);
ctx.draw();
@@ -189,7 +192,7 @@
let y = (res[0].height - res[0].width) / 2;
/**
* 鍒ゆ柇鐓х墖鍙Щ鍔ㄧ殑璺濈鏄惁澶т簬鐣欑櫧鐨勫�硷紝濡傛灉澶т簬鍚戝彸鍒掓椂鍥剧墖鐨勫鍑忓幓鍩哄噯妗嗙殑瀹藉噺鍘荤暀鐧藉悜宸︽椂鐣欑櫧锛屽皬浜庢椂鎸夊浘鐗囩殑鍙Щ鍔ㄥ��
- * */
+ * */
let x = (preImgW - maxW) / 2 > 40 ? (fx < 0 ? preImgW - maxW - 40 : 40) : (preImgW - maxW) / 2;
if (preImgH > maxH) {
this.y = this.y > y ? y : this.y < -y ? -y : this.y;
@@ -228,14 +231,10 @@
destHeight: maxH,
canvasId: 'mycanvas',
success: fileRes => {
- console.log(fileRes);
- uni.previewImage({
- count: 1,
- urls: [fileRes.tempFilePath]
- });
+ uni.$emit('update', fileRes)
+ uni.navigateBack({ delta: 1 });
},
fail: function(err) {
- console.log(err);
uni.showToast({
title: '涓婁紶澶辫触锛氬浘鐗囩敓鎴愯繃绋嬩腑閬囧埌閿欒',
icon: 'none'
@@ -247,19 +246,19 @@
}
};
</script>
-
+
<style lang="scss" scoped>
.settingHeadImage {
background-color: #000000;
overflow: hidden;
-
+
.pre-canvas {
position: fixed;
top: 0;
left: 0;
z-index: 20;
}
-
+
.preImage {
min-width: 100vw;
height: 100vh;
@@ -268,12 +267,12 @@
align-items: center;
overflow: hidden;
z-index: 1;
-
+
.pre-i {
// transition: all 0.1s;
}
}
-
+
.setting-btns {
position: fixed;
bottom: 0;
diff --git a/h5/pages/userinfo/userinfo.vue b/h5/pages/userinfo/userinfo.vue
index ae9cb78..0c56d64 100644
--- a/h5/pages/userinfo/userinfo.vue
+++ b/h5/pages/userinfo/userinfo.vue
@@ -73,6 +73,7 @@
return {
show: false,
visit: '',
+ type: '',
columns: [[{name: '韬唤璇�', id: 0}, {name: '娓境璇佷欢', id: 1},{name: '鎶ょ収', id: 2}]],
fileList: [],
visitorData: {
@@ -93,6 +94,9 @@
onLoad(option) {
this.visitorData.userAnswerId = option.userAnswerId
this.getVisit()
+ uni.$on('update', (data) => {
+ this.uploadImg(data.tempFilePath)
+ })
},
methods: {
@@ -150,14 +154,41 @@
}
})
},
+ uploadImg(file) {
+ uni.showLoading({ title: '涓婁紶涓�', mask: true });
+ uni.uploadFile({
+ url: `${this.$baseUrl}public/api/uploadFtp.do`,
+ filePath: file,
+ name: 'file',
+ formData: {
+ folderCode: 'MEMBER_IMG'
+ },
+ success: (uploadFileRes) => {
+ let res = JSON.parse(uploadFileRes.data)
+ if (this.type === 'faceImg') {
+ this.visitorData.faceImg = res.data.halfPath
+ this.visitorData.faceImgUrl = res.data.prefixPath + res.data.folder + res.data.halfPath
+ } else {
+ this.visitorData.imgurl = res.data.halfPath
+ this.visitorData.imgurlUrl = res.data.prefixPath + res.data.folder + res.data.halfPath
+ }
+ },
+ complete() {
+ uni.hideLoading();
+ }
+ });
+ },
upload(type) {
+ this.type = type
uni.chooseImage({
+ count: 1,
success: (chooseImageRes) => {
- // console.log(chooseImageRes.tempFilePaths[0])
- uni.navigateTo({
- url: `/pages/cropping/cropping?item=${JSON.stringify({ tempFilePath: chooseImageRes.tempFilePaths[0] })}`
- })
- return
+ if (type === 'faceImg') {
+ uni.navigateTo({
+ url: `/pages/cropping/cropping?item=${JSON.stringify({ tempFilePath: chooseImageRes.tempFilePaths[0] })}`
+ })
+ return
+ }
uni.showLoading({ title: '涓婁紶涓�', mask: true });
for (let i = 0; i < chooseImageRes.tempFilePaths.length; i++) {
uni.uploadFile({
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java
index d16e430..1c958a1 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java
@@ -28,13 +28,10 @@
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
private String creator;
-
-
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
private String edirot;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -51,10 +48,9 @@
@ApiModelProperty(value = "浜哄憳缂栫爜", example = "1")
private Integer memberId;
+
@ApiModelProperty(value = "璁惧缂栫爜", example = "1")
private Integer deviceId;
-
-
@ApiModelProperty(value = "瀵煎叆鐘舵��", example = "1")
private Integer importStatus;
@@ -70,7 +66,6 @@
private Integer cancelUserId;
@ApiModelProperty(value = "鍙栨秷鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date cancelDate;
@ApiModelProperty(value = "鍙栨秷澶囨敞")
@@ -109,8 +104,7 @@
private Date endTime;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿",index= 7,dateFormat = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @ExcelColumn(name="鍒涘缓鏃堕棿",index= 7,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date createDate;
@ApiModelProperty(value = "鎿嶄綔浜�")
@@ -128,11 +122,9 @@
@ExcelColumn(name="涓嬪彂绫诲瀷",index= 9,valueMapping ="0=瀹炴椂;1=瀹氭椂" )
private Integer sendType;
-
-
@ApiModelProperty(value = "涓嬪彂鏃堕棿")
- @ExcelColumn(name="涓嬪彂鏃堕棿",index= 10,dateFormat = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @ExcelColumn(name="涓嬪彂鏃堕棿",index= 10,dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date sendDate;
@ApiModelProperty(value = "涓嬪彂澶囨敞")
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java
index f0e6923..1fba2a7 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java
@@ -108,7 +108,7 @@
queryWrapper.selectAll(Empower.class);
queryWrapper.selectAs(Member::getName,Empower::getMemberName);
queryWrapper.selectAs(Member::getPhone,Empower::getMemberPhone);
- queryWrapper.selectAs(Member::getIdcardNo,Empower::getMemberidCard);
+ queryWrapper.selectAs(Member::getIdcardDecode,Empower::getMemberidCard);
queryWrapper.selectAs(Company::getName,Empower::getCompanyName);
queryWrapper.selectAs(SystemUser::getUsername,Empower::getCreaterName);
queryWrapper.leftJoin(Member.class,Member::getId,Empower::getMemberId);
@@ -120,7 +120,7 @@
.and(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()), ms->ms.like(Member::getName,pageWrap.getModel().getMemberName())
.or().like(Member::getPhone,pageWrap.getModel().getCompanyName()));
queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getSendStatus()),Empower::getSendStatus,pageWrap.getModel().getSendStatus());
- queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getCompanyId()),Company::getId,pageWrap.getModel().getCompanyId());
+ queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getCompanyId()),Company::getId,pageWrap.getModel().getCompanyId());
queryWrapper.ge(Objects.nonNull(pageWrap.getModel().getSendStartDate()),Empower::getSendDate,pageWrap.getModel().getSendStartDate());
queryWrapper.le(Objects.nonNull(pageWrap.getModel().getSendEndDate()),Empower::getSendDate,pageWrap.getModel().getSendEndDate());
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 7f39337..f9a1579 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -198,7 +198,22 @@
member.setEditor(loginUserInfo.getId());
member.setEditDate(new Date());
memberMapper.updateById(member);
+
+ UserAction userAction=new UserAction();
+ userAction.setIsdeleted(Constants.ZERO);
+ userAction.setCreateDate(new Date());
+ userAction.setCreator(loginUserInfo.getId());
+ userAction.setType(9);
+ userAction.setRemark("鐢便��"+loginUserInfo.getUsername()+"銆戜簬銆愭搷浣滄椂闂�"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"銆戯紝杩涜銆愬垹闄ゃ��");
+ userAction.setMemberId(s+"");
+ userActionJoinMapper.insert(userAction);
+
});
+
+
+
+
+
/* memberMapper.deleteBatchIds(ids);*/
}
@@ -213,7 +228,7 @@
member = memberMapper.selectById(id);
if(!Objects.isNull(member)&&member.getStatus()==Constants.ZERO){
UserAction userAction=new UserAction();
- userAction.setBeforeStatus(member.getStatus());
+// userAction.setBeforeStatus(member.getStatus());
member.setStatus(Constants.TWO);
member.setEditor(loginUserInfo.getId());
member.setEditDate(new Date());
@@ -313,12 +328,13 @@
userAction.setCreator(loginUserInfo.getId());
if(Constants.equalsInteger(result.getType(),Constants.TWO)){
userAction.setType(Constants.ZERO);
+ userAction.setBeforeStatus(Constants.ONE);
}
- if(Constants.equalsInteger(result.getType(),Constants.ZERO)){
- userAction.setType(Constants.THREE);
+ if(Constants.equalsInteger(result.getType(),Constants.ONE)){
+ userAction.setBeforeStatus(status);
+ userAction.setType(Constants.TWO);
}
userAction.setMemberId(result.getId()+"");
- userAction.setBeforeStatus(status);
userActionJoinMapper.insert(userAction);
});
}
@@ -806,6 +822,17 @@
}
List<Integer> memberIds = memberList.stream().map(m->m.getId()).collect(Collectors.toList());
+ for (Integer id:memberIds) {
+ UserAction userAction=new UserAction();
+ userAction.setIsdeleted(Constants.ZERO);
+ userAction.setCreateDate(new Date());
+ userAction.setType(1);
+ userAction.setRemark("鐢卞畾鏃朵换鍔′簬銆愭搷浣滄椂闂�"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"銆戯紝杩涜銆愬喕缁撱��");
+ userAction.setMemberId(id+"");
+ userActionJoinMapper.insert(userAction);
+ }
+
+
//鍐荤粨鐘舵��
memberMapper.update(null,new UpdateWrapper<Member>()
.lambda().set(Member::getStatus,Constants.TWO)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
index 99aefd1..4aa25ca 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
@@ -55,7 +55,8 @@
@Override
public void deleteById(Integer id) {
- retentionMapper.deleteById(id);
+ retentionMapper.update(null,new UpdateWrapper<Retention>().lambda().set(Retention::getIsdeleted,Constants.ONE).eq(Retention::getId,id));
+// retentionMapper.deleteById(id);
}
@Override
@@ -263,7 +264,8 @@
queryWrapper.selectAll(Retention.class)
.selectAs(Company::getName,Retention::getCompanyName)
.select(" ( SELECT v.company_name FROM visits v WHERE v.member_id = t.member_id and v.status = "+Constants.VisitStatus.signin+" ORDER BY create_date DESC limit 1 ) as visitCompanyName ");
- queryWrapper.like(number,Retention::getPhone,pageWrap.getModel().getKeyWords())
+ queryWrapper.eq(Retention::getIsdeleted,Constants.ZERO)
+ .like(number,Retention::getPhone,pageWrap.getModel().getKeyWords())
.like((b||hasWord),Retention::getName,pageWrap.getModel().getKeyWords())
.eq(Objects.nonNull(pageWrap.getModel().getType()),
Retention::getType,
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
index b56629f..abe363f 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
@@ -997,6 +997,7 @@
return null;
}
+
@Override
public void roleUserAuthor(UserAuthorRequest param){
if(Objects.isNull(param)
--
Gitblit v1.9.3