最新版本541200007

jiangping

2024-10-16 ef2e97be5b5303ba62212cecbaa811796c38210d

最新版本541200007

 admin/src/views/business/position.vue

@@ -24,6 +24,7 @@
      >
        <el-table-column type="selection" width="55"></el-table-column>
        <el-table-column prop="name" label="岗位" min-width="200px"></el-table-column>
        <el-table-column prop="memberNum" label="员工数" min-width="200px"></el-table-column>
        <el-table-column prop="sortnum" label="排序码"  min-width="100px"></el-table-column>
        <el-table-column prop="editDate" label="操作时间" min-width="200px"></el-table-column>
        <el-table-column

 admin/src/views/business/relativeMember.vue

@@ -228,7 +228,7 @@
        name: '',
        status: '',
        hkStatus: '',
        includeChild: false,
        includeChild: true,
        canVisit: '',
        keyword: '',
        type: 2,
@@ -244,6 +244,7 @@
      working: false,
      canvisiting: false,
      companyTree: [],
      positionList: [],
      department: []
    }
  },

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java

@@ -56,6 +56,8 @@

    @ApiModelProperty(value = "海康状态 0待下发 1成功2失败")
    private Integer hkStatus;
    @ApiModelProperty(value = "在职状态")
    private Integer workStatus;

    @ApiModelProperty(value = "操作人员 ")
    private Integer createrId;

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Position.java

@@ -79,6 +79,9 @@
    @ApiModelProperty(value = "子集分类")
    @TableField(exist = false)
    private List<Position> childList;
    @ApiModelProperty(value = "当前岗位人员数量")
    @TableField(exist = false)
    private Integer memberNum;


}

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

@@ -1387,6 +1387,7 @@
                .eq(Objects.nonNull(pageWrap.getModel().getCanVisit()),Member::getCanVisit,pageWrap.getModel().getCanVisit())
                .eq(Objects.nonNull(pageWrap.getModel().getStatus()),Member::getStatus,pageWrap.getModel().getStatus())
                .eq(Objects.nonNull(pageWrap.getModel().getHkStatus()),Member::getHkStatus,pageWrap.getModel().getHkStatus())
                .eq(Objects.nonNull(pageWrap.getModel().getWorkStatus()),Member::getWorkStatus,pageWrap.getModel().getWorkStatus())
                .eq(Objects.isNull(pageWrap.getModel().getIsdeleted()),Member::getIsdeleted,Constants.ZERO)
                .eq(Objects.nonNull(pageWrap.getModel().getIsdeleted()),Member::getIsdeleted,pageWrap.getModel().getIsdeleted())
                .eq(Objects.nonNull(pageWrap.getModel().getCompanyType()),Company::getType,pageWrap.getModel().getCompanyType())

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java

@@ -494,7 +494,7 @@
                delRetentionLis.add(visits.getMemberId());
                //如果是访客通行
                if(request.getData()!=null&&request.getData().getParamValues()!=null &&
                        StringUtils.equals(request.getData().getParamValues().getInOrOut(),"1")){
                        StringUtils.equals(request.getData().getParamValues().getInOrOut(),"0")){
                    //如果是访客登记，录入人员的在场数据记录
                    Retention r = getRetentionModelByVisitRequest(visits, request.getHappenTime(),request.getSrcType());
                    r.setCarNo(request.getData().getParamValues().getPlateNos());
@@ -505,7 +505,7 @@
                    inoutDayCount.setInVisitorNum(Constants.formatIntegerNum(inoutDayCount.getInVisitorNum())+1);
                }
                if(request.getData()!=null&&request.getData().getParamValues()!=null &&
                         StringUtils.equals(request.getData().getParamValues().getInOrOut(),"2")){
                         !StringUtils.equals(request.getData().getParamValues().getInOrOut(),"0")){
                    inoutDayCount.setOutVisitorNum(Constants.formatIntegerNum(inoutDayCount.getOutVisitorNum())+1);
                }
            }
@@ -571,6 +571,7 @@
        event.setPhotoUrl(getHkImgUrl(detail.getFacePic()));
        event.setPersonName(detail.getVisitorName());
        event.setCarNo(detail.getPlateNo());
        event.setRemark(JSONObject.toJSONString(request));
        event.setInvoicesNo(request.getData().getVisitorInvoices().getInvoicesNo());//访客单号
        event.setIdType(detail.getCertType());
        String idnum = detail.getCertNo();