岗位证书维护检索功能+定时任务更新岗位证书维护状态

develop-QA
qinyulong 3 months ago
parent 35d377cacf
commit ba11b71228
  1. 58
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/MaintenanceStatusEnum.java
  2. 47
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/CertificateLedgerQuery.java
  3. 21
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/CertificateLedgerVO.java
  4. 93
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/CertificateMaintenanceVO.java
  5. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/DeskApplication.java
  6. 36
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CertificateMaintenanceController.java
  7. 12
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateMaintenanceMapper.java
  8. 164
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateMaintenanceMapper.xml
  9. 12
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICertificateMaintenanceService.java
  10. 11
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CertificateMaintenanceServiceImpl.java

@ -0,0 +1,58 @@
package org.springblade.desk.jobTransfer.pojo.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
import org.springblade.core.tool.utils.ObjectUtil;
import org.springblade.core.tool.utils.StringPool;
import java.util.Arrays;
/**
* 证书维护状态枚举
*
* @author qyl
* @date 2026-01-12
*/
@Getter
@AllArgsConstructor
public enum MaintenanceStatusEnum {
EMPTY(StringPool.EMPTY, -1),
/**
* 状态枚举
*/
NORMAL("正常", 1),
DUE("到期", 2),
DEPART("离职", 3),
;
final String name;
final Integer code;
/**
* 匹配枚举值
*
* @param name 名称
* @return
*/
public static MaintenanceStatusEnum of(String name) {
return Arrays.stream(MaintenanceStatusEnum.values())
.filter(enumItem -> enumItem.getName().equalsIgnoreCase(name != null ? name : ""))
.findFirst()
// 在没有找到匹配项时返回默认值
.orElse(MaintenanceStatusEnum.EMPTY);
}
/**
* 根据值获取名称
*
* @param code
* @return
*/
public static String getName(Integer code) {
MaintenanceStatusEnum item = Arrays.stream(MaintenanceStatusEnum.values())
.filter(enumItem -> enumItem.getCode() == code)
.findFirst()
.orElse(null);
return ObjectUtil.isEmpty(item) ? StringPool.EMPTY : item.getName();
}
}

@ -0,0 +1,47 @@
package org.springblade.desk.jobTransfer.pojo.request;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/**
* 岗位证书管理检索请求入参
*/
@Data
public class CertificateLedgerQuery {
/**
* 姓名
*/
@Schema(description = "姓名")
private String name;
/**
* 所属班组
*/
@Schema(description = "所属班组")
private Long deptId;
/**
* 所属岗位
*/
@Schema(description = "所属岗位")
private String station;
/**
* 技能等级
*/
@Schema(description = "技能等级")
private Short skill;
/**
* 证书类型
*/
@Schema(description = "证书类型")
private Long certificateId;
/**
* 证书编号
*/
@Schema(description = "证书编号")
private String certificateCode;
/**
* 维护状态(1正常,2到期,3离职)
*/
@Schema(description = "维护状态(1正常,2到期,3离职)")
private Short maintenanceStatus;
}

@ -0,0 +1,21 @@
package org.springblade.desk.jobTransfer.pojo.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.util.List;
/**
* 岗位证书台账VO
*/
@Data
public class CertificateLedgerVO {
//人员岗位数据
@Schema(description = "人员岗位数据")
private PostHandleVO postHandleVO;
//岗位证书数据集合
@Schema(description = "岗位证书数据集合")
private List<CertificateMaintenanceVO> certificateMaintenanceVOList;
}

@ -1,10 +1,14 @@
package org.springblade.desk.jobTransfer.pojo.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import org.springblade.desk.jobTransfer.pojo.entity.CertificateMaintenanceEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.desk.jobTransfer.pojo.enums.MaintenanceStatusEnum;
import java.io.Serial;
import java.util.Calendar;
import java.util.Date;
/**
* 证书维护 视图实体类
@ -17,5 +21,94 @@ import java.io.Serial;
public class CertificateMaintenanceVO extends CertificateMaintenanceEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 证书名称
*/
@Schema(description = "证书名称")
private String CertificateTypeName;
/**
* 证书有效期
*/
@Schema(description = "证书有效期")
private Short validityPeriod;
/**
* 适航有效期
*/
@Schema(description = "适航有效期")
private Short airworthinessValidityPeriod;
/**
* 宇航有效期
*/
@Schema(description = "宇航有效期")
private Short astronautValidityPeriod;
// 适航到期日期
public Date getAirworthinessDateExpire() {
if (this.getAirworthinessDate() != null && this.airworthinessValidityPeriod != null) {
Calendar cal = Calendar.getInstance();
cal.setTime(this.getAirworthinessDate());
cal.add(Calendar.YEAR, Integer.valueOf(this.airworthinessValidityPeriod.toString()));
//得到结算后的结果 yyyy-MM-dd HH:mm
Date date = cal.getTime();
cal.setTime(date);
cal.add(Calendar.MONTH, -1);
return cal.getTime();
} else {
return null;
}
}
// 宇航到期日期
public Date getAstronautDateExpire() {
if (this.getAstronautDate() != null && this.astronautValidityPeriod != null) {
Calendar cal = Calendar.getInstance();
cal.setTime(this.getAstronautDate());
cal.add(Calendar.YEAR, Integer.valueOf(this.astronautValidityPeriod.toString()));
//得到结算后的结果 yyyy-MM-dd HH:mm
Date date = cal.getTime();
cal.setTime(date);
cal.add(Calendar.MONTH, -1);
return cal.getTime();
} else {
return null;
}
}
// 上岗证到期日期
public Date getValidityPeriodExpire() {
if (this.getCertificateDate() != null && this.validityPeriod != null) {
Calendar cal = Calendar.getInstance();
cal.setTime(this.getCertificateDate());
cal.add(Calendar.YEAR, Integer.valueOf(this.validityPeriod.toString()));
//得到结算后的结果 yyyy-MM-dd HH:mm
Date date = cal.getTime();
cal.setTime(date);
cal.add(Calendar.MONTH, -1);
return cal.getTime();
} else {
return null;
}
}
public String getMaintenanceStatusName() {
if (this.getMaintenanceStatus() == MaintenanceStatusEnum.DEPART.getCode().shortValue()) {
return MaintenanceStatusEnum.DEPART.getName();
}
Date date = new Date();
if (getAirworthinessDateExpire() != null && getAirworthinessDateExpire().getTime() < date.getTime()) {
setMaintenanceStatus(MaintenanceStatusEnum.DUE.getCode().shortValue());
return MaintenanceStatusEnum.DUE.getName();
}
if (getAstronautDateExpire() != null && getAstronautDateExpire().getTime() < date.getTime()) {
setMaintenanceStatus(MaintenanceStatusEnum.DUE.getCode().shortValue());
return MaintenanceStatusEnum.DUE.getName();
}
if (getValidityPeriodExpire() != null && getValidityPeriodExpire().getTime() < date.getTime()) {
setMaintenanceStatus(MaintenanceStatusEnum.DUE.getCode().shortValue());
return MaintenanceStatusEnum.DUE.getName();
}
setMaintenanceStatus(MaintenanceStatusEnum.NORMAL.getCode().shortValue());
return MaintenanceStatusEnum.NORMAL.getName();
}
}

@ -28,6 +28,7 @@ package org.springblade.desk;
import org.springblade.core.cloud.client.BladeCloudApplication;
import org.springblade.core.launch.BladeApplication;
import org.springblade.core.launch.constant.AppConstant;
import org.springframework.scheduling.annotation.EnableScheduling;
/**
* Desk启动器
@ -35,6 +36,7 @@ import org.springblade.core.launch.constant.AppConstant;
* @author Chill
*/
@BladeCloudApplication
@EnableScheduling
public class DeskApplication {
public static void main(String[] args) {

@ -1,9 +1,13 @@
package org.springblade.desk.jobTransfer.controller;
import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.enums.ParameterIn;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import jakarta.annotation.PostConstruct;
import lombok.AllArgsConstructor;
import jakarta.validation.Valid;
@ -14,6 +18,9 @@ import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.desk.jobTransfer.pojo.excel.CertificateMaintenanceExcel;
import org.springblade.desk.jobTransfer.pojo.request.CertificateLedgerQuery;
import org.springblade.desk.jobTransfer.pojo.vo.CertificateLedgerVO;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -61,9 +68,18 @@ public class CertificateMaintenanceController extends BladeController {
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@Operation(summary = "分页", description = "传入certificateMaintenance")
public R<IPage<CertificateMaintenanceVO>> page(CertificateMaintenanceVO certificateMaintenance, Query query) {
IPage<CertificateMaintenanceVO> pages = certificateMaintenanceService.selectCertificateMaintenancePage(Condition.getPage(query), certificateMaintenance);
@Operation(summary = "分页", description = "CertificateLedgerQuery")
@Parameters({
@Parameter(name = "name", description = "姓名", in = ParameterIn.QUERY, schema = @Schema(type = "string")),
@Parameter(name = "deptId", description = "所属班组", in = ParameterIn.QUERY, schema = @Schema(type = "integer")),
@Parameter(name = "station", description = "所属岗位", in = ParameterIn.QUERY, schema = @Schema(type = "string")),
@Parameter(name = "skill", description = "技能等级", in = ParameterIn.QUERY, schema = @Schema(type = "integer")),
@Parameter(name = "certificateId", description = "证书类型", in = ParameterIn.QUERY, schema = @Schema(type = "integer")),
@Parameter(name = "certificateCode", description = "证书编号", in = ParameterIn.QUERY, schema = @Schema(type = "string")),
@Parameter(name = "maintenanceStatus", description = "状态", in = ParameterIn.QUERY, schema = @Schema(type = "integer")),
})
public R<IPage<CertificateLedgerVO>> page(CertificateLedgerQuery certificateLedgerQuery, Query query) {
IPage<CertificateLedgerVO> pages = certificateMaintenanceService.selectCertificateMaintenancePage(Condition.getPage(query), certificateLedgerQuery);
return R.data(pages);
}
@ -125,4 +141,18 @@ public class CertificateMaintenanceController extends BladeController {
ExcelUtil.export(response, "证书维护数据" + DateUtil.time(), "证书维护数据表", list, CertificateMaintenanceExcel.class);
}
@PostConstruct // 项目启动后立即执行一次
public void init() {
updateMaintenanceStatus();
}
/**
* 更新证书维护状态
* TODO 以后需要交由PowerJob服务统一管理
*/
@Scheduled(cron = "0 0 0 * * ?") // 每天凌晨0点执行
public void updateMaintenanceStatus() {
certificateMaintenanceService.updateMaintenanceStatus();
}
}

@ -2,6 +2,8 @@ package org.springblade.desk.jobTransfer.mapper;
import org.springblade.desk.jobTransfer.pojo.entity.CertificateMaintenanceEntity;
import org.springblade.desk.jobTransfer.pojo.excel.CertificateMaintenanceExcel;
import org.springblade.desk.jobTransfer.pojo.request.CertificateLedgerQuery;
import org.springblade.desk.jobTransfer.pojo.vo.CertificateLedgerVO;
import org.springblade.desk.jobTransfer.pojo.vo.CertificateMaintenanceVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
@ -22,10 +24,10 @@ public interface CertificateMaintenanceMapper extends BaseMapper<CertificateMain
* 自定义分页
*
* @param page 分页参数
* @param certificateMaintenance 查询参数
* @return List<CertificateMaintenanceVO>
* @param certificateLedgerQuery 查询参数
* @return List<CertificateLedgerVO>
*/
List<CertificateMaintenanceVO> selectCertificateMaintenancePage(IPage page, CertificateMaintenanceVO certificateMaintenance);
List<CertificateLedgerVO> selectCertificateMaintenancePage(IPage page, CertificateLedgerQuery query);
/**
@ -36,4 +38,8 @@ public interface CertificateMaintenanceMapper extends BaseMapper<CertificateMain
*/
List<CertificateMaintenanceExcel> exportCertificateMaintenance(@Param("ew") Wrapper<CertificateMaintenanceEntity> queryWrapper);
/**
* 更新证书维护状态
*/
void updateMaintenanceStatus();
}

@ -22,14 +22,134 @@
<result column="ASTRONAUT_DATE" property="astronautDate"/>
<result column="MAINTENANCE_STATUS" property="maintenanceStatus"/>
</resultMap>
<!-- 结果映射:一对多关系 -->
<!-- <resultMap id="certificateLedgerMap" type="org.springblade.desk.jobTransfer.pojo.vo.CertificateLedgerVO">-->
<!-- &lt;!&ndash; 人员岗位数据映射 &ndash;&gt;-->
<!-- <association property="postHandleVO" resultMap="postHandleMap"/>-->
<!-- &lt;!&ndash; 岗位证书数据集合映射 &ndash;&gt;-->
<!-- <collection property="certificateMaintenanceVOList"-->
<!-- ofType="org.springblade.desk.jobTransfer.pojo.vo.CertificateMaintenanceVO"-->
<!-- resultMap="certificateMaintenanceMap"/>-->
<!-- </resultMap>-->
<resultMap id="certificateLedgerMap" type="org.springblade.desk.jobTransfer.pojo.vo.CertificateLedgerVO">
<!-- 定义主键 -->
<id property="postHandleVO.id" column="ID"/>
<select id="selectCertificateMaintenancePage" resultMap="mesCertificateMaintenanceResultMap">
select *
from MES_CERTIFICATE_MAINTENANCE
where is_deleted = 0
</select>
<!-- 人员岗位数据映射 -->
<association property="postHandleVO" resultMap="postHandleMap"/>
<!-- 岗位证书数据集合映射 -->
<collection property="certificateMaintenanceVOList"
ofType="org.springblade.desk.jobTransfer.pojo.vo.CertificateMaintenanceVO"
resultMap="certificateMaintenanceMap">
<!-- 明确指定关联关系 -->
<id property="id" column="cm_id"/>
</collection>
</resultMap>
<!-- 岗位处理表映射 -->
<resultMap id="postHandleMap" type="org.springblade.desk.jobTransfer.pojo.vo.PostHandleVO">
<!-- 映射主表 MES_POST_HANDLE 的所有字段 -->
<id 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="USER_ID" property="userId"/>
<result column="NAME" property="name"/>
<result column="NATION" property="nation"/>
<result column="AGE" property="age"/>
<result column="ID_CARD" property="idCard"/>
<result column="NATIVE_PLACE" property="nativePlace"/>
<result column="DEPT_ID" property="deptId"/>
<result column="STATION" property="station"/>
<result column="DATA_BIRTH" property="dataBirth"/>
<result column="FACE" property="face"/>
<result column="MARRIAGE" property="marriage"/>
<result column="SCHOOL" property="school"/>
<result column="MAJOR" property="major"/>
<result column="EDUCATION" property="education"/>
<result column="END_DATE" property="endDate"/>
<result column="STAFF_TYPE" property="staffType"/>
<result column="JOIN_JOB_DATE" property="joinJobDate"/>
<result column="SKILL" property="skill"/>
<result column="IN_JOB_DATE" property="inJobDate"/>
<result column="CON_EXP_DATE" property="conExpDate"/>
<result column="ADDRESS" property="address"/>
<result column="TO_NEW_JOB" property="toNewJob"/>
<result column="PH_STATUS" property="phStatus"/>
<!-- 映射 VO 扩展字段 -->
<result column="USER_NAME" property="userName"/>
<result column="USER_CODE" property="userCode"/>
<result column="DEPT_NAME" property="deptName"/>
</resultMap>
<!-- 证书维护表映射 -->
<resultMap id="certificateMaintenanceMap" type="org.springblade.desk.jobTransfer.pojo.vo.CertificateMaintenanceVO">
<id property="id" column="cm_id"/>
<result property="phId" column="cm_ph_id"/>
<result property="certificateId" column="certificate_id"/>
<result property="certificateCode" column="certificate_code"/>
<result property="certificateDate" column="certificate_date"/>
<result property="airworthinessDate" column="airworthiness_date"/>
<result property="astronautDate" column="astronaut_date"/>
<result property="maintenanceStatus" column="maintenance_status"/>
<result property="certificateTypeName" column="certificate_type_name"/>
<result property="validityPeriod" column="validity_period"/>
<result property="airworthinessValidityPeriod" column="airworthiness_validity_period"/>
<result property="astronautValidityPeriod" column="astronaut_validity_period"/>
</resultMap>
<!-- 查询语句 -->
<select id="selectCertificateMaintenancePage" parameterType="map" resultMap="certificateLedgerMap">
SELECT
ph.ID as ph_id,
ph.*,
bd.DEPT_NAME as DEPT_NAME,
cm.id as cm_id,
cm.ph_id as cm_ph_id,
cm.certificate_id,
cm.certificate_code,
cm.certificate_date,
cm.airworthiness_date,
cm.astronaut_date,
cm.maintenance_status,
cm.status as cm_status,
ct.name as certificate_type_name,
ct.validity_period as validity_period,
ct.airworthiness_validity_period as airworthiness_validity_period,
ct.astronaut_validity_period as astronaut_validity_period
FROM MES_POST_HANDLE ph
LEFT JOIN BLADE_USER bu ON ph.USER_ID = bu.ID
LEFT JOIN BLADE_DEPT bd ON ph.DEPT_ID = bd.ID
LEFT JOIN MES_CERTIFICATE_MAINTENANCE cm ON ph.id = cm.ph_id AND cm.is_deleted = 0
LEFT JOIN MES_CERTIFICATE_TYPE ct ON cm.certificate_id = ct.id AND ct.is_deleted = 0
WHERE ph.is_deleted = 0
<if test="query.name != null and query.name != ''">
AND ph.name LIKE CONCAT(CONCAT('%', #{query.name}), '%')
</if>
<if test="query.deptId != null">
AND ph.dept_id = #{query.deptId}
</if>
<if test="query.station != null and query.station != ''">
AND ph.station = #{query.station}
</if>
<if test="query.certificateId != null">
AND cm.certificate_id = #{query.certificateId}
</if>
<if test="query.certificateCode != null and query.certificateCode != ''">
AND cm.certificate_code LIKE CONCAT(CONCAT('%', #{query.certificateCode}), '%')
</if>
<if test="query.maintenanceStatus != null">
AND cm.maintenance_status = #{query.maintenanceStatus}
</if>
ORDER BY ph.create_time DESC, cm.certificate_date DESC
</select>
<select id="exportCertificateMaintenance"
resultType="org.springblade.desk.jobTransfer.pojo.excel.CertificateMaintenanceExcel">
@ -37,4 +157,38 @@
FROM MES_CERTIFICATE_MAINTENANCE ${ew.customSqlSegment}
</select>
<update id="updateMaintenanceStatus">
MERGE INTO MES_CERTIFICATE_MAINTENANCE m
USING (SELECT ID,
VALIDITY_PERIOD,
AIRWORTHINESS_VALIDITY_PERIOD,
ASTRONAUT_VALIDITY_PERIOD
FROM MES_CERTIFICATE_TYPE
WHERE IS_DELETED = 0) ct
ON (m.CERTIFICATE_ID = ct.ID AND m.IS_DELETED = 0)
WHEN MATCHED THEN
UPDATE SET
m.MAINTENANCE_STATUS =
CASE
WHEN m.CERTIFICATE_DATE IS NOT NULL AND ct.VALIDITY_PERIOD IS NOT NULL THEN
CASE
WHEN m.CERTIFICATE_DATE + NUMTOYMINTERVAL(ct.VALIDITY_PERIOD, 'YEAR') &lt;
SYSDATE THEN 2
ELSE 1 END
WHEN m.AIRWORTHINESS_DATE IS NOT NULL AND ct.AIRWORTHINESS_VALIDITY_PERIOD IS NOT NULL
THEN
CASE
WHEN m.AIRWORTHINESS_DATE +
NUMTOYMINTERVAL(ct.AIRWORTHINESS_VALIDITY_PERIOD, 'YEAR') &lt; SYSDATE
THEN 2
ELSE 1 END
WHEN m.ASTRONAUT_DATE IS NOT NULL AND ct.ASTRONAUT_VALIDITY_PERIOD IS NOT NULL THEN
CASE
WHEN m.ASTRONAUT_DATE +
NUMTOYMINTERVAL(ct.ASTRONAUT_VALIDITY_PERIOD, 'YEAR') &lt; SYSDATE THEN 2
ELSE 1 END
ELSE 1
END,
m.UPDATE_TIME = SYSDATE
</update>
</mapper>

@ -3,6 +3,8 @@ package org.springblade.desk.jobTransfer.service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import org.springblade.desk.jobTransfer.pojo.entity.CertificateMaintenanceEntity;
import org.springblade.desk.jobTransfer.pojo.excel.CertificateMaintenanceExcel;
import org.springblade.desk.jobTransfer.pojo.request.CertificateLedgerQuery;
import org.springblade.desk.jobTransfer.pojo.vo.CertificateLedgerVO;
import org.springblade.desk.jobTransfer.pojo.vo.CertificateMaintenanceVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
@ -20,10 +22,10 @@ public interface ICertificateMaintenanceService extends BaseService<CertificateM
* 自定义分页
*
* @param page 分页参数
* @param certificateMaintenance 查询参数
* @return IPage<CertificateMaintenanceVO>
* @param certificateLedgerQuery 查询参数
* @return IPage<CertificateLedgerVO>
*/
IPage<CertificateMaintenanceVO> selectCertificateMaintenancePage(IPage<CertificateMaintenanceVO> page, CertificateMaintenanceVO certificateMaintenance);
IPage<CertificateLedgerVO> selectCertificateMaintenancePage(IPage<CertificateLedgerVO> page, CertificateLedgerQuery certificateLedgerQuery);
/**
@ -34,4 +36,8 @@ public interface ICertificateMaintenanceService extends BaseService<CertificateM
*/
List<CertificateMaintenanceExcel> exportCertificateMaintenance(Wrapper<CertificateMaintenanceEntity> queryWrapper);
/**
* 更新证书维护状态
*/
void updateMaintenanceStatus();
}

@ -2,7 +2,8 @@ package org.springblade.desk.jobTransfer.service.impl;
import org.springblade.desk.jobTransfer.pojo.entity.CertificateMaintenanceEntity;
import org.springblade.desk.jobTransfer.pojo.excel.CertificateMaintenanceExcel;
import org.springblade.desk.jobTransfer.pojo.vo.CertificateMaintenanceVO;
import org.springblade.desk.jobTransfer.pojo.request.CertificateLedgerQuery;
import org.springblade.desk.jobTransfer.pojo.vo.CertificateLedgerVO;
import org.springblade.desk.jobTransfer.mapper.CertificateMaintenanceMapper;
import org.springblade.desk.jobTransfer.service.ICertificateMaintenanceService;
import org.springframework.stereotype.Service;
@ -22,8 +23,8 @@ import java.util.List;
public class CertificateMaintenanceServiceImpl extends BaseServiceImpl<CertificateMaintenanceMapper, CertificateMaintenanceEntity> implements ICertificateMaintenanceService {
@Override
public IPage<CertificateMaintenanceVO> selectCertificateMaintenancePage(IPage<CertificateMaintenanceVO> page, CertificateMaintenanceVO certificateMaintenance) {
return page.setRecords(baseMapper.selectCertificateMaintenancePage(page, certificateMaintenance));
public IPage<CertificateLedgerVO> selectCertificateMaintenancePage(IPage<CertificateLedgerVO> page, CertificateLedgerQuery certificateLedgerQuery) {
return page.setRecords(baseMapper.selectCertificateMaintenancePage(page, certificateLedgerQuery));
}
@ -36,4 +37,8 @@ public class CertificateMaintenanceServiceImpl extends BaseServiceImpl<Certifica
return certificateMaintenanceList;
}
@Override
public void updateMaintenanceStatus() {
baseMapper.updateMaintenanceStatus();
}
}

Loading…
Cancel
Save