朱园亮 / xingyun-erp · Commits

Commit eda4d04d826e8029dad5a81547073467352f71fc

Authored by 房远帅
1 parent 9a99a710

发货：草稿要车单、要车单数据权限

Inline Side-by-side
Showing 6 changed files with 53 additions and 4 deletions
@@ -177,13 +177,13 @@ public class DraftRequestCarTicket extends BaseEntity implements BaseDto { @@ -177,13 +177,13 @@ public class DraftRequestCarTicket extends BaseEntity implements BaseDto {
177 /** 177 /**
178 * 创建人ID 178 * 创建人ID
179 */ 179 */
180 - @TableField(fill = FieldFill.INSERT) 180 + @TableField(fill = FieldFill.DEFAULT)
181 private String createById; 181 private String createById;
182 182
183 /** 183 /**
184 * 创建人 184 * 创建人
185 */ 185 */
186 - @TableField(fill = FieldFill.INSERT) 186 + @TableField(fill = FieldFill.DEFAULT)
187 private String createBy; 187 private String createBy;
188 188
189 /** 189 /**
@@ -179,13 +179,13 @@ public class RequestCarTicket extends BaseEntity implements BaseDto { @@ -179,13 +179,13 @@ public class RequestCarTicket extends BaseEntity implements BaseDto {
179 /** 179 /**
180 * 创建人ID 180 * 创建人ID
181 */ 181 */
182 - @TableField(fill = FieldFill.INSERT) 182 + @TableField(fill = FieldFill.DEFAULT)
183 private String createById; 183 private String createById;
184 184
185 /** 185 /**
186 * 创建人 186 * 创建人
187 */ 187 */
188 - @TableField(fill = FieldFill.INSERT) 188 + @TableField(fill = FieldFill.DEFAULT)
189 private String createBy; 189 private String createBy;
190 190
191 /** 191 /**
@@ -21,7 +21,10 @@ import com.lframework.starter.web.core.utils.OpLogUtil; @@ -21,7 +21,10 @@ import com.lframework.starter.web.core.utils.OpLogUtil;
21 import com.lframework.starter.web.core.utils.PageHelperUtil; 21 import com.lframework.starter.web.core.utils.PageHelperUtil;
22 import com.lframework.starter.web.core.utils.PageResultUtil; 22 import com.lframework.starter.web.core.utils.PageResultUtil;
23 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType; 23 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
  24 +import com.lframework.starter.web.inner.entity.SysUser;
  25 +import com.lframework.starter.web.inner.service.system.SysUserService;
24 import com.lframework.xingyun.sc.entity.DraftRequestCarTicket; 26 import com.lframework.xingyun.sc.entity.DraftRequestCarTicket;
  27 +import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
25 import com.lframework.xingyun.sc.mappers.DraftRequestCarTicketMapper; 28 import com.lframework.xingyun.sc.mappers.DraftRequestCarTicketMapper;
26 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService; 29 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
27 import com.lframework.xingyun.sc.service.shipments.car.DraftRequestCarTicketService; 30 import com.lframework.xingyun.sc.service.shipments.car.DraftRequestCarTicketService;
@@ -46,6 +49,8 @@ public class DraftRequestCarTicketServiceImpl extends BaseMpServiceImpl<DraftReq @@ -46,6 +49,8 @@ public class DraftRequestCarTicketServiceImpl extends BaseMpServiceImpl<DraftReq
46 private FlowTaskWrapperMapper flowTaskWrapperMapper; 49 private FlowTaskWrapperMapper flowTaskWrapperMapper;
47 @Resource 50 @Resource
48 private PurchaseOrderInfoService purchaseOrderInfoService; 51 private PurchaseOrderInfoService purchaseOrderInfoService;
  52 + @Resource
  53 + private SysUserService sysUserService;
49 54
50 @Override 55 @Override
51 public PageResult<DraftRequestCarTicket> query(Integer pageIndex, Integer pageSize, QueryDraftRequestCarTicketVo vo) { 56 public PageResult<DraftRequestCarTicket> query(Integer pageIndex, Integer pageSize, QueryDraftRequestCarTicketVo vo) {
@@ -162,6 +167,18 @@ public class DraftRequestCarTicketServiceImpl extends BaseMpServiceImpl<DraftReq @@ -162,6 +167,18 @@ public class DraftRequestCarTicketServiceImpl extends BaseMpServiceImpl<DraftReq
162 if (!StringUtil.isBlank(vo.getSource())) { 167 if (!StringUtil.isBlank(vo.getSource())) {
163 data.setSource(vo.getSource()); 168 data.setSource(vo.getSource());
164 } 169 }
  170 + //草稿要车单创建人默认为业务员（合同创建人）
  171 + PurchaseOrderInfo orderInfo = purchaseOrderInfoService.findById(vo.getPurchaseOrderId());
  172 + if (orderInfo != null) {
  173 + String contractCreateById = orderInfo.getContractCreateById();
  174 + data.setCreateById(contractCreateById);
  175 + if (StringUtils.isNotBlank(contractCreateById)) {
  176 + SysUser user = sysUserService.getById(contractCreateById);
  177 + if (user != null) {
  178 + data.setCreateBy(user.getName());
  179 + }
  180 + }
  181 + }
165 182
166 getBaseMapper().insert(data); 183 getBaseMapper().insert(data);
167 184
@@ -18,8 +18,12 @@ import com.lframework.starter.web.core.annotations.oplog.OpLog; @@ -18,8 +18,12 @@ import com.lframework.starter.web.core.annotations.oplog.OpLog;
18 import com.lframework.starter.web.core.utils.PageHelperUtil; 18 import com.lframework.starter.web.core.utils.PageHelperUtil;
19 import com.lframework.starter.common.utils.Assert; 19 import com.lframework.starter.common.utils.Assert;
20 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType; 20 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
  21 +import com.lframework.starter.web.inner.entity.SysUser;
  22 +import com.lframework.starter.web.inner.service.system.SysUserService;
  23 +import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
21 import com.lframework.xingyun.sc.entity.RequestCarTicket; 24 import com.lframework.xingyun.sc.entity.RequestCarTicket;
22 import com.lframework.xingyun.sc.mappers.RequestCarTicketMapper; 25 import com.lframework.xingyun.sc.mappers.RequestCarTicketMapper;
  26 +import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
23 import com.lframework.xingyun.sc.service.shipments.car.RequestCarTicketService; 27 import com.lframework.xingyun.sc.service.shipments.car.RequestCarTicketService;
24 import com.lframework.xingyun.sc.vo.shipments.car.CreateRequestCarTicketVo; 28 import com.lframework.xingyun.sc.vo.shipments.car.CreateRequestCarTicketVo;
25 import com.lframework.xingyun.sc.vo.shipments.car.QueryRequestCarTicketVo; 29 import com.lframework.xingyun.sc.vo.shipments.car.QueryRequestCarTicketVo;
@@ -34,6 +38,10 @@ import java.util.List; @@ -34,6 +38,10 @@ import java.util.List;
34 38
35 @Service 39 @Service
36 public class RequestCarTicketServiceImpl extends BaseMpServiceImpl<RequestCarTicketMapper, RequestCarTicket> implements RequestCarTicketService { 40 public class RequestCarTicketServiceImpl extends BaseMpServiceImpl<RequestCarTicketMapper, RequestCarTicket> implements RequestCarTicketService {
  41 + @Resource
  42 + private PurchaseOrderInfoService purchaseOrderInfoService;
  43 + @Resource
  44 + private SysUserService sysUserService;
37 45
38 @Override 46 @Override
39 public PageResult<RequestCarTicket> query(Integer pageIndex, Integer pageSize, QueryRequestCarTicketVo vo) { 47 public PageResult<RequestCarTicket> query(Integer pageIndex, Integer pageSize, QueryRequestCarTicketVo vo) {
@@ -132,6 +140,18 @@ public class RequestCarTicketServiceImpl extends BaseMpServiceImpl<RequestCarTic @@ -132,6 +140,18 @@ public class RequestCarTicketServiceImpl extends BaseMpServiceImpl<RequestCarTic
132 if (!StringUtil.isBlank(vo.getStatus())) { 140 if (!StringUtil.isBlank(vo.getStatus())) {
133 data.setStatus(vo.getStatus()); 141 data.setStatus(vo.getStatus());
134 } 142 }
  143 + //要车单创建人默认为业务员（合同创建人）
  144 + PurchaseOrderInfo orderInfo = purchaseOrderInfoService.findById(vo.getPurchaseOrderId());
  145 + if (orderInfo != null) {
  146 + String contractCreateById = orderInfo.getContractCreateById();
  147 + data.setCreateById(contractCreateById);
  148 + if (StringUtils.isNotBlank(contractCreateById)) {
  149 + SysUser user = sysUserService.getById(contractCreateById);
  150 + if (user != null) {
  151 + data.setCreateBy(user.getName());
  152 + }
  153 + }
  154 + }
135 155
136 getBaseMapper().insert(data); 156 getBaseMapper().insert(data);
137 157
1 package com.lframework.xingyun.sc.mappers; 1 package com.lframework.xingyun.sc.mappers;
2 2
  3 +import com.lframework.starter.web.core.annotations.permission.DataPermission;
  4 +import com.lframework.starter.web.core.annotations.permission.DataPermissions;
3 import com.lframework.starter.web.core.mapper.BaseMapper; 5 import com.lframework.starter.web.core.mapper.BaseMapper;
  6 +import com.lframework.starter.web.inner.components.permission.OrderDataPermissionDataPermissionType;
4 import com.lframework.xingyun.sc.entity.DraftRequestCarTicket; 7 import com.lframework.xingyun.sc.entity.DraftRequestCarTicket;
5 import com.lframework.xingyun.sc.vo.shipments.car.QueryDraftRequestCarTicketVo; 8 import com.lframework.xingyun.sc.vo.shipments.car.QueryDraftRequestCarTicketVo;
6 import org.apache.ibatis.annotations.Param; 9 import org.apache.ibatis.annotations.Param;
@@ -20,6 +23,9 @@ public interface DraftRequestCarTicketMapper extends BaseMapper<DraftRequestCarT @@ -20,6 +23,9 @@ public interface DraftRequestCarTicketMapper extends BaseMapper<DraftRequestCarT
20 * @param vo 23 * @param vo
21 * @return 24 * @return
22 */ 25 */
  26 + @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = {
  27 + @DataPermission(template = "order", alias = "tb")
  28 + })
23 List<DraftRequestCarTicket> query(@Param("vo") QueryDraftRequestCarTicketVo vo); 29 List<DraftRequestCarTicket> query(@Param("vo") QueryDraftRequestCarTicketVo vo);
24 30
25 31
1 package com.lframework.xingyun.sc.mappers; 1 package com.lframework.xingyun.sc.mappers;
2 2
  3 +import com.lframework.starter.web.core.annotations.permission.DataPermission;
  4 +import com.lframework.starter.web.core.annotations.permission.DataPermissions;
3 import com.lframework.starter.web.core.mapper.BaseMapper; 5 import com.lframework.starter.web.core.mapper.BaseMapper;
  6 +import com.lframework.starter.web.inner.components.permission.OrderDataPermissionDataPermissionType;
4 import com.lframework.xingyun.sc.entity.RequestCarTicket; 7 import com.lframework.xingyun.sc.entity.RequestCarTicket;
5 import com.lframework.xingyun.sc.vo.shipments.car.QueryRequestCarTicketVo; 8 import com.lframework.xingyun.sc.vo.shipments.car.QueryRequestCarTicketVo;
6 import org.apache.ibatis.annotations.Param; 9 import org.apache.ibatis.annotations.Param;
@@ -20,6 +23,9 @@ public interface RequestCarTicketMapper extends BaseMapper<RequestCarTicket> { @@ -20,6 +23,9 @@ public interface RequestCarTicketMapper extends BaseMapper<RequestCarTicket> {
20 * @param vo 23 * @param vo
21 * @return 24 * @return
22 */ 25 */
  26 + @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = {
  27 + @DataPermission(template = "order", alias = "tb")
  28 + })
23 List<RequestCarTicket> query(@Param("vo") QueryRequestCarTicketVo vo); 29 List<RequestCarTicket> query(@Param("vo") QueryRequestCarTicketVo vo);
24 30
25 31