联系人管理通过企业id查询用户接口调整，联系人管理分页列表查询接口调整

jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java

@@ -26,6 +26,7 @@ import com.jero.company.service.IPayContactsManagementService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.jeecgframework.poi.excel.ExcelImportCheckUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.entity.ImportParams;
@@ -79,9 +80,8 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 		if(!StringUtils.isBlank(payContactsManagement.getPhone()) && payContactsManagement.getPhone().length() > 11){
 			return Result.error("手机号长度应小于11个字符！");
 		}
-		QueryWrapper<PayContactsManagement> queryWrapper = QueryGenerator.initQueryWrapper(payContactsManagement, req.getParameterMap());
 		Page<PayContactsManagement> page = new Page<PayContactsManagement>(pageNo, pageSize);
-		IPage<PayContactsManagement> pageList = payContactsManagementService.page(page, queryWrapper);
+		IPage<PayContactsManagement> pageList = payContactsManagementService.queryPageList(page, payContactsManagement);
 		return Result.OK(pageList);
 	}
 	
@@ -227,16 +227,16 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	}
 
 	 /**
-	  * 通过企业名称查询用户
+	  * 通过企业id查询用户
 	  *
-	  * @param companyName 企业名称
+	  * @param companyId 企业id
 	  * @return
 	  */
-	 @ApiOperation(value="联系人管理-通过企业名称查询用户", notes="联系人管理-通过企业名称查询用户")
+	 @ApiOperation(value="联系人管理-通过企业id查询用户", notes="联系人管理-通过企业id查询用户")
 	 @GetMapping(value = "/queryByCompany")
-	 public Result<?> queryByCompany(@RequestParam(name="companyName",required=true) String companyName) {
+	 public Result<?> queryByCompany(@RequestParam(name="companyId",required=true) String companyId) {
 		 LambdaQueryWrapper<PayContactsManagement> queryWrapper = new LambdaQueryWrapper<>();
-		 queryWrapper.eq(PayContactsManagement::getCompanyName,companyName);
+		 queryWrapper.eq(PayContactsManagement::getCompanyId,companyId);
 		 List<PayContactsManagement> list = payContactsManagementService.list(queryWrapper);
 		 return Result.OK(list);
 	 }

jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayContactsManagementMapper.java

@@ -2,7 +2,10 @@ package com.jero.company.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.company.entity.PayContactsManagement;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * @Description: pay_contacts_management
@@ -12,4 +15,14 @@ import com.jero.company.entity.PayContactsManagement;
  */
 public interface PayContactsManagementMapper extends BaseMapper<PayContactsManagement> {
 
+    /**
+     * @Description 分页查询
+     * @Author  lqt
+     * @Date   2021/8/27
+     * @Param
+     * @Return
+     * @Exception
+     */
+    IPage<PayContactsManagement> queryPageList(Page<PayContactsManagement> page, @Param("payContactsManagement") PayContactsManagement payContactsManagement);
+
 }

jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayContactsManagementMapper.xml

@@ -2,4 +2,44 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jero.company.mapper.PayContactsManagementMapper">
 
+    <select id="queryPageList" resultType="com.jero.company.entity.PayContactsManagement">
+        SELECT
+            pcm.id,
+            pcm.company_id AS companyId,
+            pcm1.company_name AS companyName,
+            pcm.name,
+            pcm.gender,
+            pcm.post,
+            pcm.phone,
+            pcm.email,
+            pcm.contact_address AS contactAddress,
+            pcm.postal_code AS postalCode,
+            pcm.data_source AS dataSource,
+            pcm.signing_up AS signingUp,
+            pcm.remarks,
+            pcm.create_by AS createBy,
+            pcm.create_time AS createTime,
+            pcm.update_by AS updateBy,
+            pcm.update_time AS updateTime
+            FROM pay_contacts_management pcm
+            LEFT JOIN pay_company_management pcm1 ON pcm.company_id = pcm1.id
+            <where>
+                <if test="payContactsManagement.dataSource != null and payContactsManagement.dataSource != ''">
+                    AND pcm.data_source = #{payContactsManagement.dataSource}
+                </if>
+                <if test="payContactsManagement.signingUp != null and payContactsManagement.signingUp != ''">
+                    AND pcm.signing_up = #{payContactsManagement.signingUp}
+                </if>
+                <if test="payContactsManagement.name != null and payContactsManagement.name != ''">
+                    AND pcm.name LIKE concat('%',concat(#{payContactsManagement.name}))
+                </if>
+                <if test="payContactsManagement.phone != null and payContactsManagement.phone != ''">
+                    AND pcm.phone LIKE concat('%',concat(#{payContactsManagement.phone},'%'))
+                </if>
+                <if test="payContactsManagement.companyName != null and payContactsManagement.companyName != ''">
+                    AND pcm1.company_name LIKE concat('%',concat(#{payContactsManagement.companyName},'%'))
+                </if>
+            </where>
+            ORDER BY pcm.create_time DESC
+    </select>
 </mapper>

jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayContactsManagementService.java

@@ -1,6 +1,9 @@
 package com.jero.company.service;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.company.entity.PayCompanyManagement;
 import com.jero.company.entity.PayContactsManagement;
@@ -14,6 +17,16 @@ import java.util.List;
  * @Version: V1.0
  */
 public interface IPayContactsManagementService extends IService<PayContactsManagement> {
+
+    /**
+    * @Description 分页查询
+    * @Author  lqt
+    * @Date   2021/8/27
+    * @Param
+    * @Return
+    * @Exception
+    */
+    IPage<PayContactsManagement> queryPageList(Page<PayContactsManagement> page,PayContactsManagement payContactsManagement);
     /**
      * @Description 更新数据
      * @Author  lqt

jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java

@@ -1,6 +1,9 @@
 package com.jero.company.service.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.company.entity.PayContactsManagement;
 import com.jero.company.mapper.PayContactsManagementMapper;
@@ -10,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -23,6 +27,14 @@ public class PayContactsManagementServiceImpl extends ServiceImpl<PayContactsMan
     @Autowired
     IPayContactsManagementService iPayContactsManagementService;
 
+    @Resource
+    PayContactsManagementMapper payContactsManagementMapper;
+
+    @Override
+    public IPage<PayContactsManagement> queryPageList(Page<PayContactsManagement> page, PayContactsManagement payContactsManagement) {
+        return payContactsManagementMapper.queryPageList(page,payContactsManagement);
+    }
+
     @Override
     @Transactional
     public void updateContactsData(List<PayContactsManagement> listSigning, List<PayContactsManagement> list) {

jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java

@@ -0,0 +1,114 @@
+package com.jero.project.entity;
+
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: pay_working_group
+ * @Author: jeecg-boot
+ * @Date:   2021-08-27
+ * @Version: V1.0
+ */
+@Data
+@TableName("pay_working_group")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="pay_working_group对象", description="pay_working_group")
+public class PayWorkingGroup implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**工作组项目*/
+	@Excel(name = "工作组项目", width = 15)
+    @ApiModelProperty(value = "工作组项目")
+    private java.lang.String workingGroupProject;
+	/**运行年份*/
+	@Excel(name = "运行年份", width = 15)
+    @ApiModelProperty(value = "运行年份")
+    private java.lang.Integer year;
+	/**负责人Aid*/
+	@Excel(name = "负责人Aid", width = 15)
+    @ApiModelProperty(value = "负责人Aid")
+    private java.lang.String principalIdA;
+	/**负责人名称A*/
+	@Excel(name = "负责人名称A", width = 15)
+    @ApiModelProperty(value = "负责人名称A")
+    private java.lang.String principalNameA;
+	/**负责人Bid*/
+	@Excel(name = "负责人Bid", width = 15)
+    @ApiModelProperty(value = "负责人Bid")
+    private java.lang.String principalIdB;
+	/**负责人名称B*/
+	@Excel(name = "负责人名称B", width = 15)
+    @ApiModelProperty(value = "负责人名称B")
+    private java.lang.String principalNameB;
+	/**每年召开次数*/
+	@Excel(name = "每年召开次数", width = 15)
+    @ApiModelProperty(value = "每年召开次数")
+    private java.lang.String convokeNum;
+	/**运行周期*/
+	@Excel(name = "运行周期", width = 15)
+    @ApiModelProperty(value = "运行周期")
+    private java.lang.String operationCycle;
+	/**本年应收款A（元）*/
+	@Excel(name = "本年应收款A（元）", width = 15)
+    @ApiModelProperty(value = "本年应收款A（元）")
+    private java.lang.Integer yearChargeA;
+	/**收费通知号A*/
+	@Excel(name = "收费通知号A", width = 15)
+    @ApiModelProperty(value = "收费通知号A")
+    private java.lang.String chargeNoticeNoA;
+	/**收费通知文件Aid*/
+	@Excel(name = "收费通知文件Aid", width = 15)
+    @ApiModelProperty(value = "收费通知文件Aid")
+    private java.lang.String chargeNoticeAId;
+	/**本年应收款B（元）*/
+	@Excel(name = "本年应收款B（元）", width = 15)
+    @ApiModelProperty(value = "本年应收款B（元）")
+    private java.lang.Integer yearChargeB;
+	/**收费通知号B*/
+	@Excel(name = "收费通知号B", width = 15)
+    @ApiModelProperty(value = "收费通知号B")
+    private java.lang.String chargeNoticeNoB;
+	/**收费通知文件Bid*/
+	@Excel(name = "收费通知文件Bid", width = 15)
+    @ApiModelProperty(value = "收费通知文件Bid")
+    private java.lang.String chargeNoticeBId;
+	/**任务及目标*/
+	@Excel(name = "任务及目标", width = 15)
+    @ApiModelProperty(value = "任务及目标")
+    private java.lang.String missionAndObjectives;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private java.lang.String remarks;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新时间")
+    private java.util.Date updateTime;
+}