Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

jiangping

2024-01-08 cbaf83881759106a3e4ff1fa784b5ad99137463c

Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

 server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java

@@ -46,7 +46,7 @@
                ERPApiResponse<PageData<ErpOrgListResponse>> response = JSONObject.parseObject(result, typeReference.getType());
                if(response!=null && response.getData()!=null&& response.getData().getRecords()!=null){
                    list.addAll(response.getData().getRecords());
                        if(100*pageSize < response.getData().getTotal() ){
                        if(page*pageSize < response.getData().getTotal() ){
                            hasLast =true;//还有下一页
                        }
                        page++;

 server/dmvisit_service/src/main/java/com/doumee/dao/web/response/ApproveVO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
package com.doumee.dao.web.response;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
public class ApproveVO {

    @ApiModelProperty(value = "主键")
    private Integer id;

}

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java

@@ -192,4 +192,7 @@






}

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java

@@ -137,7 +137,7 @@
        initWithVisitInfo(visits);
        updateProblemLog(visits,problemLog,member);
        //创建审批记录
        createApprove(visits,visitMember);
//        createApprove(visits,visitMember);
        //发送微信公众号通知
        wxPlatNotice.sendVisitAuditTemplateNotice(visits,
                systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_PREFIX).getCode(),
@@ -380,9 +380,9 @@
        ApproveParam approveParam = new ApproveParam();
        //发送审批/抄送记录的用户主键集合
        ids.clear();
        if(Objects.isNull(allParam)){
        if(!CollectionUtils.isNotEmpty(allParam)){
            if(Objects.isNull(level)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"未配置访客记录审批流，请联系管理员");
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"未配置访客审批流，请联系管理员");
            }
        }else{
             approveParam = allParam.get(0);

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java

@@ -209,7 +209,9 @@
        company.setEditDate(date);
        company.setStatus(respone.getStatus());
        company.setCode(respone.getCode());
        company.setErpParentId(respone.getParentOrgId());
        if(StringUtils.isNotBlank(respone.getParentOrgId())&&!respone.getParentOrgId().equals("orgRoot")){
            company.setErpParentId(respone.getParentOrgId());
        }
        company.setErpDate(date);
        company.setHkStatus(Constants.ZERO);
        return  company;
@@ -282,10 +284,10 @@
                    .eq(Member::getType, Constants.memberType.internal));
            dealUserChangeList(list,addList,updateList,delList,allList);
            if(addList.size()>0){
                memberMapper.insertBatchSomeColumn(addList);
                for (Member member:addList) {
                    dealRoleEmpower(member,param.getStartTime(), param.getEndTime());
                }
                memberMapper.insertBatchSomeColumn(addList);
            }
            if(updateList.size()>0){
                for(Member c : updateList){
@@ -325,7 +327,7 @@
                company = companyMapper.selectOne(new QueryWrapper<Company>().lambda().eq(Company::getErpId,response.getOrgId()).last("limit 1"));
                if(Objects.isNull(company)){
                    continue;
                }    
                }
            }
            //根据 erpId æŸ¥è¯¢ç”¨æˆ·ä¿¡æ¯ï¼Œåˆ¤æ–­æ˜¯æ–°å¢žè¿˜æ˜¯æ›´æ–°
            Member member = findUserByERPId(allList,response.getId());
@@ -369,6 +371,7 @@
        member.setErpStatus(Constants.ONE);
        member.setErpDate(new Date());
        member.setErpId(param.getId());
        member.setIdcardType(param.getIdType());
        member.setFsStatus(Constants.ZERO);
        member.setStatus(param.getStatus());
        member.setType(Constants.memberType.internal);
@@ -881,10 +884,13 @@
     */
    private void dealMemberRoleEmpower(Member member, List<Integer> doorIds,Date startTime,Date endTime ) {
        //删除所有老的授权信息
        empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
                .eq(Empower::getMemberId,member.getId())
                .set(Empower::getIsdeleted,Constants.ONE)
                .set(Empower::getSendStatus,Constants.ZERO));
        if(!Objects.isNull(member)&&!Objects.isNull(member.getId())){
            empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
                    .eq(Empower::getMemberId,member.getId())
                    .set(Empower::getIsdeleted,Constants.ONE)
                    .set(Empower::getSendStatus,Constants.ZERO));
        }

//        empowerMapper.delete(new UpdateWrapper<Empower>().lambda()
//                .eq(Empower::getMemberId,member.getId())
//                );
@@ -919,7 +925,9 @@

    private   List<Integer>  getRoleIdByParam(Integer[] param, Member member) {
        //添加人员角色关联数据
        memberRoleMapper.delete(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId()));
        if(!Objects.isNull(member)&&!Objects.isNull(member.getId())){
            memberRoleMapper.delete(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId()));
        }
        if(!Objects.isNull(param)&&param.length>Constants.ZERO){
            //查询数据库存在的权限
            List<DeviceRole> deviceRoleList= deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda()