Sfoglia il codice sorgente

添加菜单的缓存字段
修改人员属性 附加次数的调整

785834757 2 mesi fa
parent
commit
5b91c657a3

+ 5 - 0
commons/src/main/java/com/jzg/commons/entity/po/SysMenu.java

@@ -42,6 +42,11 @@ public class SysMenu {
     private Integer type;
     @Schema(description = "图标")
     private String icon;
+
+    @Schema(description = "是否缓存")
+    @TableField("keep_alive")
+    private String keepAlive;
+
     @TableField(value = "order_num")
     @Schema(description = "排序")
     private Integer orderNum = 0;

+ 14 - 0
tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/UnifyOrderManager.java

@@ -341,6 +341,20 @@ public class UnifyOrderManager {
             quoteResultsVo.setOrdersNo(ordersNo);
             // 报价后更新订单
             insOrdersService.orderAfterUpdateQuote(ordersNo, quoteResultsVo);
+
+            quoteResultsVo.getKindInfoVo().forEach(item->{
+                if(Objects.nonNull(item.getPlatformKindCode())) {
+                    if (item.getPlatformKindCode().equals("TY1") || item.getPlatformKindCode().equals("TY2") || item.getPlatformKindCode().equals("TY3") || item.getPlatformKindCode().equals("TY4")) {
+                        item.setAmount(String.valueOf((int) Double.parseDouble(item.getAmount())) + "次");
+                    }
+                    // 人保是用kindcode 传的 需要处理一下
+                }else if(Objects.nonNull(item.getKindCode())){
+                    if (item.getKindCode().equals("TY1") || item.getKindCode().equals("TY2") || item.getKindCode().equals("TY3") || item.getKindCode().equals("TY4")) {
+                        item.setAmount(String.valueOf((int) Double.parseDouble(item.getAmount())) + "次");
+                    }
+                }
+            });
+
             log.info("报价返回:{}", JSON.toJSONString(quoteResultsVo));
 
         } catch (Exception e) {

+ 3 - 0
tenant/organization/src/main/java/com/jzg/organization/service/SysUserJzgInfoSalesmanService.java

@@ -3,6 +3,7 @@ package com.jzg.organization.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jzg.commons.entity.po.SysUserJzgInfoSalesman;
 
+import java.util.List;
 import java.util.Map;
 
 public interface SysUserJzgInfoSalesmanService extends IService<SysUserJzgInfoSalesman> {
@@ -24,4 +25,6 @@ public interface SysUserJzgInfoSalesmanService extends IService<SysUserJzgInfoSa
      * @date 2026/5/13 11:05
      */
     Map<String, String> queryYwyTypeAttrMap();
+
+    List<SysUserJzgInfoSalesman> getTypeAttrByUserId(String userId);
 }

+ 7 - 0
tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserJzgInfoSalesmanServiceImpl.java

@@ -2,6 +2,7 @@ package com.jzg.organization.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.entity.Constant;
@@ -92,4 +93,10 @@ public class SysUserJzgInfoSalesmanServiceImpl extends ServiceImpl<SysUserJzgInf
         log.info("按照sys_user表的username进行划分后。数据个数[{}]", CollectionUtil.size(resultMap));
         return resultMap;
     }
+
+    @Override
+    public List<SysUserJzgInfoSalesman> getTypeAttrByUserId(String userId) {
+        return baseMapper.selectList(new LambdaQueryWrapper<SysUserJzgInfoSalesman>()
+                .eq(SysUserJzgInfoSalesman::getSysUserJzgInfoId,userId));
+    }
 }

+ 17 - 0
tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserServiceImpl.java

@@ -1025,6 +1025,23 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             sysOrganizationUserLink.setOrganizationId(sysUserVo.getOrganizationId());
             sysOrganizationUserLinkService.save(sysOrganizationUserLink);
         }
+
+        //修改团队类型
+        sysOrganizationUserLinkService.getOrganizationUser(Long.parseLong(originSysUser.getId()),baseController.getSystemCode());
+        if (sysUserVo.getTypeAttr() != null && !sysUserVo.getTypeAttr().equals("")){
+            List<SysUserJzgInfoSalesman> typeAttrByUserId = sysUserJzgInfoSalesmanService.getTypeAttrByUserId(sysUserJzgInfo.getId());
+            // 个代 团队 电销 渠道 只能存在一条
+            List<SysUserJzgInfoSalesman> list = typeAttrByUserId.stream().filter(x -> x.getTypeAttr().equals("5") || x.getTypeAttr().equals("6") || x.getTypeAttr().equals("7") || x.getTypeAttr().equals("8")).toList();
+            List<String> ids = list.stream().map(SysUserJzgInfoSalesman::getId).collect(Collectors.toList());
+            sysUserJzgInfoSalesmanService.removeByIds(ids);
+            //新增一条
+            SysUserJzgInfoSalesman salesman = new SysUserJzgInfoSalesman();
+            salesman.setId(IdGenerate.nextId());
+            salesman.setSysUserJzgInfoId(sysUserJzgInfo.getId());
+            salesman.setTypeAttr(sysUserVo.getTypeAttr());
+            sysUserJzgInfoSalesmanService.save(salesman);
+        }
+
         boolean isPartner = sysUserJzgInfoService.isPartnerPresent(sysUserJzgInfo.getId());
         if (isPartner){
             sysUserJzgInfoService.updatePartnerByUserId(sysUserJzgInfo);