Merge remote-tracking branch 'origin/master'

k94314517

2024-05-21 49405039d850c4256b1c3e87fd92c5cdbb08ff72

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

@@ -1,19 +1,28 @@
package com.doumee.service.business.impl;

import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.ApproveTemplMapper;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.model.ApproveTempl;
import com.doumee.dao.business.model.CarDriver;
import com.doumee.dao.business.model.Member;
import com.doumee.service.business.ApproveTemplService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.shiro.SecurityUtils;
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;

/**
@@ -26,11 +35,13 @@

    @Autowired
    private ApproveTemplMapper approveTemplMapper;
    @Autowired
    private MemberMapper memberMapper;

    @Override
    public Integer create(ApproveTempl approveTempl) {
        approveTemplMapper.insert(approveTempl);
        return approveTempl.getId();
    public Integer create(ApproveTempl model) {
        approveTemplMapper.insert(model);
        return model.getId();
    }

    @Override