Merge remote-tracking branch 'origin/master'

jiangping

2024-02-28 300d75d257dbe60401dfb97123ae39e32f37380e

Merge remote-tracking branch 'origin/master'

 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>

 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;

 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({

 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 = "下发备注")

 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());


 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)

 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,

 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)