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

sql/Online.sql

@@ -5,3 +5,13 @@ alter table ins_area_company
 alter table ins_area_company
     add sy_claims tinyint null comment '商业出险次数', ALGORITHM=INSTANT;
 
+# 2024-05-15 hy
+DROP TABLE IF EXISTS `sys_user_is_dial`;
+CREATE TABLE `sys_user_is_dial`  (
+                                     `id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+                                     `user_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户id',
+                                     `is_dial` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '是否有拨打电话权限',
+                                     `create_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建用户',
+                                     `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+                                     PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;

src/main/java/com/ydtech/modules/admin/controller/SysQuotationController.java

@@ -161,5 +161,4 @@ public class SysQuotationController extends BaseController {
         return HttpResult.ok(quotationServiceOne);
     }
 
-
 }

src/main/java/com/ydtech/modules/admin/controller/SysUserController.java

@@ -17,6 +17,7 @@ import com.ydtech.modules.admin.model.dto.AgentUserDto;
 import com.ydtech.modules.admin.model.dto.QuTeamNumDto;
 import com.ydtech.modules.admin.model.dto.QuUserNumDto;
 import com.ydtech.modules.admin.model.dto.SysUserDto;
+import com.ydtech.modules.admin.model.po.SysUserIsDial;
 import com.ydtech.modules.admin.model.po.SysUserTreeShowLevel;
 import com.ydtech.modules.admin.model.vo.*;
 import com.ydtech.modules.admin.service.*;
@@ -83,6 +84,9 @@ public class SysUserController extends BaseController {
 
     private final InsUploadFilesService insUploadFilesService;
 
+    private final SysUserIsDialService sysUserIsDialService;
+
+
     //    @PreAuthorize("hasAuthority('sys:user:delete')")
     @ApiOperation(value = "逻辑删除")
     @PostMapping(value = "/deleteFlag")
@@ -148,7 +152,7 @@ public class SysUserController extends BaseController {
      */
     @PostMapping(value = "/saveUserRole")
     @Transactional
-    public HttpResult saveUserRole(@RequestParam String userId, @RequestParam String roleId, @RequestParam String showLevel) {
+    public HttpResult saveUserRole(@RequestParam String userId, @RequestParam String roleId, @RequestParam String showLevel, @RequestParam String isDial) {
         SysUserRole userRole = new SysUserRole();
         sysUserRoleService.deleteByUserId(userId);
         String userName = getUserName();
@@ -167,6 +171,15 @@ public class SysUserController extends BaseController {
             sysUserTreeShowLevel.setCreateTime(new Date());
             sysUserTreeShowLevelService.save(sysUserTreeShowLevel);
         }
+        if (!"".equals(isDial)) {
+            sysUserIsDialService.remove(new LambdaQueryWrapper<SysUserIsDial>().eq(SysUserIsDial::getUserId, userId));
+            SysUserIsDial sysUserIsDial = new SysUserIsDial();
+            sysUserIsDial.setUserId(userId);
+            sysUserIsDial.setIsDial(isDial);
+            sysUserIsDial.setCreateName(userName);
+            sysUserIsDial.setCreateTime(new Date());
+            sysUserIsDialService.save(sysUserIsDial);
+        }
         return HttpResult.ok();
     }
 

src/main/java/com/ydtech/modules/admin/dao/SysUserIsDialMapper.java

@@ -0,0 +1,9 @@
+package com.ydtech.modules.admin.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ydtech.modules.admin.model.po.SysUserIsDial;
+
+public interface SysUserIsDialMapper extends BaseMapper<SysUserIsDial> {
+
+
+}

src/main/java/com/ydtech/modules/admin/model/SysUser.java

@@ -170,6 +170,10 @@ public class SysUser extends BaseEntity {
     @Excel(name = "树权限等级")
     private String showLevel;
 
+    @TableField(exist = false)
+    @Excel(name = "是否拥有拨号权限")
+    private String isDial;
+
     @TableField(exist = false)
     @ApiModelProperty("机构来源")
     private String managementSource;

src/main/java/com/ydtech/modules/admin/model/po/SysUserIsDial.java

@@ -0,0 +1,51 @@
+package com.ydtech.modules.admin.model.po;
+
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 用户是否拥有拨号权限
+ * @TableName sys_user_is_dial
+ */
+@TableName(value ="sys_user_is_dial")
+@Data
+public class SysUserIsDial {
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id")
+    private String id;
+
+    /**
+     * 用户ID
+     */
+    @TableField(value = "user_id")
+    private String userId;
+
+    /**
+     * 是否开启拨号
+     */
+    @TableField(value = "is_dial")
+    private String isDial;
+
+    /***
+     * 创建人名称
+     */
+    @TableField(value = "create_name")
+    private String createName;
+
+    /***
+     * 创建时间
+     */
+    @JsonFormat( pattern = "yyyy-MM-dd")
+    @TableField(value = "create_time")
+    private Date createTime;
+
+}

src/main/java/com/ydtech/modules/admin/service/SysUserIsDialService.java

@@ -0,0 +1,8 @@
+package com.ydtech.modules.admin.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ydtech.modules.admin.model.po.SysUserIsDial;
+
+public interface SysUserIsDialService extends IService<SysUserIsDial> {
+
+}

src/main/java/com/ydtech/modules/admin/service/impl/SysUserIsDialServiceImpl.java

@@ -0,0 +1,13 @@
+package com.ydtech.modules.admin.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.modules.admin.dao.SysUserIsDialMapper;
+import com.ydtech.modules.admin.model.po.SysUserIsDial;
+import com.ydtech.modules.admin.service.SysUserIsDialService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class SysUserIsDialServiceImpl extends ServiceImpl<SysUserIsDialMapper, SysUserIsDial> implements SysUserIsDialService {
+
+
+}

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -18,6 +18,7 @@ import com.ydtech.modules.admin.model.*;
 import com.ydtech.modules.admin.model.dto.QuTeamNumDto;
 import com.ydtech.modules.admin.model.dto.QuUserNumDto;
 import com.ydtech.modules.admin.model.dto.SysUserDto;
+import com.ydtech.modules.admin.model.po.SysUserIsDial;
 import com.ydtech.modules.admin.model.po.SysUserTreeShowLevel;
 import com.ydtech.modules.admin.model.vo.*;
 import com.ydtech.modules.admin.service.*;
@@ -73,6 +74,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Autowired
     private SysUserTreeShowLevelService sysUserTreeShowLevelService;
 
+    @Autowired
+    private SysUserIsDialService sysUserIsDialService;
+
     @Override
     public IPage<SysUserBaseVO> findUserList(PageDto<SysUserDto> pageDto) {
         PageVo<SysUserBaseVO> pageVo = new PageVo();
@@ -336,6 +340,16 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                     }
                 }
             }
+            LambdaQueryWrapper<SysUserIsDial> isWrapper = new LambdaQueryWrapper<>();
+            isWrapper.in(SysUserIsDial::getUserId, ids);
+            List<SysUserIsDial> isDialList = sysUserIsDialService.list(isWrapper);
+            for (SysUser record : records) {
+                for (SysUserIsDial isDial : isDialList) {
+                    if (record.getId().equals(isDial.getUserId())) {
+                        record.setIsDial(isDial.getIsDial());
+                    }
+                }
+            }
         }
         return sysUserIPage;
     }

src/main/java/com/ydtech/modules/order/entity/vo/OrderVo.java

@@ -441,4 +441,11 @@ public class OrderVo implements Serializable {
     @TableField(exist = false)
     private AgreementProductCostsSave agreementProductCostsSave;   //产品费用
 
+
+    /**
+     * 当前用户是否拥有拨号权限
+     */
+    @TableField(exist = false)
+    private String isDial;
+
 }

src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -25,10 +25,8 @@ import com.ydtech.modules.admin.dao.SysUserLinkPtlAgreementMapper;
 import com.ydtech.modules.admin.dao.SysUserMapper;
 import com.ydtech.modules.admin.model.*;
 import com.ydtech.modules.admin.model.dto.SysUserLinkPtlAgreementDto;
-import com.ydtech.modules.admin.service.SysDeptService;
-import com.ydtech.modules.admin.service.SysUserInfoService;
-import com.ydtech.modules.admin.service.SysUserRoleService;
-import com.ydtech.modules.admin.service.SysUserService;
+import com.ydtech.modules.admin.model.po.SysUserIsDial;
+import com.ydtech.modules.admin.service.*;
 import com.ydtech.modules.esm.model.EsmUserReferrer;
 import com.ydtech.modules.esm.service.EsmUserReferrerService;
 import com.ydtech.modules.fee.service.CostsCalcService;
@@ -151,6 +149,9 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
     @Autowired
     private PtlAgreementUndwrtRulesAttrService ptlAgreementUndwrtRulesAttrService;
 
+    @Autowired
+    private SysUserIsDialService sysUserIsDialService;
+
 
     public InsOrdersServiceImpl(OrderComponents orderComponents, SysUserService sysUserService,
                                 SysUserRoleService sysUserRoleService,
@@ -275,6 +276,10 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
                 daikeFlag = true;
             }
         }
+        //添加后线人员不能报价的验证
+        if(!"admin".equals(realUserId) && !realUserId.contains("M")){
+            throw new SystemException("后线人员不允许报价！！");
+        }
         // 1. 验证订单参数
         orderComponents.checkEmpty(quoteInfoVo);
         SysUser user = sysUserService.getById(realUserId);
@@ -1143,6 +1148,14 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         orderAndAreaCompany.setOwnerinfo(setNewIdentifyType(orderAndAreaCompany.getOwnerinfo()));
         orderAndAreaCompany.setApplyinfo(setNewIdentifyType(orderAndAreaCompany.getApplyinfo()));
         orderAndAreaCompany.setInsureinfo(setNewIdentifyType(orderAndAreaCompany.getInsureinfo()));
+
+        //查询当前用户是否拥有拨号权限
+        SysUserIsDial userIsDial = sysUserIsDialService.getOne(new LambdaQueryWrapper<SysUserIsDial>().eq(SysUserIsDial::getUserId, userId));
+        if (userIsDial == null) {
+            orderAndAreaCompany.setIsDial("0");
+        }else {
+            orderAndAreaCompany.setIsDial(userIsDial.getIsDial());
+        }
         return HttpResult.ok("success", orderAndAreaCompany);
     }