朱园亮 / xingyun-erp · Commits

Commit 2dfc75a765e3298a20122c5d9f9e401ba7c0c576

Authored by 房远帅
1 parent e3692f78

楚江ERP:未锁规格申请单审批添加办事处编码

Inline Side-by-side
Showing 2 changed files with 14 additions and 0 deletions
... ... @@ -71,6 +71,12 @@ public class SpecLockDelayApplication extends BaseEntity implements BaseDto {
71 71 private String workshopCode;
72 72
73 73 /**
  74 + * 办事处编码(非持久化字段)
  75 + */
  76 + @TableField(exist = false)
  77 + private String deptCode;
  78 +
  79 + /**
74 80 * 创建人ID
75 81 */
76 82 @TableField(fill = FieldFill.INSERT)
... ...
... ... @@ -22,6 +22,8 @@ import com.lframework.starter.web.core.utils.PageHelperUtil;
22 22 import com.lframework.starter.web.core.utils.PageResultUtil;
23 23 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
24 24 import com.lframework.starter.web.inner.dto.message.SysSiteMessageDto;
  25 +import com.lframework.starter.web.inner.entity.SysDept;
  26 +import com.lframework.starter.web.inner.service.system.SysDeptService;
25 27 import com.lframework.starter.web.inner.service.system.SysUserRoleService;
26 28 import com.lframework.xingyun.basedata.entity.Workshop;
27 29 import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
... ... @@ -72,6 +74,8 @@ public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecL
72 74 private SysUserRoleService sysUserRoleService;
73 75 @Resource
74 76 private WorkshopService workshopService;
  77 + @Resource
  78 + private SysDeptService sysDeptService;
75 79
76 80 @Override
77 81 public PageResult<SpecLockDelayApplication> query(Integer pageIndex, Integer pageSize, QuerySpecLockDelayApplicationVo vo) {
... ... @@ -136,6 +140,8 @@ public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecL
136 140 if (standard != null) {
137 141 Workshop workshop = workshopService.findById(standard.getWorkshopId());
138 142 data.setWorkshopCode(workshop == null ? "" : workshop.getCode());
  143 + SysDept sysDept = sysDeptService.findById(standard.getDeptId());
  144 + data.setDeptCode(sysDept == null ? "" : sysDept.getCode());
139 145 }
140 146 flowInstanceWrapperService.startInstance(SPEC_LOCK_DELAY_FLAY, data.getId(), SPEC_LOCK_DELAY_FLAY, data);
141 147 return data.getId();
... ... @@ -190,6 +196,8 @@ public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecL
190 196 if (standard != null) {
191 197 Workshop workshop = workshopService.findById(standard.getWorkshopId());
192 198 data.setWorkshopCode(workshop == null ? "" : workshop.getCode());
  199 + SysDept sysDept = sysDeptService.findById(standard.getDeptId());
  200 + data.setDeptCode(sysDept == null ? "" : sysDept.getCode());
193 201 }
194 202 flowInstanceWrapperService.startInstance(SPEC_LOCK_DELAY_FLAY, data.getId(), SPEC_LOCK_DELAY_FLAY, data);
195 203 }
... ...