diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/PartLeaseController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/controller/PartLeaseController.java similarity index 90% rename from bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/PartLeaseController.java rename to bonus-modules/bonus-material/src/main/java/com/bonus/material/part/controller/PartLeaseController.java index 45a196ee..bf07bcb3 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/PartLeaseController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/controller/PartLeaseController.java @@ -1,12 +1,11 @@ -package com.bonus.material.lease.controller; +package com.bonus.material.part.controller; 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.material.lease.domain.PartLeaseDetails; -import com.bonus.material.lease.domain.PartLeaseInfo; -import com.bonus.material.lease.service.PartLeaseService; -import com.bonus.material.lease.service.impl.PartLeaseServiceImpl; +import com.bonus.material.part.domain.PartLeaseDetails; +import com.bonus.material.part.domain.PartLeaseInfo; +import com.bonus.material.part.service.PartLeaseService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/PartLeaseDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/domain/PartLeaseDetails.java similarity index 91% rename from bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/PartLeaseDetails.java rename to bonus-modules/bonus-material/src/main/java/com/bonus/material/part/domain/PartLeaseDetails.java index d4220f8b..389554ed 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/PartLeaseDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/domain/PartLeaseDetails.java @@ -1,4 +1,4 @@ -package com.bonus.material.lease.domain; +package com.bonus.material.part.domain; import lombok.Data; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/PartLeaseInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/domain/PartLeaseInfo.java similarity index 96% rename from bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/PartLeaseInfo.java rename to bonus-modules/bonus-material/src/main/java/com/bonus/material/part/domain/PartLeaseInfo.java index 0d411a12..890e4645 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/PartLeaseInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/domain/PartLeaseInfo.java @@ -1,4 +1,4 @@ -package com.bonus.material.lease.domain; +package com.bonus.material.part.domain; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/PartLeasePersonStorage.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/domain/PartLeasePersonStorage.java similarity index 94% rename from bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/PartLeasePersonStorage.java rename to bonus-modules/bonus-material/src/main/java/com/bonus/material/part/domain/PartLeasePersonStorage.java index 037cf3da..63f1808e 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/PartLeasePersonStorage.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/domain/PartLeasePersonStorage.java @@ -1,4 +1,4 @@ -package com.bonus.material.lease.domain; +package com.bonus.material.part.domain; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/PartLeaseMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/mapper/PartLeaseMapper.java similarity index 91% rename from bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/PartLeaseMapper.java rename to bonus-modules/bonus-material/src/main/java/com/bonus/material/part/mapper/PartLeaseMapper.java index 0196eeb7..8d3f430f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/PartLeaseMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/mapper/PartLeaseMapper.java @@ -1,7 +1,7 @@ -package com.bonus.material.lease.mapper; +package com.bonus.material.part.mapper; -import com.bonus.material.lease.domain.PartLeaseDetails; -import com.bonus.material.lease.domain.PartLeaseInfo; +import com.bonus.material.part.domain.PartLeaseDetails; +import com.bonus.material.part.domain.PartLeaseInfo; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/PartLeaseService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/service/PartLeaseService.java similarity index 91% rename from bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/PartLeaseService.java rename to bonus-modules/bonus-material/src/main/java/com/bonus/material/part/service/PartLeaseService.java index 1599973a..b92ce676 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/PartLeaseService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/service/PartLeaseService.java @@ -1,7 +1,7 @@ -package com.bonus.material.lease.service; +package com.bonus.material.part.service; -import com.bonus.material.lease.domain.PartLeaseDetails; -import com.bonus.material.lease.domain.PartLeaseInfo; +import com.bonus.material.part.domain.PartLeaseDetails; +import com.bonus.material.part.domain.PartLeaseInfo; import java.util.List; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/PartLeaseServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/service/impl/PartLeaseServiceImpl.java similarity index 94% rename from bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/PartLeaseServiceImpl.java rename to bonus-modules/bonus-material/src/main/java/com/bonus/material/part/service/impl/PartLeaseServiceImpl.java index 6459e3ab..ee706e44 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/PartLeaseServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/service/impl/PartLeaseServiceImpl.java @@ -1,15 +1,14 @@ -package com.bonus.material.lease.service.impl; +package com.bonus.material.part.service.impl; -import com.bonus.common.biz.config.DateTimeHelper; import com.bonus.common.biz.constant.MaterialConstants; 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.security.utils.SecurityUtils; -import com.bonus.material.lease.domain.PartLeaseDetails; -import com.bonus.material.lease.domain.PartLeaseInfo; -import com.bonus.material.lease.mapper.PartLeaseMapper; -import com.bonus.material.lease.service.PartLeaseService; +import com.bonus.material.part.domain.PartLeaseDetails; +import com.bonus.material.part.domain.PartLeaseInfo; +import com.bonus.material.part.mapper.PartLeaseMapper; +import com.bonus.material.part.service.PartLeaseService; import com.bonus.material.task.mapper.TmTaskMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/PartLeaseMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/part/PartLeaseMapper.xml similarity index 94% rename from bonus-modules/bonus-material/src/main/resources/mapper/material/lease/PartLeaseMapper.xml rename to bonus-modules/bonus-material/src/main/resources/mapper/material/part/PartLeaseMapper.xml index 181dbc6d..96e126eb 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/PartLeaseMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/part/PartLeaseMapper.xml @@ -2,12 +2,12 @@ - + - - select task_id, code, creator, create_time, auditor, audit_time, status, remarks, company_id from pa_collar_apply @@ -36,7 +36,7 @@ - select pcad.id, pcad.task_id, pcad.part_id, mpt.pa_name as partName, pcad.pre_num, pcad.al_num, pcad.remarks from pa_collar_apply_details pcad left join ma_part_type mpt on pcad.part_id = mpt.pa_id