上传凭证修改

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

@@ -138,6 +138,9 @@ public class BillLandingInspectionController {
         Map<String, String> map = new HashMap<>();
         if (ObjectUtil.isNotEmpty(idCordBackUrl)) {
             String content =   uploadImage.getImageCom(idCordBackUrl);;
+            if (content.equals("上传失败")) {
+                return new Result(10001, "图片上传失败，请稍后重试！", false);
+            }
             map.put("url", content);
         } else {
             String content = null;

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

@@ -92,6 +92,9 @@ public class BillSubsidyController {
                         @RequestParam("rejectReason") String rejectReason) throws IOException {
         String content = uploadImage.getImageCom(workImg);
 
+        if (content.equals("上次失败")) {
+            return new Result(10001, "验收表上传失败，请稍后重试！", false);
+        }
         Map<String, String> map = new HashMap<>();
         map.put("id", id);
         map.put("type", type);
@@ -196,15 +199,18 @@ public class BillSubsidyController {
     }
 
     @PostMapping("/updatePayStatus")
-    public Result updatePayStatus(@RequestBody Map<String, String> paramsMap) {
+    public Result updatePayStatus(HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap) {
         String ids = paramsMap.get("ids");
         String[] split = ids.split(",");
+        Long name = TokenSign.getMemberIdByJwtToken(httpServletRequest);
         List list = new ArrayList();
         for (String s : split) {
 
             BillSubsidy billSubsidy = new BillSubsidy();
             billSubsidy.setId(Long.parseLong(s));
             billSubsidy.setIsPay(2);
+            billSubsidy.setPayTime(new Date());
+            billSubsidy.setPayUser(name.toString());
             list.add(billSubsidy);
         }
         subsidyService.updateBatchById(list);

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

@@ -248,6 +248,7 @@ public class BillSubsidy extends BaseEntity implements Serializable {
     private Integer subsidyType;
     private Integer isBatch;
 
-   /* @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date createTime;*/
+    /* @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+     private Date createTime;*/
+    private String payUser;
 }

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

@@ -22,10 +22,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * <p>
@@ -152,6 +149,9 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
         billSubsidy.setPayImgUrl(url);
         billSubsidy.setSubsidySch(3);
         billSubsidy.setIsPay(2);
+        billSubsidy.setPayTime(new Date());
+        Long memberIdByJwtToken = TokenSign.getMemberIdByJwtToken(httpServletRequest);
+        billSubsidy.setPayUser(memberIdByJwtToken.toString());
         billSubsidy.setPayMoney(billSubsidy.getApplyMoney());
         subsidyMapper.updateById(billSubsidy);
         return new Result(ResultCode.SUCCESS,subsidyMapper.selectById(id));