楚江ERP-客户开发新增、编辑逻辑调整

@@ -41,6 +41,13 @@ public class CustomerDevelopPlan extends BaseEntity implements BaseDto {
     private String workshopId;
     private String workshopId;
 
 
     /**
     /**
+     * 厂房名称
+     * 非持久化字段
+     */
+    @TableField(exist = false)
+    private String workshopName;
+
+    /**
      * 办事处/科办ID
      * 办事处/科办ID
      */
      */
     private String officeId;
     private String officeId;

@@ -8,7 +8,9 @@ import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
 import com.lframework.starter.bpm.service.FlowTaskWrapperService;
 import com.lframework.starter.bpm.service.FlowTaskWrapperService;
 import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.utils.*;
 import com.lframework.starter.web.core.utils.*;
+import com.lframework.xingyun.basedata.entity.Workshop;
 import com.lframework.xingyun.basedata.service.customer.CustomerService;
 import com.lframework.xingyun.basedata.service.customer.CustomerService;
+import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
 import com.lframework.xingyun.sc.bo.customer.develop.CustomerDevelopPlanStatisticsBo;
 import com.lframework.xingyun.sc.bo.customer.develop.CustomerDevelopPlanStatisticsBo;
 import com.lframework.xingyun.sc.entity.CustomerDevelopPlan;
 import com.lframework.xingyun.sc.entity.CustomerDevelopPlan;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
@@ -49,7 +51,8 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe
     private FlowInstanceWrapperService flowInstanceWrapperService;
     private FlowInstanceWrapperService flowInstanceWrapperService;
     @Resource
     @Resource
     private FlowTaskWrapperService flowTaskWrapperService;
     private FlowTaskWrapperService flowTaskWrapperService;
-
+    @Resource
+    private WorkshopService workshopService;
 
 
 
 
     @Override
     @Override
@@ -147,6 +150,9 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe
         }
         }
         if (!StringUtil.isBlank(vo.getWorkshopId())) {
         if (!StringUtil.isBlank(vo.getWorkshopId())) {
             data.setWorkshopId(vo.getWorkshopId());
             data.setWorkshopId(vo.getWorkshopId());
+            // 获取厂房名称
+            Workshop workshop = workshopService.findById(vo.getWorkshopId());
+            data.setWorkshopName(workshop == null ? null : workshop.getName());
         }
         }
         if (!StringUtil.isBlank(vo.getOfficeId())) {
         if (!StringUtil.isBlank(vo.getOfficeId())) {
             data.setOfficeId(vo.getOfficeId());
             data.setOfficeId(vo.getOfficeId());
@@ -223,6 +229,12 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe
                 }
                 }
             }
             }
         }
         }
+        String workshopId = StringUtils.isBlank(vo.getWorkshopId()) ? data.getWorkshopId() : vo.getWorkshopId();
+        if (StringUtils.isNotBlank(workshopId)) {
+            // 获取厂房名称
+            Workshop workshop = workshopService.findById(workshopId);
+            data.setWorkshopName(workshop == null ? null : workshop.getName());
+        }
         // 重新发起流程
         // 重新发起流程
         Instance instance = flowInstanceWrapperService.startInstance("CUSTOMER_DEVELOP", vo.getId(), BPM_FLAG, data);
         Instance instance = flowInstanceWrapperService.startInstance("CUSTOMER_DEVELOP", vo.getId(), BPM_FLAG, data);