LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改bug#41556

Browse Source
This commit is contained in:
梁琦涛
2021-10-27 18:32:50 +08:00
parent 3a245288f9
commit e239b4d3cc
5 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractMapper.java
+1 -1
View File
@@ -36,7 +36,7 @@ public interface PaySpendingContractMapper extends BaseMapper<PaySpendingContrac
* @Return * @Return
* @Exception * @Exception
*/ */
List<PaySpendingContract> queryList(@Param("contractNum") String contractNum, List<PaySpendingContract> queryList(@Param("principalId") String principalId, @Param("contractNum") String contractNum,
@Param("contractName") String contractName,@Param("startTime") String startTime, @Param("contractName") String contractName,@Param("startTime") String startTime,
@Param("endTime") String endTime); @Param("endTime") String endTime);
jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml
+3
View File
@@ -295,6 +295,9 @@
<if test="projectName != null and projectName != ''"> <if test="projectName != null and projectName != ''">
AND aa.associatedProject LIKE CONCAT('%',CONCAT(#{projectName},'%')) AND aa.associatedProject LIKE CONCAT('%',CONCAT(#{projectName},'%'))
</if> </if>
<if test="payIncomeContract.principalId != null and payIncomeContract.principalId != ''">
AND aa.principalId = #{payIncomeContract.principalId}
</if>
</where> </where>
ORDER BY aa.chargeStatus desc,aa.statusOrder desc, aa.createTime desc ORDER BY aa.chargeStatus desc,aa.statusOrder desc, aa.createTime desc
</select> </select>
jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml
+3
View File
@@ -109,6 +109,9 @@
<if test="endTime != null and endTime != ''"> <if test="endTime != null and endTime != ''">
AND DATE_FORMAT(create_time,'%Y-%m-%d') &lt;= #{endTime} AND DATE_FORMAT(create_time,'%Y-%m-%d') &lt;= #{endTime}
</if> </if>
<if test="principalId != null and principalId != ''">
AND principal_id = #{principalId}
</if>
</where> </where>
ORDER BY chargeStatus desc,create_time desc ORDER BY chargeStatus desc,create_time desc
</select> </select>
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java
+1 -1
View File
@@ -79,5 +79,5 @@ public interface IPaySpendingContractService extends IService<PaySpendingContrac
* @Return * @Return
* @Exception * @Exception
*/ */
List<PaySpendingContract> queryList(String contractNum,String contractName,String startTime,String endTime); List<PaySpendingContract> queryList(String principalId, String contractNum,String contractName,String startTime,String endTime);
} }
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
+2 -2
View File
@@ -520,8 +520,8 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
} }
@Override @Override
public List<PaySpendingContract> queryList(String contractNum, String contractName, String startTime, String endTime) { public List<PaySpendingContract> queryList(String principalId,String contractNum, String contractName, String startTime, String endTime) {
return paySpendingContractMapper.queryList( contractNum, contractName, startTime, endTime); return paySpendingContractMapper.queryList(principalId, contractNum, contractName, startTime, endTime);
} }