公司信息

pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCompanyInfoController.java

@@ -4,6 +4,8 @@ import java.util.List;
 
 import cn.dev33.satoken.annotation.SaIgnore;
 import com.pusong.business.domain.bo.PsCompanyQueryBo;
+import com.pusong.business.domain.vo.PsCompanyQueryVo;
+import com.pusong.business.domain.vo.PsContractInfoVo;
 import com.pusong.common.core.validate.QueryGroup;
 import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
@@ -55,8 +57,8 @@ public class PsCompanyInfoController extends BaseController {
      */
     @SaCheckPermission("business:companyInfo:list")
     @GetMapping("/pageList")
-    public R<List<PsCompanyInfoVo>> pageList( PsCompanyQueryBo bo, PageQuery pageQuery) {
+    public TableDataInfo<PsCompanyQueryVo>  pageList(PsCompanyQueryBo bo, PageQuery pageQuery) {
-        return R.ok(psCompanyInfoService.queryPageList(bo,pageQuery));
+        return psCompanyInfoService.queryPageList(bo,pageQuery);
     }
 
 

pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsCompanyQueryBo.java

@@ -28,6 +28,10 @@ public class PsCompanyQueryBo {
      * 公司ID
      */
     private Long id;
+    /**
+     * 销售经理
+     */
+    private String customManagerName;
     /**
      * 客户姓名
      */

pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsCompanyQueryVo.java

@@ -3,6 +3,8 @@ package com.pusong.business.domain.vo;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.pusong.business.domain.PsCompanyInfo;
+import com.pusong.common.translation.annotation.Translation;
+import com.pusong.common.translation.constant.TransConstant;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 
@@ -25,120 +27,42 @@ public class PsCompanyQueryVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
-
     /**
-     * 公司ID
+     * 销售经理
      */
-    private Long id;
+    @Translation(type = TransConstant.USER_ID_TO_NICKNAME)
-
+    private Long customManager;
     /**
-     * 客户id
+     * 公司名
-     */
-    private Long customId;
-
-    /**
-     * 公司名称
      */
     private String companyName;
-
-    /**
-     * 公司地址
-     */
-    private String companyAdress;
-
-    /**
-     * 公司开户行
-     */
-    private String companyAccountBank;
-    /**
-     * 公司开户行地址
-     */
-    private String companyAccountBankAdress;
-    /**
-     * 法人姓名
-     */
-    private String legalPersonName;
-
-    /**
-     * 法人证件号
-     */
-    private String legalPersonIdcard;
-
-    /**
-     * 法人电话号
-     */
-    private String legalPersonPhone;
-    /**
-     * 更新时间
-     */
-    private Date updateTime;
-
     /**
      * 纳税人识别号
      */
     private String customerNum;
     /**
-     * 纳税人资格
+     * 法人姓名
      */
-    private String customerCert;
+    private String legalPersonName;
     /**
-     * 个税密码
+     * 法人证件号
      */
-    private String companyPersonPassword;
+    private String legalPersonIdcard;
     /**
-     * 税务密码
+     * 客户名
      */
-    private String companyTaxPassword;
+    private String customName;
     /**
-     * 开户行客户经理电话
+     * 客户手机号
      */
-    private String companyBankManagerPhone;
+    private String customMobile;
     /**
-     * 刻章公司名称
+     * 介绍人姓名
      */
-    private String madeSignCompanyName;
+    private String customIntroducer;
     /**
-     * 公司地址详情
+     * 创建时间
      */
-    private String companyAdressDetail;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
-    /**
+    private Date createTime;
-     * 账套号
-     */
-    private String financeAccountNo;
-    /**
-     * 社保开户时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date socialStartDate;
-    /**
-     * 公积金开户时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date providentStartDate;
-    /**
-     * 营业执照开始时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date licenseStartDate;
-    /**
-     * 营业执照结束时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date licenseEndDate;
-    /**
-     * 经营范围
-     */
-    private String companyScope;
-    /**
-     * 注册资金
-     */
-    private BigDecimal registerAmount;
-    /**
-     * 注册类型
-     */
-    private String registerType;
-    /**
-     * 发票类型
-     */
-    private String billType;
 }

pusong-modules/pusong-business/src/main/java/com/pusong/business/mapper/PsCompanyInfoMapper.java

@@ -7,6 +7,7 @@ import com.pusong.business.domain.PsApproverRecord;
 import com.pusong.business.domain.PsCompanyInfo;
 import com.pusong.business.domain.vo.PsApproverRecordVo;
 import com.pusong.business.domain.vo.PsCompanyInfoVo;
+import com.pusong.business.domain.vo.PsCompanyQueryVo;
 import com.pusong.common.mybatis.core.mapper.BaseMapperPlus;
 import org.apache.ibatis.annotations.Param;
 
@@ -18,5 +19,5 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface PsCompanyInfoMapper extends BaseMapperPlus<PsCompanyInfo, PsCompanyInfoVo> {
 
-    Page<PsApproverRecordVo> selectPageList(@Param("page") Page<PsApproverRecord> page, @Param(Constants.WRAPPER) Wrapper<PsApproverRecord> queryWrapper);
+    Page<PsCompanyQueryVo> selectPageList(@Param("page") Page<PsApproverRecord> page, @Param(Constants.WRAPPER) Wrapper<PsCompanyInfo> queryWrapper);
 }

pusong-modules/pusong-business/src/main/java/com/pusong/business/service/IPsCompanyInfoService.java

@@ -3,6 +3,7 @@ package com.pusong.business.service;
 import com.pusong.business.domain.bo.PsCompanyQueryBo;
 import com.pusong.business.domain.vo.PsCompanyInfoVo;
 import com.pusong.business.domain.bo.PsCompanyInfoBo;
+import com.pusong.business.domain.vo.PsCompanyQueryVo;
 import com.pusong.common.mybatis.core.page.TableDataInfo;
 import com.pusong.common.mybatis.core.page.PageQuery;
 
@@ -38,7 +39,7 @@ public interface IPsCompanyInfoService {
      * @param bo 查询条件
      * @return 公司信息列表
      */
-    List<PsCompanyInfoVo> queryPageList(PsCompanyQueryBo bo, PageQuery pageQuery);
+    TableDataInfo<PsCompanyQueryVo> queryPageList(PsCompanyQueryBo bo, PageQuery pageQuery);
 
     /**
      * 新增公司信息

pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCompanyInfoServiceImpl.java

@@ -1,8 +1,11 @@
 package com.pusong.business.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.pusong.business.domain.PsContractInfo;
 import com.pusong.business.domain.bo.PsCompanyQueryBo;
+import com.pusong.business.domain.vo.PsCompanyQueryVo;
+import com.pusong.business.domain.vo.PsSalaryVo;
 import com.pusong.business.mapper.PsContractInfoMapper;
 import com.pusong.business.service.IPsContractInfoService;
 import com.pusong.common.core.exception.ServiceException;
@@ -67,10 +70,17 @@ public class PsCompanyInfoServiceImpl implements IPsCompanyInfoService {
      * @param bo 查询条件
      * @return 公司信息列表
      */
-    public List<PsCompanyInfoVo> queryPageList(PsCompanyQueryBo bo, PageQuery pageQuery){
+    public TableDataInfo<PsCompanyQueryVo> queryPageList(PsCompanyQueryBo bo, PageQuery pageQuery){
+        QueryWrapper<PsCompanyInfo> lqw = Wrappers.query();
+        lqw.exists(StringUtils.isNotBlank(bo.getCustomManagerName()),"select 1 from sys_user su where su.user_id = cus.custom_manager and su.nick_name like '%"+bo.getCustomManagerName()+"%'");
+        lqw.eq(bo.getId() != null,"com.id",bo.getId());
+        lqw.like(bo.getCustomName() != null,"cus.custom_name",bo.getId());
+        lqw.like(bo.getCustomMobile() != null,"cus.custom_mobile",bo.getCustomMobile());
+        lqw.like(bo.getCompanyName() != null,"com.company_name",bo.getCompanyName());
+        lqw.like(bo.getCustomIntroducer() != null,"cusi.custom_name",bo.getCustomIntroducer());
+        Page<PsCompanyQueryVo> result = baseMapper.selectPageList(pageQuery.build(), lqw);
 
-
+        return TableDataInfo.build(result);
-        return null;
 
     }
 

pusong-modules/pusong-business/src/main/resources/mapper/business/PsCompanyInfoMapper.xml

@@ -3,5 +3,20 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.pusong.business.mapper.PsCompanyInfoMapper">
+    <select id="selectPageList" resultType="com.pusong.business.domain.vo.PsCompanyQueryVo">
+        select cus.custom_manager,
+               com.company_name,
+               com.customer_num,
+               com.legal_person_name,
+               com.legal_person_idcard,
+               cus.custom_name,
+               cus.custom_mobile,
+               cusi.custom_name custom_introducer,
+               com.create_time
+        from ps_company_info com
+            left join ps_custom_info cus on com.custom_id = cus.id
+            left join ps_custom_info cusi on cus.custom_introducer, = cusi.id
 
+                          ${ew.getCustomSqlSegment}
+    </select>
 </mapper>