Prechádzať zdrojové kódy

资金转账 明细打印查询

changhaoning 1 rok pred
rodič
commit
45d2acd80a

+ 23 - 0
src/main/java/com/dk/mdm/controller/mac/MacTransferItemController.java

@@ -1,7 +1,16 @@
 package com.dk.mdm.controller.mac;
 
+import com.dk.common.model.pojo.PageList;
+import com.dk.common.response.ResponseResultVO;
 import com.dk.mdm.model.pojo.mac.MacTransferItem;
 import com.dk.common.service.BaseService;
+import com.dk.mdm.model.query.mac.MacTransferItemQuery;
+import com.dk.mdm.model.query.pur.PurchaseItemQuery;
+import com.dk.mdm.model.response.mac.MacTransferItemResponse;
+import com.dk.mdm.model.response.pur.PurchaseItemResponse;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RestController;
@@ -20,4 +29,18 @@ public class MacTransferItemController {
     @Autowired
     private MacTransferItemService macTransferItemService;
 
+    /**
+     * @desc   : 条件查询
+     * @author : 常皓宁
+     * @date   : 2024/2/28 15:11
+     */
+    @ApiOperation(
+            value = "分页、关联、条件查询",
+            notes = "分页、关联、条件查询"
+    )
+    @PostMapping({"list_by"})
+    public ResponseResultVO<PageList<MacTransferItemResponse>> selectByCond(@RequestBody MacTransferItemQuery macTransferItemQuery) {
+        return macTransferItemService.selectByCond(macTransferItemQuery);
+    }
+
 }

+ 9 - 0
src/main/java/com/dk/mdm/mapper/mac/MacTransferItemMapper.java

@@ -3,6 +3,7 @@ package com.dk.mdm.mapper.mac;
 import com.dk.mdm.model.pojo.mac.MacTransferItem;
 import com.dk.common.mapper.BaseMapper;
 import com.dk.mdm.model.query.mac.MacTransferItemQuery;
+import com.dk.mdm.model.query.pur.PurchaseItemQuery;
 import com.dk.mdm.model.response.mac.MacTransferItemResponse;
 import org.springframework.stereotype.Repository;
 
@@ -19,6 +20,14 @@ public interface MacTransferItemMapper extends BaseMapper<MacTransferItem> {
      * @date   : 2024-03-19 16:13
      */
     List<MacTransferItemResponse> selectByCond(MacTransferItemQuery macTransferItemQuery);
+
+    /**
+     * @desc   : 根据条件进行查询(数量)
+     * @author : 常皓宁
+     * @date   : 2024/2/28 15:17
+     */
+    Long countByCond(MacTransferItemQuery macTransferItemQuery);
+
     /**
      * @desc :根据主表主键锁定表t_mac_transfer_item的多行数据
      * @author : 付斌

+ 2 - 0
src/main/java/com/dk/mdm/mapper/mac/MacTransferItemMapper.xml

@@ -104,6 +104,8 @@
     <select id="countByCond" resultType="Long">
         SELECT count(1)
         FROM dkic_b.t_mac_transfer_item as t
+        left join dkic_b.t_mst_money_account as main on main.mac_id = t.trf_in_mac
+        left join dkic_b.t_mst_money_account as maout on maout.mac_id = t.trf_out_mac
         <include refid="Condition"/>
     </select>
 

+ 17 - 0
src/main/java/com/dk/mdm/service/mac/MacTransferItemService.java

@@ -1,9 +1,16 @@
 package com.dk.mdm.service.mac;
 
+import com.dk.common.infrastructure.annotaiton.Pagination;
+import com.dk.common.model.pojo.PageList;
+import com.dk.common.response.ResponseResultVO;
 import com.dk.mdm.model.pojo.mac.MacTransferItem;
 import com.dk.mdm.mapper.mac.MacTransferItemMapper;
 import com.dk.common.service.BaseService;
 import com.dk.common.mapper.BaseMapper;
+import com.dk.mdm.model.query.mac.MacTransferItemQuery;
+import com.dk.mdm.model.query.pur.PurchaseItemQuery;
+import com.dk.mdm.model.response.mac.MacTransferItemResponse;
+import com.dk.mdm.model.response.pur.PurchaseItemResponse;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -25,4 +32,14 @@ public class MacTransferItemService extends BaseService<MacTransferItem> {
 	@Autowired
 	private MacTransferItemMapper macTransferItemMapper;
 
+	/**
+	 * @desc   : 条件查询
+	 * @author : 常皓宁
+	 * @date   : 2024/2/28 15:16
+	 */
+	@Pagination
+	public ResponseResultVO<PageList<MacTransferItemResponse>> selectByCond(MacTransferItemQuery macTransferItemQuery) {
+		return super.mergeListWithCount(macTransferItemMapper, macTransferItemMapper.selectByCond(macTransferItemQuery), macTransferItemMapper.countByCond(macTransferItemQuery));
+	}
+
 }