|
@@ -2,20 +2,27 @@ package com.huimv.farm.damsubsidy.service.impl;
|
|
|
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
|
+import cn.hutool.core.date.DateTime;
|
|
|
|
+import cn.hutool.core.util.ObjectUtil;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
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.Result;
|
|
import com.huimv.farm.damsubsidy.common.utils.ResultCode;
|
|
import com.huimv.farm.damsubsidy.common.utils.ResultCode;
|
|
|
|
+import com.huimv.farm.damsubsidy.common.utils.ResultCode;
|
|
import com.huimv.farm.damsubsidy.entity.BillBuyInfo;
|
|
import com.huimv.farm.damsubsidy.entity.BillBuyInfo;
|
|
import com.huimv.farm.damsubsidy.entity.BillIsolated;
|
|
import com.huimv.farm.damsubsidy.entity.BillIsolated;
|
|
import com.huimv.farm.damsubsidy.entity.BillLandingInspection;
|
|
import com.huimv.farm.damsubsidy.entity.BillLandingInspection;
|
|
import com.huimv.farm.damsubsidy.mapper.BillBuyInfoMapper;
|
|
import com.huimv.farm.damsubsidy.mapper.BillBuyInfoMapper;
|
|
import com.huimv.farm.damsubsidy.mapper.BillIsolatedMapper;
|
|
import com.huimv.farm.damsubsidy.mapper.BillIsolatedMapper;
|
|
|
|
+import com.huimv.farm.damsubsidy.entity.SysUser;
|
|
import com.huimv.farm.damsubsidy.mapper.BillLandingInspectionMapper;
|
|
import com.huimv.farm.damsubsidy.mapper.BillLandingInspectionMapper;
|
|
|
|
+import com.huimv.farm.damsubsidy.mapper.SysUserMapper;
|
|
import com.huimv.farm.damsubsidy.service.IBillLandingInspectionService;
|
|
import com.huimv.farm.damsubsidy.service.IBillLandingInspectionService;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
|
|
+import javax.annotation.Resource;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
@@ -102,6 +109,54 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
|
|
QueryWrapper<BillBuyInfo> queryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<BillBuyInfo> queryWrapper = new QueryWrapper<>();
|
|
queryWrapper.between("create_time", startTime, endTime).orderByDesc("create_time");
|
|
queryWrapper.between("create_time", startTime, endTime).orderByDesc("create_time");
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ return null;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public Result addApplication(HttpServletRequest httpServletRequest, BillLandingInspection billLandingInspection) {
|
|
|
|
+ QueryWrapper<BillLandingInspection> landingInspectionQueryWrapper = new QueryWrapper<>();
|
|
|
|
+ landingInspectionQueryWrapper.eq("inspection_num",billLandingInspection.getInspectionNum()).ne("inspection_sch",5);
|
|
|
|
+ if (this.count(landingInspectionQueryWrapper) != 0){
|
|
|
|
+ return new Result(10001,"存在相同检疫证号!",false);
|
|
|
|
+ }
|
|
|
|
+ billLandingInspection.setInspectionName(TokenSign.getUserName(httpServletRequest)+"的落地检疫申请");
|
|
|
|
+ billLandingInspection.setCreateTime(DateTime.now());
|
|
|
|
+ billLandingInspection.setCreateUser(Long.valueOf(TokenSign.getUserName(httpServletRequest)));
|
|
|
|
+ billLandingInspection.setInspectionType(0);
|
|
|
|
+ if (this.save(billLandingInspection)){
|
|
|
|
+ return Result.SUCCESS();
|
|
|
|
+ }else {
|
|
|
|
+ return Result.FAIL();
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public Result cancelApplication(HttpServletRequest httpServletRequest, BillLandingInspection billLandingInspection) {
|
|
|
|
+ BillLandingInspection landingInspection = this.getById(billLandingInspection);
|
|
|
|
+ landingInspection.setInspectionSch(5);
|
|
|
|
+ if (this.updateById(landingInspection)) {
|
|
|
|
+ return Result.SUCCESS();
|
|
|
|
+ }else {
|
|
|
|
+ return Result.FAIL();
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public Result listApplication(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
|
|
|
|
+ String sort = paramsMap.get("sort");
|
|
|
|
+ String applicationStatus = paramsMap.get("applicationStatus");
|
|
|
|
+ QueryWrapper<BillLandingInspection> landingInspectionQueryWrapper = new QueryWrapper<>();
|
|
|
|
+ if (ObjectUtil.isNotEmpty(applicationStatus)){
|
|
|
|
+ landingInspectionQueryWrapper.eq("inspection_sch",applicationStatus);
|
|
|
|
+ }else {
|
|
|
|
+ landingInspectionQueryWrapper.ne("inspection_sch",5);
|
|
|
|
+ }
|
|
|
|
+ if (sort.equals("1")){
|
|
|
|
+ landingInspectionQueryWrapper.orderByDesc("create_time");
|
|
|
|
+ }else {
|
|
|
|
+ landingInspectionQueryWrapper.orderByAsc("create_time");
|
|
|
|
+ }
|
|
return null;
|
|
return null;
|
|
}
|
|
}
|
|
}
|
|
}
|