From dd6687b118561100e1677e88a9c2f5842a54c531 Mon Sep 17 00:00:00 2001
From: jialh <1972868360@qq.com>
Date: 星期四, 16 四月 2026 18:14:14 +0800
Subject: [PATCH] 水电话费

---
 service-fee/src/main/java/com/java110/fee/api/contract/ContractCollectionDetailApi.java |   51 ++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/service-fee/src/main/java/com/java110/fee/api/contract/ContractCollectionDetailApi.java b/service-fee/src/main/java/com/java110/fee/api/contract/ContractCollectionDetailApi.java
index 0ed4bde..02203ae 100644
--- a/service-fee/src/main/java/com/java110/fee/api/contract/ContractCollectionDetailApi.java
+++ b/service-fee/src/main/java/com/java110/fee/api/contract/ContractCollectionDetailApi.java
@@ -4,8 +4,10 @@
 import com.java110.dto.contract.ContractCollectionDetailDto;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.vo.ResultVo;
 import org.mybatis.spring.SqlSessionTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
@@ -110,6 +112,29 @@
         return ResponseEntity.ok(resJson.toJSONString());
     }
 
+    @RequestMapping(value = "/deleteContractCollectionDetail", method = RequestMethod.POST)
+    public ResponseEntity<String> deleteContractCollectionDetail(@RequestBody JSONObject reqJson) {
+        // 涓婚敭/鍚堝悓ID鏍¢獙锛堜簩閫変竴锛�
+        Assert.hasKey(reqJson, "id", "璇锋眰鎶ユ枃涓湭鍖呭惈涓婚敭ID");
+//        Assert.hasKey(reqJson, "contractId", "璇锋眰鎶ユ枃涓湭鍖呭惈鍚堝悓ID");
+
+        ContractCollectionDetailDto dto = BeanConvertUtil.covertBean(reqJson, ContractCollectionDetailDto.class);
+
+        // 璋冪敤Mapper淇敼鏂规硶
+        int update = sqlSessionTemplate.delete("contractCollectionDetailDaoImpl.deleteContractCollectionDetail",
+                BeanConvertUtil.beanCovertMap(dto));
+
+        JSONObject resJson = new JSONObject();
+        if (update > 0) {
+            resJson.put("code", "0000");
+            resJson.put("msg", "鍒犻櫎鍚堝悓鏀舵鏄庣粏淇℃伅鎴愬姛");
+        } else {
+            resJson.put("code", "0001");
+            resJson.put("msg", "鍒犻櫎鍚堝悓鏀舵鏄庣粏淇℃伅澶辫触锛屾湭鎵惧埌瀵瑰簲璁板綍");
+        }
+        resJson.put("count", update);
+        return ResponseEntity.ok(resJson.toJSONString());
+    }
     /**
      * 鍒嗛〉鏌ヨ鍚堝悓鏀舵鏄庣粏淇℃伅鍒楄〃
      *
@@ -169,25 +194,29 @@
         }
 
         // 鏌ヨ鍒楄〃鏁版嵁锛圡yBatis鑷姩璇嗗埆String[]骞堕亶鍘嗭級
-        List<Map<String, Object>> list = sqlSessionTemplate.selectList(
+        List<ContractCollectionDetailDto> list = BeanConvertUtil.covertBeanList(sqlSessionTemplate.selectList(
                 "contractCollectionDetailDaoImpl.getContractCollectionDetail",
-                BeanConvertUtil.beanCovertMap(queryDto));
+                BeanConvertUtil.beanCovertMap(queryDto)), ContractCollectionDetailDto.class);
 
         // 鏌ヨ鎬绘暟
         Object total = ((HashMap) sqlSessionTemplate.selectOne(
                 "contractCollectionDetailDaoImpl.queryContractCollectionDetailCount",
                 BeanConvertUtil.beanCovertMap(queryDto))).get("count");
 
-        // 鏋勯�犲垎椤靛搷搴�
-        JSONObject resJson = new JSONObject();
-        resJson.put("code", "0000");
-        resJson.put("msg", "鏌ヨ鍚堝悓鏀舵鏄庣粏淇℃伅鎴愬姛");
-        resJson.put("page", page);
-        resJson.put("row", row);
-        resJson.put("total", total);
-        resJson.put("data", list);
 
-        return ResponseEntity.ok(resJson.toJSONString());
+
+        // 鏋勯�犲垎椤靛搷搴�
+        ResultVo resultVo = new ResultVo();
+        resultVo.setCode(0000);
+        resultVo.setMsg("鏌ヨ鍚堝悓鏀舵鏄庣粏淇℃伅鎴愬姛");
+        resultVo.setPage(page);
+        resultVo.setRows(row);
+        resultVo.setTotal(Integer.parseInt(total.toString()));
+        resultVo.setData(list);
+
+//        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) payFeeAuditDto.getRow()), count, payFeeAuditDtos);
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+        return responseEntity;
     }
 
     /**

--
Gitblit v1.8.0