bmfileinfo类共用移动

bonus-common-biz/src/main/java/com/bonus/common/biz/domain/BmFileInfo.java

@@ -1,4 +1,4 @@
-package com.bonus.material.basic.domain;
+package com.bonus.common.biz.domain;
 
 import com.bonus.common.core.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;

bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/BackApplyDetails.java

@@ -1,7 +1,7 @@
 package com.bonus.material.back.domain;
 
 import com.bonus.common.core.annotation.Excel;
-import com.bonus.material.basic.domain.BmFileInfo;
+import com.bonus.common.biz.domain.BmFileInfo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/MaCodeDto.java

@@ -1,7 +1,7 @@
 package com.bonus.material.back.domain;
 
 import com.bonus.common.core.web.domain.BaseEntity;
-import com.bonus.material.basic.domain.BmFileInfo;
+import com.bonus.common.biz.domain.BmFileInfo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java

@@ -21,7 +21,7 @@ import com.bonus.material.back.domain.MaCodeDto;
 import com.bonus.material.back.domain.vo.BackAppRequestVo;
 import com.bonus.material.back.domain.vo.BackApplyRequestVo;
 import com.bonus.material.back.domain.vo.MaCodeVo;
-import com.bonus.material.basic.domain.BmFileInfo;
+import com.bonus.common.biz.domain.BmFileInfo;
 import com.bonus.material.basic.mapper.BmFileInfoMapper;
 import com.bonus.material.ma.mapper.MachineMapper;
 import com.bonus.material.purchase.config.RemoteConfig;
@@ -32,7 +32,6 @@ import com.bonus.material.task.domain.TmTaskAgreement;
 import com.bonus.material.task.mapper.TmTaskAgreementMapper;
 import com.bonus.material.task.mapper.TmTaskMapper;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.bonus.material.back.mapper.BackApplyInfoMapper;
 import com.bonus.material.back.domain.BackApplyInfo;

bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmFileInfoController.java

@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.bonus.common.log.annotation.SysLog;
 import com.bonus.common.security.annotation.RequiresPermissions;
-import com.bonus.material.basic.domain.BmFileInfo;
+import com.bonus.common.biz.domain.BmFileInfo;
 import com.bonus.material.basic.service.IBmFileInfoService;
 import com.bonus.common.core.web.controller.BaseController;
 import com.bonus.common.core.web.domain.AjaxResult;

bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmAgreementInfo.java

@@ -3,6 +3,7 @@ package com.bonus.material.basic.domain;
 import java.util.Date;
 import java.util.List;
 
+import com.bonus.common.biz.domain.BmFileInfo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.bonus.common.core.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;

bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmFileInfoMapper.java

@@ -1,7 +1,7 @@
 package com.bonus.material.basic.mapper;
 
 import java.util.List;
-import com.bonus.material.basic.domain.BmFileInfo;
+import com.bonus.common.biz.domain.BmFileInfo;
 import org.apache.ibatis.annotations.Param;
 
 /**

bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmFileInfoService.java

@@ -1,7 +1,7 @@
 package com.bonus.material.basic.service;
 
 import java.util.List;
-import com.bonus.material.basic.domain.BmFileInfo;
+import com.bonus.common.biz.domain.BmFileInfo;
 
 /**
  * 附件

bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmAgreementInfoServiceImpl.java

@@ -11,7 +11,7 @@ import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.core.utils.DateUtils;
 import com.bonus.common.core.web.domain.AjaxResult;
 import com.bonus.common.security.utils.SecurityUtils;
-import com.bonus.material.basic.domain.BmFileInfo;
+import com.bonus.common.biz.domain.BmFileInfo;
 import com.bonus.material.basic.mapper.BmFileInfoMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmFileInfoServiceImpl.java

@@ -5,7 +5,7 @@ import com.bonus.common.core.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.bonus.material.basic.mapper.BmFileInfoMapper;
-import com.bonus.material.basic.domain.BmFileInfo;
+import com.bonus.common.biz.domain.BmFileInfo;
 import com.bonus.material.basic.service.IBmFileInfoService;
 
 /**

bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/SupplierInfo.java

@@ -1,7 +1,7 @@
 package com.bonus.material.ma.domain;
 
 import com.bonus.common.core.annotation.Excel;
-import com.bonus.material.basic.domain.BmFileInfo;
+import com.bonus.common.biz.domain.BmFileInfo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/SupplierInfoServiceImpl.java

@@ -6,7 +6,7 @@ import com.bonus.common.biz.enums.TmTaskTypeEnum;
 import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.core.utils.DateUtils;
 import com.bonus.common.core.web.domain.AjaxResult;
-import com.bonus.material.basic.domain.BmFileInfo;
+import com.bonus.common.biz.domain.BmFileInfo;
 import com.bonus.material.basic.mapper.BmFileInfoMapper;
 import com.bonus.system.api.RemoteFileService;
 import org.springframework.stereotype.Service;

bonus-modules/bonus-material/src/main/java/com/bonus/material/part/controller/partArrivedController.java

@@ -6,19 +6,12 @@ import com.bonus.common.core.utils.ServletUtils;
 import com.bonus.common.core.utils.poi.ExcelUtil;
 import com.bonus.common.core.web.controller.BaseController;
 import com.bonus.common.core.web.domain.AjaxResult;
-import com.bonus.common.core.web.page.TableDataInfo;
 import com.bonus.common.log.annotation.SysLog;
 import com.bonus.common.log.enums.OperaType;
-import com.bonus.common.security.annotation.RequiresPermissions;
-import com.bonus.material.basic.domain.BmFileInfo;
 import com.bonus.material.common.annotation.PreventRepeatSubmit;
 import com.bonus.material.part.domain.*;
 import com.bonus.material.part.mapper.PartArrivedMapper;
 import com.bonus.material.part.service.IPartArrivedService;
-import com.bonus.material.purchase.domain.PurchaseCheckDetails;
-import com.bonus.material.purchase.domain.PurchaseCheckInfo;
-import com.bonus.material.purchase.domain.dto.PurchaseCheckDto;
-import com.bonus.material.purchase.domain.dto.PurchaseQueryDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

bonus-modules/bonus-material/src/main/java/com/bonus/material/part/domain/PartTypeCheckDetails.java

@@ -2,7 +2,7 @@ package com.bonus.material.part.domain;
 
 import com.bonus.common.core.annotation.Excel;
 import com.bonus.common.core.web.domain.BaseEntity;
-import com.bonus.material.basic.domain.BmFileInfo;
+import com.bonus.common.biz.domain.BmFileInfo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

bonus-modules/bonus-material/src/main/java/com/bonus/material/part/service/impl/PartAcceptServiceImpl.java

@@ -3,9 +3,7 @@ package com.bonus.material.part.service.impl;
 
 
 import com.bonus.common.core.web.domain.AjaxResult;
-import com.bonus.material.basic.domain.BmFileInfo;
 import com.bonus.material.basic.mapper.BmFileInfoMapper;
-import com.bonus.material.ma.domain.Type;
 import com.bonus.material.part.domain.*;
 import com.bonus.material.part.mapper.PartAcceptMapper;
 
@@ -18,8 +16,6 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 
-import java.util.ArrayList;
-
 import java.util.List;
 
 

bonus-modules/bonus-material/src/main/java/com/bonus/material/part/service/impl/PartArrivedServiceImpl.java

@@ -1,25 +1,16 @@
 package com.bonus.material.part.service.impl;
 
 
-import com.bonus.common.biz.constant.BmConfigItems;
-import com.bonus.common.biz.enums.MaTypeManageTypeEnum;
-import com.bonus.common.biz.enums.PurchaseTaskStageEnum;
-import com.bonus.common.biz.enums.PurchaseTaskStatusEnum;
 import com.bonus.common.biz.enums.TmTaskTypeEnum;
 import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.core.utils.DateUtils;
 import com.bonus.common.core.web.domain.AjaxResult;
 import com.bonus.common.security.utils.SecurityUtils;
-import com.bonus.material.basic.domain.BmFileInfo;
+import com.bonus.common.biz.domain.BmFileInfo;
 import com.bonus.material.basic.mapper.BmFileInfoMapper;
-import com.bonus.material.ma.domain.Type;
 import com.bonus.material.part.domain.*;
 import com.bonus.material.part.mapper.PartArrivedMapper;
 import com.bonus.material.part.service.IPartArrivedService;
-import com.bonus.material.purchase.domain.PurchaseCheckDetails;
-import com.bonus.material.purchase.domain.PurchaseCheckInfo;
-import com.bonus.material.purchase.domain.dto.PurchaseCheckDto;
-import com.bonus.material.purchase.domain.dto.PurchaseQueryDto;
 import com.bonus.material.task.domain.TmTask;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataAccessException;
@@ -29,14 +20,10 @@ import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.stream.Collectors;
 
 import static com.bonus.common.biz.constant.MaterialConstants.PART_TASK_TYPE_LABEL;
-import static com.bonus.common.biz.constant.MaterialConstants.PURCHASE_TASK_TYPE_LABEL;
 
 /**
  * 配件新购管理Service业务层处理

bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java

@@ -5,7 +5,7 @@ import java.util.Date;
 import java.util.List;
 
 import com.bonus.material.archives.domain.ElcSignatureInfo;
-import com.bonus.material.basic.domain.BmFileInfo;
+import com.bonus.common.biz.domain.BmFileInfo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.bonus.common.core.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;

bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java

@@ -17,7 +17,7 @@ import com.bonus.common.core.utils.DateUtils;
 import com.bonus.common.core.utils.StringUtils;
 import com.bonus.common.core.web.domain.AjaxResult;
 import com.bonus.common.security.utils.SecurityUtils;
-import com.bonus.material.basic.domain.BmFileInfo;
+import com.bonus.common.biz.domain.BmFileInfo;
 import com.bonus.material.basic.mapper.BmFileInfoMapper;
 import com.bonus.material.basic.service.IBmConfigService;
 import com.bonus.material.countersign.domain.SignProcessVo;

bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairPart.java

@@ -1,6 +1,6 @@
 package com.bonus.material.repair.domain;
 
-import com.bonus.material.basic.domain.BmFileInfo;
+import com.bonus.common.biz.domain.BmFileInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairPartDetails.java

@@ -4,7 +4,7 @@ import java.math.BigDecimal;
 import java.util.List;
 
 import com.bonus.common.core.annotation.Excel;
-import com.bonus.material.basic.domain.BmFileInfo;
+import com.bonus.common.biz.domain.BmFileInfo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.ToString;

bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairDeviceListVo.java

@@ -1,7 +1,7 @@
 package com.bonus.material.repair.domain.vo;
 
 import com.bonus.common.biz.domain.BaseVO;
-import com.bonus.material.basic.domain.BmFileInfo;
+import com.bonus.common.biz.domain.BmFileInfo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairDeviceSummaryVo.java

@@ -1,7 +1,7 @@
 package com.bonus.material.repair.domain.vo;
 
 import com.bonus.common.biz.domain.BaseVO;
-import com.bonus.material.basic.domain.BmFileInfo;
+import com.bonus.common.biz.domain.BmFileInfo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairDeviceVO.java

@@ -1,15 +1,13 @@
 package com.bonus.material.repair.domain.vo;
 
-import com.bonus.material.basic.domain.BmFileInfo;
+import com.bonus.common.biz.domain.BmFileInfo;
 import com.bonus.material.repair.domain.RepairPartDetails;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 /**

bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java

@@ -10,7 +10,7 @@ import com.bonus.common.core.web.domain.AjaxResult;
 import com.bonus.common.security.utils.SecurityUtils;
 import com.bonus.material.back.domain.BackApplyInfo;
 import com.bonus.material.back.mapper.BackApplyInfoMapper;
-import com.bonus.material.basic.domain.BmFileInfo;
+import com.bonus.common.biz.domain.BmFileInfo;
 import com.bonus.material.basic.mapper.BmFileInfoMapper;
 import com.bonus.material.repair.domain.*;
 import com.bonus.material.repair.domain.vo.RepairDeviceSummaryVo;
@@ -37,7 +37,6 @@ import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 /**

bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/domain/ScrapApplyDetails.java

@@ -4,7 +4,7 @@ import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
-import com.bonus.material.basic.domain.BmFileInfo;
+import com.bonus.common.biz.domain.BmFileInfo;
 import com.bonus.material.scrap.domain.vo.ScrapTaskListVo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.bonus.common.core.annotation.Excel;

bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/service/impl/ScrapApplyDetailsServiceImpl.java

@@ -14,7 +14,7 @@ import com.bonus.common.core.utils.DateUtils;
 import com.bonus.common.core.utils.StringUtils;
 import com.bonus.common.core.web.domain.AjaxResult;
 import com.bonus.common.security.utils.SecurityUtils;
-import com.bonus.material.basic.domain.BmFileInfo;
+import com.bonus.common.biz.domain.BmFileInfo;
 import com.bonus.material.basic.mapper.BmFileInfoMapper;
 import com.bonus.material.scrap.domain.vo.ScrapTaskListVo;
 import com.bonus.material.task.domain.TmTask;

bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bonus.material.basic.mapper.BmFileInfoMapper">
-    <resultMap type="com.bonus.material.basic.domain.BmFileInfo" id="BmFileInfoResult">
+    <resultMap type="com.bonus.common.biz.domain.BmFileInfo" id="BmFileInfoResult">
         <result property="id"    column="id"    />
         <result property="taskType"    column="task_type"    />
         <result property="taskId"    column="task_id"    />
@@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, task_type, task_id, model_id, name, url, file_type, create_by, create_time from bm_file_info
     </sql>
 
-    <select id="selectBmFileInfoList" parameterType="com.bonus.material.basic.domain.BmFileInfo" resultMap="BmFileInfoResult">
+    <select id="selectBmFileInfoList" parameterType="com.bonus.common.biz.domain.BmFileInfo" resultMap="BmFileInfoResult">
         <include refid="selectBmFileInfoVo"/>
         <where>
             <if test="taskType != null "> and task_type = #{taskType}</if>
@@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
         
-    <insert id="insertBmFileInfo" parameterType="com.bonus.material.basic.domain.BmFileInfo" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertBmFileInfo" parameterType="com.bonus.common.biz.domain.BmFileInfo" useGeneratedKeys="true" keyProperty="id">
         insert into bm_file_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="taskType != null">task_type,</if>
@@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <insert id="insertBmFileInfos" parameterType="com.bonus.material.basic.domain.BmFileInfo">
+    <insert id="insertBmFileInfos" parameterType="com.bonus.common.biz.domain.BmFileInfo">
         INSERT INTO bm_file_info(task_type,task_id,model_id,name,url,file_type,create_by,create_time)
         VALUES
         <foreach collection="list" item="item" index="index" separator=",">
@@ -76,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </insert>
 
-    <update id="updateBmFileInfo" parameterType="com.bonus.material.basic.domain.BmFileInfo">
+    <update id="updateBmFileInfo" parameterType="com.bonus.common.biz.domain.BmFileInfo">
         update bm_file_info
         <trim prefix="SET" suffixOverrides=",">
             <if test="taskType != null">task_type = #{taskType},</if>
@@ -102,7 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
-    <delete id="deleteBmFileInfoByBizInfo" parameterType="com.bonus.material.basic.domain.BmFileInfo">
+    <delete id="deleteBmFileInfoByBizInfo" parameterType="com.bonus.common.biz.domain.BmFileInfo">
         delete from bm_file_info
         <where>
             <if test="taskType != null "> and task_type = #{taskType}</if>