diff --git a/sgzb-api/sgzb-api-system/pom.xml b/sgzb-api/sgzb-api-system/pom.xml index 49867621..c8a5068a 100644 --- a/sgzb-api/sgzb-api-system/pom.xml +++ b/sgzb-api/sgzb-api-system/pom.xml @@ -22,6 +22,10 @@ com.bonus.sgzb sgzb-common-core + + org.projectlombok + lombok + diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseApplyDetails.java similarity index 97% rename from sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java rename to sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseApplyDetails.java index 3e5a9604..d5b48827 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseApplyDetails.java @@ -1,4 +1,4 @@ -package com.bonus.sgzb.app.domain; +package com.bonus.sgzb.base.api.domain; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyInfo.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseApplyInfo.java similarity index 98% rename from sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyInfo.java rename to sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseApplyInfo.java index a2d094c8..83871aeb 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyInfo.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseApplyInfo.java @@ -1,4 +1,4 @@ -package com.bonus.sgzb.app.domain; +package com.bonus.sgzb.base.api.domain; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/TmTask.java similarity index 97% rename from sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java rename to sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/TmTask.java index d38e5105..5e7f90f7 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/TmTask.java @@ -1,4 +1,4 @@ -package com.bonus.sgzb.app.domain; +package com.bonus.sgzb.base.api.domain; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/sgzb-auth/pom.xml b/sgzb-auth/pom.xml index 30ac3205..38ca9e20 100644 --- a/sgzb-auth/pom.xml +++ b/sgzb-auth/pom.xml @@ -55,12 +55,12 @@ org.projectlombok lombok - - com.bonus.sgzb - sgzb-modules-system - 3.6.3 - compile - + + + + + + diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java index c3375d33..3715542d 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java @@ -1,8 +1,8 @@ package com.bonus.sgzb.app.controller; import cn.hutool.core.collection.CollUtil; -import com.bonus.sgzb.app.domain.LeaseApplyDetails; -import com.bonus.sgzb.app.domain.LeaseApplyInfo; -import com.bonus.sgzb.app.domain.TmTask; +import com.bonus.sgzb.base.api.domain.LeaseApplyDetails; +import com.bonus.sgzb.base.api.domain.LeaseApplyInfo; +import com.bonus.sgzb.base.api.domain.TmTask; import com.bonus.sgzb.app.service.LeaseApplyDetailsService; import com.bonus.sgzb.app.service.LeaseApplyInfoService; import com.bonus.sgzb.app.service.TmTaskService; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseApplyDetailsMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseApplyDetailsMapper.java index 58e9200c..26fad6d3 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseApplyDetailsMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseApplyDetailsMapper.java @@ -1,6 +1,6 @@ package com.bonus.sgzb.app.mapper; -import com.bonus.sgzb.app.domain.LeaseApplyDetails; +import com.bonus.sgzb.base.api.domain.LeaseApplyDetails; import java.util.List; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseApplyInfoMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseApplyInfoMapper.java index 6681a03f..31951933 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseApplyInfoMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseApplyInfoMapper.java @@ -1,6 +1,6 @@ package com.bonus.sgzb.app.mapper; -import com.bonus.sgzb.app.domain.LeaseApplyInfo; +import com.bonus.sgzb.base.api.domain.LeaseApplyInfo; import java.util.List; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java index e40b1fc6..09e8aac3 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java @@ -1,6 +1,6 @@ package com.bonus.sgzb.app.mapper; -import com.bonus.sgzb.app.domain.TmTask; +import com.bonus.sgzb.base.api.domain.TmTask; import java.util.List; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseApplyDetailsService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseApplyDetailsService.java index 3af18fb8..1ec9c91d 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseApplyDetailsService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseApplyDetailsService.java @@ -1,7 +1,7 @@ package com.bonus.sgzb.app.service; import java.util.List; -import com.bonus.sgzb.app.domain.LeaseApplyDetails; +import com.bonus.sgzb.base.api.domain.LeaseApplyDetails; /** * Description: * @Author 阮世耀 diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseApplyInfoService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseApplyInfoService.java index 0d4d79bb..3e623b43 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseApplyInfoService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseApplyInfoService.java @@ -1,7 +1,7 @@ package com.bonus.sgzb.app.service; import java.util.List; -import com.bonus.sgzb.app.domain.LeaseApplyInfo; +import com.bonus.sgzb.base.api.domain.LeaseApplyInfo; /** * Description: * @Author 阮世耀 diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java index b8322996..415d7ec1 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java @@ -1,7 +1,7 @@ package com.bonus.sgzb.app.service; import java.util.List; -import com.bonus.sgzb.app.domain.TmTask; +import com.bonus.sgzb.base.api.domain.TmTask; /** * Description: 任务表Task diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseApplyDetailsServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseApplyDetailsServiceImpl.java index 53f2fae2..ac1ee305 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseApplyDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseApplyDetailsServiceImpl.java @@ -4,7 +4,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; import com.bonus.sgzb.app.mapper.LeaseApplyDetailsMapper; -import com.bonus.sgzb.app.domain.LeaseApplyDetails; +import com.bonus.sgzb.base.api.domain.LeaseApplyDetails; import com.bonus.sgzb.app.service.LeaseApplyDetailsService; /** * Description: diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseApplyInfoServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseApplyInfoServiceImpl.java index eb9708df..2615f5b6 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseApplyInfoServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseApplyInfoServiceImpl.java @@ -4,7 +4,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import com.bonus.sgzb.app.mapper.LeaseApplyInfoMapper; import java.util.List; -import com.bonus.sgzb.app.domain.LeaseApplyInfo; +import com.bonus.sgzb.base.api.domain.LeaseApplyInfo; import com.bonus.sgzb.app.service.LeaseApplyInfoService; /** * Description: diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index 01803ed9..c01228bf 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java @@ -4,7 +4,7 @@ import com.bonus.sgzb.common.core.utils.DateUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; -import com.bonus.sgzb.app.domain.TmTask; +import com.bonus.sgzb.base.api.domain.TmTask; import com.bonus.sgzb.app.mapper.TmTaskMapper; import com.bonus.sgzb.app.service.TmTaskService; /** diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseApplyDetailsMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseApplyDetailsMapper.xml index 88789438..dab557a3 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseApplyDetailsMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseApplyDetailsMapper.xml @@ -1,7 +1,7 @@ - + @@ -34,7 +34,7 @@ delete from lease_apply_details where id = #{id,jdbcType=INTEGER} - + insert into lease_apply_details (parennt_id, type_id, pre_num, al_num, `status`, create_by, @@ -45,7 +45,7 @@ #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER}) - + insert into lease_apply_details @@ -119,7 +119,7 @@ - + update lease_apply_details @@ -159,7 +159,7 @@ where id = #{id,jdbcType=INTEGER} - + update lease_apply_details set parennt_id = #{parenntId,jdbcType=INTEGER}, @@ -342,7 +342,7 @@ - + insert into lease_apply_details @@ -396,7 +396,7 @@ company_id = #{companyId,jdbcType=INTEGER}, - + insert into lease_apply_details diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml index c4a21039..54512113 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml @@ -1,7 +1,7 @@ - + @@ -45,7 +45,7 @@ where id = #{id,jdbcType=INTEGER} - + insert into lease_apply_info (code, task_id, lease_person, phone, `type`, company_audit_by, company_audit_time, @@ -61,7 +61,7 @@ #{companyId,jdbcType=INTEGER}) - + insert into lease_apply_info @@ -172,7 +172,7 @@ - + update lease_apply_info @@ -228,7 +228,7 @@ where id = #{id,jdbcType=INTEGER} - + update lease_apply_info set task_id = #{taskId,jdbcType=INTEGER}, @@ -482,7 +482,7 @@ - + insert into lease_apply_info @@ -552,7 +552,7 @@ - + insert into lease_apply_info diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml index 0b9ddccc..b70cd39f 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml @@ -2,7 +2,7 @@ - + @@ -33,13 +33,13 @@ where task_id = #{taskId,jdbcType=BIGINT} - + insert into tm_task (task_type, task_status, code, create_by, create_time, update_by, update_time, remark, company_id) values (#{taskType,jdbcType=INTEGER}, #{taskStatus,jdbcType=INTEGER}, #{code,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER}) - + insert into tm_task @@ -101,7 +101,7 @@ - + update tm_task @@ -136,7 +136,7 @@ where task_id = #{taskId,jdbcType=BIGINT} - + update tm_task set task_type = #{taskType,jdbcType=INTEGER}, @@ -295,7 +295,7 @@ - + insert into tm_task @@ -344,7 +344,7 @@ - + insert into tm_task diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/TmTaskController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/TaskController.java similarity index 94% rename from sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/TmTaskController.java rename to sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/TaskController.java index b8f83e51..1a2b47f6 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/TmTaskController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/TaskController.java @@ -3,8 +3,8 @@ package com.bonus.sgzb.material.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; -import com.bonus.sgzb.material.domain.TmTask; -import com.bonus.sgzb.material.service.ITmTaskService; +import com.bonus.sgzb.base.api.domain.TmTask; +import com.bonus.sgzb.material.service.TaskService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -30,10 +30,10 @@ import com.bonus.sgzb.common.core.web.page.TableDataInfo; */ @RestController @RequestMapping("/task") -public class TmTaskController extends BaseController +public class TaskController extends BaseController { @Autowired - private ITmTaskService tmTaskService; + private TaskService tmTaskService; /** * 查询任务tm_task列表 diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseCheckInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseCheckInfo.java index 3029a295..31842a92 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseCheckInfo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseCheckInfo.java @@ -35,7 +35,7 @@ public class PurchaseCheckInfo extends BaseEntity /** 数据所属组织 */ @ApiModelProperty(value = "数据所属组织") - private Long companyId; + private Integer companyId; @ApiModelProperty(value = "采购单号") private String code; @@ -87,12 +87,12 @@ public class PurchaseCheckInfo extends BaseEntity { return purchaser; } - public void setCompanyId(Long companyId) + public void setCompanyId(Integer companyId) { this.companyId = companyId; } - public Long getCompanyId() + public Integer getCompanyId() { return companyId; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/TmTask.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/TmTask.java deleted file mode 100644 index 878538f8..00000000 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/TmTask.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.bonus.sgzb.material.domain; - -import com.bonus.sgzb.common.core.annotation.Excel; -import com.bonus.sgzb.common.core.web.domain.BaseEntity; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -/** - * 任务tm_task对象 tm_task - * - * @author bonus - * @date 2023-12-13 - */ -public class TmTask extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 任务ID */ - private Long taskId; - - /** 任务类型(定义数据字典) */ - @Excel(name = "任务类型(定义数据字典)") - private Long taskType; - - /** 任务状态(定义数据字典) */ - @Excel(name = "任务状态(定义数据字典)") - private Long taskStatus; - - /** 编号 */ - @Excel(name = "编号") - private String code; - - /** 数据所属组织 */ - @Excel(name = "数据所属组织") - private Long companyId; - - public void setTaskId(Long taskId) - { - this.taskId = taskId; - } - - public Long getTaskId() - { - return taskId; - } - public void setTaskType(Long taskType) - { - this.taskType = taskType; - } - - public Long getTaskType() - { - return taskType; - } - public void setTaskStatus(Long taskStatus) - { - this.taskStatus = taskStatus; - } - - public Long getTaskStatus() - { - return taskStatus; - } - public void setCode(String code) - { - this.code = code; - } - - public String getCode() - { - return code; - } - public void setCompanyId(Long companyId) - { - this.companyId = companyId; - } - - public Long getCompanyId() - { - return companyId; - } - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("taskId", getTaskId()) - .append("taskType", getTaskType()) - .append("taskStatus", getTaskStatus()) - .append("code", getCode()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .append("companyId", getCompanyId()) - .toString(); - } -} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/TmTaskMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/TaskMapper.java similarity index 93% rename from sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/TmTaskMapper.java rename to sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/TaskMapper.java index 0af1f515..f7674709 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/TmTaskMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/TaskMapper.java @@ -1,7 +1,9 @@ package com.bonus.sgzb.material.mapper; + +import com.bonus.sgzb.base.api.domain.TmTask; + import java.util.List; -import com.bonus.sgzb.material.domain.TmTask; /** * 任务tm_taskMapper接口 @@ -9,7 +11,7 @@ import com.bonus.sgzb.material.domain.TmTask; * @author bonus * @date 2023-12-13 */ -public interface TmTaskMapper +public interface TaskMapper { /** * 查询任务tm_task diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/ITmTaskService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/TaskService.java similarity index 93% rename from sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/ITmTaskService.java rename to sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/TaskService.java index c44aac9d..8c04b7ab 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/ITmTaskService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/TaskService.java @@ -1,6 +1,7 @@ package com.bonus.sgzb.material.service; -import com.bonus.sgzb.material.domain.TmTask; + +import com.bonus.sgzb.base.api.domain.TmTask; import java.util.List; @@ -10,7 +11,7 @@ import java.util.List; * @author bonus * @date 2023-12-13 */ -public interface ITmTaskService +public interface TaskService { /** * 查询任务tm_task diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java index d5a7855b..4eac2b67 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java @@ -2,10 +2,10 @@ package com.bonus.sgzb.material.service.impl; import java.util.List; +import com.bonus.sgzb.base.api.domain.TmTask; import com.bonus.sgzb.material.domain.PurchaseCheckInfo; -import com.bonus.sgzb.material.domain.TmTask; import com.bonus.sgzb.material.mapper.PurchaseCheckInfoMapper; -import com.bonus.sgzb.material.mapper.TmTaskMapper; +import com.bonus.sgzb.material.mapper.TaskMapper; import com.bonus.sgzb.material.service.IPurchaseCheckInfoService; import com.bonus.sgzb.common.core.utils.DateUtils; import org.springframework.stereotype.Service; @@ -26,7 +26,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService private PurchaseCheckInfoMapper purchaseCheckInfoMapper; @Resource - private TmTaskMapper taskMapper; + private TaskMapper taskMapper; /** * 查询新购验收任务 @@ -68,8 +68,8 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService public int insertPurchaseCheckInfo(PurchaseCheckInfo purchaseCheckInfo) { TmTask task = new TmTask(); - task.setTaskType(14L); - task.setTaskStatus(24L); + task.setTaskType(14); + task.setTaskStatus(24); task.setCode(purchaseCheckInfo.getCode()); task.setCompanyId(purchaseCheckInfo.getCompanyId()); taskMapper.insertTmTask(task); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/TaskServiceImpl.java similarity index 88% rename from sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/TmTaskServiceImpl.java rename to sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/TaskServiceImpl.java index 91b5031d..ec38941d 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/TaskServiceImpl.java @@ -1,12 +1,13 @@ package com.bonus.sgzb.material.service.impl; import java.util.List; + +import com.bonus.sgzb.base.api.domain.TmTask; import com.bonus.sgzb.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.bonus.sgzb.material.mapper.TmTaskMapper; -import com.bonus.sgzb.material.domain.TmTask; -import com.bonus.sgzb.material.service.ITmTaskService; +import com.bonus.sgzb.material.mapper.TaskMapper; +import com.bonus.sgzb.material.service.TaskService; /** * 任务tm_taskService业务层处理 @@ -15,10 +16,10 @@ import com.bonus.sgzb.material.service.ITmTaskService; * @date 2023-12-13 */ @Service -public class TmTaskServiceImpl implements ITmTaskService +public class TaskServiceImpl implements TaskService { @Autowired - private TmTaskMapper tmTaskMapper; + private TaskMapper tmTaskMapper; /** * 查询任务tm_task diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/TmTaskMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/TaskMapper.xml similarity index 90% rename from sgzb-modules/sgzb-material/src/main/resources/mapper/material/TmTaskMapper.xml rename to sgzb-modules/sgzb-material/src/main/resources/mapper/material/TaskMapper.xml index 089fc3ea..5d72380d 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/TmTaskMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/TaskMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select task_id, task_type, task_status, code, create_by, create_time, update_by, update_time, remark, company_id from tm_task - and task_type = #{taskType} @@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where task_id = #{taskId} - + insert into tm_task task_type, @@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update tm_task task_type = #{taskType},