整理后端包，移动位置

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/baogao/service/impl/ItdmBaogaoServiceImpl.java

@@ -18,8 +18,8 @@ import org.jeecg.modules.chuanganqi.entity.ItdmChuanganqi;
 import org.jeecg.modules.chuanganqi.mapper.ItdmChuanganqiMapper;
 import org.jeecg.modules.itdmDevice.entity.ItdmDevice;
 import org.jeecg.modules.itdmDevice.mapper.ItdmDeviceMapper;
-import org.jeecg.modules.itdmGongdanMaster.mapper.ItdmGongdanMasterMapper;
-import org.jeecg.modules.itdmTestPlan.mapper.ItdmTestPlanMapper;
+import org.jeecg.modules.itdmGongDan.mapper.ItdmGongdanMasterMapper;
+import org.jeecg.modules.itdmGongDan.mapper.ItdmTestPlanMapper;
 import org.jeecg.modules.moban.entity.ItdmMoban;
 import org.jeecg.modules.moban.mapper.ItdmMobanMapper;
 import org.jeecg.modules.weituo.entity.ItdmWeituoInfo;

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/gongdandetail/controller/ItdmGongdanQuerenController.java

@@ -12,7 +12,7 @@ import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.gongdandetail.dto.ItdmGongdanDetailEditDTO;
 import org.jeecg.modules.gongdandetail.service.IItdmGongdanQuerenService;
-import org.jeecg.modules.itdmGongdanDetail.entity.ItdmGongdanDetail;
+import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/gongdandetail/convert/GongdanDetailConvert.java

@@ -1,7 +1,7 @@
 package org.jeecg.modules.gongdandetail.convert;
 
 import org.jeecg.modules.gongdandetail.dto.ItdmGongdanDetailEditDTO;
-import org.jeecg.modules.itdmGongdanDetail.entity.ItdmGongdanDetail;
+import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 import org.mapstruct.factory.Mappers;

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/gongdandetail/service/IItdmGongdanQuerenService.java

@@ -2,7 +2,7 @@ package org.jeecg.modules.gongdandetail.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.gongdandetail.dto.ItdmGongdanDetailEditDTO;
-import org.jeecg.modules.itdmGongdanDetail.entity.ItdmGongdanDetail;
+import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail;
 
 import java.text.ParseException;
 

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/gongdandetail/service/impl/ItdmGongdanQuerenServiceImpl.java

@@ -5,10 +5,10 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.jeecg.modules.gongdandetail.convert.GongdanDetailConvert;
 import org.jeecg.modules.gongdandetail.dto.ItdmGongdanDetailEditDTO;
 import org.jeecg.modules.gongdandetail.service.IItdmGongdanQuerenService;
-import org.jeecg.modules.itdmGongdanDetail.entity.ItdmGongdanDetail;
-import org.jeecg.modules.itdmGongdanDetail.mapper.ItdmGongdanDetailMapper;
-import org.jeecg.modules.itdmGongdanMaster.entity.ItdmGongdanMaster;
-import org.jeecg.modules.itdmGongdanMaster.mapper.ItdmGongdanMasterMapper;
+import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail;
+import org.jeecg.modules.itdmGongDan.mapper.ItdmGongdanDetailMapper;
+import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanMaster;
+import org.jeecg.modules.itdmGongDan.mapper.ItdmGongdanMasterMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -16,13 +16,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
-import java.util.function.Function;
 import java.util.function.Supplier;
-import java.util.stream.Collectors;
 
 /**
  * @Description: 工单detail
@@ -35,6 +31,7 @@ public class ItdmGongdanQuerenServiceImpl extends ServiceImpl<ItdmGongdanDetailM
 
 
     @Autowired
+    @SuppressWarnings("all")
     private ItdmGongdanMasterMapper masterMapper;
 
     @Override

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongdanDetail/controller/ItdmGongdanDetailController.java

@@ -1,37 +1,22 @@
-package org.jeecg.modules.itdmGongdanDetail.controller;
+package org.jeecg.modules.itdmGongDan.controller;
 
 import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.itdmGongdanDetail.entity.ItdmGongdanDetail;
-import org.jeecg.modules.itdmGongdanDetail.service.IItdmGongdanDetailService;
+import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail;
+import org.jeecg.modules.itdmGongDan.service.IItdmGongdanDetailService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
@@ -49,7 +34,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class ItdmGongdanDetailController extends JeecgController<ItdmGongdanDetail, IItdmGongdanDetailService> {
 	@Autowired
 	private IItdmGongdanDetailService itdmGongdanDetailService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -71,7 +56,7 @@ public class ItdmGongdanDetailController extends JeecgController<ItdmGongdanDeta
 		IPage<ItdmGongdanDetail> pageList = itdmGongdanDetailService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -86,7 +71,7 @@ public class ItdmGongdanDetailController extends JeecgController<ItdmGongdanDeta
 		itdmGongdanDetailService.save(itdmGongdanDetail);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -101,7 +86,7 @@ public class ItdmGongdanDetailController extends JeecgController<ItdmGongdanDeta
 		itdmGongdanDetailService.updateById(itdmGongdanDetail);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -116,7 +101,7 @@ public class ItdmGongdanDetailController extends JeecgController<ItdmGongdanDeta
 		itdmGongdanDetailService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -131,7 +116,7 @@ public class ItdmGongdanDetailController extends JeecgController<ItdmGongdanDeta
 		this.itdmGongdanDetailService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongdanMaster/controller/ItdmGongdanMasterController.java

@@ -1,37 +1,22 @@
-package org.jeecg.modules.itdmGongdanMaster.controller;
+package org.jeecg.modules.itdmGongDan.controller;
 
 import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.itdmGongdanMaster.entity.ItdmGongdanMaster;
-import org.jeecg.modules.itdmGongdanMaster.service.IItdmGongdanMasterService;
+import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanMaster;
+import org.jeecg.modules.itdmGongDan.service.IItdmGongdanMasterService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
@@ -39,7 +24,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 工单master
  * @Author: jeecg-boot
- * @Date:   2023-05-21
+ * @Date:   2023-05-28
  * @Version: V1.0
  */
 @Api(tags="工单master")
@@ -49,7 +34,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class ItdmGongdanMasterController extends JeecgController<ItdmGongdanMaster, IItdmGongdanMasterService> {
 	@Autowired
 	private IItdmGongdanMasterService itdmGongdanMasterService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -71,7 +56,7 @@ public class ItdmGongdanMasterController extends JeecgController<ItdmGongdanMast
 		IPage<ItdmGongdanMaster> pageList = itdmGongdanMasterService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -86,7 +71,7 @@ public class ItdmGongdanMasterController extends JeecgController<ItdmGongdanMast
 		itdmGongdanMasterService.save(itdmGongdanMaster);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -101,7 +86,7 @@ public class ItdmGongdanMasterController extends JeecgController<ItdmGongdanMast
 		itdmGongdanMasterService.updateById(itdmGongdanMaster);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -116,7 +101,7 @@ public class ItdmGongdanMasterController extends JeecgController<ItdmGongdanMast
 		itdmGongdanMasterService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -131,7 +116,7 @@ public class ItdmGongdanMasterController extends JeecgController<ItdmGongdanMast
 		this.itdmGongdanMasterService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmTestPlan/controller/ItdmJCXMSHJHController.java

@@ -1,16 +1,16 @@
-package org.jeecg.modules.itdmTestPlan.controller;
+package org.jeecg.modules.itdmGongDan.controller;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.modules.itdmGongdanDetail.service.IItdmGongdanDetailService;
-import org.jeecg.modules.itdmGongdanMaster.service.IItdmGongdanMasterService;
-import org.jeecg.modules.itdmTestPlan.service.IItdmJCXMSHJHService;
-import org.jeecg.modules.itdmTestPlan.service.IItdmTestPlanService;
-import org.jeecg.modules.itdmTestPlan.vo.ItdmJHYQueryListVO;
-import org.jeecg.modules.itdmTestPlan.vo.ItdmXMJLQueryListVO;
+import org.jeecg.modules.itdmGongDan.service.IItdmGongdanDetailService;
+import org.jeecg.modules.itdmGongDan.service.IItdmGongdanMasterService;
+import org.jeecg.modules.itdmGongDan.service.IItdmJCXMSHJHService;
+import org.jeecg.modules.itdmGongDan.service.IItdmTestPlanService;
+import org.jeecg.modules.itdmGongDan.vo.ItdmJHYQueryListVO;
+import org.jeecg.modules.itdmGongDan.vo.ItdmXMJLQueryListVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmTestPlan/controller/ItdmTestPlanController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.itdmTestPlan.controller;
+package org.jeecg.modules.itdmGongDan.controller;
 
 import java.util.Arrays;
 import javax.servlet.http.HttpServletRequest;
@@ -6,8 +6,8 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.itdmTestPlan.entity.ItdmTestPlan;
-import org.jeecg.modules.itdmTestPlan.service.IItdmTestPlanService;
+import org.jeecg.modules.itdmGongDan.entity.ItdmTestPlan;
+import org.jeecg.modules.itdmGongDan.service.IItdmTestPlanService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongdanDetail/entity/ItdmGongdanDetail.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.itdmGongdanDetail.entity;
+package org.jeecg.modules.itdmGongDan.entity;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongdanMaster/entity/ItdmGongdanMaster.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.itdmGongdanMaster.entity;
+package org.jeecg.modules.itdmGongDan.entity;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
@@ -21,7 +21,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 工单master
  * @Author: jeecg-boot
- * @Date:   2023-05-21
+ * @Date:   2023-05-28
  * @Version: V1.0
  */
 @Data
@@ -115,8 +115,8 @@ public class ItdmGongdanMaster implements Serializable {
 	/**所属部门*/
     @ApiModelProperty(value = "所属部门")
     private java.lang.String sysOrgCode;
-    /**传感器*/
-    @Excel(name = "传感器id", width = 20)
-    @ApiModelProperty(value = "传感器id")
+	/**传感器*/
+	@Excel(name = "传感器", width = 15)
+    @ApiModelProperty(value = "传感器")
     private java.lang.String chuanganqi;
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmTestPlan/entity/ItdmTestPlan.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.itdmTestPlan.entity;
+package org.jeecg.modules.itdmGongDan.entity;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongdanDetail/mapper/ItdmGongdanDetailMapper.java

@@ -1,9 +1,6 @@
-package org.jeecg.modules.itdmGongdanDetail.mapper;
+package org.jeecg.modules.itdmGongDan.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.itdmGongdanDetail.entity.ItdmGongdanDetail;
+import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongdanMaster/mapper/ItdmGongdanMasterMapper.java

@@ -1,15 +1,12 @@
-package org.jeecg.modules.itdmGongdanMaster.mapper;
+package org.jeecg.modules.itdmGongDan.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.itdmGongdanMaster.entity.ItdmGongdanMaster;
+import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanMaster;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * @Description: 工单master
  * @Author: jeecg-boot
- * @Date:   2023-05-21
+ * @Date:   2023-05-28
  * @Version: V1.0
  */
 public interface ItdmGongdanMasterMapper extends BaseMapper<ItdmGongdanMaster> {

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmTestPlan/mapper/ItdmJCXMSHJHMapper.java

@@ -1,11 +1,10 @@
-package org.jeecg.modules.itdmTestPlan.mapper;
+package org.jeecg.modules.itdmGongDan.mapper;
 
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
-import org.jeecg.modules.itdmDevice.entity.ItdmDevice;
-import org.jeecg.modules.itdmTestPlan.vo.ItdmJCXMAndSYJHVO;
-import org.jeecg.modules.itdmTestPlan.vo.ItdmJHYQueryListVO;
-import org.jeecg.modules.itdmTestPlan.vo.ItdmXMJLQueryListVO;
+import org.jeecg.modules.itdmGongDan.vo.ItdmJCXMAndSYJHVO;
+import org.jeecg.modules.itdmGongDan.vo.ItdmJHYQueryListVO;
+import org.jeecg.modules.itdmGongDan.vo.ItdmXMJLQueryListVO;
 
 import java.util.List;
 

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmTestPlan/mapper/ItdmTestPlanMapper.java

@@ -1,7 +1,7 @@
-package org.jeecg.modules.itdmTestPlan.mapper;
+package org.jeecg.modules.itdmGongDan.mapper;
 
 import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.itdmTestPlan.entity.ItdmTestPlan;
+import org.jeecg.modules.itdmGongDan.entity.ItdmTestPlan;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import java.util.List;

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongdanDetail/mapper/xml/ItdmGongdanDetailMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.itdmGongdanDetail.mapper.ItdmGongdanDetailMapper">
+<mapper namespace="org.jeecg.modules.itdmGongDan.mapper.ItdmGongdanDetailMapper">
 
-</mapper>
+</mapper>

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongdanMaster/mapper/xml/ItdmGongdanMasterMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.itdmGongdanMaster.mapper.ItdmGongdanMasterMapper">
+<mapper namespace="org.jeecg.modules.itdmGongDan.mapper.ItdmGongdanMasterMapper">
 
-</mapper>
+</mapper>

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmTestPlan/mapper/xml/ItdmJCXMSHJHMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.itdmTestPlan.mapper.ItdmJCXMSHJHMapper">
+<mapper namespace="org.jeecg.modules.itdmGongDan.mapper.ItdmJCXMSHJHMapper">
 
 </mapper>

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmTestPlan/mapper/xml/ItdmTestPlanMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.itdmTestPlan.mapper.ItdmTestPlanMapper">
+<mapper namespace="org.jeecg.modules.itdmGongDan.mapper.ItdmTestPlanMapper">
 
     <select id="geChuanganqitByShiyanid" resultType="java.lang.String">
 
@@ -70,4 +70,4 @@
     </select>
 
 
-</mapper>
+</mapper>

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongdanDetail/service/IItdmGongdanDetailService.java

@@ -1,6 +1,6 @@
-package org.jeecg.modules.itdmGongdanDetail.service;
+package org.jeecg.modules.itdmGongDan.service;
 
-import org.jeecg.modules.itdmGongdanDetail.entity.ItdmGongdanDetail;
+import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongdanMaster/service/IItdmGongdanMasterService.java

@@ -1,12 +1,12 @@
-package org.jeecg.modules.itdmGongdanMaster.service;
+package org.jeecg.modules.itdmGongDan.service;
 
-import org.jeecg.modules.itdmGongdanMaster.entity.ItdmGongdanMaster;
+import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanMaster;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * @Description: 工单master
  * @Author: jeecg-boot
- * @Date:   2023-05-21
+ * @Date:   2023-05-28
  * @Version: V1.0
  */
 public interface IItdmGongdanMasterService extends IService<ItdmGongdanMaster> {

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmTestPlan/service/IItdmJCXMSHJHService.java

@@ -1,9 +1,8 @@
-package org.jeecg.modules.itdmTestPlan.service;
+package org.jeecg.modules.itdmGongDan.service;
 
 import org.apache.ibatis.annotations.Param;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.itdmTestPlan.vo.ItdmJHYQueryListVO;
-import org.jeecg.modules.itdmTestPlan.vo.ItdmXMJLQueryListVO;
+import org.jeecg.modules.itdmGongDan.vo.ItdmJHYQueryListVO;
+import org.jeecg.modules.itdmGongDan.vo.ItdmXMJLQueryListVO;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmTestPlan/service/IItdmTestPlanService.java

@@ -1,6 +1,6 @@
-package org.jeecg.modules.itdmTestPlan.service;
+package org.jeecg.modules.itdmGongDan.service;
 
-import org.jeecg.modules.itdmTestPlan.entity.ItdmTestPlan;
+import org.jeecg.modules.itdmGongDan.entity.ItdmTestPlan;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongdanDetail/service/impl/ItdmGongdanDetailServiceImpl.java

@@ -1,8 +1,8 @@
-package org.jeecg.modules.itdmGongdanDetail.service.impl;
+package org.jeecg.modules.itdmGongDan.service.impl;
 
-import org.jeecg.modules.itdmGongdanDetail.entity.ItdmGongdanDetail;
-import org.jeecg.modules.itdmGongdanDetail.mapper.ItdmGongdanDetailMapper;
-import org.jeecg.modules.itdmGongdanDetail.service.IItdmGongdanDetailService;
+import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail;
+import org.jeecg.modules.itdmGongDan.mapper.ItdmGongdanDetailMapper;
+import org.jeecg.modules.itdmGongDan.service.IItdmGongdanDetailService;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongdanMaster/service/impl/ItdmGongdanMasterServiceImpl.java

@@ -1,8 +1,8 @@
-package org.jeecg.modules.itdmGongdanMaster.service.impl;
+package org.jeecg.modules.itdmGongDan.service.impl;
 
-import org.jeecg.modules.itdmGongdanMaster.entity.ItdmGongdanMaster;
-import org.jeecg.modules.itdmGongdanMaster.mapper.ItdmGongdanMasterMapper;
-import org.jeecg.modules.itdmGongdanMaster.service.IItdmGongdanMasterService;
+import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanMaster;
+import org.jeecg.modules.itdmGongDan.mapper.ItdmGongdanMasterMapper;
+import org.jeecg.modules.itdmGongDan.service.IItdmGongdanMasterService;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 工单master
  * @Author: jeecg-boot
- * @Date:   2023-05-21
+ * @Date:   2023-05-28
  * @Version: V1.0
  */
 @Service

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmTestPlan/service/impl/ItdmJCXMSHJHServiceImpl.java

@@ -1,20 +1,20 @@
-package org.jeecg.modules.itdmTestPlan.service.impl;
+package org.jeecg.modules.itdmGongDan.service.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.jeecg.modules.itdmDevice.mapper.ItdmDeviceMapper;
-import org.jeecg.modules.itdmGongdanDetail.entity.ItdmGongdanDetail;
-import org.jeecg.modules.itdmGongdanDetail.mapper.ItdmGongdanDetailMapper;
-import org.jeecg.modules.itdmGongdanMaster.entity.ItdmGongdanMaster;
-import org.jeecg.modules.itdmGongdanMaster.mapper.ItdmGongdanMasterMapper;
-import org.jeecg.modules.itdmTestPlan.entity.ItdmTestPlan;
-import org.jeecg.modules.itdmTestPlan.mapper.ItdmJCXMSHJHMapper;
-import org.jeecg.modules.itdmTestPlan.mapper.ItdmTestPlanMapper;
-import org.jeecg.modules.itdmTestPlan.service.IItdmJCXMSHJHService;
-import org.jeecg.modules.itdmTestPlan.vo.ItdmJCXMAndSYJHVO;
-import org.jeecg.modules.itdmTestPlan.vo.ItdmJHYQueryListVO;
-import org.jeecg.modules.itdmTestPlan.vo.ItdmXMJLQueryListVO;
+import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail;
+import org.jeecg.modules.itdmGongDan.mapper.ItdmGongdanDetailMapper;
+import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanMaster;
+import org.jeecg.modules.itdmGongDan.mapper.ItdmGongdanMasterMapper;
+import org.jeecg.modules.itdmGongDan.entity.ItdmTestPlan;
+import org.jeecg.modules.itdmGongDan.mapper.ItdmJCXMSHJHMapper;
+import org.jeecg.modules.itdmGongDan.mapper.ItdmTestPlanMapper;
+import org.jeecg.modules.itdmGongDan.service.IItdmJCXMSHJHService;
+import org.jeecg.modules.itdmGongDan.vo.ItdmJCXMAndSYJHVO;
+import org.jeecg.modules.itdmGongDan.vo.ItdmJHYQueryListVO;
+import org.jeecg.modules.itdmGongDan.vo.ItdmXMJLQueryListVO;
 import org.jeecg.modules.weituo.mapper.ItdmWeituoInfoMapper;
 import org.jeecg.modules.weituo.mapper.ItdmWeituoYangpinMapper;
 import org.springframework.beans.factory.annotation.Autowired;

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmTestPlan/service/impl/ItdmTestPlanServiceImpl.java

@@ -1,8 +1,8 @@
-package org.jeecg.modules.itdmTestPlan.service.impl;
+package org.jeecg.modules.itdmGongDan.service.impl;
 
-import org.jeecg.modules.itdmTestPlan.entity.ItdmTestPlan;
-import org.jeecg.modules.itdmTestPlan.mapper.ItdmTestPlanMapper;
-import org.jeecg.modules.itdmTestPlan.service.IItdmTestPlanService;
+import org.jeecg.modules.itdmGongDan.entity.ItdmTestPlan;
+import org.jeecg.modules.itdmGongDan.mapper.ItdmTestPlanMapper;
+import org.jeecg.modules.itdmGongDan.service.IItdmTestPlanService;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmTestPlan/vo/ItdmJCXMAndSYJHVO.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.itdmTestPlan.vo;
+package org.jeecg.modules.itdmGongDan.vo;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmTestPlan/vo/ItdmJHYQueryListVO.java

@@ -1,10 +1,10 @@
-package org.jeecg.modules.itdmTestPlan.vo;
+package org.jeecg.modules.itdmGongDan.vo;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import org.jeecg.common.aspect.annotation.Dict;
-import org.jeecg.modules.itdmTestPlan.entity.ItdmTestPlan;
+import org.jeecg.modules.itdmGongDan.entity.ItdmTestPlan;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmTestPlan/vo/ItdmXMJLQueryListVO.java

@@ -1,10 +1,10 @@
-package org.jeecg.modules.itdmTestPlan.vo;
+package org.jeecg.modules.itdmGongDan.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import org.jeecg.common.aspect.annotation.Dict;
-import org.jeecg.modules.itdmGongdanMaster.entity.ItdmGongdanMaster;
-import org.jeecg.modules.itdmTestPlan.entity.ItdmTestPlan;
+import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanMaster;
+import org.jeecg.modules.itdmGongDan.entity.ItdmTestPlan;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;