Kaynağa Gözat

修改bug:
应付账款-业务员账户,业务员类型不显示

jiakai 3 ay önce
ebeveyn
işleme
8230407387

+ 3 - 0
commons/src/main/java/com/jzg/commons/entity/dto/SysUserJzgInfoBankCardDto.java

@@ -27,6 +27,9 @@ public class SysUserJzgInfoBankCardDto implements Serializable {
     @Schema(description = "用户名称")
     private String name;
 
+    @Schema(description = "用户表的username")
+    private String username;
+
     @Schema(description = "银行名称")
     private String bankName;
 

+ 14 - 0
tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserJzgInfoBankCardServiceImpl.java

@@ -11,13 +11,16 @@ import com.jzg.commons.entity.dto.SysUserJzgInfoBankCardDto;
 import com.jzg.commons.entity.po.SysUploadFiles;
 import com.jzg.commons.entity.po.SysUserJzgInfoBankCard;
 import com.jzg.commons.entity.po.SysUserJzgInfoBankCardRecord;
+import com.jzg.commons.entity.po.SysUserJzgInfoSalesmanBO;
 import com.jzg.commons.entity.vo.SysUserJzgInfoBankCardVo;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.commons.util.MinioUtils;
 import com.jzg.organization.mapper.SysUploadFilesMapper;
 import com.jzg.organization.mapper.SysUserJzgInfoBankCardMapper;
 import com.jzg.organization.mapper.SysUserJzgInfoBankCardRecordMapper;
+import com.jzg.organization.mapper.SysUserJzgInfoSalesmanMapper;
 import com.jzg.organization.service.SysUserJzgInfoBankCardService;
+import com.jzg.organization.service.SysUserJzgInfoSalesmanService;
 import jakarta.annotation.Resource;
 import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
@@ -27,7 +30,10 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * @author quchen
@@ -46,6 +52,9 @@ public class SysUserJzgInfoBankCardServiceImpl extends ServiceImpl<SysUserJzgInf
     @Resource
     private SysUserJzgInfoBankCardRecordMapper sysUserJzgInfoBankCardRecordMapper;
 
+    @Resource
+    private SysUserJzgInfoSalesmanService sysUserJzgInfoSalesmanService;
+
     @Resource
     private SysUploadFilesMapper sysUploadFilesMapper;
 
@@ -64,6 +73,8 @@ public class SysUserJzgInfoBankCardServiceImpl extends ServiceImpl<SysUserJzgInf
     public Page<SysUserJzgInfoBankCardDto> getBankCardPageList(Page page, SysUserJzgInfoBankCardVo sysUserJzgInfoBankCardVo) {
         log.info("查询业务员账户:sysUserJzgInfoBankCardVo=[{}]", JSONUtil.toJsonStr(sysUserJzgInfoBankCardVo));
         Page<SysUserJzgInfoBankCardDto> pageList = sysUserJzgInfoBankCardMapper.getBankCardPageList(page, sysUserJzgInfoBankCardVo);
+        // 查询业务员类型
+        Map<String, String> typeAttrMap = sysUserJzgInfoSalesmanService.queryYwyTypeAttrMap();
         pageList.getRecords().forEach(sysUserJzgInfoBankCardDto -> {
             if (sysUserJzgInfoBankCardDto.getFileId() != null) {
                 String cardFileId = sysUserJzgInfoBankCardDto.getFileId();
@@ -72,6 +83,9 @@ public class SysUserJzgInfoBankCardServiceImpl extends ServiceImpl<SysUserJzgInf
                     sysUserJzgInfoBankCardDto.setCardFileUrl(MinioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
                 }
             }
+
+            // 设置业务员类型
+            sysUserJzgInfoBankCardDto.setTypeAttr(typeAttrMap.getOrDefault(sysUserJzgInfoBankCardDto.getUsername(), ""));
             List<SysUserJzgInfoBankCardRecord> sysUserJzgInfoBankCardRecordList = sysUserJzgInfoBankCardRecordMapper
                     .selectList(new LambdaQueryWrapper<SysUserJzgInfoBankCardRecord>()
                             .eq(SysUserJzgInfoBankCardRecord::getBankCardId, sysUserJzgInfoBankCardDto.getId()));

+ 1 - 0
tenant/organization/src/main/resources/mapper/SysUserJzgInfoBankCardMapper.xml

@@ -41,6 +41,7 @@
         suji.name as name,
         suji.work_number as workNumber,
         su.mobile as mobile,
+        su.username as username,
         suji.type_attr as typeAttr,
         ss.sys_name as systemName,
         ( select uu.name from sys_user_jzg_info uu where uu.id = suji.leader_id ) as leaderName