Merge remote-tracking branch 'origin/master'

xiangpei

2024-03-13 10df3eebf12aa53fe2f66af2dc75fcd0ef12251c

 ycl-server/src/main/java/com/ycl/platform/service/impl/TCheckPublishServiceImpl.java

@@ -3,10 +3,15 @@
import com.ycl.platform.domain.entity.TCheckPublish;
import com.ycl.platform.mapper.TCheckPublishMapper;
import com.ycl.platform.service.ITCheckPublishService;
import com.ycl.system.entity.SysUser;
import com.ycl.system.mapper.SysUserMapper;
import com.ycl.system.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Service;
import utils.DateUtils;

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

/**
@@ -20,7 +25,8 @@
{
    @Autowired
    private TCheckPublishMapper tCheckPublishMapper;

    @Autowired
    private SysUserMapper userMapper;
    /**
     * 查询考核发布
     * 
@@ -54,7 +60,14 @@
    @Override
    public int insertTCheckPublish(TCheckPublish tCheckPublish)
    {
        tCheckPublish.setCreateTime(DateUtils.getNowDate());
        Date nowDate = DateUtils.getNowDate();
        tCheckPublish.setCreateTime(nowDate);
        tCheckPublish.setUpdateTime(nowDate);
        LoginUser user = (LoginUser) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
        tCheckPublish.setCreateUser(user.getUserId());
        tCheckPublish.setCreateUserName(user.getUsername());
        tCheckPublish.setUpdateUser(user.getUserId());
        tCheckPublish.setUpdateUserName(user.getUsername());
        return tCheckPublishMapper.insertTCheckPublish(tCheckPublish);
    }

@@ -68,6 +81,9 @@
    public int updateTCheckPublish(TCheckPublish tCheckPublish)
    {
        tCheckPublish.setUpdateTime(DateUtils.getNowDate());
        LoginUser user = (LoginUser) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
        tCheckPublish.setUpdateUser(user.getUserId());
        tCheckPublish.setUpdateUserName(user.getUsername());
        return tCheckPublishMapper.updateTCheckPublish(tCheckPublish);
    }