diff --git a/sgzb-api/sgzb-api-system/pom.xml b/sgzb-api/sgzb-api-system/pom.xml index c8a5068a..06bc4793 100644 --- a/sgzb-api/sgzb-api-system/pom.xml +++ b/sgzb-api/sgzb-api-system/pom.xml @@ -26,7 +26,7 @@ org.projectlombok lombok - + \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java index b2a7499b..afbd514c 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java @@ -3,14 +3,11 @@ package com.bonus.sgzb.app.controller; import cn.hutool.core.collection.CollUtil; import com.bonus.sgzb.app.domain.BackApplyInfo; import com.bonus.sgzb.app.domain.BmAgreementInfo; +import com.bonus.sgzb.app.domain.TmTask; import com.bonus.sgzb.app.service.BackApplyService; import com.bonus.sgzb.app.service.LeaseApplyDetailsService; import com.bonus.sgzb.app.service.LeaseApplyInfoService; import com.bonus.sgzb.app.service.TmTaskService; -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.base.domain.WarehouseKeeper; import com.bonus.sgzb.common.core.utils.DateUtils; import com.bonus.sgzb.common.core.utils.StringUtils; import com.bonus.sgzb.common.core.web.controller.BaseController; @@ -18,7 +15,6 @@ import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; import io.swagger.annotations.ApiOperation; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -27,7 +23,7 @@ import java.util.Date; import java.util.List; /** - * 退料申请 + * 退料申请--App */ @RestController @RequestMapping("/back_apply") diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java index 614824eb..f6c90bd2 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java @@ -1,22 +1,14 @@ package com.bonus.sgzb.app.controller; import com.bonus.sgzb.app.domain.BackApplyInfo; -import com.bonus.sgzb.app.domain.BmAgreementInfo; import com.bonus.sgzb.app.service.*; -import com.bonus.sgzb.base.api.domain.TmTask; -import com.bonus.sgzb.common.core.utils.DateUtils; -import com.bonus.sgzb.common.core.utils.StringUtils; import com.bonus.sgzb.common.core.web.controller.BaseController; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; -import io.swagger.annotations.ApiOperation; -import org.aspectj.weaver.loadtime.Aj; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.text.SimpleDateFormat; -import java.util.Date; import java.util.List; /** 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 cb744e0d..500bafe8 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 @@ -2,14 +2,15 @@ package com.bonus.sgzb.app.controller; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.util.ObjectUtil; +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.app.domain.TmTaskDto; import com.bonus.sgzb.app.service.LeaseApplyDetailsService; import com.bonus.sgzb.app.service.LeaseApplyInfoService; import com.bonus.sgzb.app.service.LeaseUserBookService; import com.bonus.sgzb.app.service.TmTaskService; -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.base.api.domain.TmTaskDto; import com.bonus.sgzb.common.core.utils.StringUtils; import com.bonus.sgzb.common.core.utils.poi.ExcelUtil; import com.bonus.sgzb.common.core.web.controller.BaseController; @@ -17,8 +18,9 @@ import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.core.web.page.TableDataInfo; import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; +import com.bonus.sgzb.common.security.utils.SecurityUtils; import io.swagger.annotations.ApiOperation; -import org.springframework.beans.BeanUtils; +import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; @@ -315,11 +317,56 @@ public class TmTaskController extends BaseController { */ @Log(title = "查询机具领料审核列表- app", businessType = BusinessType.QUERY) @GetMapping(value = "getLeaseAuditList") - public AjaxResult getLeaseAuditList(TmTask task) { + public AjaxResult getLeaseAuditList(TmTask task, String role) { if (StringUtils.isNull(task)) { return AjaxResult.error("参数错误"); } - List leaseAuditList = tmTaskService.getLeaseAuditList(task); + if (StringUtils.isNotBlank(role)) { + if (role.contains("admin")) { + //如果是管理员可以看到所有的审核列表 + List leaseAuditList = tmTaskService.getLeaseAuditList(task); + return AjaxResult.success(getDataTable(leaseAuditList)); + } + String[] split = role.split(","); + for (String s : split) { + if (s.equals("kg")) { + //如果是库管员只能看到自己的审核列表 + List leaseAuditList = tmTaskService.getLeaseAuditListForApp(task); + List list = new ArrayList<>(); + for (int i = 0; i < leaseAuditList.size(); i++) { + List leaseApplyInfoList = leaseAuditList.get(i).getLeaseApplyInfoList(); + if (leaseApplyInfoList != null) { + for (int j = 0; j < leaseApplyInfoList.size(); j++) { + List leaseApplyDetails = leaseApplyInfoList.get(j).getLeaseApplyDetails(); + if (leaseApplyDetails != null) { + for (int k = 0; k < leaseApplyDetails.size(); k++) { + if (leaseApplyDetails.get(k).getUserId() == null || leaseApplyDetails.get(k).getUserId() == 0) { + leaseApplyDetails.get(k).setCount(0); + } else { + leaseApplyDetails.get(k).setCount(1); + } + } + } + } + } + List leaseApplyDetails = leaseAuditList.get(i).getLeaseApplyInfoList().get(0).getLeaseApplyDetails(); + if (leaseApplyDetails != null){ + List list1 = new ArrayList<>(); + for (int l = 0; l < leaseApplyDetails.size(); l++) { + if (leaseApplyDetails.get(l).getCount() == 1) { + list1.add(leaseApplyDetails.get(l)); + TmTask tmTask = leaseAuditList.get(i); + tmTask.getLeaseApplyInfoList().get(0).setLeaseApplyDetails(list1); + list.add(tmTask); + } + } + } + } + return AjaxResult.success(getDataTable(list)); + } + } + } + List leaseAuditList = new ArrayList<>(); return AjaxResult.success(getDataTable(leaseAuditList)); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java new file mode 100644 index 00000000..96e23d4e --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java @@ -0,0 +1,156 @@ +package com.bonus.sgzb.app.domain; + +import com.bonus.sgzb.base.domain.MaintenanceGang; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +/** +* Description: +* @Author 阮世耀 +* @Create 2023/12/13 15:45 +* @Version 1.0 +*/ + +/** + * 领料任务详细表lease_apply_details + */ +@ApiModel(description = "领料任务详细表lease_apply_details") +@Data +public class LeaseApplyDetails implements Serializable { + + private static final long serialVersionUID = 2227217051604273598L; + + @ApiModelProperty(value = "") + private Integer id; + + /** + * 任务ID + */ + @ApiModelProperty(value = "任务ID") + private Integer parenntId; + + /** + * 规格ID + */ + @ApiModelProperty(value = "规格ID") + private Integer typeId; + + /** + * 类型名称 + */ + @ApiModelProperty(value = "类型名称") + private String typeName; + + /** + * 规格型号 + */ + @ApiModelProperty(value = "规格型号") + private String typeModelName; + + /** + * 预领料数 + */ + @ApiModelProperty(value = "预领料数") + private Double preNum; + + /** + * 已领数量 + */ + @ApiModelProperty(value = "已领数量") + private Double alNum; + + /** + * 此数量是剩余需要出库的数量（preNum - alNum） + */ + @ApiModelProperty(value = "剩余最大出库数量") + private Double outNum; + + /** 审批数量 */ + @ApiModelProperty(value = "审批数量") + private Double auditNum; + + /** + * 状态（待审批，进行中，已出库） + */ + @ApiModelProperty(value = "状态（0待审批，1进行中，2已出库）") + private String status; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者") + private String createBy; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + /** + * 更新者 + */ + @ApiModelProperty(value = "更新者") + private String updateBy; + + /** + * 更新时间 + */ + @ApiModelProperty(value = "更新时间 ") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; + + /** + * 计量单位 + */ + @ApiModelProperty(value = "计量单位") + private String unitName; + + /** + * 设备所属类型 + */ + @ApiModelProperty(value = "数据所属组织") + private Integer companyId; + + /** + * 装备管理方式(0编号 1计数) + */ + @ApiModelProperty(value = "装备管理方式") + private int manageType; + + /** + * 装备管理方式(0编号 1计数) + */ + @ApiModelProperty(value = "装备管理方式名称") + private String manageTypeName; + + /** + * 实时库存 + */ + @ApiModelProperty(value = "实时库存") + private Double num; + + @ApiModelProperty(value = "库管员id") + private Integer userId; + + /** + * 实时库存 + */ + @ApiModelProperty(value = "当前库管员领料出库的单子") + private Integer count; +} \ No newline at end of file diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseApplyInfo.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyInfo.java similarity index 98% rename from sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseApplyInfo.java rename to sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyInfo.java index ae67e57c..4dfd1132 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseApplyInfo.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyInfo.java @@ -1,4 +1,4 @@ -package com.bonus.sgzb.base.api.domain; +package com.bonus.sgzb.app.domain; import com.alibaba.fastjson2.annotation.JSONField; import io.swagger.annotations.ApiModel; diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/TmTask.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java similarity index 98% rename from sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/TmTask.java rename to sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java index defa86b0..b4cbc809 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/TmTask.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java @@ -1,6 +1,5 @@ -package com.bonus.sgzb.base.api.domain; +package com.bonus.sgzb.app.domain; -import com.alibaba.fastjson2.annotation.JSONField; import com.bonus.sgzb.common.core.annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/TmTaskDto.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTaskDto.java similarity index 98% rename from sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/TmTaskDto.java rename to sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTaskDto.java index 1446d84f..5299f528 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/TmTaskDto.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTaskDto.java @@ -1,8 +1,7 @@ -package com.bonus.sgzb.base.api.domain; +package com.bonus.sgzb.app.domain; import com.bonus.sgzb.common.core.annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackApplyMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackApplyMapper.java index b03610a1..e4555e19 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackApplyMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackApplyMapper.java @@ -2,9 +2,8 @@ package com.bonus.sgzb.app.mapper; import com.bonus.sgzb.app.domain.BackApplyInfo; import com.bonus.sgzb.app.domain.BmAgreementInfo; -import com.bonus.sgzb.base.api.domain.TmTask; +import com.bonus.sgzb.app.domain.TmTask; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java index 44fd14b1..2666dcb0 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java @@ -1,8 +1,6 @@ package com.bonus.sgzb.app.mapper; import com.bonus.sgzb.app.domain.BackApplyInfo; -import com.bonus.sgzb.app.domain.BmAgreementInfo; -import com.bonus.sgzb.base.api.domain.TmTask; 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/LeaseApplyDetailsMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseApplyDetailsMapper.java index 574a7e6b..5d900e09 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.base.api.domain.LeaseApplyDetails; +import com.bonus.sgzb.app.domain.LeaseApplyDetails; 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 31951933..110949c7 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,7 +1,8 @@ package com.bonus.sgzb.app.mapper; -import com.bonus.sgzb.base.api.domain.LeaseApplyInfo; import java.util.List; + +import com.bonus.sgzb.app.domain.LeaseApplyInfo; 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/PurchaseInputMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/PurchaseInputMapper.java index 8e993a2d..41c8fd9e 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/PurchaseInputMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/PurchaseInputMapper.java @@ -3,12 +3,10 @@ package com.bonus.sgzb.app.mapper; import com.bonus.sgzb.app.domain.*; import com.bonus.sgzb.base.api.domain.MaMachine; import com.bonus.sgzb.base.api.domain.MaType; -import com.bonus.sgzb.base.api.domain.TmTask; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.math.BigDecimal; -import java.util.Date; import java.util.List; 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 b47989ce..02ac634c 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,8 +1,9 @@ package com.bonus.sgzb.app.mapper; -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.domain.LeaseApplyDetails; +import com.bonus.sgzb.app.domain.LeaseApplyInfo; +import com.bonus.sgzb.app.domain.TmTask; +import com.bonus.sgzb.base.domain.MaintenanceGang; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -96,4 +97,6 @@ public interface TmTaskMapper { List getListSome(Long taskId); LeaseApplyInfo getListSomeol(LeaseApplyInfo info); + + Integer getKgByMaType(Integer typeId); } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackApplyService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackApplyService.java index 5317c15c..893c57f7 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackApplyService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackApplyService.java @@ -2,7 +2,7 @@ package com.bonus.sgzb.app.service; import com.bonus.sgzb.app.domain.BackApplyInfo; import com.bonus.sgzb.app.domain.BmAgreementInfo; -import com.bonus.sgzb.base.api.domain.TmTask; +import com.bonus.sgzb.app.domain.TmTask; import java.util.List; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackReceiveService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackReceiveService.java index 5f474c61..de28ab3d 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackReceiveService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackReceiveService.java @@ -1,8 +1,6 @@ package com.bonus.sgzb.app.service; import com.bonus.sgzb.app.domain.BackApplyInfo; -import com.bonus.sgzb.app.domain.BmAgreementInfo; -import com.bonus.sgzb.base.api.domain.TmTask; import java.util.List; 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 992297de..58f3ff57 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,6 +1,6 @@ package com.bonus.sgzb.app.service; -import com.bonus.sgzb.base.api.domain.LeaseApplyDetails; +import com.bonus.sgzb.app.domain.LeaseApplyDetails; import java.util.List; /** 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 3e623b43..efcab277 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,8 +1,10 @@ package com.bonus.sgzb.app.service; +import com.bonus.sgzb.app.domain.LeaseApplyInfo; + import java.util.List; -import com.bonus.sgzb.base.api.domain.LeaseApplyInfo; - /** + +/** * Description: * @Author 阮世耀 * @Create 2023/12/13 15:45 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 f72595d3..2b5acc92 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 com.bonus.sgzb.base.api.domain.LeaseApplyInfo; -import com.bonus.sgzb.base.api.domain.TmTask; +import com.bonus.sgzb.app.domain.LeaseApplyInfo; +import com.bonus.sgzb.app.domain.TmTask; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import org.apache.ibatis.annotations.Param; @@ -19,6 +19,8 @@ public interface TmTaskService{ List getLeaseAuditList(TmTask record); + List getLeaseAuditListForApp(TmTask record); + /** 领料任务审核状态修改 */ int updateLeaseTaskAuditInfo(TmTask record); diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java index cfc4a4b8..52ea9d94 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java @@ -2,12 +2,9 @@ package com.bonus.sgzb.app.service.impl; import com.bonus.sgzb.app.domain.BackApplyInfo; import com.bonus.sgzb.app.domain.BmAgreementInfo; +import com.bonus.sgzb.app.domain.TmTask; import com.bonus.sgzb.app.mapper.BackApplyMapper; -import com.bonus.sgzb.app.mapper.TmTaskMapper; import com.bonus.sgzb.app.service.BackApplyService; -import com.bonus.sgzb.app.service.TmTaskService; -import com.bonus.sgzb.base.api.domain.TmTask; -import com.bonus.sgzb.common.core.utils.DateUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java index b12014cb..8f539fd3 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java @@ -1,15 +1,9 @@ package com.bonus.sgzb.app.service.impl; import com.bonus.sgzb.app.domain.BackApplyInfo; -import com.bonus.sgzb.app.domain.BmAgreementInfo; -import com.bonus.sgzb.app.mapper.BackApplyMapper; import com.bonus.sgzb.app.mapper.BackReceiveMapper; -import com.bonus.sgzb.app.service.BackApplyService; import com.bonus.sgzb.app.service.BackReceiveService; -import com.bonus.sgzb.base.api.domain.TmTask; import com.bonus.sgzb.common.core.utils.DateUtils; -import com.bonus.sgzb.common.core.utils.StringUtils; -import org.apache.poi.util.StringUtil; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; 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 94ecfbbe..c688051d 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 @@ -1,8 +1,8 @@ package com.bonus.sgzb.app.service.impl; +import com.bonus.sgzb.app.domain.LeaseApplyDetails; import com.bonus.sgzb.app.mapper.LeaseApplyDetailsMapper; import com.bonus.sgzb.app.service.LeaseApplyDetailsService; -import com.bonus.sgzb.base.api.domain.LeaseApplyDetails; import org.springframework.stereotype.Service; import javax.annotation.Resource; 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 2615f5b6..769e0a00 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 @@ -1,10 +1,11 @@ package com.bonus.sgzb.app.service.impl; +import com.bonus.sgzb.app.domain.LeaseApplyInfo; import org.springframework.stereotype.Service; import javax.annotation.Resource; import com.bonus.sgzb.app.mapper.LeaseApplyInfoMapper; import java.util.List; -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/LeaseOutDetailsServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java index 973b37c2..80bd3716 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java @@ -1,9 +1,9 @@ package com.bonus.sgzb.app.service.impl; +import com.bonus.sgzb.app.domain.LeaseApplyDetails; import com.bonus.sgzb.app.mapper.LeaseApplyDetailsMapper; import com.bonus.sgzb.app.mapper.LeaseOutDetailsMapper; import com.bonus.sgzb.app.service.LeaseOutDetailsService; -import com.bonus.sgzb.base.api.domain.LeaseApplyDetails; import com.bonus.sgzb.base.api.domain.LeaseOutDetails; import com.bonus.sgzb.base.api.domain.MaMachine; import com.bonus.sgzb.base.mapper.MaMachineMapper; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/PurchaseInputServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/PurchaseInputServiceImpl.java index e4c827c8..f8619277 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/PurchaseInputServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/PurchaseInputServiceImpl.java @@ -1,21 +1,15 @@ package com.bonus.sgzb.app.service.impl; import com.bonus.sgzb.app.domain.*; -import com.bonus.sgzb.app.mapper.BackReceiveMapper; import com.bonus.sgzb.app.mapper.PurchaseInputMapper; -import com.bonus.sgzb.app.service.BackReceiveService; import com.bonus.sgzb.app.service.PurchaseInputService; import com.bonus.sgzb.base.api.domain.MaMachine; import com.bonus.sgzb.base.api.domain.MaType; -import com.bonus.sgzb.base.api.domain.TmTask; -import com.bonus.sgzb.common.core.utils.DateUtils; import com.bonus.sgzb.common.security.utils.SecurityUtils; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.math.BigDecimal; -import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; 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 b4fe2042..c490e0a0 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 @@ -1,34 +1,35 @@ package com.bonus.sgzb.app.service.impl; 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.app.mapper.TmTaskMapper; import com.bonus.sgzb.app.service.TmTaskService; -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.base.api.domain.TmTaskDto; +import com.bonus.sgzb.base.domain.MaintenanceGang; import com.bonus.sgzb.common.core.utils.DateUtils; import com.bonus.sgzb.common.core.utils.StringUtils; import com.bonus.sgzb.common.core.web.domain.AjaxResult; +import com.bonus.sgzb.common.security.utils.SecurityUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Collections; import java.util.Date; import java.util.List; /** -* Description: -* @Author 阮世耀 -* @Create 2023/12/13 15:14 -* @Version 1.0 -*/ + * Description: + * + * @Author 阮世耀 + * @Create 2023/12/13 15:14 + * @Version 1.0 + */ @Service -public class TmTaskServiceImpl implements TmTaskService{ +public class TmTaskServiceImpl implements TmTaskService { @Resource private TmTaskMapper tmTaskMapper; @@ -69,7 +70,7 @@ public class TmTaskServiceImpl implements TmTaskService{ } /** - * 获取审核列表 + * 获取审核列表 - web端 */ @Override public List getLeaseAuditList(TmTask record) { @@ -107,6 +108,53 @@ public class TmTaskServiceImpl implements TmTaskService{ return tmTaskList; } + /** + * 获取审核列表 - App端 + */ + @Override + public List getLeaseAuditListForApp(TmTask record) { + List tmTaskList = tmTaskMapper.getAuditListByLeaseTmTask(record); + for (TmTask tmTask : tmTaskList) { + int count = 0; + if (tmTask != null) { + // 去查询任务分单表 + List auditListByLeaseInfo = tmTaskMapper.getAuditListByLeaseInfo(tmTask); + if (auditListByLeaseInfo != null && !auditListByLeaseInfo.isEmpty()) { + // 对领料任务集合查询具体详情 + for (LeaseApplyInfo leaseApplyInfo : auditListByLeaseInfo) { + if (leaseApplyInfo != null) { + // 去查询领料任务详情表 + List leaseApplyDetails = tmTaskMapper.getLeaseApplyDetails(leaseApplyInfo); + if (leaseApplyDetails != null && !leaseApplyDetails.isEmpty()) { + for (LeaseApplyDetails leaseApplyDetail : leaseApplyDetails) { + if (leaseApplyDetail != null) { + Integer typeId = leaseApplyDetail.getTypeId(); + //根据器具id找到对应的库管员信息 + Integer userId = tmTaskMapper.getKgByMaType(typeId); + System.out.println(userId); + if (userId != null && userId != 0 && SecurityUtils.getLoginUser().getUserid().equals((long)userId)) { + // 统计预领数量 + count += leaseApplyDetail.getPreNum(); + leaseApplyDetail.setUserId(userId); + } + } + + } + // 塞入领料任务详情的集合中 + leaseApplyInfo.setLeaseApplyDetails(leaseApplyDetails); + } + } + } + // 存入领料任务实体集合 + tmTask.setLeaseApplyInfoList(auditListByLeaseInfo); + } + // 塞入预领的合计数量 + tmTask.setPreCountNum(count); + } + } + return tmTaskList; + } + /** * 领料任务驳回 * @@ -148,14 +196,14 @@ public class TmTaskServiceImpl implements TmTaskService{ Date nowDate = DateUtils.getNowDate(); String format = dateFormat.format(nowDate); String result = format.replace("-", ""); - int num = tmTaskMapper.selectNumByMonth(nowDate) ; - num= num+ 1; - String code=""; - if (num>9 && num<100){ + int num = tmTaskMapper.selectNumByMonth(nowDate); + num = num + 1; + String code = ""; + if (num > 9 && num < 100) { code = "L" + result + "-00" + num; - }else if (num>99 && num<1000){ + } else if (num > 99 && num < 1000) { code = "L" + result + "-0" + num; - }else { + } else { code = "L" + result + "-000" + num; } return code; @@ -169,19 +217,20 @@ public class TmTaskServiceImpl implements TmTaskService{ @Override public AjaxResult deleteByPrimaryKey(String taskId) { - int i = tmTaskMapper.deleteTaskByPrimaryKey(taskId); - int j = tmTaskMapper.deleteTaskInfoByTaskId(taskId); - if(i==1 && j==1){ + int i = tmTaskMapper.deleteTaskByPrimaryKey(taskId); + int j = tmTaskMapper.deleteTaskInfoByTaskId(taskId); + if (i == 1 && j == 1) { return AjaxResult.success("删除成功"); - }else if(i<1 || j<1){ + } else if (i < 1 || j < 1) { return AjaxResult.error("删除失败,任务表或信息表未删除!"); - }else { + } else { return AjaxResult.error("删除失败，请检查任务ID是否正确!!"); } } /** * 根据id删除详情表配置的设备 + * * @param id 数据id * @return 结果 */ @@ -192,6 +241,7 @@ public class TmTaskServiceImpl implements TmTaskService{ /** * 根据parentID删除详情表配置的设备 + * * @param parentId 所属ID * @return 结果 */ @@ -270,7 +320,7 @@ public class TmTaskServiceImpl implements TmTaskService{ @Override public int selectTaskNumByMonth(Date date, Integer taskType) { - return tmTaskMapper.selectTaskNumByMonth(date,taskType); + return tmTaskMapper.selectTaskNumByMonth(date, taskType); } @Override @@ -282,7 +332,7 @@ public class TmTaskServiceImpl implements TmTaskService{ public List getLeaseListAll(TmTask task) { List tmTaskList = new ArrayList<>(); TmTask tmTask = tmTaskMapper.getLeaseListTmTask(task); - if(tmTask != null){ + if (tmTask != null) { List leaseApplyInfoList = tmTaskMapper.getLeaseListByLeaseInfo(task); tmTask.setLeaseApplyInfoList(leaseApplyInfoList); @@ -310,7 +360,7 @@ public class TmTaskServiceImpl implements TmTaskService{ @Override public List getListSome(Long taskId) { - return tmTaskMapper.getListSome(taskId); + return tmTaskMapper.getListSome(taskId); } @Override diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml index 17cc0dde..badc6910 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml @@ -26,7 +26,7 @@ - + insert into tm_task ( diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml index 02c2af40..f8be55eb 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml @@ -26,8 +26,7 @@ - - + insert into tm_task ( @@ -84,7 +83,7 @@ ) - + insert into tm_task ( 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 59dab457..76158a3f 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 @@ - + @@ -29,7 +29,7 @@ from lease_apply_details where id = #{id,jdbcType=INTEGER} - select @@ -47,7 +47,7 @@ where parennt_id = #{parentId,jdbcType=INTEGER} - + insert into lease_apply_details (parennt_id, type_id, pre_num, al_num, `status`, create_by, @@ -58,7 +58,7 @@ NOW(), #{updateBy,jdbcType=VARCHAR}, NOW(), #{remark,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER}) - + insert into lease_apply_details @@ -133,7 +133,7 @@ - + update lease_apply_details @@ -160,7 +160,7 @@ where id = #{id,jdbcType=INTEGER} - + update lease_apply_details set parennt_id = #{parenntId,jdbcType=INTEGER}, @@ -343,7 +343,7 @@ - + insert into lease_apply_details @@ -397,7 +397,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 54512113..c4a21039 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 e957b396..fbcd3d9e 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 @@ - + @@ -50,13 +50,13 @@ delete from lease_apply_details where parennt_id = #{parentId} - + 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 @@ -110,7 +110,7 @@ - + update tm_task @@ -132,7 +132,7 @@ where task_id = #{taskId,jdbcType=BIGINT} - + update tm_task set task_type = #{taskType,jdbcType=INTEGER}, task_status = #{taskStatus,jdbcType=INTEGER}, @@ -290,7 +290,7 @@ - + insert into tm_task @@ -339,7 +339,7 @@ - + insert into tm_task @@ -453,7 +453,7 @@ where task_id = #{taskId} - SELECT DISTINCT tt.*, su.phonenumber AS phoneNumber, sd.dept_name as deptName, bpl.lot_id as proId,bpl.lot_name as proName, @@ -503,7 +503,7 @@ ORDER BY tt.update_time DESC - SELECT lai.* FROM @@ -512,7 +512,7 @@ lai.task_id = #{record.taskId} AND lai.`code` = #{record.code} - SELECT lad.*, mt.type_name AS typeModelName, mt1.type_name AS typeName,mt.unit_name as unitName, mt.manage_type as manageType, case WHEN mt.manage_type = '0' then '编号' else '计数' end manageTypeName, @@ -530,7 +530,7 @@ - SELECT DISTINCT tt.*, su.phonenumber AS phoneNumber, sd.dept_name as deptName, bpi.lot_id as proId, bpi.pro_id as projectId,bpi.lot_name as proName, @@ -570,7 +570,7 @@ WHERE tt.task_id = #{taskId} - SELECT lai.* FROM @@ -702,14 +702,20 @@ where unit_id = #{unitId} and project_id = #{projectId} - SELECT * FROM `lease_apply_info` WHERE task_id = #{taskId} AND `status` ='1' - SELECT * FROM `lease_apply_info` WHERE task_id = #{taskId} AND `status` ='1' and company_id = #{id} + + diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java index f131c606..604a5b24 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java @@ -1,8 +1,6 @@ package com.bonus.sgzb.material.controller; import cn.hutool.core.collection.CollUtil; -import com.bonus.sgzb.base.api.domain.LeaseApplyDetails; -import com.bonus.sgzb.base.api.domain.LeaseApplyInfo; import com.bonus.sgzb.common.core.utils.StringUtils; import com.bonus.sgzb.common.core.utils.poi.ExcelUtil; import com.bonus.sgzb.common.core.web.controller.BaseController; @@ -11,7 +9,6 @@ import com.bonus.sgzb.common.core.web.page.TableDataInfo; import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; import com.bonus.sgzb.material.domain.BackApplyInfo; -import com.bonus.sgzb.material.domain.PurchaseCheckInfo; import com.bonus.sgzb.material.service.BackApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/TaskController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/TaskController.java index 1a2b47f6..66b47193 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/TaskController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/TaskController.java @@ -3,7 +3,7 @@ package com.bonus.sgzb.material.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; -import com.bonus.sgzb.base.api.domain.TmTask; +import com.bonus.sgzb.material.domain.TmTask; import com.bonus.sgzb.material.service.TaskService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java index 2cf16f0d..d523c47d 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java @@ -1,9 +1,7 @@ package com.bonus.sgzb.material.domain; -import com.bonus.sgzb.base.api.domain.LeaseApplyInfo; import com.bonus.sgzb.common.core.annotation.Excel; import com.bonus.sgzb.common.core.web.domain.BaseEntity; -import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseApplyDetails.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LeaseApplyDetails.java similarity index 98% rename from sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseApplyDetails.java rename to sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LeaseApplyDetails.java index 61caf1e1..d4e5b049 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseApplyDetails.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LeaseApplyDetails.java @@ -1,4 +1,4 @@ -package com.bonus.sgzb.base.api.domain; +package com.bonus.sgzb.material.domain; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LeaseApplyInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LeaseApplyInfo.java new file mode 100644 index 00000000..5f3c1153 --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LeaseApplyInfo.java @@ -0,0 +1,160 @@ +package com.bonus.sgzb.material.domain; + +import com.alibaba.fastjson2.annotation.JSONField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** +* Description: +* @Author 阮世耀 +* @Create 2023/12/13 15:45 +* @Version 1.0 +*/ + +/** + * 领料任务表lease_apply_info + */ +@ApiModel(description = "领料任务表lease_apply_info") +@Data +public class LeaseApplyInfo implements Serializable { + + private static final long serialVersionUID = 4429196890466663037L; + + @ApiModelProperty(value = "id") + private Integer id; + + /** + * 任务ID + */ + @ApiModelProperty(value = "任务ID") + private Integer taskId; + + /** + * 领料单号 + */ + @ApiModelProperty(value = "领料单号") + private String code; + + /** + * 领料人 + */ + @ApiModelProperty(value = "领料人") + private String leasePerson; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式") + private String phone; + + /** + * 1：1级审批，2：2级审批 + */ + @ApiModelProperty(value = "1：1级审批，2：2级审批") + private String type; + + /** 机具规格详情列表 */ + @ApiModelProperty(value = "机具规格详情列表") + private List leaseApplyDetails; + + /** + * 公司审批人 + */ + @ApiModelProperty(value = "公司审批人") + private Integer companyAuditBy; + + /** + * 公司审批时间 + */ + @ApiModelProperty(value = "公司审批时间") + private String companyAuditTime; + + /** + * 公司审批备注 + */ + @ApiModelProperty(value = "公司审批备注") + private String companyAuditRemark; + + /** + * 分管审批人 + */ + @ApiModelProperty(value = "分管审批人") + private Integer deptAuditBy; + + /** + * 分管审批时间 + */ + @ApiModelProperty(value = "分管审批时间") + private String deptAuditTime; + + /** + * 分管审批备注 + */ + @ApiModelProperty(value = "分管审批备注") + private String deptAuditRemark; + + /** + * 机具分公司审批人 + */ + @ApiModelProperty(value = "机具分公司审批人") + private String directAuditBy; + + /** + * 机具分公司审批时间 + */ + @ApiModelProperty(value = "机具分公司审批时间") + private String directAuditTime; + + + @ApiModelProperty(value = "机具分公司审批备注") + private String directAuditRemark; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者") + private String createBy; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + /** + * 更新者 + */ + @ApiModelProperty(value = "更新者") + private String updateBy; + + /** + * 更新时间 + */ + @ApiModelProperty(value = "更新时间") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; + + /** + * 设备数据所属组织【类型】 + */ + @ApiModelProperty(value = "设备数据所属组织类型") + private Integer companyId; + + @ApiModelProperty(value="审批状态id") + private String examineStatusId; + +} \ No newline at end of file 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 new file mode 100644 index 00000000..5195b807 --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/TmTask.java @@ -0,0 +1,230 @@ +package com.bonus.sgzb.material.domain; + +import com.bonus.sgzb.common.core.annotation.Excel; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** +* Description: 任务表tm_task +* @Author 阮世耀 +* @Create 2023/12/13 15:14 +* @Version 1.0 +*/ + +@ApiModel(description="任务表tm_task") +@Data +public class TmTask implements Serializable { + + private static final long serialVersionUID = -4135112109792782142L; + + private String id; + + /** + * 任务ID + */ + @ApiModelProperty(value="任务ID") + private Long taskId; + + /** + * 任务类型(定义数据字典) + */ + @ApiModelProperty(value="任务类型(数据字典)") + private Integer taskType; + + /** + * 任务状态(定义数据字典) + */ + @ApiModelProperty(value="任务状态(数据字典)") + private Integer taskStatus; + + /** + * 预领料合计数 + */ + @ApiModelProperty(value="预领料合计数") + private int preCountNum; + + /** + * 编号 + */ + @ApiModelProperty(value="编号") + @Excel(name = "领料单号",sort = 1) + private String code; + + /** + * 创建者 + */ + @ApiModelProperty(value="创建者") + private String createBy; + + /** + * 申请人手机号码 + */ + @ApiModelProperty(value="手机号") + private String phoneNumber; + + /** + * 部门名称 单位名称 + */ + @ApiModelProperty(value="部门/单位名称") + private String deptName; + + /** + * 工程名称 + */ + @ApiModelProperty(value="工程名称") + @Excel(name = "领料工程",sort = 3) + private String proName; + + /** + * 工程id + */ + @ApiModelProperty(value="工程id") + private int proId; + + /** + * 创建时间 + */ + @ApiModelProperty(value="创建时间") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + + /** + * 更新者 + */ + @ApiModelProperty(value="更新者") + private String updateBy; + + /** + * 更新时间 + */ + @ApiModelProperty(value="更新时间") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date updateTime; + + /** + * 备注 + */ + @ApiModelProperty(value="备注") + @Excel(name = "备注",sort = 11) + private String remark; + + /** + * 数据所属组织 + */ + @ApiModelProperty(value="数据所属组织") + private Integer companyId; + + /** + * 领料任务实体 + */ + @ApiModelProperty(value="领料任务实体") + private LeaseApplyInfo leaseApplyInfo; + + /** + * 领料任务实体集合 + */ + @ApiModelProperty(value="领料任务实体集合") + private List leaseApplyInfoList; + + /** + * 领料任务详情集合 + */ + @ApiModelProperty(value="领料任务详情集合") + private List leaseApplyDetails; + + @ApiModelProperty(value="协议id") + private Integer agreementId; + + @ApiModelProperty(value="退料人") + private String backPerson; + @ApiModelProperty(value="退料人联系电话") + private String phone; + @ApiModelProperty(value="退料申请时间") + private String backTime; + @ApiModelProperty(value="退料审核人 机具分公司审批人") + private String directAuditBy; + @ApiModelProperty(value="退料审核时间 机具分公司审批时间") + private String directAuditTime; + @ApiModelProperty(value="退料审核备注 机具分公司审批备注") + private String directAuditRemark; + + @ApiModelProperty(value="往来单位id") + private Long unitId; + @ApiModelProperty(value="往来单位") + @Excel(name = "领料单位",sort = 2) + private String unitName; + + @ApiModelProperty(value="工程id") + private Long projectId; + @ApiModelProperty(value="关键字") + private String keyWord; + @ApiModelProperty(value="开始时间") + private String startTime; + @ApiModelProperty(value="结束时间") + private String endTime; + @ApiModelProperty(value="类型") + private Integer types; + + + @ApiModelProperty(value="协议编号") + @Excel(name = "协议号",sort = 4) + private String agreementCode; + + @ApiModelProperty(value="领料人") + @Excel(name = "领料人",sort = 5) + private String leasePerson; + + @ApiModelProperty(value="领料人手机号") + @Excel(name = "联系电话",sort = 6) + private String leasePhone; + + @ApiModelProperty(value="申请人") + @Excel(name = "申请人",sort = 7) + private String applyFor; + + @ApiModelProperty(value="任务状态") + @Excel(name = "任务状态",sort = 9) + private String taskName; + + @ApiModelProperty(value="审批状态id") + private String examineStatusId; + + @ApiModelProperty(value="审批状态的备注") + @Excel(name = "审批结果",sort = 10) + private String examineStatus; + + @ApiModelProperty(value="创建时间") + @Excel(name = "申请时间",sort = 8) + private String createTimes; + + @ApiModelProperty(value="更新时间") + private String updateTimes; + + @ApiModelProperty(value="公司审批人") + private String companyAuditBy; + + @ApiModelProperty(value="公司审批时间") + private String companyAuditTime; + + @ApiModelProperty(value="公司审批备注") + private String companyAuditRemark; + + @ApiModelProperty(value="分管审批人") + private String deptAuditBy; + + @ApiModelProperty(value="分管审批时间") + private String deptAuditTime; + + @ApiModelProperty(value="分管审批备注") + private String deptAuditRemark; + +} \ No newline at end of file diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java index 1470fddf..6fc7acfe 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java @@ -1,7 +1,5 @@ package com.bonus.sgzb.material.mapper; -import com.bonus.sgzb.base.api.domain.LeaseApplyDetails; -import com.bonus.sgzb.material.domain.AgreementInfo; import com.bonus.sgzb.material.domain.BackApplyInfo; import com.bonus.sgzb.material.domain.TypeTreeNode; import org.apache.ibatis.annotations.Mapper; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/TaskMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/TaskMapper.java index 907cc736..02152b18 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/TaskMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/TaskMapper.java @@ -1,7 +1,7 @@ package com.bonus.sgzb.material.mapper; -import com.bonus.sgzb.base.api.domain.TmTask; +import com.bonus.sgzb.material.domain.TmTask; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/TaskService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/TaskService.java index 8c04b7ab..947841a9 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/TaskService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/TaskService.java @@ -1,7 +1,7 @@ package com.bonus.sgzb.material.service; -import com.bonus.sgzb.base.api.domain.TmTask; +import com.bonus.sgzb.material.domain.TmTask; import java.util.List; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckDetailsServiceImpl.java index 590c7f14..1b05a228 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckDetailsServiceImpl.java @@ -2,9 +2,8 @@ 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.PurchaseCheckDetails; -import com.bonus.sgzb.material.domain.PurchaseMacodeInfo; +import com.bonus.sgzb.material.domain.TmTask; import com.bonus.sgzb.material.mapper.PurchaseCheckDetailsMapper; import com.bonus.sgzb.material.mapper.TaskMapper; import com.bonus.sgzb.material.service.IPurchaseCheckDetailsService; 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 2aac6d44..a1127b96 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 @@ -4,12 +4,8 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; -import com.bonus.sgzb.base.api.domain.TmTask; import com.bonus.sgzb.common.security.utils.SecurityUtils; -import com.bonus.sgzb.material.domain.BmNoticeInfo; -import com.bonus.sgzb.material.domain.PurchaseCheckDetails; -import com.bonus.sgzb.material.domain.PurchaseCheckInfo; -import com.bonus.sgzb.material.domain.PurchaseInput; +import com.bonus.sgzb.material.domain.*; import com.bonus.sgzb.material.mapper.PurchaseCheckDetailsMapper; import com.bonus.sgzb.material.mapper.PurchaseCheckInfoMapper; import com.bonus.sgzb.material.mapper.TaskMapper; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java index 9db0cfbc..59213ff5 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java @@ -5,7 +5,6 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; -import com.bonus.sgzb.base.api.domain.TmTask; import com.bonus.sgzb.common.core.exception.ServiceException; import com.bonus.sgzb.common.core.utils.DateUtils; import com.bonus.sgzb.common.security.utils.SecurityUtils; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java index f3bfb21b..712d090d 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java @@ -3,10 +3,10 @@ package com.bonus.sgzb.material.service.impl; import java.util.Date; import java.util.List; -import com.bonus.sgzb.base.api.domain.TmTask; import com.bonus.sgzb.common.core.utils.DateUtils; import com.bonus.sgzb.common.security.utils.SecurityUtils; import com.bonus.sgzb.material.domain.ScrapApplyDetails; +import com.bonus.sgzb.material.domain.TmTask; import com.bonus.sgzb.material.mapper.PurchaseCheckInfoMapper; import com.bonus.sgzb.material.mapper.ScrapApplyDetailsMapper; import com.bonus.sgzb.material.mapper.TaskMapper; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/TaskServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/TaskServiceImpl.java index ec38941d..9b1d7e09 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/TaskServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/TaskServiceImpl.java @@ -2,8 +2,8 @@ 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 com.bonus.sgzb.material.domain.TmTask; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.bonus.sgzb.material.mapper.TaskMapper; diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/TaskMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/TaskMapper.xml index ee2b64b7..a3900258 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/TaskMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/TaskMapper.xml @@ -3,8 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - + @@ -21,7 +20,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 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where task_id = #{taskId} - + insert into tm_task task_type, @@ -62,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update tm_task task_type = #{taskType},