提交 71878294 authored 作者: hzh's avatar hzh

代码优化

上级 ca538fda
...@@ -197,4 +197,20 @@ public class TravelConfigController extends BaseController { ...@@ -197,4 +197,20 @@ public class TravelConfigController extends BaseController {
return R.ok(travelConfigService.updateByBo(BeanUtil.copyProperties(tc, TravelConfigBo.class))); return R.ok(travelConfigService.updateByBo(BeanUtil.copyProperties(tc, TravelConfigBo.class)));
} }
/**
* 更新用车开关
*
* @param useCar 用车开关
* @return 是否成功
*/
@Log(title = "差旅通用设置-更行用车开关", businessType = BusinessType.UPDATE)
@SaCheckPermission("server:travel:edit")
@RepeatSubmit()
@PutMapping("/updateUseCar")
public R<Boolean> updateUseCar(@RequestBody Boolean useCar) {
TravelConfigVo tc = getTravelConfigVo();
tc.setUseCar(useCar);
return R.ok(travelConfigService.updateByBo(BeanUtil.copyProperties(tc, TravelConfigBo.class)));
}
} }
package org.dromara.server.domain; package org.dromara.server.domain;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
...@@ -71,6 +72,11 @@ public class TravelConfig extends TenantEntity { ...@@ -71,6 +72,11 @@ public class TravelConfig extends TenantEntity {
*/ */
private String payMethod; private String payMethod;
/**
* 用车开关
*/
private Boolean useCar;
/** /**
* 删除标志(0代表存在 2代表删除) * 删除标志(0代表存在 2代表删除)
*/ */
......
...@@ -74,6 +74,11 @@ public class TravelConfigPerson extends TenantEntity { ...@@ -74,6 +74,11 @@ public class TravelConfigPerson extends TenantEntity {
*/ */
private String payMethod; private String payMethod;
/**
* 用车开关
*/
private Boolean useCar;
/** /**
* 删除标志(0代表存在 2代表删除) * 删除标志(0代表存在 2代表删除)
*/ */
......
...@@ -73,4 +73,10 @@ public class TravelConfigBo extends BaseEntity { ...@@ -73,4 +73,10 @@ public class TravelConfigBo extends BaseEntity {
*/ */
private String payMethod; private String payMethod;
/**
* 用车开关
*/
@NotBlank(message = "用车开关不能为空", groups = {AddGroup.class, EditGroup.class})
private Boolean useCar;
} }
...@@ -83,5 +83,9 @@ public class TravelConfigPersonBo extends BaseEntity { ...@@ -83,5 +83,9 @@ public class TravelConfigPersonBo extends BaseEntity {
@NotBlank(message = "支付方式不能为空", groups = {AddGroup.class, EditGroup.class}) @NotBlank(message = "支付方式不能为空", groups = {AddGroup.class, EditGroup.class})
private String payMethod; private String payMethod;
/**
* 用车开关
*/
@NotBlank(message = "用车开关不能为空", groups = {AddGroup.class, EditGroup.class})
private Boolean useCar;
} }
...@@ -94,4 +94,10 @@ public class TravelConfigPersonVo implements Serializable { ...@@ -94,4 +94,10 @@ public class TravelConfigPersonVo implements Serializable {
*/ */
private String userPhone; private String userPhone;
/**
* 用车开关
*/
@ExcelProperty(value = "支付方式")
private Boolean useCar;
} }
...@@ -79,4 +79,10 @@ public class TravelConfigVo implements Serializable { ...@@ -79,4 +79,10 @@ public class TravelConfigVo implements Serializable {
@ExcelProperty(value = "支付方式") @ExcelProperty(value = "支付方式")
private String payMethod; private String payMethod;
/**
* 用车开关
*/
@ExcelProperty(value = "支付方式")
private Boolean useCar;
} }
...@@ -6,6 +6,7 @@ import lombok.RequiredArgsConstructor; ...@@ -6,6 +6,7 @@ import lombok.RequiredArgsConstructor;
import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.common.mybatis.service.AbstractBaseService; import org.dromara.common.mybatis.service.AbstractBaseService;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.server.domain.CrmContract; import org.dromara.server.domain.CrmContract;
import org.dromara.server.domain.bo.CrmContractBo; import org.dromara.server.domain.bo.CrmContractBo;
import org.dromara.server.domain.vo.CrmContractVo; import org.dromara.server.domain.vo.CrmContractVo;
...@@ -13,6 +14,7 @@ import org.dromara.server.mapper.CrmContractMapper; ...@@ -13,6 +14,7 @@ import org.dromara.server.mapper.CrmContractMapper;
import org.dromara.server.service.ICrmContractService; import org.dromara.server.service.ICrmContractService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
...@@ -44,4 +46,20 @@ public class CrmContractServiceImpl extends AbstractBaseService<CrmContractVo, C ...@@ -44,4 +46,20 @@ public class CrmContractServiceImpl extends AbstractBaseService<CrmContractVo, C
return lqw; return lqw;
} }
@Override
public void validEntityBeforeSave(CrmContract entity) {
super.validEntityBeforeSave(entity);
List<CrmContract> list = baseMapper.selectList(
buildQueryWrapper(new CrmContractBo()
.setName(entity.getName())
.setPhone(entity.getPhone())
.setUserId(LoginHelper.getUserId())
));
if (list.size() > 0) {
throw new RuntimeException("联系人已存在");
}
}
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论