我的修改

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

@@ -64,7 +64,7 @@ public class BillSubsidy extends BaseEntity implements Serializable {
     /**
      * 联系电话
      */
-    private String phon;
+    private String phone;
 
     /**
      * 存栏数

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

@@ -1,8 +1,12 @@
 package com.huimv.farm.damsubsidy.service;
 
+import com.huimv.farm.damsubsidy.common.utils.Result;
 import com.huimv.farm.damsubsidy.entity.BillSubsidy;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
  * 补贴信息表 服务类
@@ -12,5 +16,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2023-04-26
  */
 public interface IBillSubsidyService extends IService<BillSubsidy> {
+    Result list(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
+
+    Result listById(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
+
+    Result edit(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
 
+    Result appeal(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

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

@@ -1,8 +1,15 @@
 package com.huimv.farm.damsubsidy.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 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.BillBuyInfo;
+import com.huimv.farm.damsubsidy.entity.BillIsolated;
 import com.huimv.farm.damsubsidy.entity.BillLandingInspection;
+import com.huimv.farm.damsubsidy.mapper.BillBuyInfoMapper;
+import com.huimv.farm.damsubsidy.mapper.BillIsolatedMapper;
 import com.huimv.farm.damsubsidy.mapper.BillLandingInspectionMapper;
 import com.huimv.farm.damsubsidy.service.IBillLandingInspectionService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -10,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -25,16 +33,75 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
 
     @Autowired
     private BillLandingInspectionMapper billLandingInspectionMapper;
+    @Autowired
+    private BillIsolatedMapper isolatedMapper;
+    @Autowired
+    private BillBuyInfoMapper buyInfoMapper;
 
     @Override
     public Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
-//        Integer inspectionName = Integer.valueOf(paramsMap.get("inspectionName"));
-//        String date = paramsMap.get("date");
-//        if (date == "1") {
-//            QueryWrapper<>
-//        } else {
-//
-//        }
+        String type = paramsMap.get("type");//信息类型
+        String date = paramsMap.get("date");
+        String startTime = paramsMap.get("startTime");
+        String endTime = paramsMap.get("endTime");
+
+
+        if (startTime != null) {
+            startTime = startTime + " 00:00:00";
+        }
+        if (endTime != null) {
+            endTime = endTime + " 23:59:59";
+        }
+
+
+        JSONArray jsonArray = new JSONArray();
+        if (type == "1") { //检疫申请
+            QueryWrapper<BillLandingInspection> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_time").between("create_time", startTime, endTime);
+            List<BillLandingInspection> billLandingInspections = billLandingInspectionMapper.selectList(queryWrapper);
+            for (BillLandingInspection billLandingInspection : billLandingInspections) {
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("name", billLandingInspection.getInspectionName());
+                jsonObject.put("id", billLandingInspection.getId());
+                jsonObject.put("time", billLandingInspection.getCreateTime());
+                jsonObject.put("state", billLandingInspection.getInspectionSch());
+                jsonArray.add(jsonObject);
+            }
+            return new Result(ResultCode.SUCCESS, jsonArray);
+        }
+        if (type == "2") { //隔离申请
+            QueryWrapper<BillIsolated> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("str_isolated").between("str_isolated", startTime, endTime);
+            List<BillIsolated> billIsolateds = isolatedMapper.selectList(queryWrapper);
+            for (BillIsolated billIsolated : billIsolateds) {
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("name", billIsolated.getInspectionName());
+                jsonObject.put("time", billIsolated.getStrIsolated());
+                jsonObject.put("id", billIsolated.getId());
+                jsonObject.put("state", billIsolated.getIsolatedSch());
+                jsonArray.add(jsonObject);
+            }
+            return new Result(ResultCode.SUCCESS, jsonArray);
+        }
+        //交易信息
+        if (type == "3") {
+            QueryWrapper<BillBuyInfo> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_time").between("create_time", startTime, endTime);
+            List<BillBuyInfo> billBuyInfos = buyInfoMapper.selectList(queryWrapper);
+            for (BillBuyInfo billBuyInfo : billBuyInfos) {
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("name", billBuyInfo.getBuyName());
+                jsonObject.put("id", billBuyInfo.getId());
+                jsonObject.put("time", billBuyInfo.getCreateTime());
+                jsonArray.add(jsonObject);
+            }
+            return new Result(ResultCode.SUCCESS, jsonArray);
+        }
+        //补贴申请
+        if (type == "4") {
+            QueryWrapper<BillBuyInfo> queryWrapper = new QueryWrapper<>();
+            queryWrapper.between("create_time", startTime, endTime).orderByDesc("create_time");
+        }
         return null;
     }
 }

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

@@ -1,11 +1,22 @@
 package com.huimv.farm.damsubsidy.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+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.BillSubsidy;
 import com.huimv.farm.damsubsidy.mapper.BillSubsidyMapper;
 import com.huimv.farm.damsubsidy.service.IBillSubsidyService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 补贴信息表 服务实现类
@@ -17,4 +28,126 @@ import org.springframework.stereotype.Service;
 @Service
 public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillSubsidy> implements IBillSubsidyService {
 
+    @Autowired
+    private BillSubsidyMapper subsidyMapper;
+
+    @Override
+    public Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        Integer subsidySch = Integer.valueOf(paramsMap.get("subsidySch"));
+        String startTime = paramsMap.get("startTime");
+        String endTime = paramsMap.get("endTime");
+
+
+        if (startTime != null) {
+            startTime = startTime + " 00:00:00";
+        }
+        if (endTime != null) {
+            endTime = endTime + " 23:59:59";
+        }
+
+        //从近到远
+        QueryWrapper<BillSubsidy> queryWrapper = new QueryWrapper<>();
+
+            if (subsidySch == 7) { //全部进度
+                queryWrapper.orderByDesc("sub_time").between("sub_time",startTime,endTime);
+            } else {
+                queryWrapper.eq("subsidy_sch", subsidySch).orderByDesc("sub_time")
+                        .between("sub_time",startTime,endTime);
+            }
+            queryWrapper.eq("phone", paramsMap.get("phone"));
+            List<BillSubsidy> billSubsidies = subsidyMapper.selectList(queryWrapper);
+            JSONArray jsonArray = new JSONArray();
+            for (BillSubsidy billSubsidy : billSubsidies) {
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("name", billSubsidy.getSubsidyName());
+                jsonObject.put("date", billSubsidy.getSubTime());
+                jsonObject.put("state", billSubsidy.getSubsidySch());
+                jsonObject.put("id", billSubsidy.getId());
+                jsonArray.add(jsonObject);
+            }
+            return new Result(ResultCode.SUCCESS, jsonArray);
+    }
+
+    @Override
+    public Result listById(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        QueryWrapper<BillSubsidy> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("id", paramsMap.get("id"));
+        BillSubsidy billSubsidy = subsidyMapper.selectOne(queryWrapper);
+        return new Result(ResultCode.SUCCESS, billSubsidy);
+    }
+
+    @Override
+    public Result edit(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String type = paramsMap.get("type");
+        String id = paramsMap.get("id");
+        String stateType = paramsMap.get("stateType");
+        //拒绝
+        if (type == "1") {
+            String refuseReason = paramsMap.get("refuseReason"); //拒绝理由
+            if (refuseReason == "" || refuseReason == null) {
+                return new Result(ResultCode.FAIL, "拒绝理由不能为空！");
+            }
+            QueryWrapper<BillSubsidy> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("id", id);
+            BillSubsidy billSubsidy = subsidyMapper.selectOne(queryWrapper);
+            billSubsidy.setSubsidySch(2);
+            billSubsidy.setAcceptTime(new Date());
+            subsidyMapper.insert(billSubsidy);
+            return new Result(ResultCode.SUCCESS, "更新状态成功！");
+        } else { //受理
+            QueryWrapper<BillSubsidy> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("id", id);
+            BillSubsidy billSubsidy = subsidyMapper.selectOne(queryWrapper);
+            if (stateType == "1") { //驳回
+                String rejectReason = paramsMap.get("rejectReason");
+                String workAccptUrl = paramsMap.get("workAccptUrl");
+                if (rejectReason == null || rejectReason == "") {
+                    return new Result(ResultCode.FAIL, "驳回理由不能为空！");
+                }
+                if (workAccptUrl == null || workAccptUrl == "") {
+                    return new Result(ResultCode.FAIL, "工作验收表不能为空！");
+                }
+                billSubsidy.setSubsidySch(4);
+                billSubsidy.setRejectReason(rejectReason);
+                billSubsidy.setWorkAccptUrl(workAccptUrl);
+                billSubsidy.setAcceptTime(new Date());
+                subsidyMapper.insert(billSubsidy);
+                return new Result(ResultCode.SUCCESS, "更新状态成功！");
+            } else { //通过
+                billSubsidy.setSubsidySch(3);
+                billSubsidy.setAcceptTime(new Date());
+                String workAccptUrl = paramsMap.get("workAccptUrl");
+                if (workAccptUrl == null || workAccptUrl == "") {
+                    return new Result(ResultCode.FAIL, "工作验收表不能为空！");
+                }
+                billSubsidy.setWorkAccptUrl(workAccptUrl);
+                billSubsidy.setReviewedTime(new Date());
+                subsidyMapper.insert(billSubsidy);
+                return new Result(ResultCode.SUCCESS, "更新状态成功！");
+            }
+        }
+    }
+
+    @Override
+    public Result appeal(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String id = paramsMap.get("id");
+        Integer type = Integer.parseInt(paramsMap.get("type"));
+        QueryWrapper<BillSubsidy> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("id", id);
+        BillSubsidy billSubsidy = subsidyMapper.selectOne(queryWrapper);
+        if (type == 1) { //驳回
+            String appeal = paramsMap.get("appeal");
+            billSubsidy.setSubsidySch(4);
+            billSubsidy.setAppealTime(new Date());
+            billSubsidy.setAppeal(appeal);
+            subsidyMapper.insert(billSubsidy);
+        } else {
+            String appeal = paramsMap.get("appeal");
+            billSubsidy.setSubsidySch(3);
+            billSubsidy.setAppealTime(new Date());
+            billSubsidy.setAppeal(appeal);
+            subsidyMapper.insert(billSubsidy);
+        }
+        return new Result(ResultCode.SUCCESS, "更新状态成功！");
+    }
 }