Merge branch 'master' of http://42.192.7.176:3000/suojin/jonhon-mes-svr
commit
8a4a18c386
50 changed files with 1336 additions and 349 deletions
@ -0,0 +1,44 @@ |
||||
package org.springblade.core.log.pojo.dto; |
||||
|
||||
import lombok.AllArgsConstructor; |
||||
import lombok.Data; |
||||
|
||||
/** |
||||
* @author 石玖洲 |
||||
* @Description |
||||
* @create 2026-02-27 14:15 |
||||
*/ |
||||
@Data |
||||
@AllArgsConstructor |
||||
public class UserLoginStatsDTO { |
||||
|
||||
/** |
||||
* 用户ID |
||||
*/ |
||||
private String userId; |
||||
|
||||
/** |
||||
* 用户名 |
||||
*/ |
||||
private String username; |
||||
|
||||
/** |
||||
* 登录IP |
||||
*/ |
||||
private String loginIp; |
||||
|
||||
/** |
||||
* 部门ID |
||||
*/ |
||||
private String deptId; |
||||
|
||||
/** |
||||
* 最后一次登录时间 |
||||
*/ |
||||
private Long lastLoginTime; |
||||
|
||||
/** |
||||
* 登录次数 |
||||
*/ |
||||
private Long loginCount; |
||||
} |
||||
@ -1,60 +0,0 @@ |
||||
/** |
||||
* BladeX Commercial License Agreement |
||||
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
|
||||
* <p> |
||||
* Use of this software is governed by the Commercial License Agreement |
||||
* obtained after purchasing a license from BladeX. |
||||
* <p> |
||||
* 1. This software is for development use only under a valid license |
||||
* from BladeX. |
||||
* <p> |
||||
* 2. Redistribution of this software's source code to any third party |
||||
* without a commercial license is strictly prohibited. |
||||
* <p> |
||||
* 3. Licensees may copyright their own code but cannot use segments |
||||
* from this software for such purposes. Copyright of this software |
||||
* remains with BladeX. |
||||
* <p> |
||||
* Using this software signifies agreement to this License, and the software |
||||
* must not be used for illegal purposes. |
||||
* <p> |
||||
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is |
||||
* not liable for any claims arising from secondary or illegal development. |
||||
* <p> |
||||
* Author: Chill Zhuang (bladejava@qq.com) |
||||
*/ |
||||
package org.springblade.erpdata.feign; |
||||
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import org.springblade.core.launch.constant.AppConstant; |
||||
import org.springblade.core.tool.api.R; |
||||
import org.springblade.erpdata.pojo.dto.AllocationDTO; |
||||
import org.springframework.cloud.openfeign.FeignClient; |
||||
import org.springframework.web.bind.annotation.PostMapping; |
||||
|
||||
/** |
||||
* Feign接口类 |
||||
* |
||||
* @author Chill |
||||
*/ |
||||
@FeignClient( |
||||
value = AppConstant.APPLICATION_SYSTEM_NAME, |
||||
fallback = IErpDataSearchClientFallback.class |
||||
) |
||||
public interface IErpDataSearchClient { |
||||
|
||||
String API_PREFIX = "/feign/erpdata/client"; |
||||
String PAGE_ALLOCATION = API_PREFIX + "/pageAllocation"; |
||||
|
||||
/** |
||||
* 查询烧结配套信息 |
||||
* |
||||
* @param page |
||||
* @param entity |
||||
* @return |
||||
*/ |
||||
@PostMapping(PAGE_ALLOCATION) |
||||
R<IPage<AllocationDTO>> pageAllocation(IPage<AllocationDTO> page, AllocationDTO entity); |
||||
|
||||
} |
||||
@ -1,21 +0,0 @@ |
||||
package org.springblade.erpdata.feign; |
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import org.springblade.core.tool.api.R; |
||||
import org.springblade.erpdata.pojo.dto.AllocationDTO; |
||||
import org.springframework.stereotype.Component; |
||||
|
||||
/** |
||||
* Feign失败配置 |
||||
* |
||||
* @author lqk |
||||
* @date 2025-12-17 15:13 |
||||
*/ |
||||
@Component |
||||
public class IErpDataSearchClientFallback implements IErpDataSearchClient { |
||||
|
||||
@Override |
||||
public R<IPage<AllocationDTO>> pageAllocation(IPage<AllocationDTO> page, AllocationDTO entity) { |
||||
return R.fail("获取数据失败"); |
||||
} |
||||
} |
||||
@ -0,0 +1,43 @@ |
||||
package org.springblade.erpdata.feign; |
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import org.springblade.core.launch.constant.AppConstant; |
||||
import org.springblade.core.tool.api.R; |
||||
import org.springblade.erpdata.pojo.dto.MesRbPkpqryDTO; |
||||
import org.springframework.cloud.openfeign.FeignClient; |
||||
import org.springframework.web.bind.annotation.GetMapping; |
||||
import org.springframework.web.bind.annotation.RequestParam; |
||||
|
||||
/** |
||||
* Feign接口类 |
||||
* |
||||
* @author liuqingkun |
||||
*/ |
||||
@FeignClient( |
||||
value = AppConstant.APPLICATION_SYSTEM_NAME, |
||||
fallback = IErpMesRbPkpqryClientFallback.class |
||||
) |
||||
public interface IErpMesRbPkpqryClient { |
||||
|
||||
String API_PREFIX = "/feign/erpdata/mesRbPkpqry/"; |
||||
String SELECT_PAGE = API_PREFIX + "selectPage"; |
||||
|
||||
/** |
||||
* 查询配置结果 |
||||
* |
||||
* @param current 分页参数 |
||||
* @param size 分页参数 |
||||
* @param pkno 配套单号 |
||||
* @param prtmdept 主制部门 |
||||
* @param subpkdateStart 配套开始时间 |
||||
* @param subpkdateEnd 配套结束时间 |
||||
* @return |
||||
*/ |
||||
@GetMapping(SELECT_PAGE) |
||||
R<IPage<MesRbPkpqryDTO>> selectPage(@RequestParam(value = "current", required = false, defaultValue = "1") Integer current, |
||||
@RequestParam(value = "size", required = false, defaultValue = "10") Integer size, |
||||
@RequestParam(value = "pkno", required = false) String pkno, |
||||
@RequestParam(value = "prtmdept", required = false) String prtmdept, |
||||
@RequestParam(value = "subpkdateStart", required = false) String subpkdateStart, |
||||
@RequestParam(value = "subpkdateEnd", required = false) String subpkdateEnd); |
||||
} |
||||
@ -0,0 +1,19 @@ |
||||
package org.springblade.erpdata.feign; |
||||
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import org.springblade.core.tool.api.R; |
||||
import org.springblade.erpdata.pojo.dto.MesRbPkpqryDTO; |
||||
|
||||
/** |
||||
* Feign接口类 |
||||
* |
||||
* @author liuqingkun |
||||
*/ |
||||
public class IErpMesRbPkpqryClientFallback implements IErpMesRbPkpqryClient { |
||||
|
||||
@Override |
||||
public R<IPage<MesRbPkpqryDTO>> selectPage(Integer current, Integer size, String pkno, String prtmdept, String subpkdateStart, String subpkdateEnd) { |
||||
return R.fail("获取数据失败"); |
||||
} |
||||
} |
||||
@ -0,0 +1,34 @@ |
||||
package org.springblade.erpdata.feign; |
||||
|
||||
|
||||
import org.springblade.core.launch.constant.AppConstant; |
||||
import org.springblade.core.tool.api.R; |
||||
import org.springblade.erpdata.pojo.dto.PartoplinkFirseqDTO; |
||||
import org.springframework.cloud.openfeign.FeignClient; |
||||
import org.springframework.web.bind.annotation.GetMapping; |
||||
|
||||
import java.util.List; |
||||
|
||||
/** |
||||
* Feign接口类 |
||||
* |
||||
* @author liuqingkun |
||||
*/ |
||||
@FeignClient( |
||||
value = AppConstant.APPLICATION_SYSTEM_NAME, |
||||
fallback = IErpPartoplinkFirseqClientFallback.class |
||||
) |
||||
public interface IErpPartoplinkFirseqClient { |
||||
|
||||
String API_PREFIX = "/feign/erpdata/partoplinkFirseq/"; |
||||
String LIST_BY_PART_CODE = API_PREFIX + "listByPartCode"; |
||||
|
||||
/** |
||||
* 根据物料号查询一级工序 |
||||
* |
||||
* @param partCode |
||||
* @return |
||||
*/ |
||||
@GetMapping(LIST_BY_PART_CODE) |
||||
R<List<PartoplinkFirseqDTO>> listByPartCode(String partCode); |
||||
} |
||||
@ -0,0 +1,20 @@ |
||||
package org.springblade.erpdata.feign; |
||||
|
||||
|
||||
import org.springblade.core.tool.api.R; |
||||
import org.springblade.erpdata.pojo.dto.PartoplinkFirseqDTO; |
||||
|
||||
import java.util.List; |
||||
|
||||
/** |
||||
* Feign接口类 |
||||
* |
||||
* @author liuqingkun |
||||
*/ |
||||
public class IErpPartoplinkFirseqClientFallback implements IErpPartoplinkFirseqClient { |
||||
|
||||
@Override |
||||
public R<List<PartoplinkFirseqDTO>> listByPartCode(String partCode) { |
||||
return R.fail("获取数据失败"); |
||||
} |
||||
} |
||||
@ -1,92 +0,0 @@ |
||||
package org.springblade.erpdata.pojo.dto; |
||||
|
||||
import lombok.Data; |
||||
|
||||
import java.io.Serializable; |
||||
|
||||
/** |
||||
* 配套信息查询 |
||||
* |
||||
* @author lqk |
||||
*/ |
||||
@Data |
||||
public class AllocationDTO implements Serializable { |
||||
|
||||
/** |
||||
* 配套单号 |
||||
*/ |
||||
private String pkno; |
||||
/** |
||||
* 父件号 |
||||
*/ |
||||
private String prntno; |
||||
/** |
||||
* 型号 |
||||
*/ |
||||
private String mtltmrk; |
||||
/** |
||||
* 生产标识 |
||||
*/ |
||||
private String prtlotno; |
||||
/** |
||||
* 需求日期 |
||||
*/ |
||||
private String pkreqdat; |
||||
/** |
||||
* 父件批次 |
||||
*/ |
||||
private String fjSplcode; |
||||
/** |
||||
* 父件配套数 |
||||
*/ |
||||
private String fjPkavqty; |
||||
/** |
||||
* 配套序号 |
||||
*/ |
||||
private String serialno; |
||||
/** |
||||
* 主制部门 |
||||
*/ |
||||
private String prtmdept; |
||||
/** |
||||
* 计划标记 |
||||
*/ |
||||
private String plnsign; |
||||
/** |
||||
* 制造订单号 |
||||
*/ |
||||
private String mono; |
||||
/** |
||||
* 计划员 |
||||
*/ |
||||
private String schemer; |
||||
/** |
||||
* 调度员 |
||||
*/ |
||||
private String planner1; |
||||
/** |
||||
* 配套日期 |
||||
*/ |
||||
private String subpkdate; |
||||
|
||||
/** |
||||
* 保管员 |
||||
*/ |
||||
private String warctlr; |
||||
/** |
||||
* 条码序号 |
||||
*/ |
||||
private String barcodeno; |
||||
/** |
||||
* 计划部门 |
||||
*/ |
||||
private String plandept; |
||||
/** |
||||
* 备注 |
||||
*/ |
||||
private String remark; |
||||
/** |
||||
* 物料标识 |
||||
*/ |
||||
private String prtclass; |
||||
} |
||||
@ -0,0 +1,129 @@ |
||||
package org.springblade.erpdata.pojo.dto; |
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableField; |
||||
import io.swagger.v3.oas.annotations.media.Schema; |
||||
import lombok.Data; |
||||
import lombok.NoArgsConstructor; |
||||
|
||||
/** |
||||
* @author liuqingkun |
||||
*/ |
||||
@Data |
||||
@NoArgsConstructor |
||||
public class MesRbPkpqryDTO { |
||||
/** |
||||
* 配套单号 |
||||
*/ |
||||
@Schema(description = "配套单号") |
||||
@TableField("pkno") |
||||
private String pkno; |
||||
/** |
||||
* 父件号 |
||||
*/ |
||||
@Schema(description = "父件号") |
||||
@TableField("prntno") |
||||
private String prntno; |
||||
/** |
||||
* 型号 |
||||
*/ |
||||
@Schema(description = "型号") |
||||
@TableField("mtltmrk") |
||||
private String mtltmrk; |
||||
/** |
||||
* 生产标识 |
||||
*/ |
||||
@Schema(description = "生产标识") |
||||
@TableField("prtlotno") |
||||
private String prtlotno; |
||||
/** |
||||
* 需求日期 |
||||
*/ |
||||
@Schema(description = "需求日期") |
||||
@TableField("pkreqdat") |
||||
private String pkreqdat; |
||||
/** |
||||
* 父件批次 |
||||
*/ |
||||
@Schema(description = "父件批次") |
||||
@TableField("fj_splcode") |
||||
private String fjSplcode; |
||||
/** |
||||
* 父件配套数 |
||||
*/ |
||||
@Schema(description = "父件配套数") |
||||
@TableField("fj_pkavqty") |
||||
private String fjPkavqty; |
||||
/** |
||||
* 配套序号 |
||||
*/ |
||||
@Schema(description = "配套序号") |
||||
@TableField("serialno") |
||||
private String serialno; |
||||
/** |
||||
* 主制部门 |
||||
*/ |
||||
@Schema(description = "主制部门") |
||||
@TableField("prtmdept") |
||||
private String prtmdept; |
||||
/** |
||||
* 计划标记 |
||||
*/ |
||||
@Schema(description = "计划标记") |
||||
@TableField("plnsign") |
||||
private String plnsign; |
||||
/** |
||||
* 制造订单号 |
||||
*/ |
||||
@Schema(description = "制造订单号") |
||||
@TableField("mono") |
||||
private String mono; |
||||
/** |
||||
* 计划员 |
||||
*/ |
||||
@Schema(description = "计划员") |
||||
@TableField("schemer") |
||||
private String schemer; |
||||
/** |
||||
* 调度员 |
||||
*/ |
||||
@Schema(description = "调度员") |
||||
@TableField("planner1") |
||||
private String planner1; |
||||
/** |
||||
* 配套日期 |
||||
*/ |
||||
@Schema(description = "配套日期") |
||||
@TableField("subpkdate") |
||||
private String subpkdate; |
||||
|
||||
/** |
||||
* 保管员 |
||||
*/ |
||||
@Schema(description = "保管员") |
||||
@TableField("warctlr") |
||||
private String warctlr; |
||||
/** |
||||
* 条码序号 |
||||
*/ |
||||
@Schema(description = "条码序号") |
||||
@TableField("barcodeno") |
||||
private String barcodeno; |
||||
/** |
||||
* 计划部门 |
||||
*/ |
||||
@Schema(description = "计划部门") |
||||
@TableField("plandept") |
||||
private String plandept; |
||||
/** |
||||
* 备注 |
||||
*/ |
||||
@Schema(description = "备注") |
||||
@TableField("remark") |
||||
private String remark; |
||||
/** |
||||
* 物料标识 |
||||
*/ |
||||
@Schema(description = "物料标识") |
||||
@TableField("prtclass") |
||||
private String prtclass; |
||||
} |
||||
@ -0,0 +1,48 @@ |
||||
package org.springblade.erpdata.pojo.dto; |
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema; |
||||
import lombok.Data; |
||||
import lombok.NoArgsConstructor; |
||||
|
||||
/** |
||||
* @author liuqingkun |
||||
*/ |
||||
@Data |
||||
@NoArgsConstructor |
||||
public class PartoplinkFirseqDTO { |
||||
/** |
||||
* 零件号 |
||||
*/ |
||||
@Schema(description = "零件号") |
||||
private String partcode; |
||||
/** |
||||
* 零件名称 |
||||
*/ |
||||
@Schema(description = "零件名称") |
||||
private String partname; |
||||
/** |
||||
* 一级工艺计划(A)号 |
||||
*/ |
||||
@Schema(description = "一级工艺计划(A)号") |
||||
private String firpp; |
||||
/** |
||||
* 一级工艺计划名称 |
||||
*/ |
||||
@Schema(description = "一级工艺计划名称") |
||||
private String firppname; |
||||
/** |
||||
* 一级工序 |
||||
*/ |
||||
@Schema(description = "一级工序") |
||||
private String firseq; |
||||
/** |
||||
* 一级工序名称 |
||||
*/ |
||||
@Schema(description = "一级工序名称") |
||||
private String firseqname; |
||||
/** |
||||
* 一级工序序号 |
||||
*/ |
||||
@Schema(description = "一级工序序号") |
||||
private String firseqno; |
||||
} |
||||
@ -1,35 +0,0 @@ |
||||
package org.springblade.erpdata.feign; |
||||
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import io.swagger.v3.oas.annotations.Hidden; |
||||
import lombok.AllArgsConstructor; |
||||
import org.springblade.core.tenant.annotation.NonDS; |
||||
import org.springblade.core.tool.api.R; |
||||
import org.springblade.desk.dashboard.pojo.entity.DsPartEntity; |
||||
import org.springblade.erpdata.pojo.dto.AllocationDTO; |
||||
import org.springblade.erpdata.service.IErpDataSearchService; |
||||
import org.springblade.erpdata.service.IErpPartService; |
||||
import org.springframework.web.bind.annotation.GetMapping; |
||||
import org.springframework.web.bind.annotation.RestController; |
||||
|
||||
|
||||
/** |
||||
* 字典服务Feign实现类 |
||||
* |
||||
* @author Chill |
||||
*/ |
||||
@NonDS |
||||
@Hidden |
||||
@RestController |
||||
@AllArgsConstructor |
||||
public class ErpDataSearchClient implements IErpDataSearchClient{ |
||||
|
||||
private final IErpDataSearchService dataSearchService; |
||||
|
||||
@Override |
||||
@GetMapping(PAGE_ALLOCATION) |
||||
public R<IPage<AllocationDTO>> pageAllocation(IPage<AllocationDTO> page, AllocationDTO entity) { |
||||
return R.data(dataSearchService.queryAllocation(page, entity)); |
||||
} |
||||
} |
||||
@ -0,0 +1,38 @@ |
||||
package org.springblade.erpdata.feign; |
||||
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import io.swagger.v3.oas.annotations.Hidden; |
||||
import lombok.AllArgsConstructor; |
||||
import org.springblade.core.mp.support.Condition; |
||||
import org.springblade.core.mp.support.Query; |
||||
import org.springblade.core.tenant.annotation.NonDS; |
||||
import org.springblade.core.tool.api.R; |
||||
import org.springblade.erpdata.pojo.dto.MesRbPkpqryDTO; |
||||
import org.springblade.erpdata.service.IErpMesRbPkpqryService; |
||||
import org.springframework.web.bind.annotation.GetMapping; |
||||
import org.springframework.web.bind.annotation.RestController; |
||||
|
||||
|
||||
/** |
||||
* 字典服务Feign实现类 |
||||
* |
||||
* @author liuqingkun |
||||
*/ |
||||
@NonDS |
||||
@Hidden |
||||
@RestController |
||||
@AllArgsConstructor |
||||
public class ErpMesRbPkpqryClient implements IErpMesRbPkpqryClient { |
||||
|
||||
private final IErpMesRbPkpqryService mesRbPkpqryService; |
||||
|
||||
@GetMapping(SELECT_PAGE) |
||||
@Override |
||||
public R<IPage<MesRbPkpqryDTO>> selectPage(Integer current, Integer size, String pkno, String prtmdept, String subpkdateStart, String subpkdateEnd) { |
||||
Query query = new Query(); |
||||
query.setCurrent(current); |
||||
query.setSize(size); |
||||
return R.data(mesRbPkpqryService.page(Condition.getPage(query), pkno, prtmdept, subpkdateStart, subpkdateEnd)); |
||||
} |
||||
} |
||||
@ -0,0 +1,35 @@ |
||||
package org.springblade.erpdata.feign; |
||||
|
||||
|
||||
import io.swagger.v3.oas.annotations.Hidden; |
||||
import lombok.AllArgsConstructor; |
||||
import org.springblade.core.tenant.annotation.NonDS; |
||||
import org.springblade.core.tool.api.R; |
||||
import org.springblade.erpdata.pojo.dto.PartoplinkFirseqDTO; |
||||
import org.springblade.erpdata.service.IErpPartoplinkFirseqService; |
||||
import org.springframework.web.bind.annotation.GetMapping; |
||||
import org.springframework.web.bind.annotation.RestController; |
||||
|
||||
import java.util.List; |
||||
|
||||
|
||||
/** |
||||
* 字典服务Feign实现类 |
||||
* |
||||
* @author liuqingkun |
||||
*/ |
||||
@NonDS |
||||
@Hidden |
||||
@RestController |
||||
@AllArgsConstructor |
||||
public class ErpPartoplinkFirseqClient implements IErpPartoplinkFirseqClient { |
||||
|
||||
private final IErpPartoplinkFirseqService partoplinkFirseqService; |
||||
|
||||
@GetMapping(LIST_BY_PART_CODE) |
||||
@Override |
||||
public R<List<PartoplinkFirseqDTO>> listByPartCode(String partCode) { |
||||
List<PartoplinkFirseqDTO> dataList = partoplinkFirseqService.listByPartCode(partCode); |
||||
return R.data(dataList); |
||||
} |
||||
} |
||||
@ -1,30 +0,0 @@ |
||||
package org.springblade.erpdata.mapper; |
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.Mapper; |
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import org.springblade.erpdata.pojo.dto.AllocationDTO; |
||||
import org.springblade.erpdata.pojo.dto.view.MesRbWo; |
||||
|
||||
import java.util.List; |
||||
|
||||
/** |
||||
* Mapper 接口 |
||||
* |
||||
* @author lqk |
||||
*/ |
||||
public interface ErpDataSearchMapper extends Mapper { |
||||
/** |
||||
* 查询烧结配套信息 |
||||
* |
||||
* @param page |
||||
* @return |
||||
*/ |
||||
List<AllocationDTO> queryAllocation(IPage page); |
||||
|
||||
/** |
||||
* 从ERP视图中获取要同步的生产计划 |
||||
* |
||||
* @return |
||||
*/ |
||||
List<MesRbWo> getYieldPlanErpList(); |
||||
} |
||||
@ -1,15 +0,0 @@ |
||||
<?xml version="1.0" encoding="UTF-8"?> |
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
||||
<mapper namespace = "org.springblade.erpdata.mapper.ErpDataSearchMapper"> |
||||
|
||||
<select id = "queryAllocation" resultType = "org.springblade.erpdata.pojo.dto.AllocationDTO"> |
||||
select * |
||||
from v_mes_rb_pkpqry |
||||
where 1=1 |
||||
</select> |
||||
|
||||
<select id = "getYieldPlanErpList" resultType = "org.springblade.erpdata.pojo.dto.view.MesRbWo"> |
||||
SELECT * FROM v_mes_rb_wo WHERE is_deleted = 0 |
||||
</select> |
||||
|
||||
</mapper> |
||||
@ -0,0 +1,27 @@ |
||||
package org.springblade.erpdata.mapper; |
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.Mapper; |
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import org.springblade.erpdata.pojo.dto.MesRbPkpqryDTO; |
||||
|
||||
import java.util.List; |
||||
|
||||
/** |
||||
* Mapper 接口 |
||||
* |
||||
* @author lqk |
||||
*/ |
||||
public interface ErpMesRbPkpqryMapper extends Mapper { |
||||
|
||||
/** |
||||
* 自定义分页 - 查询配置结果 |
||||
* |
||||
* @param page 分页参数 |
||||
* @param pkno 配套单号 |
||||
* @param prtmdept 主制部门 |
||||
* @param subpkdateStart 配套开始时间 |
||||
* @param subpkdateEnd 配套结束时间 |
||||
* @return |
||||
*/ |
||||
List<MesRbPkpqryDTO> selectPage(IPage page, String pkno, String prtmdept, String subpkdateStart, String subpkdateEnd); |
||||
} |
||||
@ -0,0 +1,22 @@ |
||||
<?xml version="1.0" encoding="UTF-8"?> |
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
||||
<mapper namespace = "org.springblade.erpdata.mapper.ErpMesRbPkpqryMapper"> |
||||
<select id = "selectPage" resultType = "org.springblade.erpdata.pojo.dto.MesRbPkpqryDTO"> |
||||
SELECT * |
||||
FROM v_mes_rb_pkpqry |
||||
<where> |
||||
<if test = "pkno != null and pkno != ''"> |
||||
AND pkno LIKE CONCAT('%', CONCAT(#{pkno}, '%')) |
||||
</if> |
||||
<if test = "prtmdept != null and pkno != ''"> |
||||
AND prtmdept LIKE CONCAT('%', CONCAT(#{prtmdept}, '%')) |
||||
</if> |
||||
<if test = "subpkdateStart != null and subpkdateStart != ''"> |
||||
AND subpkdate >= TO_DATE(CONCAT(#{subpkdateStart}, ' 00:00:00'), 'yyyy-mm-dd hh24:mi:ss') |
||||
</if> |
||||
<if test = "subpkdateEnd != null and subpkdateEnd != ''"> |
||||
AND subpkdate <= TO_DATE(CONCAT(#{subpkdateEnd}, ' 23:59:59'), 'yyyy-mm-dd hh24:mi:ss') |
||||
</if> |
||||
</where> |
||||
</select> |
||||
</mapper> |
||||
@ -0,0 +1,22 @@ |
||||
package org.springblade.erpdata.mapper; |
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.Mapper; |
||||
import org.springblade.erpdata.pojo.dto.PartoplinkFirseqDTO; |
||||
|
||||
import java.util.List; |
||||
|
||||
/** |
||||
* Mapper 接口 |
||||
* |
||||
* @author lqk |
||||
*/ |
||||
public interface ErpPartoplinkFirseqMapper extends Mapper { |
||||
|
||||
/** |
||||
* 根据物料号查询一级工序 |
||||
* |
||||
* @param partCode |
||||
* @return |
||||
*/ |
||||
List<PartoplinkFirseqDTO> listByPartCode(String partCode); |
||||
} |
||||
@ -0,0 +1,9 @@ |
||||
<?xml version="1.0" encoding="UTF-8"?> |
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
||||
<mapper namespace = "org.springblade.erpdata.mapper.ErpPartoplinkFirseqMapper"> |
||||
<select id = "listByPartCode" resultType = "org.springblade.erpdata.pojo.dto.PartoplinkFirseqDTO"> |
||||
select a.partno as partcode, a.partname, a.firpp, a.firppname, a.firseq, a.firseqname, a.firseqno |
||||
from v_partoplink_firseq a |
||||
where prtno = #{partCode} |
||||
</select> |
||||
</mapper> |
||||
@ -1,22 +0,0 @@ |
||||
package org.springblade.erpdata.service; |
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import org.springblade.erpdata.pojo.dto.AllocationDTO; |
||||
|
||||
/** |
||||
* ERP数据查询service |
||||
* |
||||
* @author lqk |
||||
*/ |
||||
public interface IErpDataSearchService { |
||||
|
||||
/** |
||||
* 查询烧结配套信息 |
||||
* |
||||
* @param page |
||||
* @param entity |
||||
* @return |
||||
*/ |
||||
IPage<AllocationDTO> queryAllocation(IPage page, AllocationDTO entity); |
||||
|
||||
} |
||||
@ -0,0 +1,25 @@ |
||||
package org.springblade.erpdata.service; |
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import org.springblade.erpdata.pojo.dto.MesRbPkpqryDTO; |
||||
|
||||
/** |
||||
* ERP数据查询service |
||||
* |
||||
* @author liuqingkun |
||||
*/ |
||||
public interface IErpMesRbPkpqryService { |
||||
|
||||
/** |
||||
* 查询配置结果 |
||||
* |
||||
* @param page 分页参数 |
||||
* @param pkno 配套单号 |
||||
* @param prtmdept 主制部门 |
||||
* @param subpkdateStart 配套开始时间 |
||||
* @param subpkdateEnd 配套结束时间 |
||||
* @return |
||||
*/ |
||||
IPage<MesRbPkpqryDTO> page(IPage<MesRbPkpqryDTO> page, String pkno, String prtmdept, String subpkdateStart, String subpkdateEnd); |
||||
|
||||
} |
||||
@ -0,0 +1,22 @@ |
||||
package org.springblade.erpdata.service; |
||||
|
||||
import org.springblade.erpdata.pojo.dto.PartoplinkFirseqDTO; |
||||
|
||||
import java.util.List; |
||||
|
||||
/** |
||||
* ERP数据查询service |
||||
* |
||||
* @author liuqingkun |
||||
*/ |
||||
public interface IErpPartoplinkFirseqService { |
||||
|
||||
/** |
||||
* 根据物料号查询一级工序 |
||||
* |
||||
* @param partCode |
||||
* @return |
||||
*/ |
||||
List<PartoplinkFirseqDTO> listByPartCode(String partCode); |
||||
|
||||
} |
||||
@ -1,29 +0,0 @@ |
||||
package org.springblade.erpdata.service.impl; |
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import lombok.RequiredArgsConstructor; |
||||
import lombok.extern.slf4j.Slf4j; |
||||
import org.springblade.erpdata.mapper.ErpDataSearchMapper; |
||||
import org.springblade.erpdata.pojo.dto.AllocationDTO; |
||||
import org.springblade.erpdata.service.IErpDataSearchService; |
||||
import org.springframework.stereotype.Service; |
||||
|
||||
import java.util.List; |
||||
|
||||
/** |
||||
* @author lqk |
||||
* @date 2025-11-26 9:39 |
||||
*/ |
||||
@Slf4j |
||||
@RequiredArgsConstructor |
||||
@Service |
||||
public class ErpDataSearchServiceImpl implements IErpDataSearchService { |
||||
|
||||
private final ErpDataSearchMapper dataSearchMapper; |
||||
|
||||
@Override |
||||
public IPage<AllocationDTO> queryAllocation(IPage page, AllocationDTO entity) { |
||||
List<AllocationDTO> dataList = dataSearchMapper.queryAllocation(page); |
||||
return page.setRecords(dataList); |
||||
} |
||||
} |
||||
@ -0,0 +1,29 @@ |
||||
package org.springblade.erpdata.service.impl; |
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import lombok.RequiredArgsConstructor; |
||||
import lombok.extern.slf4j.Slf4j; |
||||
import org.springblade.erpdata.mapper.ErpMesRbPkpqryMapper; |
||||
import org.springblade.erpdata.pojo.dto.MesRbPkpqryDTO; |
||||
import org.springblade.erpdata.service.IErpMesRbPkpqryService; |
||||
import org.springframework.stereotype.Service; |
||||
|
||||
import java.util.List; |
||||
|
||||
/** |
||||
* @author liuqingkun |
||||
* @date 2026-1-31 |
||||
*/ |
||||
@Slf4j |
||||
@RequiredArgsConstructor |
||||
@Service |
||||
public class ErpMesRbPkpqryServiceImpl implements IErpMesRbPkpqryService { |
||||
|
||||
private final ErpMesRbPkpqryMapper mesRbPkpqryMapper; |
||||
|
||||
@Override |
||||
public IPage<MesRbPkpqryDTO> page(IPage<MesRbPkpqryDTO> page, String pkno, String prtmdept, String subpkdateStart, String subpkdateEnd) { |
||||
List<MesRbPkpqryDTO> dataList = mesRbPkpqryMapper.selectPage(page, pkno, prtmdept, subpkdateStart, subpkdateEnd); |
||||
return page.setRecords(dataList); |
||||
} |
||||
} |
||||
@ -0,0 +1,32 @@ |
||||
package org.springblade.erpdata.service.impl; |
||||
|
||||
import lombok.RequiredArgsConstructor; |
||||
import lombok.extern.slf4j.Slf4j; |
||||
import org.apache.commons.lang3.StringUtils; |
||||
import org.springblade.erpdata.mapper.ErpPartoplinkFirseqMapper; |
||||
import org.springblade.erpdata.pojo.dto.PartoplinkFirseqDTO; |
||||
import org.springblade.erpdata.service.IErpPartoplinkFirseqService; |
||||
import org.springframework.stereotype.Service; |
||||
|
||||
import java.util.List; |
||||
|
||||
/** |
||||
* @author liuqingkun |
||||
* @date 2026-1-31 |
||||
*/ |
||||
@Slf4j |
||||
@RequiredArgsConstructor |
||||
@Service |
||||
public class ErpPartoplinkFirseqServiceImpl implements IErpPartoplinkFirseqService { |
||||
|
||||
private final ErpPartoplinkFirseqMapper erpPartoplinkFirseqMapper; |
||||
|
||||
@Override |
||||
public List<PartoplinkFirseqDTO> listByPartCode(String partCode) { |
||||
if (StringUtils.isEmpty(partCode)) { |
||||
return null; |
||||
} |
||||
|
||||
return erpPartoplinkFirseqMapper.listByPartCode(partCode); |
||||
} |
||||
} |
||||
@ -0,0 +1,134 @@ |
||||
package org.springblade.scheduling.scheduling.controller; |
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; |
||||
import io.swagger.v3.oas.annotations.Operation; |
||||
import io.swagger.v3.oas.annotations.Parameter; |
||||
import io.swagger.v3.oas.annotations.tags.Tag; |
||||
import jakarta.servlet.http.HttpServletResponse; |
||||
import jakarta.validation.Valid; |
||||
import lombok.AllArgsConstructor; |
||||
import org.springblade.core.boot.ctrl.BladeController; |
||||
import org.springblade.core.excel.util.ExcelUtil; |
||||
import org.springblade.core.mp.support.Condition; |
||||
import org.springblade.core.mp.support.Query; |
||||
import org.springblade.core.secure.BladeUser; |
||||
import org.springblade.core.tool.api.R; |
||||
import org.springblade.core.tool.utils.DateUtil; |
||||
import org.springblade.core.tool.utils.Func; |
||||
import org.springblade.desk.jobtransfer.pojo.entity.CertificateTypeEntity; |
||||
import org.springblade.desk.jobtransfer.pojo.excel.CertificateTypeExcel; |
||||
import org.springblade.desk.jobtransfer.pojo.vo.CertificateTypeVO; |
||||
import org.springblade.scheduling.scheduling.service.ICertificateTypeService; |
||||
import org.springblade.scheduling.scheduling.wrapper.CertificateTypeWrapper; |
||||
import org.springframework.web.bind.annotation.*; |
||||
|
||||
import java.util.List; |
||||
import java.util.Map; |
||||
|
||||
/** |
||||
* 证书类型 控制器 |
||||
* |
||||
* @author qyl |
||||
* @since 2026-01-08 |
||||
*/ |
||||
@RestController |
||||
@AllArgsConstructor |
||||
@RequestMapping("/certificateType") |
||||
@Tag(name = "证书类型维护", description = "证书类型维护接口") |
||||
public class CertificateTypeController extends BladeController { |
||||
|
||||
private final ICertificateTypeService certificateTypeService; |
||||
|
||||
/** |
||||
* 证书类型 详情 |
||||
*/ |
||||
@GetMapping("/detail") |
||||
@ApiOperationSupport(order = 1) |
||||
@Operation(summary = "详情", description = "传入certificateType") |
||||
public R<CertificateTypeVO> detail(CertificateTypeEntity certificateType) { |
||||
CertificateTypeEntity detail = certificateTypeService.getOne(Condition.getQueryWrapper(certificateType)); |
||||
return R.data(CertificateTypeWrapper.build().entityVO(detail)); |
||||
} |
||||
|
||||
/** |
||||
* 证书类型 自定义分页 |
||||
*/ |
||||
@GetMapping("/page") |
||||
@ApiOperationSupport(order = 3) |
||||
@Operation(summary = "分页", description = "传入certificateType") |
||||
public R<IPage<CertificateTypeVO>> page(CertificateTypeVO certificateType, Query query) { |
||||
IPage<CertificateTypeVO> pages = certificateTypeService.selectCertificateTypePage(Condition.getPage(query), certificateType); |
||||
return R.data(pages); |
||||
} |
||||
|
||||
/** |
||||
* 证书类型 新增 |
||||
*/ |
||||
@PostMapping("/save") |
||||
@ApiOperationSupport(order = 4) |
||||
@Operation(summary = "新增", description = "传入certificateType") |
||||
public R save(@Valid @RequestBody CertificateTypeEntity certificateType) { |
||||
return R.status(certificateTypeService.save(certificateType)); |
||||
} |
||||
|
||||
/** |
||||
* 证书类型 修改 |
||||
*/ |
||||
@PostMapping("/update") |
||||
@ApiOperationSupport(order = 5) |
||||
@Operation(summary = "修改", description = "传入certificateType") |
||||
public R update(@Valid @RequestBody CertificateTypeEntity certificateType) { |
||||
return R.status(certificateTypeService.updateById(certificateType)); |
||||
} |
||||
|
||||
/** |
||||
* 证书类型 新增或修改 |
||||
*/ |
||||
@PostMapping("/submit") |
||||
@ApiOperationSupport(order = 6) |
||||
@Operation(summary = "新增或修改", description = "传入certificateType") |
||||
public R submit(@Valid @RequestBody CertificateTypeEntity certificateType) { |
||||
return R.status(certificateTypeService.saveOrUpdate(certificateType)); |
||||
} |
||||
|
||||
/** |
||||
* 证书类型 删除 |
||||
*/ |
||||
@PostMapping("/remove") |
||||
@ApiOperationSupport(order = 7) |
||||
@Operation(summary = "逻辑删除", description = "传入ids") |
||||
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { |
||||
return R.status(certificateTypeService.deleteLogic(Func.toLongList(ids))); |
||||
} |
||||
|
||||
|
||||
/** |
||||
* 导出数据 |
||||
*/ |
||||
@GetMapping("/export-certificateType") |
||||
@ApiOperationSupport(order = 9) |
||||
@Operation(summary = "导出数据", description = "传入certificateType") |
||||
public void exportCertificateType(@Parameter(hidden = true) @RequestParam Map<String, Object> certificateType, BladeUser bladeUser, HttpServletResponse response) { |
||||
QueryWrapper<CertificateTypeEntity> queryWrapper = Condition.getQueryWrapper(certificateType, CertificateTypeEntity.class); |
||||
//if (!AuthUtil.isAdministrator()) {
|
||||
// queryWrapper.lambda().eq(CertificateType::getTenantId, bladeUser.getTenantId());
|
||||
//}
|
||||
//queryWrapper.lambda().eq(CertificateTypeEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
|
||||
List<CertificateTypeExcel> list = certificateTypeService.exportCertificateType(queryWrapper); |
||||
ExcelUtil.export(response, "证书类型数据" + DateUtil.time(), "证书类型数据表", list, CertificateTypeExcel.class); |
||||
} |
||||
|
||||
/** |
||||
* 质量等级表 分页 |
||||
*/ |
||||
@GetMapping("/selectList") |
||||
@ApiOperationSupport(order = 2) |
||||
@Operation(summary = "分页", description = "传入QualityGrade") |
||||
public R<List<CertificateTypeEntity>> selectGradeList() { |
||||
List<CertificateTypeEntity> list = certificateTypeService.list(); |
||||
return R.data(list); |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,39 @@ |
||||
package org.springblade.scheduling.scheduling.mapper; |
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.Wrapper; |
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import org.apache.ibatis.annotations.Param; |
||||
import org.springblade.desk.jobtransfer.pojo.entity.CertificateTypeEntity; |
||||
import org.springblade.desk.jobtransfer.pojo.excel.CertificateTypeExcel; |
||||
import org.springblade.desk.jobtransfer.pojo.vo.CertificateTypeVO; |
||||
|
||||
import java.util.List; |
||||
|
||||
/** |
||||
* 证书类型 Mapper 接口 |
||||
* |
||||
* @author qyl |
||||
* @since 2026-01-08 |
||||
*/ |
||||
public interface CertificateTypeMapper extends BaseMapper<CertificateTypeEntity> { |
||||
|
||||
/** |
||||
* 自定义分页 |
||||
* |
||||
* @param page 分页参数 |
||||
* @param certificateType 查询参数 |
||||
* @return List<CertificateTypeVO> |
||||
*/ |
||||
List<CertificateTypeVO> selectCertificateTypePage(IPage page, CertificateTypeVO certificateType); |
||||
|
||||
|
||||
/** |
||||
* 获取导出数据 |
||||
* |
||||
* @param queryWrapper 查询条件 |
||||
* @return List<CertificateTypeExcel> |
||||
*/ |
||||
List<CertificateTypeExcel> exportCertificateType(@Param("ew") Wrapper<CertificateTypeEntity> queryWrapper); |
||||
|
||||
} |
||||
@ -0,0 +1,36 @@ |
||||
<?xml version="1.0" encoding="UTF-8"?> |
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
||||
<mapper namespace="org.springblade.scheduling.scheduling.mapper.CertificateTypeMapper"> |
||||
|
||||
<!-- 通用查询映射结果 --> |
||||
<resultMap id="mesCertificateTypeResultMap" |
||||
type="org.springblade.desk.jobtransfer.pojo.entity.CertificateTypeEntity"> |
||||
<result column="ID" property="id"/> |
||||
<result column="TENANT_ID" property="tenantId"/> |
||||
<result column="CREATE_USER" property="createUser"/> |
||||
<result column="CREATE_TIME" property="createTime"/> |
||||
<result column="CREATE_DEPT" property="createDept"/> |
||||
<result column="UPDATE_USER" property="updateUser"/> |
||||
<result column="UPDATE_TIME" property="updateTime"/> |
||||
<result column="STATUS" property="status"/> |
||||
<result column="IS_DELETED" property="isDeleted"/> |
||||
<result column="NAME" property="name"/> |
||||
<result column="VALIDITY_PERIOD" property="validityPeriod"/> |
||||
<result column="AIRWORTHINESS_VALIDITY_PERIOD" property="airworthinessValidityPeriod"/> |
||||
<result column="ASTRONAUT_VALIDITY_PERIOD" property="astronautValidityPeriod"/> |
||||
</resultMap> |
||||
|
||||
|
||||
<select id="selectCertificateTypePage" resultMap="mesCertificateTypeResultMap"> |
||||
select * |
||||
from MES_CERTIFICATE_TYPE |
||||
where is_deleted = 0 |
||||
</select> |
||||
|
||||
|
||||
<select id="exportCertificateType" resultType="org.springblade.desk.jobtransfer.pojo.excel.CertificateTypeExcel"> |
||||
SELECT * |
||||
FROM MES_CERTIFICATE_TYPE ${ew.customSqlSegment} |
||||
</select> |
||||
|
||||
</mapper> |
||||
@ -0,0 +1,37 @@ |
||||
package org.springblade.scheduling.scheduling.service; |
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.Wrapper; |
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import org.springblade.core.mp.base.BaseService; |
||||
import org.springblade.desk.jobtransfer.pojo.entity.CertificateTypeEntity; |
||||
import org.springblade.desk.jobtransfer.pojo.excel.CertificateTypeExcel; |
||||
import org.springblade.desk.jobtransfer.pojo.vo.CertificateTypeVO; |
||||
|
||||
import java.util.List; |
||||
|
||||
/** |
||||
* 证书类型 服务类 |
||||
* |
||||
* @author qyl |
||||
* @since 2026-01-08 |
||||
*/ |
||||
public interface ICertificateTypeService extends BaseService<CertificateTypeEntity> { |
||||
/** |
||||
* 自定义分页 |
||||
* |
||||
* @param page 分页参数 |
||||
* @param certificateType 查询参数 |
||||
* @return IPage<CertificateTypeVO> |
||||
*/ |
||||
IPage<CertificateTypeVO> selectCertificateTypePage(IPage<CertificateTypeVO> page, CertificateTypeVO certificateType); |
||||
|
||||
|
||||
/** |
||||
* 导出数据 |
||||
* |
||||
* @param queryWrapper 查询条件 |
||||
* @return List<CertificateTypeExcel> |
||||
*/ |
||||
List<CertificateTypeExcel> exportCertificateType(Wrapper<CertificateTypeEntity> queryWrapper); |
||||
|
||||
} |
||||
@ -0,0 +1,39 @@ |
||||
package org.springblade.scheduling.scheduling.service.impl; |
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.Wrapper; |
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import org.springblade.core.mp.base.BaseServiceImpl; |
||||
import org.springblade.desk.jobtransfer.pojo.entity.CertificateTypeEntity; |
||||
import org.springblade.desk.jobtransfer.pojo.excel.CertificateTypeExcel; |
||||
import org.springblade.desk.jobtransfer.pojo.vo.CertificateTypeVO; |
||||
import org.springblade.scheduling.scheduling.mapper.CertificateTypeMapper; |
||||
import org.springblade.scheduling.scheduling.service.ICertificateTypeService; |
||||
import org.springframework.stereotype.Service; |
||||
|
||||
import java.util.List; |
||||
|
||||
/** |
||||
* 证书类型 服务实现类 |
||||
* |
||||
* @author qyl |
||||
* @since 2026-01-08 |
||||
*/ |
||||
@Service |
||||
public class CertificateTypeServiceImpl extends BaseServiceImpl<CertificateTypeMapper, CertificateTypeEntity> implements ICertificateTypeService { |
||||
|
||||
@Override |
||||
public IPage<CertificateTypeVO> selectCertificateTypePage(IPage<CertificateTypeVO> page, CertificateTypeVO certificateType) { |
||||
return page.setRecords(baseMapper.selectCertificateTypePage(page, certificateType)); |
||||
} |
||||
|
||||
|
||||
@Override |
||||
public List<CertificateTypeExcel> exportCertificateType(Wrapper<CertificateTypeEntity> queryWrapper) { |
||||
List<CertificateTypeExcel> certificateTypeList = baseMapper.exportCertificateType(queryWrapper); |
||||
//certificateTypeList.forEach(certificateType -> {
|
||||
// certificateType.setTypeName(DictCache.getValue(DictEnum.YES_NO, CertificateType.getType()));
|
||||
//});
|
||||
return certificateTypeList; |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,35 @@ |
||||
package org.springblade.scheduling.scheduling.wrapper; |
||||
|
||||
import org.springblade.core.mp.support.BaseEntityWrapper; |
||||
import org.springblade.core.tool.utils.BeanUtil; |
||||
import org.springblade.desk.jobtransfer.pojo.entity.CertificateTypeEntity; |
||||
import org.springblade.desk.jobtransfer.pojo.vo.CertificateTypeVO; |
||||
|
||||
import java.util.Objects; |
||||
|
||||
/** |
||||
* 证书类型 包装类,返回视图层所需的字段 |
||||
* |
||||
* @author qyl |
||||
* @since 2026-01-08 |
||||
*/ |
||||
public class CertificateTypeWrapper extends BaseEntityWrapper<CertificateTypeEntity, CertificateTypeVO> { |
||||
|
||||
public static CertificateTypeWrapper build() { |
||||
return new CertificateTypeWrapper(); |
||||
} |
||||
|
||||
@Override |
||||
public CertificateTypeVO entityVO(CertificateTypeEntity certificateType) { |
||||
CertificateTypeVO certificateTypeVO = Objects.requireNonNull(BeanUtil.copyProperties(certificateType, CertificateTypeVO.class)); |
||||
|
||||
//User createUser = UserCache.getUser(certificateType.getCreateUser());
|
||||
//User updateUser = UserCache.getUser(certificateType.getUpdateUser());
|
||||
//certificateTypeVO.setCreateUserName(createUser.getName());
|
||||
//certificateTypeVO.setUpdateUserName(updateUser.getName());
|
||||
|
||||
return certificateTypeVO; |
||||
} |
||||
|
||||
|
||||
} |
||||
Loading…
Reference in new issue