提醒规则管理菜单、销售订单流程中增加手工转办、手工加签接口

This commit is contained in:
fanzongzhe
2023-10-26 18:03:34 +08:00
parent 85e9346194
commit 65e3d78f97
9 changed files with 205 additions and 100 deletions

View File

@@ -3,17 +3,13 @@ package com.yxt.messagecenter.biz.messageremindrule;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.messagecenter.api.messageremindrule.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import com.yxt.messagecenter.api.messageremindrule.MessageRemindrule;
import com.yxt.messagecenter.api.messageremindrule.MessageRemindruleQuery;
import com.yxt.messagecenter.api.messageremindrule.MessageRemindruleVo;
import com.yxt.messagecenter.api.messageremindrule.MessageRemindruleDto;
import com.yxt.messagecenter.api.messageremindrule.MessageRemindruleFeign;
/**
* Project: message-center(消息中心) <br/>
@@ -63,8 +59,23 @@ public class MessageRemindruleRest implements MessageRemindruleFeign {
messageRemindruleService.saveOrUpdateDto(dto);
return rb.success();
}
@Override
@Override
public ResultBean saveRules(MessageRemindruleDto dto) {
return messageRemindruleService.saveRules(dto);
}
@Override
public ResultBean<MessageRemindruleInitVo> detail(String sid) {
return messageRemindruleService.detail(sid);
}
@Override
public ResultBean deleteBySids(String[] sids) {
return messageRemindruleService.deleteBySids(sids);
}
@Override
public ResultBean update(MessageRemindruleDto dto,String sid){
ResultBean rb = ResultBean.fireFail();
messageRemindruleService.updateBySid(dto.toMap(),sid);

View File

@@ -3,17 +3,13 @@ package com.yxt.messagecenter.biz.messageremindrule;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.messagecenter.api.messageremindrule.*;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.messagecenter.api.messageremindrule.MessageRemindrule;
import com.yxt.messagecenter.api.messageremindrule.MessageRemindruleQuery;
import com.yxt.messagecenter.api.messageremindrule.MessageRemindruleVo;
import com.yxt.messagecenter.api.messageremindrule.MessageRemindruleDto;
import com.yxt.messagecenter.api.messageremindrule.MessageRemindruleFeign;
import org.springframework.stereotype.Service;
@@ -34,70 +30,107 @@ import java.util.List;
*/
@Service
public class MessageRemindruleService extends MybatisBaseService<MessageRemindruleMapper, MessageRemindrule> {
public PagerVo<MessageRemindrule> listPage(PagerQuery<MessageRemindruleQuery> pq) {
MessageRemindruleQuery query = pq.getParams();
QueryWrapper<MessageRemindrule> qw = createQueryWrapper(query);
IPage<MessageRemindrule> page = PagerUtil.queryToPage(pq);
IPage<MessageRemindrule> pagging = baseMapper.selectPage(page, qw);
PagerVo<MessageRemindrule> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public List<MessageRemindrule> listAll(MessageRemindruleQuery query) {
QueryWrapper<MessageRemindrule> qw = createQueryWrapper(query);
return baseMapper.selectList(qw);
}
private QueryWrapper<MessageRemindrule> createQueryWrapper(MessageRemindruleQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<MessageRemindrule> qw = new QueryWrapper<>();
public PagerVo<MessageRemindrule> listPage(PagerQuery<MessageRemindruleQuery> pq) {
MessageRemindruleQuery query = pq.getParams();
QueryWrapper<MessageRemindrule> qw = createQueryWrapper(query);
IPage<MessageRemindrule> page = PagerUtil.queryToPage(pq);
IPage<MessageRemindrule> pagging = baseMapper.selectPage(page, qw);
PagerVo<MessageRemindrule> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public List<MessageRemindrule> listAll(MessageRemindruleQuery query) {
QueryWrapper<MessageRemindrule> qw = createQueryWrapper(query);
return baseMapper.selectList(qw);
}
private QueryWrapper<MessageRemindrule> createQueryWrapper(MessageRemindruleQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<MessageRemindrule> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getRuleCode())) {
qw.eq("ruleCode", query.getRuleCode());
}
if (StringUtils.isNotBlank(query.getRuleCode())) {
qw.eq("ruleCode", query.getRuleCode());
}
if (query.getRules() != null) {
qw.eq("rules", query.getRules());
}
if (query.getRules() != null) {
qw.eq("rules", query.getRules());
}
qw.eq("isDelete", 0);
qw.orderByDesc("createTime");
// if (query.getRemindWay() != null) {
// qw.eq("remindWay", query.getRemindWay());
// }
return qw;
}
if (query.getRemindWay() != null) {
qw.eq("remindWay", query.getRemindWay());
}
return qw;
}
public PagerVo<MessageRemindruleVo> listPageVo(PagerQuery<MessageRemindruleQuery> pq) {
MessageRemindruleQuery query = pq.getParams();
QueryWrapper<MessageRemindrule> qw = createQueryWrapper(query);
IPage<MessageRemindrule> page = PagerUtil.queryToPage(pq);
IPage<MessageRemindruleVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<MessageRemindruleVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public List<MessageRemindruleVo> listAllVo(MessageRemindruleQuery query) {
QueryWrapper<MessageRemindrule> qw = createQueryWrapper(query);
return baseMapper.selectListAllVo(qw);
}
public List<MessageRemindruleVo> listVo() {
return baseMapper.selectListVo();
}
public void saveOrUpdateDto(MessageRemindruleDto dto){
MessageRemindrule entity = new MessageRemindrule();
dto.fillEntity(entity);
this.saveOrUpdate(entity);
}
public MessageRemindruleVo fetchByIdVo(String id){
MessageRemindrule entity = this.fetchById(id);
MessageRemindruleVo vo = new MessageRemindruleVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public PagerVo<MessageRemindruleVo> listPageVo(PagerQuery<MessageRemindruleQuery> pq) {
MessageRemindruleQuery query = pq.getParams();
QueryWrapper<MessageRemindrule> qw = createQueryWrapper(query);
IPage<MessageRemindrule> page = PagerUtil.queryToPage(pq);
IPage<MessageRemindruleVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<MessageRemindruleVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public MessageRemindrule selectOne() {
return baseMapper.selectOnes();
}
public List<MessageRemindruleVo> listAllVo(MessageRemindruleQuery query) {
QueryWrapper<MessageRemindrule> qw = createQueryWrapper(query);
return baseMapper.selectListAllVo(qw);
}
public List<MessageRemindruleVo> listVo() {
return baseMapper.selectListVo();
}
public void saveOrUpdateDto(MessageRemindruleDto dto) {
MessageRemindrule entity = new MessageRemindrule();
dto.fillEntity(entity);
this.saveOrUpdate(entity);
}
public MessageRemindruleVo fetchByIdVo(String id) {
MessageRemindrule entity = this.fetchById(id);
MessageRemindruleVo vo = new MessageRemindruleVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public MessageRemindrule selectOne() {
return baseMapper.selectOnes();
}
public ResultBean saveRules(MessageRemindruleDto dto) {
ResultBean rb = ResultBean.fireFail();
if (StringUtils.isNotBlank(dto.getSid())) {
MessageRemindrule messageRemindrule = fetchBySid(dto.getSid());
BeanUtil.copyProperties(dto, messageRemindrule, "id", "sid");
baseMapper.updateById(messageRemindrule);
} else {
MessageRemindrule entity = new MessageRemindrule();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
return rb.success();
}
public ResultBean<MessageRemindruleInitVo> detail(String sid) {
ResultBean<MessageRemindruleInitVo> rb = ResultBean.fireFail();
MessageRemindruleInitVo initVo = new MessageRemindruleInitVo();
MessageRemindrule messageRemindrule = fetchBySid(sid);
if (null != messageRemindrule) {
BeanUtil.copyProperties(messageRemindrule, initVo);
}
return rb.success().setData(initVo);
}
public ResultBean deleteBySids(String[] sids) {
ResultBean rb = ResultBean.fireFail();
for (String sid : sids) {
MessageRemindrule messageRemindrule = fetchBySid(sid);
messageRemindrule.setIsDelete(1);
baseMapper.updateById(messageRemindrule);
}
return rb.success();
}
}