From 39d245a30c9960749283a4fda013b8284115da75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Wed, 8 Sep 2021 15:46:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E5=87=BA=E5=90=88=E5=90=8C=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayContactsManagementController.java      |  6 +++
 .../PaySpendingContractController.java        |  8 +--
 .../mapper/PaySpendingContractMapper.java     | 15 ++++++
 .../mapper/xml/PaySpendingContractMapper.xml  | 50 +++++++++++++++++++
 .../service/IPaySpendingContractService.java  | 11 ++++
 .../impl/PaySpendingContractServiceImpl.java  | 11 ++++
 .../controller/PayWorkingGroupController.java |  2 +
 7 files changed, 97 insertions(+), 6 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
index 3699a060..a256a102 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
@@ -344,6 +344,12 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 		if(payContactsManagement == null) {
 			return Result.error("未找到对应数据");
 		}
+		if (!StringUtils.isBlank(payContactsManagement.getPhone())){
+			payContactsManagement.setPhone(PasswordUtil.decrypt(payContactsManagement.getPhone()));
+		}
+		if (!StringUtils.isBlank(payContactsManagement.getEmail())){
+			payContactsManagement.setEmail(PasswordUtil.decrypt(payContactsManagement.getEmail()));
+		}
 		return Result.OK(payContactsManagement);
 	}
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java
index e7559543..cfc05978 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java
@@ -61,13 +61,9 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
 		if(!StringUtils.isBlank(paySpendingContract.getContractName()) && paySpendingContract.getContractName().length() > 50){
 			return Result.error("合同名称长度不能大于50个字符!");
 		}
-		LambdaQueryWrapper<PaySpendingContract> queryWrapper = new LambdaQueryWrapper<>();
-		queryWrapper.eq(PaySpendingContract::getContractNum,paySpendingContract.getContractNum());
-		queryWrapper.eq(PaySpendingContract::getContractName,paySpendingContract.getContractName());
-		queryWrapper.ge(PaySpendingContract::getCreateTime,startTime);
-		queryWrapper.le(PaySpendingContract::getCreateTime,endTime);
 		Page<PaySpendingContract> page = new Page<>(pageNo, pageSize);
-		IPage<PaySpendingContract> pageList = paySpendingContractService.page(page, queryWrapper);
+		IPage<PaySpendingContract> pageList = paySpendingContractService.queryPageList(page, paySpendingContract.getContractNum(),
+				paySpendingContract.getContractName(),startTime,endTime);
 		return Result.OK(pageList);
 	}
 	
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractMapper.java
index 6d5a7453..2649c730 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractMapper.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractMapper.java
@@ -2,7 +2,10 @@ package com.jero.contract.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.contract.entity.PaySpendingContract;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * @Description: pay_spending_contract
@@ -12,4 +15,16 @@ import com.jero.contract.entity.PaySpendingContract;
  */
 public interface PaySpendingContractMapper extends BaseMapper<PaySpendingContract> {
 
+    /**
+     * @Description 分页查询
+     * @Author  lqt
+     * @Date   2021/9/8
+     * @Param
+     * @Return
+     * @Exception
+     */
+    IPage<PaySpendingContract> queryPageList(Page<PaySpendingContract> page, @Param("contractNum") String contractNum,
+                                             @Param("contractName") String contractName,@Param("startTime") String startTime,
+                                             @Param("endTime") String endTime);
+
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml
index 4f33b071..a4bd0bd9 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml
@@ -2,4 +2,54 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jero.contract.mapper.PaySpendingContractMapper">
 
+    <select id="queryPageList" resultType="com.jero.contract.entity.PaySpendingContract">
+        SELECT
+            id,
+            contract_num AS contractNum,
+            contract_name AS contractName,
+            signed_company_id AS signedCompanyId,
+            signed_company_temporary_id AS signedCompanyTemporaryId,
+            signed_company_temporary_name AS signedCompanTemporaryName,
+            signed_contacts_id AS signedContactsId,
+            signed_contacts_temporary_id AS signedContactsTemporaryId,
+            signed_contacts_temporary_name AS signedContactsTemporaryName,
+            opening,
+            principal_id AS principaId,
+            principal_name AS principalName,
+            department_name AS departmentName,
+            contract_amount AS contractAmount,
+            rate,
+            no_tax_amount AS noTaxAmount,
+            contract_date AS contractDate,
+            termination_date AS terminationDate,
+            contract_time_points AS contractTimPoints,
+            accounts_receivable_amount AS accountsReceivableAmount,
+            amount_received AS amountReceived,
+            outstanding_amount AS outstandingAmount,
+            account_status AS accountStatus,
+            contract_payment_times AS contractPaymentTimes,
+            pack,
+            pack_year AS packYear,
+            create_by AS createBy,
+            create_time AS createTime,
+            update_by AS updateBy,
+            update_time AS updateTime
+        FROM pay_spending_contract
+        <where>
+            <if test="contractNum != null and contractNum != ''">
+                AND contract_num LIKE CONCAT('%',CONCAT(#{contractNum},'%'))
+            </if>
+            <if test="contractName != null and contractName != ''">
+                AND contract_name LIKE CONCAT('%',CONCAT(#{contractName},'%'))
+            </if>
+            <if test="startTime != null and startTime != ''">
+                AND DATE_FORMAT(create_time,'%Y-%m-%d') >= #{startTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND DATE_FORMAT(create_time,'%Y-%m-%d') &lt;= #{endTime}
+            </if>
+        </where>
+        ORDER BY create_time desc
+
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java
index d66f69a8..8a631f2c 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java
@@ -1,5 +1,7 @@
 package com.jero.contract.service;
 
+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.contract.entity.PaySpendingContract;
 import com.jero.contract.vo.PaySpendingContractInput;
@@ -13,6 +15,15 @@ import java.util.List;
  * @Version: V1.0
  */
 public interface IPaySpendingContractService extends IService<PaySpendingContract> {
+    /**
+    * @Description 分页查询
+    * @Author  lqt
+    * @Date   2021/9/8
+    * @Param
+    * @Return
+    * @Exception
+    */
+    IPage<PaySpendingContract> queryPageList(Page<PaySpendingContract> page,String contractNum,String contractName,String startTime,String endTime);
 
     /**
     * @Description 添加
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
index 49cdfdb7..88e52d47 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
@@ -2,6 +2,8 @@ package com.jero.contract.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+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.common.exception.JeroBootException;
 import com.jero.common.util.ValidUtil;
@@ -26,6 +28,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -52,6 +55,14 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
     @Autowired
     private ISysUserService sysUserService;
 
+    @Resource
+    private PaySpendingContractMapper paySpendingContractMapper;
+
+
+    @Override
+    public IPage<PaySpendingContract> queryPageList(Page<PaySpendingContract> page, String contractNum, String contractName, String startTime, String endTime) {
+        return paySpendingContractMapper.queryPageList(page,contractNum,contractName,startTime,endTime);
+    }
 
     @Override
     public PaySpendingContract addPaySpendingContractInput(PaySpendingContractInput input) {
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
index 398409d7..0a77d8b2 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
@@ -54,6 +54,8 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
 	private ISysUserService sysUserService;
 	@Autowired
 	private IPayWorkingGroupSubItemService payWorkingGroupSubItemService;
+
+	// todo 缺少工作组A,B权限查询
 	
 	/**
 	 * 分页列表查询