|
@@ -11,7 +11,6 @@ import com.ydtech.modules.admin.model.SysUser;
|
|
|
import com.ydtech.modules.admin.model.SysUserRole;
|
|
import com.ydtech.modules.admin.model.SysUserRole;
|
|
|
import com.ydtech.modules.admin.service.SysUserRoleService;
|
|
import com.ydtech.modules.admin.service.SysUserRoleService;
|
|
|
import com.ydtech.modules.admin.service.SysUserService;
|
|
import com.ydtech.modules.admin.service.SysUserService;
|
|
|
-import com.ydtech.modules.base.controller.BaseController;
|
|
|
|
|
import com.ydtech.modules.esm.model.EsmInsCompany;
|
|
import com.ydtech.modules.esm.model.EsmInsCompany;
|
|
|
import com.ydtech.modules.esm.service.EsmInsCompanyService;
|
|
import com.ydtech.modules.esm.service.EsmInsCompanyService;
|
|
|
import com.ydtech.modules.fee.service.CostsCalcService;
|
|
import com.ydtech.modules.fee.service.CostsCalcService;
|
|
@@ -141,6 +140,8 @@ public class QuoteVerificationAspect {
|
|
|
String companyId = ((BaseQuoteVo<?>) arg).getCompanyId();
|
|
String companyId = ((BaseQuoteVo<?>) arg).getCompanyId();
|
|
|
String agreementId = ((BaseQuoteVo<?>) arg).getAgreementId();
|
|
String agreementId = ((BaseQuoteVo<?>) arg).getAgreementId();
|
|
|
String orderno = ((BaseQuoteVo<?>) arg).getOrderNo();
|
|
String orderno = ((BaseQuoteVo<?>) arg).getOrderNo();
|
|
|
|
|
+ //由于前台未传userid判断不了,从主订单表获取用户id和机构id保证待客录单和录单员录单的信息一致
|
|
|
|
|
+ /**
|
|
|
String deptId = ((BaseQuoteVo<?>) arg).getDeptId();
|
|
String deptId = ((BaseQuoteVo<?>) arg).getDeptId();
|
|
|
String userId = ((BaseQuoteVo<?>) arg).getUserId();
|
|
String userId = ((BaseQuoteVo<?>) arg).getUserId();
|
|
|
//待客录单传入userId
|
|
//待客录单传入userId
|
|
@@ -155,9 +156,13 @@ public class QuoteVerificationAspect {
|
|
|
//}
|
|
//}
|
|
|
userId = new BaseController().getUserId();
|
|
userId = new BaseController().getUserId();
|
|
|
}
|
|
}
|
|
|
|
|
+ **/
|
|
|
//税源查询
|
|
//税源查询
|
|
|
BaseQuoteInfoVo quoteInfo = insOrdersComponents.getQuoteInfo(orderno, agreementId);
|
|
BaseQuoteInfoVo quoteInfo = insOrdersComponents.getQuoteInfo(orderno, agreementId);
|
|
|
-
|
|
|
|
|
|
|
+ //add by hxl 2024-06-12 改为从主订单表中获取数据用户id和部门id
|
|
|
|
|
+ SysUser user = sysUserService.getById(quoteInfo.getUserId());
|
|
|
|
|
+ String userId=quoteInfo.getUserId();
|
|
|
|
|
+ String deptId = user.getDeptId();
|
|
|
List<KindInfoVo> kinds = quoteInfo.getKindList();
|
|
List<KindInfoVo> kinds = quoteInfo.getKindList();
|
|
|
List<RiskInfoVo> risks = quoteInfo.getRiskList();
|
|
List<RiskInfoVo> risks = quoteInfo.getRiskList();
|
|
|
|
|
|