补贴

admin/src/main/java/com/huimv/farm/damsubsidy/controller/BillBuyInfoController.java

@@ -10,11 +10,13 @@ import com.huimv.farm.damsubsidy.common.utils.ResultCode;
 import com.huimv.farm.damsubsidy.entity.BillBuyInfo;
 import com.huimv.farm.damsubsidy.entity.vo.BillBuyInfoImageVo;
 import com.huimv.farm.damsubsidy.entity.vo.BillBuyInfoVo;
+import com.huimv.farm.damsubsidy.mapper.BillBuyInfoMapper;
 import com.huimv.farm.damsubsidy.service.IBillBuyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -35,13 +37,15 @@ import java.util.Map;
 public class BillBuyInfoController {
     @Autowired
     private IBillBuyInfoService billBuyInfoService;
+    @Resource
+    private BillBuyInfoMapper billBuyInfoMapper;
 
     @PostMapping("/listTransaction")
     public Result listTransaction(@RequestBody Map<String,String> paramsMap){
         String pageNum = paramsMap.get("pageNum");
         String pageSize = paramsMap.get("pageSize");
-        Page<BillBuyInfo> page = new Page(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
-        Page<BillBuyInfo> billBuyInfoPage = billBuyInfoService.page(page, new QueryWrapper<BillBuyInfo>().orderByDesc("create_time").eq("bill_buy_status", 2));
+        Page<BillBuyInfoVo> page = new Page(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
+        Page<BillBuyInfoVo> billBuyInfoPage = billBuyInfoMapper.listTransaction(page);
         Page<BillBuyInfoImageVo> billBuyInfoVoPage = new Page<>();
         List billBuyInfoImageVoList = new ArrayList();
         for (BillBuyInfo record : billBuyInfoPage.getRecords()) {

admin/src/main/java/com/huimv/farm/damsubsidy/entity/vo/BillBuyInfoImageVo.java

@@ -6,6 +6,6 @@ import lombok.Data;
 import java.util.List;
 
 @Data
-public class BillBuyInfoImageVo extends BillBuyInfo {
+public class BillBuyInfoImageVo extends BillBuyInfoVo {
     private String[] pages;
 }

admin/src/main/java/com/huimv/farm/damsubsidy/mapper/BillBuyInfoMapper.java

@@ -1,5 +1,6 @@
 package com.huimv.farm.damsubsidy.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.farm.damsubsidy.entity.BillBuyInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huimv.farm.damsubsidy.entity.vo.BillBuyInfoVo;
@@ -18,4 +19,6 @@ public interface BillBuyInfoMapper extends BaseMapper<BillBuyInfo> {
     BillBuyInfoVo listDetail(@Param("id") String id);
 
     BillBuyInfoVo getLast(@Param("userName") Long userName);
+
+    Page<BillBuyInfoVo> listTransaction(Page<BillBuyInfoVo> page);
 }

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/BillBuyInfoServiceImpl.java

@@ -107,7 +107,7 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
         billLandingInspection.setReviewedTime(DateTime.now());
         billLandingInspection.setCreateUser(Long.valueOf(buyerId));
         billLandingInspection.setCreateTime(DateTime.now());
-
+        billLandingInspectionMapper.insert(billLandingInspection);
 
 
         if (ObjectUtil.isEmpty(billBuyInfo1)){
@@ -122,7 +122,7 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
             billBuyInfo.setCreateTime(DateTime.now());
             billBuyInfo.setRealNumUp(animalNumberUp);
             billBuyInfo.setBuyPicUrl(content);
-            billBuyInfo1.setBuyerId(Long.valueOf(buyerId));
+            billBuyInfo.setBuyerId(Long.valueOf(buyerId));
             billBuyInfo.setSellerId(Long.valueOf(sellerId));
             billBuyInfo.setPayPicUrl(content2);
             billBuyInfo.setBuyPayGoodsPicUrl(content3);

admin/src/main/resources/com/huimv/farm/damsubsidy/mapper/BillBuyInfoMapper.xml

@@ -30,4 +30,9 @@
         SELECT l.inspection_num,l.cargo_owner,l.owner_phone,l.animal_type,l.animal_number_up,l.use_to,l.start_tran,l.reach_tran,l.eartags,b.buyer_name,b.seller_name,b.real_num_up,real_eartag
  FROM `bill_buy_info` b LEFT JOIN `bill_landing_inspection` l ON b.inspection_num = l.inspection_num WHERE b.create_user = #{userName} and b.bill_buy_status = 1
     </select>
+
+    <select id="listTransaction" resultType="com.huimv.farm.damsubsidy.entity.vo.BillBuyInfoVo">
+        SELECT b.*,l.cargo_owner,l.owner_phone,l.animal_type,l.animal_number_up,l.use_to,l.start_tran,l.reach_tran,eartags FROM `bill_buy_info` b LEFT JOIN `bill_landing_inspection` l
+        ON b.inspection_num = l.inspection_num WHERE b.bill_buy_status = 2 ORDER BY b.create_time DESC
+    </select>
 </mapper>