bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

配件移包part

This commit is contained in:
mashuai 2025-01-20 09:26:50 +08:00
parent bfde5717d3
commit ac92f47acb
8 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/PartLeaseController.java → bonus-modules/bonus-material/src/main/java/com/bonus/material/part/controller/PartLeaseController.java
View File

@ -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.controller.BaseController;
import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.common.core.web.page.TableDataInfo; import com.bonus.common.core.web.page.TableDataInfo;
import com.bonus.material.lease.domain.PartLeaseDetails; import com.bonus.material.part.domain.PartLeaseDetails;
import com.bonus.material.lease.domain.PartLeaseInfo; import com.bonus.material.part.domain.PartLeaseInfo;
import com.bonus.material.lease.service.PartLeaseService; import com.bonus.material.part.service.PartLeaseService;
import com.bonus.material.lease.service.impl.PartLeaseServiceImpl;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/PartLeaseDetails.java → bonus-modules/bonus-material/src/main/java/com/bonus/material/part/domain/PartLeaseDetails.java
View File

@ -1,4 +1,4 @@
package com.bonus.material.lease.domain; package com.bonus.material.part.domain;
import lombok.Data; import lombok.Data;

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/PartLeaseInfo.java → bonus-modules/bonus-material/src/main/java/com/bonus/material/part/domain/PartLeaseInfo.java
View File

@ -1,4 +1,4 @@
package com.bonus.material.lease.domain; package com.bonus.material.part.domain;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/PartLeasePersonStorage.java → bonus-modules/bonus-material/src/main/java/com/bonus/material/part/domain/PartLeasePersonStorage.java
View File

@ -1,4 +1,4 @@
package com.bonus.material.lease.domain; package com.bonus.material.part.domain;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;

6
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/PartLeaseMapper.java → bonus-modules/bonus-material/src/main/java/com/bonus/material/part/mapper/PartLeaseMapper.java
View File

@ -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.part.domain.PartLeaseDetails;
import com.bonus.material.lease.domain.PartLeaseInfo; import com.bonus.material.part.domain.PartLeaseInfo;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import java.util.List; import java.util.List;

6
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/PartLeaseService.java → bonus-modules/bonus-material/src/main/java/com/bonus/material/part/service/PartLeaseService.java
View File

@ -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.part.domain.PartLeaseDetails;
import com.bonus.material.lease.domain.PartLeaseInfo; import com.bonus.material.part.domain.PartLeaseInfo;
import java.util.List; import java.util.List;

11
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/PartLeaseServiceImpl.java → bonus-modules/bonus-material/src/main/java/com/bonus/material/part/service/impl/PartLeaseServiceImpl.java
View File

@ -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.constant.MaterialConstants;
import com.bonus.common.biz.enums.TmTaskTypeEnum; import com.bonus.common.biz.enums.TmTaskTypeEnum;
import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.exception.ServiceException;
import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.utils.DateUtils;
import com.bonus.common.security.utils.SecurityUtils; import com.bonus.common.security.utils.SecurityUtils;
import com.bonus.material.lease.domain.PartLeaseDetails; import com.bonus.material.part.domain.PartLeaseDetails;
import com.bonus.material.lease.domain.PartLeaseInfo; import com.bonus.material.part.domain.PartLeaseInfo;
import com.bonus.material.lease.mapper.PartLeaseMapper; import com.bonus.material.part.mapper.PartLeaseMapper;
import com.bonus.material.lease.service.PartLeaseService; import com.bonus.material.part.service.PartLeaseService;
import com.bonus.material.task.mapper.TmTaskMapper; import com.bonus.material.task.mapper.TmTaskMapper;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;

8
bonus-modules/bonus-material/src/main/resources/mapper/material/lease/PartLeaseMapper.xml → bonus-modules/bonus-material/src/main/resources/mapper/material/part/PartLeaseMapper.xml
View File

@ -2,12 +2,12 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.material.lease.mapper.PartLeaseMapper"> <mapper namespace="com.bonus.material.part.mapper.PartLeaseMapper">
<select id="selectPartLeaseInfoById" resultType="com.bonus.material.lease.domain.PartLeaseInfo"> <select id="selectPartLeaseInfoById" resultType="com.bonus.material.part.domain.PartLeaseInfo">
</select> </select>
<select id="selectPartLeaseInfoList" resultType="com.bonus.material.lease.domain.PartLeaseInfo"> <select id="selectPartLeaseInfoList" resultType="com.bonus.material.part.domain.PartLeaseInfo">
select task_id, code, creator, create_time, auditor, audit_time, status, remarks, company_id select task_id, code, creator, create_time, auditor, audit_time, status, remarks, company_id
from pa_collar_apply from pa_collar_apply
<where> <where>
@ -36,7 +36,7 @@
</foreach> </foreach>
</delete> </delete>
<select id="selectPartLeaseDetailsList" resultType="com.bonus.material.lease.domain.PartLeaseDetails"> <select id="selectPartLeaseDetailsList" resultType="com.bonus.material.part.domain.PartLeaseDetails">
select pcad.id, pcad.task_id, pcad.part_id, mpt.pa_name as partName, pcad.pre_num, pcad.al_num, pcad.remarks 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 from pa_collar_apply_details pcad
left join ma_part_type mpt on pcad.part_id = mpt.pa_id left join ma_part_type mpt on pcad.part_id = mpt.pa_id