zhangyuewww 4 anni fa
parent
commit
4a39d49ada

+ 2 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ContractManagementInfoServiceImpl.java

@@ -147,6 +147,8 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
         pageView.put("endDate", contractManagementInfo.getEndDate());
         pageView.put("searchType", contractManagementInfo.getSearchType());
         pageView.put("contractType", contractManagementInfo.getContractType());
+        pageView.put("pageSize", contractManagementInfo.getPageSize());
+        pageView.put("currentPage", contractManagementInfo.getCurrentPage());
         // 查询服务商总数
         Integer dataCount = baseMapper.getCountByCondition(pageView);
         List<ContractManagementInfo> dataList = baseMapper.getListByCondition(pageView);

+ 3 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/ContractManagementInfoMapper.xml

@@ -22,6 +22,9 @@
                 AND p.mildew_grain != 0
             </if>
         </if>
+        <if test="contractType != null and contractType != ''">
+            AND m.contract_type = #{contractType}
+        </if>
         <if test="startDate != null">
             AND (DATE_FORMAT(m.signing_date,"%Y%m%d") &gt;=
             DATE_FORMAT(#{startDate},"%Y%m%d"))