业务员银行卡审核、添加人员同时成为业务员

commons/src/main/java/com/jzg/commons/entity/dto/SysUserJzgInfoBankCardDto.java

@@ -1,6 +1,6 @@
 package com.jzg.commons.entity.dto;
 
-import com.jzg.commons.core.base.PageRequest;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -12,21 +12,39 @@ import java.io.Serializable;
 
 @Data
 public class SysUserJzgInfoBankCardDto implements Serializable {
+    @Schema(description = "id")
     private String id;
 
+    @Schema(description = "用户id")
     private String userId;
 
+    @Schema(description = "用户名称")
     private String name;
 
+    @Schema(description = "银行名称")
     private String bankName;
 
+    @Schema(description = "银行地址")
     private String bankAddress;
 
+    @Schema(description = "银行卡号")
     private String bankCardNumber;
 
+    @Schema(description = "审核状态 0待审核 1 审核通过 2 审核驳回")
     private String auditStatus;
 
+    @Schema(description = "备注")
+    private String remark;
+
+    @Schema(description = "业务员类型")
+    private String attrType;
+
+    @Schema(description = "银行卡照片文件")
     private String cardFile;
 
+    @Schema(description = "租户编码")
     private String systemCode;
+
+    @Schema(description = "租户名称")
+    private String systemName;
 }

commons/src/main/java/com/jzg/commons/entity/po/SysUserJzgInfoBankCard.java

@@ -3,10 +3,14 @@ package com.jzg.commons.entity.po;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.jzg.commons.core.base.BaseModel;
 import com.jzg.commons.util.idgen.IdGenerate;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
 /**
  * @author quchen
  * @date 2025/1/18 9:32
@@ -14,7 +18,7 @@ import lombok.Data;
 
 @Data
 @TableName("sys_user_jzg_info_bank_card")
-public class SysUserJzgInfoBankCard {
+public class SysUserJzgInfoBankCard extends BaseModel {
     @TableId
     @Schema(description = "主键")
     private String id;
@@ -55,6 +59,18 @@ public class SysUserJzgInfoBankCard {
     @Schema(description = "租户id")
     private String systemCode;
 
+    @TableField(value = "apply_time")
+    @Schema(description = "申请时间")
+    private String applyTime;
+
+    @TableField(value = "audit_time")
+    @Schema(description = "审核时间")
+    private String auditTime;
+
+    @TableField(value = "audit_by")
+    @Schema(description = "审核人")
+    private String auditBy;
+
 
     public SysUserJzgInfoBankCard(){
 
@@ -68,5 +84,6 @@ public class SysUserJzgInfoBankCard {
         this.isDefault = false;
         this.auditStatus = 0;
         this.systemCode = systemCode;
+        this.applyTime = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
     }
 }

commons/src/main/java/com/jzg/commons/entity/po/SysUserJzgInfoSalesman.java

@@ -0,0 +1,22 @@
+package com.jzg.commons.entity.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * @author quchen
+ * @date 2025/6/20 10:46
+ */
+
+@Data
+@TableName("sys_user_jzg_info_salesman")
+public class SysUserJzgInfoSalesman {
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    private String sysUserJzgInfoId;
+
+    private String attrType;
+}

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

@@ -1,5 +1,6 @@
 package com.jzg.commons.entity.vo;
 
+import com.jzg.commons.core.base.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -9,11 +10,16 @@ import lombok.Data;
  */
 
 @Data
-public class SysUserJzgInfoBankCardVo {
+public class SysUserJzgInfoBankCardVo extends PageRequest {
+    @Schema(description = "主键")
+    private String id;
 
     @Schema(description = "user表id")
     private String userId;
 
+    @Schema(description = "业务员")
+    private String salesman;
+
     @Schema(description = "业务员id")
     private String userJzgInfoId;
 
@@ -32,4 +38,28 @@ public class SysUserJzgInfoBankCardVo {
     @Schema(description = "是否默认卡 1是 0否")
     private boolean isDefault;
 
+    @Schema(description = "业务员类型")
+    private String typeAttr;
+
+    @Schema(description = "申请时间开始")
+    private String applyTimeStart;
+
+    @Schema(description = "申请时间结束")
+    private String applyTimeEnd;
+
+    @Schema(description = "审核人")
+    private String auditBy;
+
+    @Schema(description = "审核时间开始")
+    private String auditTimeStart;
+
+    @Schema(description = "审核时间结束")
+    private String auditTimeEnd;
+
+    @Schema(description = "审核状态 0 待审核 1 审核通过 2 审核驳回")
+    private String auditStatus;
+
+    @Schema(description = "备注")
+    private String remark;
+
 }

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

@@ -176,6 +176,9 @@ public class SysUserVo extends PageRequest {
     @Schema(description = "角色id")
     private List<String> roleIds;
 
+    @Schema(description = "同时添加为业务员")
+    private Integer isAddSalesman;
+
     @Data
     @AllArgsConstructor
     @NoArgsConstructor

tenant/organization/src/main/java/com/jzg/organization/controller/UserBankCardController.java

@@ -0,0 +1,36 @@
+package com.jzg.organization.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jzg.commons.core.base.BaseController;
+import com.jzg.commons.core.page.HttpResult;
+import com.jzg.commons.entity.vo.SysUserJzgInfoBankCardVo;
+import com.jzg.organization.service.SysUserJzgInfoBankCardService;
+import org.springframework.beans.factory.annotation.Autowired;
+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;
+
+/**
+ * @author quchen
+ * @date 2025/6/20 14:24
+ */
+
+@RestController
+@RequestMapping("/userBankCard")
+public class UserBankCardController extends BaseController {
+    @Autowired
+    private SysUserJzgInfoBankCardService sysUserJzgInfoBankCardService;
+
+
+    @PostMapping("/queryUserBankCardList")
+    public HttpResult queryUserBankCardList(@RequestBody SysUserJzgInfoBankCardVo sysUserJzgInfoBankCardVo){
+        Page page = sysUserJzgInfoBankCardVo.getPage();
+        return HttpResult.ok(sysUserJzgInfoBankCardService.getBankCardPageList(page, sysUserJzgInfoBankCardVo));
+    }
+
+    @PostMapping("/audit")
+    public HttpResult audit(@RequestBody SysUserJzgInfoBankCardVo sysUserJzgInfoBankCardVo){
+        return sysUserJzgInfoBankCardService.audit(sysUserJzgInfoBankCardVo);
+    }
+}

tenant/organization/src/main/java/com/jzg/organization/mapper/SysUserJzgInfoBankCardMapper.java

@@ -1,9 +1,12 @@
 package com.jzg.organization.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jzg.commons.entity.dto.SysUserJzgInfoBankCardDto;
 import com.jzg.commons.entity.po.SysUserJzgInfoBankCard;
+import com.jzg.commons.entity.vo.SysUserJzgInfoBankCardVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -11,4 +14,6 @@ import java.util.List;
 public interface SysUserJzgInfoBankCardMapper extends BaseMapper<SysUserJzgInfoBankCard> {
     List<SysUserJzgInfoBankCardDto> getBankCardByUserId(String userInfoId , String systemCode);
 
+    Page<SysUserJzgInfoBankCardDto> getBankCardPageList (Page page, @Param("sysUserJzgInfoBankCardVo") SysUserJzgInfoBankCardVo sysUserJzgInfoBankCardVo);
+
 }

tenant/organization/src/main/java/com/jzg/organization/mapper/SysUserJzgInfoSalesmanMapper.java

@@ -0,0 +1,9 @@
+package com.jzg.organization.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jzg.commons.entity.po.SysUserJzgInfoSalesman;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface SysUserJzgInfoSalesmanMapper extends BaseMapper<SysUserJzgInfoSalesman> {
+}

tenant/organization/src/main/java/com/jzg/organization/service/SysUserJzgInfoBankCardService.java

@@ -1,14 +1,20 @@
 package com.jzg.organization.service;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.SysUserJzgInfoBankCardDto;
 import com.jzg.commons.entity.po.SysUserJzgInfoBankCard;
+import com.jzg.commons.entity.vo.SysUserJzgInfoBankCardVo;
 
 import java.util.List;
 
 public interface SysUserJzgInfoBankCardService extends IService<SysUserJzgInfoBankCard> {
 
+    Page<SysUserJzgInfoBankCardDto> getBankCardPageList(Page page, SysUserJzgInfoBankCardVo sysUserJzgInfoBankCardVo);
+
     List<SysUserJzgInfoBankCardDto> getBankCardByUserId(String userInfoId, String systemCode);
+
+    HttpResult audit(SysUserJzgInfoBankCardVo sysUserJzgInfoBankCardVo);
 }

tenant/organization/src/main/java/com/jzg/organization/service/SysUserJzgInfoSalesmanService.java

@@ -0,0 +1,7 @@
+package com.jzg.organization.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jzg.commons.entity.po.SysUserJzgInfoSalesman;
+
+public interface SysUserJzgInfoSalesmanService extends IService<SysUserJzgInfoSalesman> {
+}

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserJzgInfoBankCardServiceImpl.java

@@ -1,13 +1,20 @@
 package com.jzg.organization.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jzg.commons.core.base.BaseController;
+import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.SysUserJzgInfoBankCardDto;
 import com.jzg.commons.entity.po.SysUserJzgInfoBankCard;
+import com.jzg.commons.entity.vo.SysUserJzgInfoBankCardVo;
+import com.jzg.commons.exception.SystemException;
 import com.jzg.organization.mapper.SysUserJzgInfoBankCardMapper;
 import com.jzg.organization.service.SysUserJzgInfoBankCardService;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 
 /**
@@ -19,8 +26,37 @@ public class SysUserJzgInfoBankCardServiceImpl extends ServiceImpl<SysUserJzgInf
     @Resource
     private SysUserJzgInfoBankCardMapper sysUserJzgInfoBankCardMapper;
 
+    @Resource
+    private BaseController baseController;
     @Override
     public List<SysUserJzgInfoBankCardDto> getBankCardByUserId(String userInfoId, String systemCode) {
         return sysUserJzgInfoBankCardMapper.getBankCardByUserId(userInfoId,systemCode);
     }
+
+    @Override
+    public Page<SysUserJzgInfoBankCardDto> getBankCardPageList(Page page, SysUserJzgInfoBankCardVo sysUserJzgInfoBankCardVo) {
+        Page<SysUserJzgInfoBankCardDto> sysVersionPage = sysUserJzgInfoBankCardMapper.getBankCardPageList(page, sysUserJzgInfoBankCardVo);
+        return sysVersionPage;
+    }
+
+    @Override
+    public HttpResult audit(SysUserJzgInfoBankCardVo sysUserJzgInfoBankCardVo) {
+        SysUserJzgInfoBankCard sysUserJzgInfoBankCard = sysUserJzgInfoBankCardMapper.selectById(sysUserJzgInfoBankCardVo.getId());
+        verifyBankCard(sysUserJzgInfoBankCard);
+        sysUserJzgInfoBankCard.setAuditStatus(Integer.parseInt(sysUserJzgInfoBankCardVo.getAuditStatus()));
+        sysUserJzgInfoBankCard.setAuditTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        sysUserJzgInfoBankCard.setAuditBy(baseController.getUserName());
+        sysUserJzgInfoBankCard.setRemark(sysUserJzgInfoBankCardVo.getRemark());
+        sysUserJzgInfoBankCardMapper.updateById(sysUserJzgInfoBankCard);
+        return HttpResult.ok("审核成功");
+    }
+
+    private void verifyBankCard(SysUserJzgInfoBankCard sysUserJzgInfoBankCard){
+        if (sysUserJzgInfoBankCard == null) {
+            throw new SystemException("该银行卡不存在");
+        }
+        if (sysUserJzgInfoBankCard.getAuditStatus() != 0) {
+            throw new SystemException("该银行卡已审核");
+        }
+    }
 }

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserJzgInfoSalesmanServiceImpl.java

@@ -0,0 +1,16 @@
+package com.jzg.organization.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jzg.commons.entity.po.SysUserJzgInfoSalesman;
+import com.jzg.organization.mapper.SysUserJzgInfoSalesmanMapper;
+import com.jzg.organization.service.SysUserJzgInfoSalesmanService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author quchen
+ * @date 2025/6/20 10:52
+ */
+
+@Service
+public class SysUserJzgInfoSalesmanServiceImpl extends ServiceImpl<SysUserJzgInfoSalesmanMapper, SysUserJzgInfoSalesman> implements SysUserJzgInfoSalesmanService {
+}

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserServiceImpl.java

@@ -91,6 +91,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Autowired
     private SysUserRoleService sysUserRoleService;
 
+    @Autowired
+    private SysUserJzgInfoSalesmanService sysUserJzgInfoSalesmanService;
+
     @Qualifier("baseController")
     @Autowired
     private BaseController baseController;
@@ -332,6 +335,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             BeanUtils.copyProperties(sysUserVo, sysUserJzgInfo);
             sysUserJzgInfo.setUserId(sysUser.getId());
             sysUserJzgInfoService.save(sysUserJzgInfo);
+            // 同时添加为业务员
+            if (sysUserVo.getIsAddSalesman() == 1) {
+                addSalesmanList(sysUserJzgInfo,sysUserVo);
+            }
             sysUserJzgInfoId = sysUserJzgInfo.getId();
             sysUserId = sysUser.getId();
             if (sysUserVo.getOrganizationId() != null && !sysUserVo.getOrganizationId().equals("")) {
@@ -350,6 +357,17 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             sysUserId = sysUser1.getId();
             sysUserJzgInfo.setStatus(UserState.UserStateEnum.ALREADY_EMPLOYEE.getValue());
             sysUserJzgInfoService.save(sysUserJzgInfo);
+            // 同时添加为业务员
+            if (sysUserVo.getIsAddSalesman() == 1) {
+                addSalesmanList(sysUserJzgInfo,sysUserVo);
+            }
+            // 直接添加业务员
+            else if (sysUserVo.getIsAddSalesman() == 2) {
+                SysUserJzgInfoSalesman sysUserJzgInfoSalesman = new SysUserJzgInfoSalesman();
+                sysUserJzgInfoSalesman.setSysUserJzgInfoId(sysUserJzgInfo.getId());
+                sysUserJzgInfoSalesman.setAttrType(sysUserVo.getTypeAttr());
+                sysUserJzgInfoSalesmanService.save(sysUserJzgInfoSalesman);
+            }
             if (sysUserVo.getOrganizationId() != null && !sysUserVo.getOrganizationId().equals("")) {
                 saveOrganization(sysUserVo.getOrganizationId(), sysUserJzgInfo.getUserId());
             }
@@ -383,6 +401,22 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         this.addUserMessage(baseController.getUserName(), sysUserJzgInfo, MessageCodeEnum.TEMPLATE_11);
         return HttpResult.ok(resultMsg);
     }
+    private void addSalesmanList(SysUserJzgInfo sysUserJzgInfo,SysUserVo sysUserVo) {
+        List<SysUserJzgInfoSalesman> sysUserJzgInfoSalesmanList = new ArrayList<>();
+        // 添加后线人员
+        SysUserJzgInfoSalesman sysUserJzgInfoSalesman = new SysUserJzgInfoSalesman();
+        sysUserJzgInfoSalesman.setSysUserJzgInfoId(sysUserJzgInfo.getId());
+        sysUserJzgInfoSalesman.setAttrType("2");
+        sysUserJzgInfoSalesmanList.add(sysUserJzgInfoSalesman);
+
+        // 添加业务员
+        SysUserJzgInfoSalesman sysUserJzgInfoSalesman1 = new SysUserJzgInfoSalesman();
+        sysUserJzgInfoSalesman1.setSysUserJzgInfoId(sysUserJzgInfo.getId());
+        sysUserJzgInfoSalesman1.setAttrType(sysUserVo.getTypeAttr());  // 业务员类型
+        sysUserJzgInfoSalesmanList.add(sysUserJzgInfoSalesman1);
+
+        sysUserJzgInfoSalesmanService.saveBatch(sysUserJzgInfoSalesmanList);
+    }
 
     /**
      * 新增业务员消息
@@ -485,6 +519,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             sysUserJzgInfoFile.setFileType("bankcard");
             sysUserJzgInfoFileService.save(sysUserJzgInfoFile);
         }
+        SysUserJzgInfoBankCard verifyBankCard = sysUserJzgInfoBankCardService
+                .getOne(new LambdaQueryWrapper<SysUserJzgInfoBankCard>().eq(SysUserJzgInfoBankCard::getBankCardNumber, sysUserJzgInfoBankCardVo.getBankCardNumber())
+                        .eq(SysUserJzgInfoBankCard::getSystemCode, baseController.getUserSystemCode()));
+        if (verifyBankCard != null) {
+            HttpResult.error("该租户下银行卡已存在");
+        }
         SysUserJzgInfoBankCard sysUserJzgInfoBankCard = new SysUserJzgInfoBankCard();
         BeanUtils.copyProperties(sysUserJzgInfoBankCardVo, sysUserJzgInfoBankCard);
         sysUserJzgInfoBankCard.setFileId(fileId);

tenant/organization/src/main/resources/application.yml

@@ -59,6 +59,8 @@ tenant:
     - esm_ins_company
     - qr_barcode_config
     - jyx_config
+    - sys_user_jzg_app
+    - sys_user_jzg_info_salesman
     - dept_tree
 
   ignoreLoginNames:

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

@@ -32,4 +32,40 @@
             1=1
             and suji.id = #{userInfoId}
     </select>
+
+
+    <select id="getBankCardPageList" resultType="com.jzg.commons.entity.dto.SysUserJzgInfoBankCardDto">
+        select
+        sujibc.*,
+        suji.name as name,
+        su.mobile as mobile,
+        suji.type_attr as typeAttr,
+        ss.sys_name as systemName
+        from
+        sys_user_jzg_info_bank_card sujibc
+        left join sys_user su on su.id = sujibc.user_id
+        left join sys_user_jzg_info suji on suji.user_id = su.id
+        left join sys_system ss on ss.sys_code = sujibc.system_code
+        where
+        1=1
+        <if test="sysUserJzgInfoBankCardVo.salesman != null and sysUserJzgInfoBankCardVo.salesman != ''">
+            and suji.name = #{sysUserJzgInfoBankCardVo.salesman}
+            or su.mobile = #{sysUserJzgInfoBankCardVo.salesman}
+        </if>
+        <if test="sysUserJzgInfoBankCardVo.typeAttr != null and sysUserJzgInfoBankCardVo.typeAttr != ''">
+            and suji.type_attr = #{sysUserJzgInfoBankCardVo.typeAttr}
+        </if>
+        <if test="sysUserJzgInfoBankCardVo.applyTimeStart != null and sysUserJzgInfoBankCardVo.applyTimeEnd != null">
+            and DATE_FORMAT(sujibc.apply_time, '%Y-%m-%d') between #{sysUserJzgInfoBankCardVo.applyTimeStart} AND #{sysUserJzgInfoBankCardVo.applyTimeEnd}
+        </if>
+        <if test="sysUserJzgInfoBankCardVo.auditTimeStart != null and sysUserJzgInfoBankCardVo.auditTimeEnd == null">
+            and DATE_FORMAT(sujibc.apply_time, '%Y-%m-%d') >= #{sysUserJzgInfoBankCardVo.applyTimeStart}
+        </if>
+        <if test="sysUserJzgInfoBankCardVo.auditBy != null and sysUserJzgInfoBankCardVo.auditBy != ''">
+            and sujibc.audit_by = #{sysUserJzgInfoBankCardVo.auditBy}
+        </if>
+        <if test="sysUserJzgInfoBankCardVo.auditStatus == null and sysUserJzgInfoBankCardVo.auditStatus != ‘’">
+            and sujibc.audit_status = #{sysUserJzgInfoBankCardVo.auditStatus}
+        </if>
+    </select>
 </mapper>

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

@@ -70,7 +70,7 @@
         left join sys_organization_user_link soul on soul.user_id = suji.user_id
         left join sys_organization so on so.id = soul.organization_id
         LEFT JOIN sys_dept d ON suji.dept_id = d.id
-
+        left join sys_user_jzg_info_salesman sujis on sujis.sys_user_jzg_info_id = suji.id
         where
         1=1
         and suji.is_delete = 0
@@ -105,10 +105,10 @@
         </if>
         <if test="sysUserInfoListVo.isMember!= null and sysUserInfoListVo.isMember!= ''">
             <if test="sysUserInfoListVo.isMember == 1">
-                and suji.type_attr = 2
+                and sujis.type_attr = 2
             </if>
             <if test="sysUserInfoListVo.isMember == 2">
-                and suji.type_attr != 2
+                and sujis.type_attr != 2
             </if>
         </if>
         group by suji.id, soul.organization_id, so.name