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

liukangdong

2024-10-31 18e9c3c8c5c05fb14b13d2a30a69af0165496f33

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

 server/system_gateway/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  profiles:
    active: dev
    active: pro
  application:
    name: system_gateway
  # 安全配置

 server/system_service/src/main/java/com/doumee/dao/business/model/Company.java

@@ -196,4 +196,7 @@
    @ApiModelProperty(value = "erp部门级别路径", example = "1")
    @ExcelColumn(name="erp部门级别路径")
    private String erpCompanyPath;
    @ApiModelProperty(value = "只查询隐患配置部门：0=否；1=是", example = "1")
    @TableField(exist = false)
    private Integer queryHiddenDanger;
}

 server/system_service/src/main/java/com/doumee/service/system/impl/SystemDataPermissionServiceImpl.java

@@ -189,13 +189,17 @@
                    custom =true;
                    c += StringUtils.defaultString(d.getCustomData(),"");
                }

            }
            if(!all &&!departAndChild&& !depart && !departAndLeaf && !custom ){
                return  new ArrayList<>();
            }
            Company department = new Company();
            department.setId(user.getCompanyId());

            if(all){
                return  null;
            }else{
            } else{
                List<Integer> dList = new ArrayList<>();
                dList.add(-1);//虚拟部门，排查空集合
                if(custom) {

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java

@@ -101,7 +101,7 @@
    @ApiOperation("组织树查询")
    @GetMapping("/tree")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "type", dataType = "Integer", value = "类型 0劳务公司 1内部组织", required = true),
            @ApiImplicitParam(name = "type", dataType = "Integer", value = "类型 0劳务公司 1内部组织", required = true)
    })
    @RequiresPermissions("business:company:query")
    public ApiResponse<List<Company>> tree (@RequestParam Integer type) {

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CompanyCloudController.java

@@ -1,5 +1,6 @@
package com.doumee.cloud.admin;

import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.api.BaseController;
import com.doumee.config.DataSyncConfig;
import com.doumee.config.annotation.CloudRequiredPermission;
@@ -16,10 +17,7 @@
import com.doumee.service.business.ext.ERPSyncService;
import com.doumee.service.business.impl.hksync.fhk.HkSyncOrgUserFromHKServiceImpl;
import com.doumee.service.business.impl.hksync.fhk.HkSyncOrgUserFromSelfServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -115,10 +113,11 @@
    @ApiOperation("组织树查询")
    @GetMapping("/tree")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "type", dataType = "Integer", value = "类型 0劳务公司 1内部组织", required = true),
            @ApiImplicitParam(name = "type", dataType = "Integer", value = "类型 0劳务公司 1内部组织 2指定组织", required = true),
    })
    @CloudRequiredPermission("business:company:query")
    public ApiResponse<List<Company>> tree (@RequestParam(required=false) Integer type,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
    public ApiResponse<List<Company>> tree (@RequestParam(required=false) Integer type,
                                            @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        return ApiResponse.success(companyService.companyTree(type));
    }


 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java

@@ -24,7 +24,9 @@
import com.doumee.service.business.ext.ERPSyncService;
import com.doumee.service.business.impl.hksync.fhk.HkSyncOrgUserFromHKServiceImpl;
import com.doumee.service.business.impl.hksync.fhk.HkSyncOrgUserFromSelfServiceImpl;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import io.swagger.annotations.*;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -266,8 +268,26 @@
    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
    @CloudRequiredPermission("business:member:exportExcel")
    public void exportExcel (@RequestBody PageWrap<Member> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        ExcelExporter.build(Member.class).export(memberService.findPage(pageWrap).getRecords(), "人员信息表", response);
    public void exportExcel (@RequestBody PageWrap<MemberQuery> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        List<Member> memberList =  new ArrayList<>();
        if(pageWrap.getModel().getType().equals(Constants.memberType.visitor)){
             memberList =  memberService.findVisitPage(pageWrap).getRecords();
        }else if(pageWrap.getModel().getType().equals(Constants.memberType.internal)){
            pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
            memberList =  memberService.findMemberInfoPage(pageWrap).getRecords();
        }
        if(CollectionUtils.isNotEmpty(memberList)){
            for (Member member:memberList) {
                if(StringUtils.isNotBlank(member.getFaceImg())){
                    member.setHavaFaceImg(Constants.ONE);
                }else{
                    member.setHavaFaceImg(Constants.ZERO);
                }

            }
        }

        ExcelExporter.build(Member.class).export(memberList, "人员信息表", response);
    }

    @ApiOperation("根据ID查询")

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

@@ -182,7 +182,6 @@
    private String visitCompanyName;

    @ApiModelProperty(value = "组织名称")
    @ExcelColumn(name="所属部门",index = 4,width = 12)
    @TableField(exist = false)
    private String companyName;
    @ApiModelProperty(value = "最后操作人")
@@ -203,6 +202,7 @@
    @TableField(exist = false)
    private Integer headId;
    @ApiModelProperty(value = "组织路径")
    @ExcelColumn(name="所属部门",index = 4,width = 12)
    @TableField(exist = false)
    private String companyNamePath;
    @ApiModelProperty(value = "组织海康编码")
@@ -280,5 +280,10 @@
    @TableField(exist = false)
    private Integer querySpecial;

    @ApiModelProperty(value = "是否有人脸" )
    @ExcelColumn(name="是否有人脸",index = 15,width = 12,valueMapping = "1=有;0=无;")
    @TableField(exist = false)
    private Integer havaFaceImg;


}

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

@@ -791,6 +791,9 @@
     * @param objLevel  查询级别
     */
    public Company getAuditCompanyHead(Integer companyId, Integer objLevel){
        if(Objects.isNull(objLevel)||Objects.isNull(companyId)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"审批流配置异常，请联系管理员");
        }
        Company auditCompany =  companyMapper.selectById(companyId);
        Integer queryLevel = Constants.ONE;
        while(queryLevel<objLevel){

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

@@ -118,7 +118,7 @@
        CarDriver carDriver = carDriverMapper.selectOne(new QueryWrapper<CarDriver>().lambda()
                .eq(CarDriver::getCarId,cars.getId())
                .eq(CarDriver::getIsdeleted,Constants.ZERO)
                .eq(CarDriver::getStatus,Constants.ONE)
//                .eq(CarDriver::getStatus,Constants.ZERO)
                .last( " limit 1 ")
        );
        if(Objects.nonNull(carDriver)&&Objects.nonNull(carDriver.getMemberId())){

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

@@ -449,6 +449,9 @@
            queryWrapper.ge(Company::getFsDate, Utils.Date.getStart(company.getFsDate()));
            queryWrapper.le(Company::getFsDate, Utils.Date.getEnd(company.getFsDate()));
        }
        if (company.getQueryHiddenDanger() != null && Constants.equalsInteger(company.getQueryHiddenDanger(),Constants.ONE)) {
            queryWrapper.apply(" t.id in ( select hdp.COMPANY_ID from hidden_danger_param hdp where hdp.ISDELETED = 0 and hdp.STATUS = 0 and hdp.TYPE = 0  ) ");
        }
        queryWrapper.orderByDesc(Company::getCreateDate);
        queryWrapper.leftJoin(Company.class,Company::getId,Company::getParentId);
        queryWrapper.select(" t.* ")
@@ -678,7 +681,14 @@
        queryWrapper.leftJoin(Member.class,Member::getId,Company::getHeadId);
        queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,Company::getEditor);
        queryWrapper.eq(Company::getIsdeleted,Constants.ZERO);
        queryWrapper.eq(type!=null,Company::getType,type);
        if(Objects.nonNull(type) && ( Constants.equalsInteger(type,Constants.ONE) || Constants.equalsInteger(type,Constants.ZERO))){
            queryWrapper.eq(type!=null,Company::getType,type);
        }else{
            String companySpecialId = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SPECIAL_COMPANY_ID).getCode();
            if(StringUtils.isNotBlank(companySpecialId)){
                queryWrapper.apply(" (find_in_set('"+companySpecialId+"',REPLACE(t.company_path,'/',','))  or t.parent_id  is null  )  ");
            }
        }
        queryWrapper.orderByAsc(true,"t.sortnum");
        List<Company> companyList = companyJoinMapper.selectJoinList(Company.class,queryWrapper);
        //配置组员人员类型来源方式 0自建 1ERP

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

@@ -964,6 +964,7 @@
    public void cancelInPark(PlatformJob platformJob){
        if(Constants.equalsInteger(platformJob.getType(),Constants.TWO)
                || Constants.equalsInteger(platformJob.getType(),Constants.THREE)
                || StringUtils.isBlank(platformJob.getCarCodeFront())
                || Constants.equalsInteger(platformJob.getType(),Constants.FOUR)){

            List<VisitPark> visitParkList = visitParkMapper.selectList(new QueryWrapper<VisitPark>().lambda()