Commit a18a6011f45b47c4e8b751b1002a6bc5c2a57037

Authored by 房远帅
1 parent 82e83cca

楚江ERP:客户开发审核-流程变量添加X分厂编码

@@ -49,6 +49,12 @@ public class CustomerDevelopPlan extends BaseEntity implements BaseDto { @@ -49,6 +49,12 @@ public class CustomerDevelopPlan extends BaseEntity implements BaseDto {
49 private String workshopName; 49 private String workshopName;
50 50
51 /** 51 /**
  52 + * 厂房b=编码 非持久化字段
  53 + */
  54 + @TableField(exist = false)
  55 + private String workshopCode;
  56 +
  57 + /**
52 * 办事处/科办ID 58 * 办事处/科办ID
53 */ 59 */
54 private String officeId; 60 private String officeId;
@@ -172,6 +172,7 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe @@ -172,6 +172,7 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe
172 // 获取厂房名称 172 // 获取厂房名称
173 Workshop workshop = workshopService.findById(vo.getWorkshopId()); 173 Workshop workshop = workshopService.findById(vo.getWorkshopId());
174 data.setWorkshopName(workshop == null ? null : workshop.getName()); 174 data.setWorkshopName(workshop == null ? null : workshop.getName());
  175 + data.setWorkshopCode(workshop == null ? null : workshop.getCode());
175 } 176 }
176 if (!StringUtil.isBlank(vo.getOfficeId())) { 177 if (!StringUtil.isBlank(vo.getOfficeId())) {
177 data.setOfficeId(vo.getOfficeId()); 178 data.setOfficeId(vo.getOfficeId());
@@ -255,6 +256,7 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe @@ -255,6 +256,7 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe
255 // 获取厂房名称 256 // 获取厂房名称
256 Workshop workshop = workshopService.findById(workshopId); 257 Workshop workshop = workshopService.findById(workshopId);
257 data.setWorkshopName(workshop == null ? null : workshop.getName()); 258 data.setWorkshopName(workshop == null ? null : workshop.getName());
  259 + data.setWorkshopCode(workshop == null ? null : workshop.getCode());
258 } 260 }
259 // 重新发起流程 261 // 重新发起流程
260 Office office = officeService.findById(vo.getOfficeId()); 262 Office office = officeService.findById(vo.getOfficeId());