jz.kai 4 år sedan
förälder
incheckning
1d47eed3a8

+ 1 - 1
common/src/main/java/com/jpsoft/enterprise/modules/base/dao/BillInfoDAO.java

@@ -21,6 +21,6 @@ public interface BillInfoDAO {
     int delete(String id);
     List<BillInfo> list();
     List<BillInfo> search(Map<String,Object> searchParams, List<Sort> sortList);
-    List<DueListDTO> dueList();
+    List<DueListDTO> dueList(String billId);
     BillInfo getDueDetail();
 }

+ 1 - 1
common/src/main/java/com/jpsoft/enterprise/modules/base/service/BillInfoService.java

@@ -22,6 +22,6 @@ public interface BillInfoService {
     int delete(String id);
     List<BillInfo> list();
     Page<BillInfo> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-    List<DueListDTO> dueList();
+    List<DueListDTO> dueList(String billId);
     BillInfo getDueDetail();
 }

+ 2 - 2
common/src/main/java/com/jpsoft/enterprise/modules/base/service/impl/BillInfoServiceImpl.java

@@ -114,9 +114,9 @@ public class BillInfoServiceImpl implements BillInfoService {
     }
 
     @Override
-    public List<DueListDTO> dueList() {
+    public List<DueListDTO> dueList(String billId) {
         // TODO Auto-generated method stub
-        return billInfoDAO.dueList();
+        return billInfoDAO.dueList(billId);
     }
 
     @Override

+ 2 - 2
common/src/main/resources/mapper/base/BillInfo.xml

@@ -118,12 +118,12 @@
         <result property="companyName" column="company_name" />
         <result property="payTime" column="pay_time" />
     </resultMap>
-    <select id="dueList" resultMap="DueListDTOMap">
+    <select id="dueList" parameterType="string" resultMap="DueListDTOMap">
         SELECT c.company_name,d.pay_time FROM base_bill_info a
         LEFT JOIN base_bill_detail_info b ON a.id_ = b.bill_id
         LEFT JOIN base_company_info c ON b.company_id = c.id_
         LEFT JOIN base_order_info d ON b.order_id = d.id_
-        WHERE a.wx_show = TRUE
+        WHERE a.id_ = #{0}
         AND d.pay_time IS NOT NULL
         ORDER BY d.pay_time ASC
     </select>

+ 1 - 1
web/src/main/java/com/jpsoft/enterprise/modules/mobile/controller/BillInfoApiController.java

@@ -44,7 +44,7 @@ public class BillInfoApiController {
         try {
             BillInfo billInfo = billInfoService.getDueDetail();
             map.put("info", billInfo);
-            List<DueListDTO> listDTOS = billInfoService.dueList();
+            List<DueListDTO> listDTOS = billInfoService.dueList(billInfo.getId());
             map.put("list", listDTOS);
 
             messageResult.setData(map);