修改隔离、交易接口

admin/pom.xml

@@ -59,7 +59,7 @@
             <artifactId>poi-ooxml</artifactId>
             <version>4.1.2</version>
         </dependency>
-        <dependency>
+      <!--  <dependency>
             <groupId>cn.afterturn</groupId>
             <artifactId>easypoi-spring-boot-starter</artifactId>
             <version>4.0.0</version>
@@ -75,7 +75,7 @@
             <groupId>cn.afterturn</groupId>
             <artifactId>easypoi-base</artifactId>
             <version>4.1.0</version>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>druid-spring-boot-starter</artifactId>

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

@@ -2,9 +2,11 @@ package com.huimv.farm.damsubsidy.controller;
 
 
 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.BillLandingInspection;
 import com.huimv.farm.damsubsidy.service.IBillBuyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -29,8 +31,11 @@ public class BillBuyInfoController {
     private IBillBuyInfoService billBuyInfoService;
 
     @PostMapping("/listTransaction")
-    public Result listTransaction(){
-        return new Result(ResultCode.SUCCESS,billBuyInfoService.list(new QueryWrapper<BillBuyInfo>().orderByDesc("create_time")));
+    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));
+        return new Result(ResultCode.SUCCESS,billBuyInfoService.page(page,new QueryWrapper<BillBuyInfo>().orderByDesc("create_time")));
     }
 
     @PostMapping("/addTransaction")
@@ -46,4 +51,24 @@ public class BillBuyInfoController {
         return billBuyInfoService.addTransaction(httpServletRequest,image1,image2,image3,inspectionNum,seller,buyer,num,eartags);
     }
 
+    @PostMapping("/saveTransaction")
+    public Result saveTransaction(HttpServletRequest httpServletRequest,
+                                 @RequestParam("image1") MultipartFile image1,
+                                 @RequestParam("image2") MultipartFile image2,
+                                 @RequestParam("image3") MultipartFile image3,
+                                 @RequestParam("inspectionNum") String inspectionNum,
+                                 @RequestParam("seller") String seller,
+                                 @RequestParam("buyer") String buyer,
+                                 @RequestParam("num") String num,
+                                 @RequestParam("eartags") String eartags){
+        return billBuyInfoService.saveTransaction(httpServletRequest,image1,image2,image3,inspectionNum,seller,buyer,num,eartags);
+    }
+
+    @PostMapping("/getLast")
+    public Result getLast(HttpServletRequest httpServletRequest,@RequestBody Map<String,String> paramsMap){
+        return billBuyInfoService.getLast(httpServletRequest,paramsMap);
+    }
+
+
+
 }

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

@@ -2,6 +2,7 @@ package com.huimv.farm.damsubsidy.controller;
 
 
 import cn.hutool.core.date.DateTime;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.farm.damsubsidy.common.token.TokenSign;
 import com.huimv.farm.damsubsidy.common.utils.Result;
 import com.huimv.farm.damsubsidy.common.utils.ResultCode;
@@ -63,6 +64,13 @@ public class BillLandingInspectionController {
         return iBillLandingInspectionService.rejectApplication(httpServletRequest,paramsMap);
     }
 
+    @PostMapping("listReadyApplication")
+    public Result listReadyApplication(){
+        return new Result(ResultCode.SUCCESS,iBillLandingInspectionService.list(new QueryWrapper<BillLandingInspection>()
+                .eq("inspection_sch",4)
+                .eq("is_delete",0)));
+    }
+
 
     @Autowired
     private IBillLandingInspectionService billLandingInspectionService;

admin/src/main/java/com/huimv/farm/damsubsidy/entity/BillBuyInfo.java

@@ -75,6 +75,11 @@ public class BillBuyInfo  extends BaseEntity implements Serializable {
      */
     private String buyPayGoodsPicUrl;
 
+    /**
+     * 0未完成，1草稿，2已完成
+     */
+    private Integer billBuyStatus;
+
 
 
 }

admin/src/main/java/com/huimv/farm/damsubsidy/service/IBillBuyInfoService.java

@@ -19,4 +19,8 @@ import java.util.Map;
 public interface IBillBuyInfoService extends IService<BillBuyInfo> {
 
     Result addTransaction(HttpServletRequest httpServletRequest, MultipartFile image1, MultipartFile image2, MultipartFile image3, String inspectionNum, String seller, String buyer, String num, String eartags);
+
+    Result saveTransaction(HttpServletRequest httpServletRequest, MultipartFile image1, MultipartFile image2, MultipartFile image3, String inspectionNum, String seller, String buyer, String num, String eartags);
+
+    Result getLast(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

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

@@ -42,6 +42,8 @@ import java.util.Map;
 public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillBuyInfo> implements IBillBuyInfoService {
     @Resource
     private BaseAnimalMapper baseAnimalMapper;
+    @Resource
+    private BillBuyInfoMapper billBuyInfoMapper;
 
     @Override
     @Transactional
@@ -67,7 +69,7 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
         } catch (Exception e) {
             e.printStackTrace();
         }
-        String content = "http://139.9.167.178/images"+path +"/"+imgname;
+        String content = "http://139.9.167.178/images/"+path +"/"+imgname;
 
         String imgname2 = "成功";
         String originalFilename2 = image2.getOriginalFilename();
@@ -90,7 +92,7 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
         } catch (Exception e) {
             e.printStackTrace();
         }
-        String content2 = "http://139.9.167.178/images"+path2 +"/"+imgname2;
+        String content2 = "http://139.9.167.178/images/"+path2 +"/"+imgname2;
 
         String imgname3 = "成功";
         String originalFilename3 = image3.getOriginalFilename();
@@ -113,7 +115,7 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
         } catch (Exception e) {
             e.printStackTrace();
         }
-        String content3 = "http://139.9.167.178/images"+path3 +"/"+imgname3;
+        String content3 = "http://139.9.167.178/images/"+path3 +"/"+imgname3;
 
         BillBuyInfo billBuyInfo = new BillBuyInfo();
         billBuyInfo.setInspectionNum(inspectionNum);
@@ -126,6 +128,7 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
         billBuyInfo.setPayPicUrl(content2);
         billBuyInfo.setBuyPayGoodsPicUrl(content3);
         billBuyInfo.setRealEartag(eartags);
+        billBuyInfo.setBillBuyStatus(2);
         this.save(billBuyInfo);
 
         if (eartags.contains(";")){
@@ -204,4 +207,100 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
         }
         return Result.SUCCESS();
     }
+
+    @Override
+    public Result saveTransaction(HttpServletRequest httpServletRequest, MultipartFile image1, MultipartFile image2, MultipartFile image3, String inspectionNum, String seller, String buyer, String num, String eartags) {
+        String imgname = "成功";
+        String originalFilename = image1.getOriginalFilename();
+        String filenameExtension = StringUtils.getFilenameExtension(originalFilename);
+        String path = DateUtil.format(new Date(),"yyyy-MM");
+        try {
+            InputStream inputStream = image1.getInputStream();
+            BufferedInputStream in = new BufferedInputStream(inputStream);
+            ByteArrayOutputStream out = new ByteArrayOutputStream(1024);
+
+            byte[] temp = new byte[1024];
+            int size = 0;
+            while ((size = in.read(temp)) != -1) {
+                out.write(temp, 0, size);
+            }
+            in.close();
+            byte[] content = out.toByteArray();
+            imgname = UUID.randomUUID()+"."+filenameExtension;
+            UploadImage.sshSftp(content,path, imgname);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        String content = "http://139.9.167.178/images/"+path +"/"+imgname;
+
+        String imgname2 = "成功";
+        String originalFilename2 = image2.getOriginalFilename();
+        String filenameExtension2 = StringUtils.getFilenameExtension(originalFilename2);
+        String path2 = DateUtil.format(new Date(),"yyyy-MM");
+        try {
+            InputStream inputStream = image2.getInputStream();
+            BufferedInputStream in = new BufferedInputStream(inputStream);
+            ByteArrayOutputStream out = new ByteArrayOutputStream(1024);
+
+            byte[] temp = new byte[1024];
+            int size = 0;
+            while ((size = in.read(temp)) != -1) {
+                out.write(temp, 0, size);
+            }
+            in.close();
+            byte[] content2 = out.toByteArray();
+            imgname2 = UUID.randomUUID()+"."+filenameExtension2;
+            UploadImage.sshSftp(content2,path2, imgname2);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        String content2 = "http://139.9.167.178/images/"+path2 +"/"+imgname2;
+
+        String imgname3 = "成功";
+        String originalFilename3 = image3.getOriginalFilename();
+        String filenameExtension3 = StringUtils.getFilenameExtension(originalFilename3);
+        String path3 = DateUtil.format(new Date(),"yyyy-MM");
+        try {
+            InputStream inputStream = image3.getInputStream();
+            BufferedInputStream in = new BufferedInputStream(inputStream);
+            ByteArrayOutputStream out = new ByteArrayOutputStream(1024);
+
+            byte[] temp = new byte[1024];
+            int size = 0;
+            while ((size = in.read(temp)) != -1) {
+                out.write(temp, 0, size);
+            }
+            in.close();
+            byte[] content3 = out.toByteArray();
+            imgname3 = UUID.randomUUID()+"."+filenameExtension3;
+            UploadImage.sshSftp(content3,path3, imgname3);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        String content3 = "http://139.9.167.178/images/"+path3 +"/"+imgname3;
+
+        BillBuyInfo billBuyInfo = new BillBuyInfo();
+        billBuyInfo.setInspectionNum(inspectionNum);
+        billBuyInfo.setBuyerName(buyer);
+        billBuyInfo.setSellerName(seller);
+        billBuyInfo.setCreateUser(TokenSign.getUserName(httpServletRequest));
+        billBuyInfo.setCreateTime(DateTime.now());
+        billBuyInfo.setRealNumUp(num);
+        billBuyInfo.setBuyPicUrl(content);
+        billBuyInfo.setPayPicUrl(content2);
+        billBuyInfo.setBuyPayGoodsPicUrl(content3);
+        billBuyInfo.setRealEartag(eartags);
+        billBuyInfo.setBillBuyStatus(1);
+        this.save(billBuyInfo);
+        return Result.SUCCESS();
+    }
+
+    @Override
+    public Result getLast(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        return new Result(ResultCode.SUCCESS, billBuyInfoMapper.selectList(new QueryWrapper<BillBuyInfo>()
+                .eq("bill_buy_status",1)
+                .eq("create_user",TokenSign.getUserName(httpServletRequest))
+                .orderByDesc("create_time")
+                .last("limit 1")));
+    }
 }

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

@@ -232,7 +232,7 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
         } catch (Exception e) {
             e.printStackTrace();
         }
-        String content = "http://139.9.167.178/images"+path +"/"+imgname;
+        String content = "http://139.9.167.178/images/"+path +"/"+imgname;
         BillIsolated isolation = this.getById(id);
         isolation.setIsolatedPicUrl(content);
         isolation.setIsolatedSch(2);