|
|
@@ -3,7 +3,6 @@ package com.ydtech.modules.order.service.impl;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.ydtech.constants.enums.dict.FeeAuditAuditstatus;
|
|
|
@@ -11,9 +10,11 @@ import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
|
|
|
import com.ydtech.core.page.HttpResult;
|
|
|
import com.ydtech.exception.SystemException;
|
|
|
import com.ydtech.modules.admin.constants.ManagementSource;
|
|
|
+import com.ydtech.modules.admin.model.SysUser;
|
|
|
import com.ydtech.modules.admin.model.dto.QxFrontlineAgentDto;
|
|
|
import com.ydtech.modules.admin.model.vo.QxFrontlineAgentVo;
|
|
|
import com.ydtech.modules.admin.service.SysDeptService;
|
|
|
+import com.ydtech.modules.admin.service.SysUserService;
|
|
|
import com.ydtech.modules.base.controller.BaseController;
|
|
|
import com.ydtech.modules.fee.service.FeeRuleSchemeNewService;
|
|
|
import com.ydtech.modules.fnc.entity.InsFeeAudit;
|
|
|
@@ -107,6 +108,9 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
|
|
|
@Autowired
|
|
|
private InsOrderPushMsgService insOrderPushMsgService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private SysUserService sysUserService;
|
|
|
+
|
|
|
public InsAreaCompanyServiceImpl(@Lazy InsOrdersService insOrdersService, InsOrdersTrackService insOrdersTrackService, SysDeptService sysDeptService) {
|
|
|
this.insOrdersService = insOrdersService;
|
|
|
this.insOrdersTrackService = insOrdersTrackService;
|
|
|
@@ -695,6 +699,14 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
|
|
|
insAreaCompany.setPayDate(quoteVo.getSignDate());
|
|
|
insAreaCompany.setCreatetime(LocalDateTime.now());
|
|
|
|
|
|
+ // add by hxl 2025-01-09 添加外部订单的维护人
|
|
|
+ InsOrders insOrdersNew = insOrdersService.getById(insOrders.getOrderno());
|
|
|
+ SysUser sysUser = sysUserService.getById(insOrdersNew.getUserid());
|
|
|
+ String s = Optional.ofNullable(sysUser).map(SysUser::getLeaderId).orElse(null);
|
|
|
+ if (StringUtils.isNotEmpty(s)) {
|
|
|
+ insAreaCompany.setLeaderId(sysUser.getLeaderId());
|
|
|
+ insAreaCompany.setLeaderName(sysUser.getLeaderName());
|
|
|
+ }
|
|
|
//保存子订单
|
|
|
this.insertCompanyAndOrders(insAreaCompany);
|
|
|
|
|
|
@@ -906,6 +918,14 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
|
|
|
insAreaCompany = getNewEntity(insAreaCompany, insOrdersEditingVo, ptlAgreement);
|
|
|
this.updateById(insAreaCompany);
|
|
|
|
|
|
+ // add by hxl 2025-01-09 添加外部订单的维护人
|
|
|
+ InsOrders insOrdersNews = insOrdersService.getById(insOrders.getOrderno());
|
|
|
+ SysUser sysUser = sysUserService.getById(insOrdersNews.getUserid());
|
|
|
+ String s = Optional.ofNullable(sysUser).map(SysUser::getLeaderId).orElse(null);
|
|
|
+ if (StringUtils.isNotEmpty(s)) {
|
|
|
+ insAreaCompany.setLeaderId(sysUser.getLeaderId());
|
|
|
+ insAreaCompany.setLeaderName(sysUser.getLeaderName());
|
|
|
+ }
|
|
|
//更新轨迹表
|
|
|
// if(insOrdersEditingVo.getStageFlag()==1){
|
|
|
insOrdersTrackService.addingTrajectories(insAreaCompany);
|