no message

src/main/java/cn/ezhizao/project/business/collection/controller/BizCollectionController.java

@@ -501,13 +501,16 @@ public class BizCollectionController extends BaseController {
     }
 
     @ApiOperation("通过合同id查询具体收入支出")
-    @PostMapping("/getBycontract")
-    public Map<String,List<ResStatisticsVo>>  getByContract(ReqStatisticsVo conditions){
+    @PostMapping("/getByContract")
+    public AjaxResult getByContract(@RequestBody  ReqStatisticsVo conditions) {
+        HashMap<String, List<ResStatisticsVo>> map = new HashMap<>();
         //收款
-      List<ResStatisticsVo> inList =  collectionService.getByContractIn(conditions);
+        List<ResStatisticsVo> inList = collectionService.getByContractIn(conditions);
         //支出
-      List<ResStatisticsVo>outList =   collectionService.getByContractOut(conditions);
-        return null;
+        List<ResStatisticsVo> outList = collectionService.getByContractOut(conditions);
+        map.put("inList", inList);
+        map.put("outList", outList);
+        return success(AjaxResult.success(map));
     }
 
 

src/main/java/cn/ezhizao/project/business/collection/mapper/BizCollectionMapper.java

@@ -43,9 +43,9 @@ public interface BizCollectionMapper extends BaseMapper<BizCollection> {
 
     List<ResStatisticsVo> statistics(@Param("conditions") ReqStatisticsVo conditions);
 
-    List<ResStatisticsVo> getByContractIn(ReqStatisticsVo conditions);
+    List<ResStatisticsVo> getByContractIn(@Param("conditions") ReqStatisticsVo conditions);
 
-    List<ResStatisticsVo> getByContractOut(ReqStatisticsVo conditions);
+    List<ResStatisticsVo> getByContractOut(@Param("conditions") ReqStatisticsVo conditions);
 }
 
 

src/main/resources/mybatis/business/BizCollectionMapper.xml

@@ -174,7 +174,7 @@
         ELSE ''
         END AS isProject,
         t2.amount AS detailAllAmount,
-        t2.arrive_amount as reallyDetailAmount,
+        CASE WHEN t1.STATUS = 1 THEN t2.arrive_amount ELSE 0 END  AS reallyDetailAmount,
         t1.verify_date as examineTime
         FROM
         biz_collection t1 right join biz_collection_detail t2 ON t1.id = t2.collection_id