|
@@ -1,8 +1,7 @@
|
|
-package com.fjhx.working.service.impl;
|
|
+package com.fjhx.service.working.impl;
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
-import com.alibaba.fastjson.JSONObject;
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
@@ -13,17 +12,16 @@ import com.fjhx.entity.working.WorkingRoute;
|
|
import com.fjhx.entity.working.WorkingRouteProcedure;
|
|
import com.fjhx.entity.working.WorkingRouteProcedure;
|
|
import com.fjhx.params.working.WorkingRouteEx;
|
|
import com.fjhx.params.working.WorkingRouteEx;
|
|
import com.fjhx.params.working.WorkingRouteVo;
|
|
import com.fjhx.params.working.WorkingRouteVo;
|
|
-import com.fjhx.product.service.ProductExService;
|
|
+import com.fjhx.service.product.ProductExService;
|
|
import com.fjhx.utils.Assert;
|
|
import com.fjhx.utils.Assert;
|
|
import com.fjhx.utils.WrapperUtil;
|
|
import com.fjhx.utils.WrapperUtil;
|
|
-import com.fjhx.working.mapper.WorkingRouteMapper;
|
|
+import com.fjhx.mapper.working.WorkingRouteMapper;
|
|
-import com.fjhx.working.service.WorkingRouteProcedureService;
|
|
+import com.fjhx.service.working.WorkingRouteProcedureService;
|
|
-import com.fjhx.working.service.WorkingRouteService;
|
|
+import com.fjhx.service.working.WorkingRouteService;
|
|
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 org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
-import java.util.HashMap;
|
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|