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

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

@@ -3,16 +3,14 @@ package com.ydtech.modules.admin.controller;
 
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.model.dto.SysUserTeamDto;
+import com.ydtech.modules.admin.model.dto.SysUserTeamInfoDto;
 import com.ydtech.modules.admin.model.vo.AppCustomerManagementQueryVo;
 import com.ydtech.modules.admin.service.AppCustomerManagementService;
 import com.ydtech.modules.order.entity.BasePageResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @Api(tags = "app客户管理功能")
 @RestController
@@ -28,4 +26,10 @@ public class AppCustomerManagementController {
         return appCustomerManagementService.authenticationQuery(appCustomerManagementQueryVo);
     }
 
+    @ApiOperation(value = "团队人员详情")
+    @GetMapping(value = "/{userId}")
+    public HttpResult<SysUserTeamInfoDto> authenticationQuery(@PathVariable String userId) {
+        return appCustomerManagementService.getUserInfo(userId);
+    }
+
 }

src/main/java/com/ydtech/modules/admin/model/dto/SysUserTeamInfoDto.java

@@ -0,0 +1,51 @@
+package com.ydtech.modules.admin.model.dto;
+
+
+import com.ydtech.modules.admin.model.SysDept;
+import com.ydtech.modules.admin.model.SysUser;
+import com.ydtech.modules.admin.model.SysUserInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Optional;
+
+@ApiModel("认证查询人员信息")
+@Data
+public class SysUserTeamInfoDto {
+
+    @ApiModelProperty("机构名称")
+    private String organization;
+
+    @ApiModelProperty("部门编码")
+    private String deptId;
+
+    @ApiModelProperty("部门名称")
+    private String deptName;
+
+    @ApiModelProperty("工号")
+    private String userId;
+
+    @ApiModelProperty("姓名")
+    private String name;
+
+    @ApiModelProperty("手机号")
+    private String phone;
+
+    @ApiModelProperty("认证状态")
+    private Integer state;
+
+    @ApiModelProperty("人员信息")
+    private SysUserInfo userInfo;
+
+    public SysUserTeamInfoDto(SysUser sysUser, SysDept sysDept, SysDept  organization, SysUserInfo sysUserInfo) {
+        this.organization = organization.getName();
+        this.deptId = sysDept.getId();
+        this.deptName = sysDept.getName();
+        this.userId = sysUser.getId();
+        this.name = sysUser.getName();
+        this.phone = sysUser.getMobile();
+        this.state = sysUser.getStatus();
+        this.userInfo = Optional.ofNullable(sysUserInfo).orElse(new SysUserInfo());
+    }
+}

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

@@ -2,6 +2,7 @@ package com.ydtech.modules.admin.service;
 
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.model.dto.SysUserTeamDto;
+import com.ydtech.modules.admin.model.dto.SysUserTeamInfoDto;
 import com.ydtech.modules.admin.model.vo.AppCustomerManagementQueryVo;
 import com.ydtech.modules.order.entity.BasePageResult;
 
@@ -17,5 +18,14 @@ public interface AppCustomerManagementService {
      **/
     HttpResult<BasePageResult<SysUserTeamDto>> authenticationQuery(AppCustomerManagementQueryVo appCustomerManagementQueryVo);
 
+    /**
+     * @description: 获取人员基础信息
+     * @author: wenks
+     * @date: 2024/6/5 15:35
+     * @param: userId 用户id
+     * @return:
+     **/
+    HttpResult<SysUserTeamInfoDto> getUserInfo(String userId);
+
 
 }

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

@@ -6,10 +6,13 @@ import com.ydtech.constants.enums.dict.organization.OrganizationSource;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.model.SysDept;
 import com.ydtech.modules.admin.model.SysUser;
+import com.ydtech.modules.admin.model.SysUserInfo;
 import com.ydtech.modules.admin.model.dto.SysUserTeamDto;
+import com.ydtech.modules.admin.model.dto.SysUserTeamInfoDto;
 import com.ydtech.modules.admin.model.vo.AppCustomerManagementQueryVo;
 import com.ydtech.modules.admin.service.AppCustomerManagementService;
 import com.ydtech.modules.admin.service.SysDeptService;
+import com.ydtech.modules.admin.service.SysUserInfoService;
 import com.ydtech.modules.admin.service.SysUserService;
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.service.EsmUserReferrerService;
@@ -31,6 +34,8 @@ public class AppCustomerManagementImpl implements AppCustomerManagementService {
 
     private final EsmUserReferrerService esmUserReferrerService;
 
+    private final SysUserInfoService sysUserInfoService;
+
 
     @Override
     public HttpResult<BasePageResult<SysUserTeamDto>> authenticationQuery(AppCustomerManagementQueryVo managementQueryVo) {
@@ -60,4 +65,16 @@ public class AppCustomerManagementImpl implements AppCustomerManagementService {
         return HttpResult.ok(sysUserBasePageResult);
     }
 
+    @Override
+    public HttpResult<SysUserTeamInfoDto> getUserInfo(String userId) {
+        // 人员信息
+        SysUser sysUser = sysUserService.getById(userId);
+        // 团队信息
+        SysDept dept = sysDeptService.getById(sysUser.getDeptId());
+        // 机构信息
+        SysDept organization = sysDeptService.getById(dept.getParentId());
+        SysUserInfo sysUserInfo = sysUserInfoService.getById(userId);
+        SysUserTeamInfoDto sysUserTeamInfoDto = new SysUserTeamInfoDto(sysUser, dept, organization, sysUserInfo);
+        return HttpResult.ok(sysUserTeamInfoDto);
+    }
 }

src/main/java/com/ydtech/modules/fnc/entity/InsPlyIncome.java

@@ -8,7 +8,9 @@ import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Date;
+import java.util.Optional;
 
+import com.ydtech.utils.StringUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -475,4 +477,5 @@ public class InsPlyIncome implements Serializable {
 
     public InsPlyIncome(String id, String jqpolicyno, String sypolicyno, Object o, Object o1, String deptId, Object o2, String productid, LocalDate payDate, LocalDate signingTime, String companyId, Object o3, String agreementId, String licenseno, BigDecimal taxamount, BigDecimal allNoTaxPremium, BigDecimal handlingProportion, Object o4, BigDecimal handlingAmount, BigDecimal handlingAmount1, Object o5, Object o6, LocalDate now, Object o7, Object o8, Object o9, String number, String number1, String number2, String number3) {
     }
+
 }

src/main/java/com/ydtech/modules/fnc/service/impl/InsPlyIncomeServiceImpl.java

@@ -47,6 +47,7 @@ import com.ydtech.modules.protocols.entity.po.InsFeeOrderNew;
 import com.ydtech.modules.protocols.service.InsFeeOrderNewService;
 import com.ydtech.utils.BigDecimalUtils;
 import com.ydtech.utils.SnowFlakeUtil;
+import com.ydtech.utils.StringOperations;
 import com.ydtech.utils.excel.ExcelEasypoiUtils;
 import com.ydtech.utils.excel.ExcelStyleUtil;
 import com.ydtech.utils.excel.ExcelUtils2;
@@ -375,10 +376,10 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
         insPlyIncome.setSyNoTaxPremium(insFeeOrderNew.getSyNoTaxPremium());
         insPlyIncome.setNoNoTaxPremium(insFeeOrderNew.getNoNoTaxPremium());
         insPlyIncome.setUserId(insFeeOrderNew.getUserId());
-        insPlyIncome.setJqStartDate(insAreaCompany.getJqStartDate());
-        insPlyIncome.setJqEndDate(insAreaCompany.getJqEndDate());
-        insPlyIncome.setSyStartDate(insAreaCompany.getSyStartDate());
-        insPlyIncome.setSyEndDate(insAreaCompany.getSyEndDate());
+        insPlyIncome.setJqStartDate(StringOperations.emptyStringToNull(insAreaCompany.getJqStartDate()));
+        insPlyIncome.setJqEndDate(StringOperations.emptyStringToNull(insAreaCompany.getJqEndDate()));
+        insPlyIncome.setSyStartDate(StringOperations.emptyStringToNull(insAreaCompany.getSyStartDate()));
+        insPlyIncome.setSyEndDate(StringOperations.emptyStringToNull(insAreaCompany.getSyEndDate()));
         this.saveRiskCode(order.getProductid(),insPlyIncome);
         insPlyIncome.setInsuredName(order.getInsuredname());
         this.saveByCompanyId(insFeeOrderNew ,insAreaCompany.getCompanyId(),insPlyIncome);

src/main/java/com/ydtech/utils/StringOperations.java

@@ -0,0 +1,13 @@
+package com.ydtech.utils;
+
+public class StringOperations {
+
+    private StringOperations() {
+        throw new IllegalStateException("Utility class");
+    }
+
+    public static String emptyStringToNull(String s){
+        return StringUtils.isEmpty(s) ? null : s;
+    }
+
+}

src/main/resources/mapper/modules/esm/EsmUserReferrerMapper.xml

@@ -128,9 +128,9 @@
         LEFT JOIN sys_user u on t1.id = u.id
         where 1=1
         <if test="managementQueryVo.criteria != null and managementQueryVo.criteria != ''">
-            or u.id = #{managementQueryVo.criteria}
+            and ( u.id = #{managementQueryVo.criteria}
             or u.name = #{managementQueryVo.criteria}
-            or u.mobile = #{managementQueryVo.criteria}
+            or u.mobile = #{managementQueryVo.criteria})
         </if>
         <if test="managementQueryVo.authenticationStatus != null and managementQueryVo.authenticationStatus != ''">
             AND u.status = #{managementQueryVo.authenticationStatus}