Merge remote-tracking branch 'origin/master_0929' into master_0929

@@ -65,6 +65,18 @@ public class SpecLockDelayApplication extends BaseEntity implements BaseDto {
     private LocalDateTime approvedAt;
     private LocalDateTime approvedAt;
 
 
     /**
     /**
+     * 生产厂编码(非持久化字段)
+     */
+    @TableField(exist = false)
+    private String workshopCode;
+
+    /**
+     * 办事处编码(非持久化字段)
+     */
+    @TableField(exist = false)
+    private String deptCode;
+
+    /**
      * 创建人ID
      * 创建人ID
      */
      */
     @TableField(fill = FieldFill.INSERT)
     @TableField(fill = FieldFill.INSERT)

@@ -22,7 +22,11 @@ import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.starter.web.inner.dto.message.SysSiteMessageDto;
 import com.lframework.starter.web.inner.dto.message.SysSiteMessageDto;
+import com.lframework.starter.web.inner.entity.SysDept;
+import com.lframework.starter.web.inner.service.system.SysDeptService;
 import com.lframework.starter.web.inner.service.system.SysUserRoleService;
 import com.lframework.starter.web.inner.service.system.SysUserRoleService;
+import com.lframework.xingyun.basedata.entity.Workshop;
+import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
 import com.lframework.xingyun.sc.entity.ContractDistributorStandard;
 import com.lframework.xingyun.sc.entity.ContractDistributorStandard;
 import com.lframework.xingyun.sc.entity.SpecLockDelayApplication;
 import com.lframework.xingyun.sc.entity.SpecLockDelayApplication;
 import com.lframework.xingyun.sc.enums.CustomerDevelopStatus;
 import com.lframework.xingyun.sc.enums.CustomerDevelopStatus;
@@ -58,7 +62,7 @@ public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecL
 
 
     @Autowired
     @Autowired
     private FlowInstanceWrapperService flowInstanceWrapperService;
     private FlowInstanceWrapperService flowInstanceWrapperService;
-    @Autowired
+    @Resource
     private FlowTaskWrapperMapper flowTaskWrapperMapper;
     private FlowTaskWrapperMapper flowTaskWrapperMapper;
     @Autowired
     @Autowired
     private ContractDistributorStandardService contractDistributorStandardService;
     private ContractDistributorStandardService contractDistributorStandardService;
@@ -68,6 +72,10 @@ public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecL
     private MqProducerService mqProducerService;
     private MqProducerService mqProducerService;
     @Resource
     @Resource
     private SysUserRoleService sysUserRoleService;
     private SysUserRoleService sysUserRoleService;
+    @Resource
+    private WorkshopService workshopService;
+    @Resource
+    private SysDeptService sysDeptService;
 
 
     @Override
     @Override
     public PageResult<SpecLockDelayApplication> query(Integer pageIndex, Integer pageSize, QuerySpecLockDelayApplicationVo vo) {
     public PageResult<SpecLockDelayApplication> query(Integer pageIndex, Integer pageSize, QuerySpecLockDelayApplicationVo vo) {
@@ -127,6 +135,14 @@ public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecL
         OpLogUtil.setExtra(vo);
         OpLogUtil.setExtra(vo);
 
 
         // 开启审核
         // 开启审核
+        data.setCreateById(SecurityUtil.getCurrentUser().getId());
+        ContractDistributorStandard standard = contractDistributorStandardService.findById(vo.getContractId());
+        if (standard != null) {
+            Workshop workshop = workshopService.findById(standard.getWorkshopId());
+            data.setWorkshopCode(workshop == null ? "" : workshop.getCode());
+            SysDept sysDept = sysDeptService.findById(standard.getDeptId());
+            data.setDeptCode(sysDept == null ? "" : sysDept.getCode());
+        }
         flowInstanceWrapperService.startInstance(SPEC_LOCK_DELAY_FLAY, data.getId(), SPEC_LOCK_DELAY_FLAY, data);
         flowInstanceWrapperService.startInstance(SPEC_LOCK_DELAY_FLAY, data.getId(), SPEC_LOCK_DELAY_FLAY, data);
         return data.getId();
         return data.getId();
     }
     }
@@ -176,6 +192,13 @@ public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecL
         OpLogUtil.setExtra(vo);
         OpLogUtil.setExtra(vo);
 
 
         // 编辑完成再次开启审核
         // 编辑完成再次开启审核
+        ContractDistributorStandard standard = contractDistributorStandardService.findById(data.getContractId());
+        if (standard != null) {
+            Workshop workshop = workshopService.findById(standard.getWorkshopId());
+            data.setWorkshopCode(workshop == null ? "" : workshop.getCode());
+            SysDept sysDept = sysDeptService.findById(standard.getDeptId());
+            data.setDeptCode(sysDept == null ? "" : sysDept.getCode());
+        }
         flowInstanceWrapperService.startInstance(SPEC_LOCK_DELAY_FLAY, data.getId(), SPEC_LOCK_DELAY_FLAY, data);
         flowInstanceWrapperService.startInstance(SPEC_LOCK_DELAY_FLAY, data.getId(), SPEC_LOCK_DELAY_FLAY, data);
     }
     }