ERP接口

k94314517

2024-02-28 323fe367a3196180f76b11b9cb3ea44d6565474c

ERP接口

 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

@@ -978,6 +978,7 @@
        return  null;
    }


    @Override
    public void roleUserAuthor(UserAuthorRequest param){
        if(Objects.isNull(param)