补贴类型

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

@@ -10,11 +10,7 @@ import com.huimv.farm.damsubsidy.common.utils.Result;
 import com.huimv.farm.damsubsidy.common.utils.ResultCode;
 import com.huimv.farm.damsubsidy.entity.BaseFarmerTypeInfo;
 import com.huimv.farm.damsubsidy.service.IBaseFarmerTypeInfoService;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
@@ -29,6 +25,7 @@ import java.util.Map;
  * @since 2023-05-19
  */
 @RestController
+@CrossOrigin
 @RequestMapping("/base-farmer-type-info")
 public class BaseFarmerTypeInfoController {
     @Resource
@@ -39,7 +36,7 @@ public class BaseFarmerTypeInfoController {
         String typeName = (String) map.get("typeName");
         Integer farmerType = (Integer) map.get("farmerType");
         Integer animalType = (Integer) map.get("animalType");
-        BigDecimal rewardMoney = (BigDecimal) map.get("rewardMoney");
+        String rewardMoney = (String) map.get("rewardMoney");
         BaseFarmerTypeInfo farmerTypeInfo = baseFarmerTypeInfoService.getOne(new QueryWrapper<BaseFarmerTypeInfo>().eq("farmer_type", farmerType).eq("animal_type", animalType));
         if (ObjectUtil.isNotEmpty(farmerTypeInfo)){
             return new Result(10001,"类别已存在！",false);
@@ -48,19 +45,23 @@ public class BaseFarmerTypeInfoController {
         baseFarmerTypeInfo.setTypeName(typeName);
         baseFarmerTypeInfo.setFarmerType(farmerType);
         baseFarmerTypeInfo.setAnimalType(animalType);
-        baseFarmerTypeInfo.setRewardMoney(rewardMoney);
+        baseFarmerTypeInfo.setRewardMoney(BigDecimal.valueOf(Double.parseDouble(rewardMoney)));
         baseFarmerTypeInfoService.save(baseFarmerTypeInfo);
         return Result.SUCCESS();
     }
 
     @PostMapping("/listType")
     public Result listType(@RequestBody Map map){
-        return new Result(ResultCode.SUCCESS,baseFarmerTypeInfoService.page(PageUtils.getPage(map)));
+        String farmerType = (String) map.get("farmerType");
+        String animalType = (String) map.get("animalType");
+        QueryWrapper<BaseFarmerTypeInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(!ObjectUtil.isEmpty(farmerType),"farmer_type",farmerType).eq(!ObjectUtil.isEmpty(animalType),"animal_type",animalType);
+        return new Result(ResultCode.SUCCESS,baseFarmerTypeInfoService.page(PageUtils.getPage(map),queryWrapper));
     }
 
     @PostMapping("/deleteType")
     public Result deleteType(@RequestBody Map map){
-        String id = (String) map.get("id");
+        Integer id = (Integer) map.get("id");
         if (baseFarmerTypeInfoService.removeById(id)) {
             return Result.SUCCESS();
         }else {
@@ -70,11 +71,12 @@ public class BaseFarmerTypeInfoController {
 
     @PostMapping("/updateType")
     public Result updateType(@RequestBody Map map){
-        String id = (String) map.get("id");
+        Integer id = (Integer) map.get("id");
         String typeName = (String) map.get("typeName");
         Integer farmerType = (Integer) map.get("farmerType");
         Integer animalType = (Integer) map.get("animalType");
-        BigDecimal rewardMoney = (BigDecimal) map.get("rewardMoney");
+        String Money = (String) map.get("rewardMoney");
+        BigDecimal rewardMoney = BigDecimal.valueOf(Double.parseDouble(Money));
         BaseFarmerTypeInfo farmerTypeInfo = baseFarmerTypeInfoService.getOne(new QueryWrapper<BaseFarmerTypeInfo>().eq("farmer_type", farmerType).eq("animal_type", animalType).ne("id",id));
         if (ObjectUtil.isNotEmpty(farmerTypeInfo)){
             return new Result(10001,"类别已存在！",false);
@@ -93,14 +95,14 @@ public class BaseFarmerTypeInfoController {
 
     @PostMapping("/getRewardMoney")
     public Result getRewardMoney(@RequestBody Map map){
-        Integer rewardNum = (Integer) map.get("rewardNum");
+        String rewardNum = (String) map.get("rewardNum");
         Integer farmerType = (Integer) map.get("farmerType");
         Integer animalType = (Integer) map.get("animalType");
         BaseFarmerTypeInfo baseFarmerTypeInfo = baseFarmerTypeInfoService.getOne(new QueryWrapper<BaseFarmerTypeInfo>().eq("farmer_type", farmerType).eq("animal_type", animalType));
         if (ObjectUtil.isEmpty(baseFarmerTypeInfo)){
             return new Result(10001,"奖补类型不存在",false);
         }
-        return new Result(ResultCode.SUCCESS,baseFarmerTypeInfo.getRewardMoney().multiply(BigDecimal.valueOf(rewardNum)));
+        return new Result(ResultCode.SUCCESS,baseFarmerTypeInfo.getRewardMoney().multiply(BigDecimal.valueOf(Long.parseLong(rewardNum))));
     }
 
 }