Merge remote-tracking branch 'origin/master'

jiangping

2025-06-30 ccbcb9487250f063dc7c4e72cfa18228dca8dac8

Merge remote-tracking branch 'origin/master'

 admin/src/views/system/user.vue

@@ -14,6 +14,11 @@
      <el-form-item label="组织" prop="companyName">
        <el-input v-model="searchForm.companyName" v-trim placeholder="请输入组织" @keypress.enter.native="search"/>
      </el-form-item>
      <el-form-item label="角色" prop="roleId">
        <el-select v-model="searchForm.roleId" placeholder="请选择角色" @change="search">
          <el-option :label="item.name" :value="item.id" v-for="(item, index) in rolesList" :key="index"></el-option>
        </el-select>
      </el-form-item>
<!--            <el-form-item label="所属部门" prop="rootDeptId">-->
<!--        <DepartmentSelect v-model="searchForm.rootDeptId" placeholder="请选择所属部门" clearable/>-->
<!--      </el-form-item>-->
@@ -122,7 +127,7 @@
import ResetPwdWindow from '@/components/system/user/ResetPwdWindow'
import DepartmentSelect from '@/components/common/DepartmentSelect'
import PositionSelect from '@/components/common/PositionSelect'

import { fetchAll as fetchAllRoles, fetchAll } from '@/api/system/role'
export default {
  name: 'SystemUser',
  extends: BaseTable,
@@ -136,8 +141,10 @@
        rootDeptId: null, // 部门ID
        positionId: null, // 岗位ID
        companyName: null, // 企业名称
        roleId: null, // 角色
        mobile: '' // 手机号码
      }
      },
      rolesList: []
    }
  },
  created () {
@@ -151,6 +158,13 @@
      }]
    })
    this.search()
    fetchAllRoles()
      .then(records => {
        this.rolesList = records
      })
      .catch(e => {
        this.$tip.apiFailed(e)
      })
  }
}
</script>

 h5/pages/staff/snapshot.vue

@@ -13,6 +13,19 @@
                    <u-icon name="arrow-right" color="#CCCCCC" size="20"></u-icon>

                </view>

            </view>

			
            <view class="line">

                <view class="label">

                    <text>*</text>

                    <text>检查类型</text>

                </view>

                <view class="value" @click="openArea">

                    <text class="mr6"

                        :style="{ color: param.areaName ? '#000000' : '#999999' }">{{ param.areaName ? param.areaName : "请选择" }}</text>

                    <u-icon name="arrow-right" color="#CCCCCC" size="20"></u-icon>

                </view>

            </view>

			
            <view class="line">

                <view class="label">

                    <text>*</text>


 server/system_service/src/main/java/com/doumee/core/utils/Constants.java

@@ -105,12 +105,15 @@
    public static final String FTP_PORT ="FTP_PORT" ;
    public static final String FTP_USERNAME ="FTP_USERNAME" ;
    public static final String FTP_PWD ="FTP_PWD" ;
    public static final String COMPANY_DOCUMENTS ="COMPANY_DOCUMENTS" ;

    public static final String FTP_RESOURCE_PATH ="FTP_RESOURCE_PATH" ;
    public static final String FTP_LOCAL_RESOURCE_PATH ="FTP_LOCAL_RESOURCE_PATH" ;
    public static final String ERP_ORGLIST_URL ="ERP_ORGLIST_URL" ;
    public static final String ERP_USERLIST_URL ="ERP_USERLIST_URL" ;
    public static final String ERP_APPROVE_URL ="ERP_APPROVE_URL" ;
    public static final String ERP_USERSTATUS_RL ="ERP_USERSTATUS_RL" ;

    public static final String ERP ="ERP" ;
    public static final Integer THREE =3 ;
    public static final Integer FOUR =4 ;

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java

@@ -231,6 +231,7 @@
//                        fileJSON.put("folder", folder);
                        fileJSON.put("url", prefixPath+fileName);
                        fileJSON.put("imgaddr", fName);
                        fileJSON.put("fileSize", file.getSize());
                        fileJSON.put("imgname", fileName);
                        fileJSON.put("originname", originname);
                        context.put("data",fileJSON);

 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java

@@ -296,7 +296,7 @@
        String kqgzt = "attendance_workstand";//考勤管理
        String kqdbcl = "process_apply";//考勤代办处理
        String stxf = "010320"; //食堂
        String hqzx = "002656"; //后勤中心
        String hqzx = "0e0bca3c-4b0f-47d7-abea-f69a7a9893f2"; //后勤中心
    }

    /**

 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java

@@ -1206,8 +1206,6 @@
//            return "https://10.50.250.253:443/xauthplus-plugin/thirdLogin?type=third&service=https://10.50.250.253:443/cems/config/generalCard&token="+token;
        }else if(Constants.equalsInteger(type,7)){
            menuId = HKConstants.MenuPageId.hqzx;
            componentId = "";
//            return "https://10.50.250.253:443/portal/ui/index?menuId=002656&token="+token;
        }
        log.info("【海康获取工作台菜单免密登陆调整地址】================开始====menuId:"+menuId+"==token:"+token);
        try {

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

@@ -2,11 +2,12 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.CompanyDocuments;
import com.github.yulichang.base.MPJBaseMapper;

/**
 * @author 江蹄蹄
 * @date 2025/06/27 16:01
 */
public interface CompanyDocumentsMapper extends BaseMapper<CompanyDocuments> {
public interface CompanyDocumentsMapper extends MPJBaseMapper<CompanyDocuments> {

}

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

@@ -157,13 +157,14 @@
        Utils.MP.blankToNull(pageWrap.getModel());
        queryWrapper.lambda().eq(Category::getIsdeleted,Constants.ZERO)
                .eq(Objects.nonNull(pageWrap.getModel().getType()),Category::getType,pageWrap.getModel().getType())
                .isNull(Category::getParentId);
                .isNull(Category::getParentId)
                .orderByDesc(Category::getSortnum);
        PageData<Category> categoryPageData = PageData.from(categoryMapper.selectPage(page, queryWrapper));
        //查询所有二级数据
        List<Category> categoryList = categoryMapper.selectList(
                new QueryWrapper<Category>().lambda()
                        .eq(Objects.nonNull(pageWrap.getModel().getType()),Category::getType,pageWrap.getModel().getType())
                        .eq(Category::getIsdeleted,Constants.ZERO).isNotNull(Category::getParentId));
                        .eq(Category::getIsdeleted,Constants.ZERO).isNotNull(Category::getParentId).orderByDesc(Category::getSortnum));

        for (Category category:categoryPageData.getRecords()) {
            category.setChildCategoryList(

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

@@ -1,8 +1,15 @@
package com.doumee.service.business.impl;

import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.CompanyDocumentsMapper;
import com.doumee.dao.business.model.Category;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.CompanyDocuments;
import com.doumee.dao.business.model.Member;
import com.doumee.service.business.CompanyDocumentsService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -11,11 +18,16 @@
import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.Date;
import java.util.List;
import java.util.Objects;

/**
 * 隐患区域配置类型信息表Service实现
@@ -28,21 +40,42 @@
    @Autowired
    private CompanyDocumentsMapper companyDocumentsMapper;

    @Autowired
    private SystemDictDataBiz systemDictDataBiz;

    @Override
    public Integer create(CompanyDocuments companyDocuments) {
        if(Objects.isNull(companyDocuments)
                || Objects.isNull(companyDocuments.getCompanyId())
                || Objects.isNull(companyDocuments.getCategoryId())
                || StringUtils.isBlank(companyDocuments.getName())
                || StringUtils.isBlank(companyDocuments.getFileurl())
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        companyDocuments.setId(null);
        companyDocuments.setCreateDate(new Date());
        companyDocuments.setCreator(companyDocuments.getLoginUserInfo().getId());
        companyDocuments.setIsdeleted(Constants.ZERO);
        companyDocuments.setStatus(Constants.ZERO);
        companyDocumentsMapper.insert(companyDocuments);
        return companyDocuments.getId();
    }

    @Override
    public void deleteById(Integer id, LoginUserInfo user) {
        companyDocumentsMapper.deleteById(id);
        UpdateWrapper<CompanyDocuments> deleteWrapper = new UpdateWrapper<>();
        deleteWrapper.lambda().set(CompanyDocuments::getIsdeleted,Constants.ONE)
                .eq(CompanyDocuments::getId,id)
                .set(CompanyDocuments::getEditDate,new Date())
                .set(CompanyDocuments::getEditor,user.getId());
        companyDocumentsMapper.update(deleteWrapper);
    }

    @Override
    public void delete(CompanyDocuments companyDocuments) {
        UpdateWrapper<CompanyDocuments> deleteWrapper = new UpdateWrapper<>(companyDocuments);
        companyDocumentsMapper.delete(deleteWrapper);
        companyDocumentsMapper.update(deleteWrapper);
    }

    @Override
@@ -55,6 +88,18 @@

    @Override
    public void updateById(CompanyDocuments companyDocuments) {
        if(Objects.isNull(companyDocuments)
                || Objects.isNull(companyDocuments.getId())
                || Objects.isNull(companyDocuments.getCompanyId())
                || Objects.isNull(companyDocuments.getCategoryId())
                || StringUtils.isBlank(companyDocuments.getName())
                || StringUtils.isBlank(companyDocuments.getFileurl())
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        companyDocuments.setId(null);
        companyDocuments.setEditDate(new Date());
        companyDocuments.setEditor(companyDocuments.getLoginUserInfo().getId());
        companyDocumentsMapper.updateById(companyDocuments);
    }

@@ -70,7 +115,16 @@

    @Override
    public CompanyDocuments findById(Integer id) {
        return companyDocumentsMapper.selectById(id);
        CompanyDocuments companyDocuments = companyDocumentsMapper.selectById(id);
        if(Objects.isNull(companyDocuments)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(StringUtils.isNotBlank(companyDocuments.getFileurl())){
            String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
                    +systemDictDataBiz.queryByCode(Constants.FTP,Constants.COMPANY_DOCUMENTS).getCode();
            companyDocuments.setFileurlFull(path + companyDocuments.getFileurl());
        }
        return companyDocuments;
    }

    @Override
@@ -88,66 +142,27 @@
    @Override
    public PageData<CompanyDocuments> findPage(PageWrap<CompanyDocuments> pageWrap) {
        IPage<CompanyDocuments> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        QueryWrapper<CompanyDocuments> queryWrapper = new QueryWrapper<>();
        MPJLambdaWrapper<CompanyDocuments> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        if (pageWrap.getModel().getId() != null) {
            queryWrapper.lambda().eq(CompanyDocuments::getId, pageWrap.getModel().getId());
        CompanyDocuments queryModel = pageWrap.getModel();
        queryWrapper.selectAll(CompanyDocuments.class)
                .selectAs(Company::getName,CompanyDocuments::getCompanyName)
                .selectAs(Category::getName,CompanyDocuments::getCategoryName)
                .leftJoin(Company.class,Company::getId,CompanyDocuments::getCompanyId)
                .leftJoin(Category.class,Category::getId,CompanyDocuments::getCategoryId)
                .eq(CompanyDocuments::getIsdeleted,Constants.ZERO)
                .like(Objects.nonNull(queryModel)&&StringUtils.isNotBlank(queryModel.getName()),CompanyDocuments::getName,queryModel.getName())
                .eq(Objects.nonNull(queryModel)&&Objects.nonNull(queryModel.getCategoryId()),CompanyDocuments::getCategoryId,queryModel.getCategoryId())
                .eq(Objects.nonNull(queryModel)&&Objects.nonNull(queryModel.getCompanyId()),CompanyDocuments::getCompanyId,queryModel.getCompanyId())
                .orderByDesc(CompanyDocuments::getSortnum)
                .orderByDesc(CompanyDocuments::getCreateDate);
        IPage<CompanyDocuments> iPage = companyDocumentsMapper.selectJoinPage(page, CompanyDocuments.class,queryWrapper);
        String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
                +systemDictDataBiz.queryByCode(Constants.FTP,Constants.COMPANY_DOCUMENTS).getCode();
        for (CompanyDocuments companyDocuments:iPage.getRecords()) {
            companyDocuments.setFileurlFull(path + companyDocuments.getFileurl());
        }
        if (pageWrap.getModel().getCreator() != null) {
            queryWrapper.lambda().eq(CompanyDocuments::getCreator, pageWrap.getModel().getCreator());
        }
        if (pageWrap.getModel().getCreateDate() != null) {
            queryWrapper.lambda().ge(CompanyDocuments::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
            queryWrapper.lambda().le(CompanyDocuments::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
        }
        if (pageWrap.getModel().getEditor() != null) {
            queryWrapper.lambda().eq(CompanyDocuments::getEditor, pageWrap.getModel().getEditor());
        }
        if (pageWrap.getModel().getEditDate() != null) {
            queryWrapper.lambda().ge(CompanyDocuments::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
            queryWrapper.lambda().le(CompanyDocuments::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
        }
        if (pageWrap.getModel().getIsdeleted() != null) {
            queryWrapper.lambda().eq(CompanyDocuments::getIsdeleted, pageWrap.getModel().getIsdeleted());
        }
        if (pageWrap.getModel().getName() != null) {
            queryWrapper.lambda().eq(CompanyDocuments::getName, pageWrap.getModel().getName());
        }
        if (pageWrap.getModel().getRemark() != null) {
            queryWrapper.lambda().eq(CompanyDocuments::getRemark, pageWrap.getModel().getRemark());
        }
        if (pageWrap.getModel().getStatus() != null) {
            queryWrapper.lambda().eq(CompanyDocuments::getStatus, pageWrap.getModel().getStatus());
        }
        if (pageWrap.getModel().getSortnum() != null) {
            queryWrapper.lambda().eq(CompanyDocuments::getSortnum, pageWrap.getModel().getSortnum());
        }
        if (pageWrap.getModel().getFileurl() != null) {
            queryWrapper.lambda().eq(CompanyDocuments::getFileurl, pageWrap.getModel().getFileurl());
        }
        if (pageWrap.getModel().getFileName() != null) {
            queryWrapper.lambda().eq(CompanyDocuments::getFileName, pageWrap.getModel().getFileName());
        }
        if (pageWrap.getModel().getFileSize() != null) {
            queryWrapper.lambda().eq(CompanyDocuments::getFileSize, pageWrap.getModel().getFileSize());
        }
        if (pageWrap.getModel().getCategoryId() != null) {
            queryWrapper.lambda().eq(CompanyDocuments::getCategoryId, pageWrap.getModel().getCategoryId());
        }
        if (pageWrap.getModel().getCompanyId() != null) {
            queryWrapper.lambda().eq(CompanyDocuments::getCompanyId, pageWrap.getModel().getCompanyId());
        }
        if (pageWrap.getModel().getContent() != null) {
            queryWrapper.lambda().eq(CompanyDocuments::getContent, pageWrap.getModel().getContent());
        }
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                queryWrapper.orderByDesc(sortData.getProperty());
            } else {
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        return PageData.from(companyDocumentsMapper.selectPage(page, queryWrapper));
        return PageData.from(iPage);
    }

    @Override