优化
This commit is contained in:
@ -97,4 +97,9 @@ public interface IWgzUserService extends IServicePlus<WgzUser> {
|
||||
* 根据务工者唯一标识获取数据
|
||||
*/
|
||||
WgzUser findByUserId(Long userId);
|
||||
|
||||
/**
|
||||
* 根据务工者身份证获取数据
|
||||
*/
|
||||
WgzUser findByIdentityCard(String identityCard);
|
||||
}
|
||||
|
||||
@ -390,6 +390,9 @@ public class WgzDailyClockServiceImpl extends ServicePlusImpl<WgzDailyClockMappe
|
||||
.setMessageLargeType(LARGE_OTHER)
|
||||
.setMessageSmallType(SMALL_DAILY);
|
||||
iWgzMessageService.sendAMessage(wgzMessage);
|
||||
|
||||
//处理消息
|
||||
iBgtMessageService.operation(USERTYPE_WGZ, dailyClock.getUserId(), USERTYPE_BGT, SecurityUtils.getAppUserId(), dailyClock.getId(),SqlHelper.table(WgzDailyClock.class).getTableName());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -330,6 +330,10 @@ public class WgzLeaveServiceImpl extends ServicePlusImpl<WgzLeaveMapper, WgzLeav
|
||||
attendanceService.save(wgzAttendance);
|
||||
}
|
||||
}
|
||||
|
||||
//处理消息
|
||||
iBgtMessageService.operation(USERTYPE_WGZ, wgzLeave.getUserId(), USERTYPE_BGT, SecurityUtils.getAppUserId(), wgzLeave.getId(),SqlHelper.table(WgzLeave.class).getTableName());
|
||||
|
||||
return updateById(wgzLeave);
|
||||
}
|
||||
|
||||
|
||||
@ -414,6 +414,7 @@ public class WgzPayCalculationServiceImpl extends ServicePlusImpl<WgzPayCalculat
|
||||
BeanUtil.copyProperties(dto, payCalculation);
|
||||
boolean isPass = AuditStatus.PASS.getCode().equals(dto.getAuditorType());
|
||||
payCalculation.setAuditorTime(LocalDateTime.now());
|
||||
payCalculation.setAuditorUserName(SecurityUtils.getUsername());
|
||||
if(!isPass){
|
||||
List<WgzPayCalculationMiddle> list = iWgzPayCalculationMiddleService.list(Wrappers.<WgzPayCalculationMiddle>lambdaQuery()
|
||||
.eq(WgzPayCalculationMiddle::getCalculationId, dto.getId()));
|
||||
@ -445,6 +446,10 @@ public class WgzPayCalculationServiceImpl extends ServicePlusImpl<WgzPayCalculat
|
||||
.setTableName(SqlHelper.table(WgzPayCalculation.class).getTableName())
|
||||
.setMessageLargeType(LARGE_SALARY);
|
||||
wgzMessageService.sendAMessage(wgzMessage);
|
||||
|
||||
//处理消息
|
||||
iBgtMessageService.operation(USERTYPE_WGZ, payCalculation.getUserId(), USERTYPE_BGT, SecurityUtils.getAppUserId(), payCalculation.getId(),SqlHelper.table(WgzPayCalculation.class).getTableName());
|
||||
|
||||
return updateById(payCalculation);
|
||||
}
|
||||
|
||||
|
||||
@ -27,10 +27,7 @@ import com.ruoyi.wgz.bo.req.WgzAppCardReplacementApplicationReq;
|
||||
import com.ruoyi.wgz.bo.req.WgzAppReplacementCardRecordReq;
|
||||
import com.ruoyi.wgz.bo.res.WgzAppUserReplacementCardRecordDetailsRes;
|
||||
import com.ruoyi.wgz.bo.res.WgzReplacementCardRecordRes;
|
||||
import com.ruoyi.wgz.domain.WgzAttendance;
|
||||
import com.ruoyi.wgz.domain.WgzMessage;
|
||||
import com.ruoyi.wgz.domain.WgzReissueacard;
|
||||
import com.ruoyi.wgz.domain.WgzUser;
|
||||
import com.ruoyi.wgz.domain.*;
|
||||
import com.ruoyi.wgz.mapper.WgzReissueacardMapper;
|
||||
import com.ruoyi.wgz.service.IWgzAttendanceService;
|
||||
import com.ruoyi.wgz.service.IWgzMessageService;
|
||||
@ -292,6 +289,9 @@ public class WgzReissueacardServiceImpl extends ServicePlusImpl<WgzReissueacardM
|
||||
.setMessageLargeType(LARGE_OTHER)
|
||||
.setMessageSmallType(SMALL_CARD);
|
||||
wgzMessageService.sendAMessage(wgzMessage);
|
||||
|
||||
//处理消息
|
||||
iBgtMessageService.operation(USERTYPE_WGZ, byId.getUserId(), USERTYPE_BGT, SecurityUtils.getAppUserId(), byId.getId(),SqlHelper.table(WgzReissueacard.class).getTableName());
|
||||
return b;
|
||||
}
|
||||
|
||||
|
||||
@ -8,8 +8,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.ruoyi.common.core.domain.entity.SysDictData;
|
||||
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import com.ruoyi.common.domain.Annex;
|
||||
import com.ruoyi.common.domain.dto.AnnexDTO;
|
||||
import com.ruoyi.common.service.IAnnexService;
|
||||
import com.ruoyi.common.util.DataUtil;
|
||||
import com.ruoyi.common.util.ValidUtil;
|
||||
@ -31,10 +29,9 @@ import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import static com.ruoyi.common.constant.Constants.WGZ;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
|
||||
/**
|
||||
@ -240,4 +237,8 @@ public class WgzUserServiceImpl extends ServicePlusImpl<WgzUserMapper, WgzUser>
|
||||
return baseMapper.selectOne(new LambdaQueryWrapper<WgzUser>().eq(WgzUser::getUserId, userId));
|
||||
}
|
||||
|
||||
@Override
|
||||
public WgzUser findByIdentityCard(String identityCard) {
|
||||
return baseMapper.selectOne(new LambdaQueryWrapper<WgzUser>().eq(WgzUser::getIdentityCard, identityCard));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user