补贴修改

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

@@ -79,6 +79,11 @@ public class BillSubsidyController {
         return subsidyService.edit(httpServletRequest, paramsMap);
     }
 
+    @PostMapping("/editSubsidy")
+    public Result editSubsidy(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
+        return subsidyService.editSubsidy(httpServletRequest, paramsMap);
+    }
+
     @RequestMapping("/edit2")
     public Result edit2(HttpServletRequest httpServletRequest,
                         @RequestParam("workImg") MultipartFile workImg,

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

@@ -1,9 +1,16 @@
 package com.huimv.farm.damsubsidy.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.farm.damsubsidy.common.utils.Result;
+import com.huimv.farm.damsubsidy.common.utils.ResultCode;
+import com.huimv.farm.damsubsidy.entity.BillSubsidyModify;
+import com.huimv.farm.damsubsidy.mapper.BillSubsidyModifyMapper;
+import com.huimv.farm.damsubsidy.service.IBillSubsidyModifyService;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import java.util.Map;
 
 /**
  * <p>
@@ -15,6 +22,15 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/bill-subsidy-modify")
+@CrossOrigin
 public class BillSubsidyModifyController {
+    @Resource
+    private IBillSubsidyModifyService billSubsidyModifyService;
+
+    @PostMapping("/listById")
+    public Result listById(@RequestBody Map<String, String> paramsMap){
+        String id = paramsMap.get("id");
+        return new Result(ResultCode.SUCCESS,billSubsidyModifyService.list(new QueryWrapper<BillSubsidyModify>().eq("subsidy_id",id).orderByDesc("update_time")));
+    }
 
 }

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

@@ -3,8 +3,17 @@ package com.huimv.farm.damsubsidy.entity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.huimv.farm.damsubsidy.common.utils.LongJsonDeserializer;
+import com.huimv.farm.damsubsidy.common.utils.LongJsonSerializer;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -41,7 +50,7 @@ public class BillSubsidyModify implements Serializable {
     /**
      * 申报金额
      */
-    private String beforeApplyMoney;
+    private BigDecimal beforeApplyMoney;
 
     /**
      * 修改后引进奖补数量
@@ -56,9 +65,11 @@ public class BillSubsidyModify implements Serializable {
     /**
      * 修改后申报金额
      */
-    private Integer afterApplyMoney;
+    private BigDecimal afterApplyMoney;
 
-    private Integer updateUserId;
+    @JsonSerialize(using = LongJsonSerializer.class)
+    @JsonDeserialize(using = LongJsonDeserializer.class)
+    private Long updateUserId;
 
     /**
      * 修改人姓名
@@ -73,7 +84,8 @@ public class BillSubsidyModify implements Serializable {
     /**
      * 修改时间
      */
-    private LocalDateTime updateTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateTime;
 
 
 }

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

@@ -56,4 +56,6 @@ public interface IBillSubsidyService extends IService<BillSubsidy> {
     Result countState(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
 
     Result countPay(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
+
+    Result editSubsidy(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

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

@@ -295,7 +295,7 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
     }
 
     @Override
-    public Result   rejectApplication(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+    public Result rejectApplication(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String id = paramsMap.get("id");
         String rejectReason = paramsMap.get("rejectReason");
         BillLandingInspection billLandingInspection = this.getById(id);

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

@@ -37,6 +37,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -60,6 +61,8 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
     private BaseAnimalMapper animalMapper;
     @Autowired
     private AreaAllMapper areaAllMapper;
+    @Resource
+    private BillSubsidyModifyMapper billSubsidyModifyMapper;
 
     @Override
     public Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
@@ -935,5 +938,57 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         return new Result(ResultCode.SUCCESS, subsidyList);
     }
 
+    @Override
+    @Transactional(rollbackFor = RuntimeException.class)
+    public Result editSubsidy(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String id = paramsMap.get("id");
+        String afterRewardNum = paramsMap.get("afterRewardNum");
+        String afterEartagNo = paramsMap.get("afterEartagNo");
+        String afterApplyMoney = paramsMap.get("afterApplyMoney");
+
+        BillSubsidy billSubsidy = subsidyMapper.selectById(id);
+        String[] beforeSplit = billSubsidy.getEartagNo().split(",");
+        String[] afterSplit = afterEartagNo.split(",");
+        if (afterSplit.length != Integer.parseInt(afterRewardNum)){
+            return new Result(10001,"奖补数量与实际耳标号数量不符",false);
+        }
+        List<String> afterList = Arrays.asList(afterSplit);
+        List<String> beforeList = Arrays.asList(beforeSplit);
+
+        List<String> result = new ArrayList<>(beforeList);
+        result.removeAll(afterList);
+        ArrayList<String> eartags = new ArrayList<>();
+        for (String s : result) {
+            eartags.add(s);
+        }
+        List<BaseAnimal> baseAnimals = baseAnimalMapper.selectList(new QueryWrapper<BaseAnimal>().in("earatg_no", eartags));
+        for (BaseAnimal baseAnimal : baseAnimals) {
+            baseAnimal.setAnimalStatus(4);
+            if (baseAnimalMapper.updateById(baseAnimal) != 1) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return new Result(10001,"耳标号"+baseAnimal.getEaratgNo()+"修改失败",false);
+            }
+        }
+
+        BillSubsidyModify billSubsidyModify = new BillSubsidyModify();
+        billSubsidyModify.setSubsidyId(id);
+        billSubsidyModify.setUpdateUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+        billSubsidyModify.setUpdateTime(new Date());
+        billSubsidyModify.setUpdateUserName(TokenSign.getUserName(httpServletRequest));
+        billSubsidyModify.setBeforeApplyMoney(billSubsidy.getApplyMoney());
+        billSubsidyModify.setBeforeEartagNo(billSubsidy.getEartagNo());
+        billSubsidyModify.setBeforeRewardNum(billSubsidy.getRewardNum());
+        billSubsidyModify.setAfterApplyMoney(new BigDecimal(afterApplyMoney));
+        billSubsidyModify.setAfterEartagNo(afterEartagNo);
+        billSubsidyModify.setAfterRewardNum(Integer.parseInt(afterRewardNum));
+        billSubsidyModifyMapper.insert(billSubsidyModify);
+
+        billSubsidy.setRewardNum(Integer.parseInt(afterRewardNum));
+        billSubsidy.setEartagNo(afterEartagNo);
+        billSubsidy.setApplyMoney(new BigDecimal(afterApplyMoney));
+        subsidyMapper.updateById(billSubsidy);
+        return Result.SUCCESS();
+    }
+
 
 }