详情返回

commons/src/main/java/com/jzg/commons/entity/quote/vo/aggregated/QuoteEchoVo.java

@@ -84,6 +84,13 @@ public class QuoteEchoVo extends QuoteVo {
 
         @Schema(description = "业务员归属")
         private String deptName;
+
+        @Schema(description = "归属名称")
+        private String organizationName;
+
+        @Schema(description = "归属ID")
+        private String organizationId;
+
     }
 
 
@@ -215,6 +222,9 @@ public class QuoteEchoVo extends QuoteVo {
         salesman.setName(insOrdersVo.getSalesmanInfo().getName());
         salesman.setDeptName(insOrdersVo.getSalesmanInfo().getDeptName());
         salesman.setTypeAttr(insOrdersVo.getSalesmanInfo().getTypeAttr());
+        salesman.setDeptId(insOrdersVo.getSalesmanInfo().getDeptId());
+        salesman.setMobile(insOrdersVo.getSalesmanInfo().getMobile());
+
         this.setSalesmanInfo(salesman);
         this.setErrorMessage(insOrdersVo.getErrorMessage());
 

commons/src/main/java/com/jzg/commons/entity/vo/SalesmanVo.java

@@ -14,4 +14,12 @@ public class SalesmanVo {
     private String deptName;
 
     private String typeAttr;
+
+    private String mobile;
+
+    private String deptId;
+
+    private String organizationName;
+
+    private String organizationId;
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsFeeOrdersServiceImpl.java

@@ -41,7 +41,7 @@ public class InsFeeOrdersServiceImpl extends ServiceImpl<InsFeeOrdersMapper, Ins
     private BaseController baseController;
 
     @Resource
-    private InsFeeOrdersService insFeeOrdersService;
+    private InsFeeOrdersMapper insFeeOrdersMapper;
 
     @Override
     public InsFeeOrders calcCosts(PtlAgreementCostRatioVo ptlAgreementCostRatioVo) throws ReflectiveOperationException {
@@ -57,7 +57,7 @@ public class InsFeeOrdersServiceImpl extends ServiceImpl<InsFeeOrdersMapper, Ins
         // 获取协议信息
         PtlAgreement ptlAgreement = orgClient.getByAgreementId(insOrders.getAgreementId(), baseController.getToken());
         // 获取费用信息
-        InsFeeOrders insFeeOrders = insFeeOrdersService.getById(insOrders.getId());
+        InsFeeOrders insFeeOrders = insFeeOrdersMapper.selectById(insOrders.getId());
         // 保费
         BigDecimal jqPremium = insOrdersCosts.getJqPremium();
         BigDecimal syPremium = insOrdersCosts.getSyPremium();
@@ -124,7 +124,7 @@ public class InsFeeOrdersServiceImpl extends ServiceImpl<InsFeeOrdersMapper, Ins
         // 6. 设置总费用并更新
         insFeeOrders.setTotalReceivablePremium(scale(totalReceivable, SCALE));
         insFeeOrders.setTotalPayablePremium(scale(totalPayable, SCALE));
-        insFeeOrdersService.updateById(insFeeOrders);
+        this.updateById(insFeeOrders);
         return insFeeOrders;
     }
 

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersServiceImpl.java

@@ -46,10 +46,7 @@ import com.jzg.commons.entity.quote.vo.orders.InsOrdersVo;
 import com.jzg.quotation.commons.utils.SnowFlakeUtil;
 import com.jzg.quotation.summary.constants.QuoteNumberConstant;
 import com.jzg.quotation.summary.consumer.template.OrderMessageTemplate;
-import com.jzg.quotation.summary.mapper.InsOrdersCarInfoMapper;
-import com.jzg.quotation.summary.mapper.InsOrdersMapper;
-import com.jzg.quotation.summary.mapper.InsOrdersQrcodeMapper;
-import com.jzg.quotation.summary.mapper.SysUploadFilesMapper;
+import com.jzg.quotation.summary.mapper.*;
 import com.jzg.quotation.summary.service.*;
 import com.jzg.quotation.summary.state.listener.OrderStateListener;
 import lombok.RequiredArgsConstructor;
@@ -127,7 +124,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
     private InsOrdersPdfUrlService insOrdersPdfUrlService;
 
     @Autowired
-    private InsFeeOrdersService insFeeOrdersService;
+    private InsFeeOrdersMapper insFeeOrdersMapper;
 
     @Value("${minio.bucket-name}")
     private String bucketName;
@@ -362,6 +359,8 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         salesman.setName(salesmanInfo.getName());
         salesman.setDeptName(salesmanInfo.getDeptName());
         salesman.setTypeAttr(salesmanInfo.getTypeAttr());
+        salesman.setDeptId(salesmanInfo.getDeptId());
+        salesman.setMobile(salesmanInfo.getMobile());
         insOrdersVo.setSalesmanInfo(salesman);
         // 2. 处理车辆用户信息列表
         if (CollectionUtil.isNotEmpty(insOrdersVo.getCarUserInfoList())) {
@@ -952,7 +951,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
                 .eq(InsOrdersQrcode::getOrderno, ordersNo));
         resultVo.setQrcode(qrcode);
         // 费用信息
-        InsFeeOrders insFeeOrders = insFeeOrdersService.getOne(new LambdaQueryWrapper<InsFeeOrders>()
+        InsFeeOrders insFeeOrders = insFeeOrdersMapper.selectOne(new LambdaQueryWrapper<InsFeeOrders>()
                 .eq(InsFeeOrders::getOrderNo, ordersNo));
         resultVo.setInsFeeOrders(new InsFeeOrdersVo(insFeeOrders));
         // 比例信息

tenant/organization/src/main/resources/mapper/SysUserJzgInfoMapper.xml

@@ -163,11 +163,17 @@
             suji.name,
             suji.dept_Id as deptId,
             sd.name as deptName,
-            suji.type_attr as typeAttr
+            suji.type_attr as typeAttr,
+            su.mobile as mobile ,
+            suji.dept_id as deptId,
+            so.name as organizationName,
+            so.id as organizationId
         FROM
             sys_user_jzg_info suji
                 LEFT JOIN sys_user su ON suji.user_id = su.id
                 left join sys_dept sd on sd.id = suji.dept_id
+                left join sys_organization_user_link soul on soul.user_id = su.id
+                left join sys_organization so on so.id = soul.organization_id
         WHERE
             suji.user_id = #{userId}
     </select>