交易,落地检五张照片

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

@@ -1,11 +1,15 @@
 package com.huimv.farm.damsubsidy.controller;
 
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.farm.damsubsidy.common.utils.Result;
 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.service.IBillBuyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -13,6 +17,8 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -35,7 +41,16 @@ public class BillBuyInfoController {
         String pageNum = paramsMap.get("pageNum");
         String pageSize = paramsMap.get("pageSize");
         Page<BillBuyInfo> page = new Page(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
-        return new Result(ResultCode.SUCCESS,billBuyInfoService.page(page,new QueryWrapper<BillBuyInfo>().orderByDesc("create_time").eq("bill_buy_status",2)));
+        Page<BillBuyInfo> billBuyInfoPage = billBuyInfoService.page(page, new QueryWrapper<BillBuyInfo>().orderByDesc("create_time").eq("bill_buy_status", 2));
+        Page<BillBuyInfoImageVo> billBuyInfoVoPage = new Page<>();
+        BeanUtil.copyProperties(billBuyInfoPage,billBuyInfoVoPage);
+        for (BillBuyInfoImageVo record : billBuyInfoVoPage.getRecords()) {
+            if (ObjectUtil.isNotEmpty(record.getBuyPicUrl())){
+                String[] split = record.getBuyPicUrl().split(",");
+                record.setPages(split);
+            }
+        }
+        return new Result(ResultCode.SUCCESS, billBuyInfoVoPage);
     }
 
     @PostMapping("/addTransaction")

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

@@ -0,0 +1,11 @@
+package com.huimv.farm.damsubsidy.entity.vo;
+
+import com.huimv.farm.damsubsidy.entity.BillBuyInfo;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class BillBuyInfoImageVo extends BillBuyInfo {
+    private String[] pages;
+}

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

@@ -0,0 +1,9 @@
+package com.huimv.farm.damsubsidy.entity.vo;
+
+import com.huimv.farm.damsubsidy.entity.BillLandingInspection;
+import lombok.Data;
+
+@Data
+public class BillLandingImageVo extends BillLandingInspection {
+    private String[] pages;
+}

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

@@ -1,5 +1,6 @@
 package com.huimv.farm.damsubsidy.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSONObject;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.util.ObjectUtil;
@@ -10,6 +11,7 @@ import com.huimv.farm.damsubsidy.common.token.TokenSign;
 import com.huimv.farm.damsubsidy.common.utils.*;
 import com.huimv.farm.damsubsidy.entity.*;
 import com.huimv.farm.damsubsidy.entity.BillLandingInspection;
+import com.huimv.farm.damsubsidy.entity.vo.BillLandingImageVo;
 import com.huimv.farm.damsubsidy.mapper.*;
 import com.huimv.farm.damsubsidy.service.IBillLandingInspectionService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -293,7 +295,15 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
         }
         landingInspectionQueryWrapper.orderByDesc("create_time");
         Page<BillLandingInspection> page = new Page(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
-        return new Result(ResultCode.SUCCESS,billLandingInspectionMapper.selectPage(page,landingInspectionQueryWrapper));
+        Page<BillLandingInspection> billLandingInspectionPage = billLandingInspectionMapper.selectPage(page, landingInspectionQueryWrapper);
+        Page<BillLandingImageVo> billLandingImageVoPage = new Page<>();
+        BeanUtil.copyProperties(billLandingInspectionPage,billLandingImageVoPage);
+        for (BillLandingImageVo record : billLandingImageVoPage.getRecords()) {
+            if (ObjectUtil.isNotEmpty(record.getJcbgImgUrl())){
+                record.setPages(record.getJcbgImgUrl().split(","));
+            }
+        }
+        return new Result(ResultCode.SUCCESS, billLandingImageVoPage);
     }
 
     @Override

admin/src/main/resources/application.properties

@@ -1,5 +1,5 @@
-#spring.profiles.active=dev
-spring.profiles.active=formal
+spring.profiles.active=dev
+#spring.profiles.active=formal
 #spring.profiles.active=root
 
 #spring.profiles.active=prod