diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java index 77fce3f..d50a3a6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -2,16 +2,20 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.BaseApprovalListRequest; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -25,12 +29,12 @@ @Api(tags = "质量监督报告") @RestController @RequestMapping("/quality/bizQualitySupervisionRep") -public class BizQualitySupervisionRepController extends BaseController { +public class BizQualitySupervisionRepController extends GeneralApprovalController { + @Autowired + private IBizQualitySupervisionRepService bizQualitySupervisionRepService; - private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; - - public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { - this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + public BizQualitySupervisionRepController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); } /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java index 77fce3f..d50a3a6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -2,16 +2,20 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.BaseApprovalListRequest; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -25,12 +29,12 @@ @Api(tags = "质量监督报告") @RestController @RequestMapping("/quality/bizQualitySupervisionRep") -public class BizQualitySupervisionRepController extends BaseController { +public class BizQualitySupervisionRepController extends GeneralApprovalController { + @Autowired + private IBizQualitySupervisionRepService bizQualitySupervisionRepService; - private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; - - public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { - this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + public BizQualitySupervisionRepController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); } /** diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index bc14fac..47665fc 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -58,7 +58,10 @@ SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl", MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb", MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb", MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb", MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"); + SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb", MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + + /*******************************************质量活动***********************************************/ + QUALITY_REP_APPROVAL("zlhdzlbgspgl", MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"); private String code; private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java index 77fce3f..d50a3a6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -2,16 +2,20 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.BaseApprovalListRequest; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -25,12 +29,12 @@ @Api(tags = "质量监督报告") @RestController @RequestMapping("/quality/bizQualitySupervisionRep") -public class BizQualitySupervisionRepController extends BaseController { +public class BizQualitySupervisionRepController extends GeneralApprovalController { + @Autowired + private IBizQualitySupervisionRepService bizQualitySupervisionRepService; - private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; - - public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { - this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + public BizQualitySupervisionRepController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); } /** diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index bc14fac..47665fc 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -58,7 +58,10 @@ SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl", MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb", MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb", MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb", MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"); + SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb", MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + + /*******************************************质量活动***********************************************/ + QUALITY_REP_APPROVAL("zlhdzlbgspgl", MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"); private String code; private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java index e890c3b..f4e975c 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -2,8 +2,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.BaseApprovalListRequest; +import com.casic.missiles.mapper.GeneralApprovalMapper; import com.casic.missiles.model.quality.BizQualitySupervisionRecord; import com.casic.missiles.model.quality.BizQualitySupervisionRep; import org.apache.ibatis.annotations.Param; @@ -18,7 +19,7 @@ * @author lwh * @date 2023-10-21 */ -public interface BizQualitySupervisionRepMapper extends BaseMapper { +public interface BizQualitySupervisionRepMapper extends GeneralApprovalMapper { /** * 质量监督报告 分页检索 */ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java index 77fce3f..d50a3a6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -2,16 +2,20 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.BaseApprovalListRequest; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -25,12 +29,12 @@ @Api(tags = "质量监督报告") @RestController @RequestMapping("/quality/bizQualitySupervisionRep") -public class BizQualitySupervisionRepController extends BaseController { +public class BizQualitySupervisionRepController extends GeneralApprovalController { + @Autowired + private IBizQualitySupervisionRepService bizQualitySupervisionRepService; - private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; - - public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { - this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + public BizQualitySupervisionRepController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); } /** diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index bc14fac..47665fc 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -58,7 +58,10 @@ SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl", MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb", MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb", MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb", MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"); + SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb", MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + + /*******************************************质量活动***********************************************/ + QUALITY_REP_APPROVAL("zlhdzlbgspgl", MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"); private String code; private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java index e890c3b..f4e975c 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -2,8 +2,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.BaseApprovalListRequest; +import com.casic.missiles.mapper.GeneralApprovalMapper; import com.casic.missiles.model.quality.BizQualitySupervisionRecord; import com.casic.missiles.model.quality.BizQualitySupervisionRep; import org.apache.ibatis.annotations.Param; @@ -18,7 +19,7 @@ * @author lwh * @date 2023-10-21 */ -public interface BizQualitySupervisionRepMapper extends BaseMapper { +public interface BizQualitySupervisionRepMapper extends GeneralApprovalMapper { /** * 质量监督报告 分页检索 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index a5bf5ec..5f02d25 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -3,11 +3,12 @@ import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.BaseRequest; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; import java.util.Date; import java.util.List; @@ -20,7 +21,7 @@ */ @Data @TableName("biz_quality_supervision_rep") -public class BizQualitySupervisionRep extends Model { +public class BizQualitySupervisionRep extends BaseRequest implements Serializable { private static final long serialVersionUID = 1L; /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java index 77fce3f..d50a3a6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -2,16 +2,20 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.BaseApprovalListRequest; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -25,12 +29,12 @@ @Api(tags = "质量监督报告") @RestController @RequestMapping("/quality/bizQualitySupervisionRep") -public class BizQualitySupervisionRepController extends BaseController { +public class BizQualitySupervisionRepController extends GeneralApprovalController { + @Autowired + private IBizQualitySupervisionRepService bizQualitySupervisionRepService; - private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; - - public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { - this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + public BizQualitySupervisionRepController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); } /** diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index bc14fac..47665fc 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -58,7 +58,10 @@ SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl", MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb", MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb", MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb", MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"); + SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb", MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + + /*******************************************质量活动***********************************************/ + QUALITY_REP_APPROVAL("zlhdzlbgspgl", MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"); private String code; private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java index e890c3b..f4e975c 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -2,8 +2,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.BaseApprovalListRequest; +import com.casic.missiles.mapper.GeneralApprovalMapper; import com.casic.missiles.model.quality.BizQualitySupervisionRecord; import com.casic.missiles.model.quality.BizQualitySupervisionRep; import org.apache.ibatis.annotations.Param; @@ -18,7 +19,7 @@ * @author lwh * @date 2023-10-21 */ -public interface BizQualitySupervisionRepMapper extends BaseMapper { +public interface BizQualitySupervisionRepMapper extends GeneralApprovalMapper { /** * 质量监督报告 分页检索 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index a5bf5ec..5f02d25 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -3,11 +3,12 @@ import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.BaseRequest; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; import java.util.Date; import java.util.List; @@ -20,7 +21,7 @@ */ @Data @TableName("biz_quality_supervision_rep") -public class BizQualitySupervisionRep extends Model { +public class BizQualitySupervisionRep extends BaseRequest implements Serializable { private static final long serialVersionUID = 1L; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java index 3823a20..61c1992 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -4,8 +4,9 @@ import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.dto.BaseApprovalListRequest; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.enums.quality.QualityFileNoEnum; import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; @@ -13,6 +14,7 @@ import com.casic.missiles.model.quality.BizQualityRepRel; import com.casic.missiles.model.quality.BizQualitySupervisionRecord; import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; import com.casic.missiles.service.quality.IBizQualityRepRelService; import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; @@ -34,7 +36,7 @@ * @date 2023-10-21 */ @Service -public class BizQualitySupervisionRepServiceImpl extends ServiceImpl implements IBizQualitySupervisionRepService { +public class BizQualitySupervisionRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualitySupervisionRepService { private final IBizQualityRepRelService bizQualityRepRelService; private final AbstractPermissionContext permissionContext; private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java index 77fce3f..d50a3a6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -2,16 +2,20 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.BaseApprovalListRequest; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -25,12 +29,12 @@ @Api(tags = "质量监督报告") @RestController @RequestMapping("/quality/bizQualitySupervisionRep") -public class BizQualitySupervisionRepController extends BaseController { +public class BizQualitySupervisionRepController extends GeneralApprovalController { + @Autowired + private IBizQualitySupervisionRepService bizQualitySupervisionRepService; - private final IBizQualitySupervisionRepService bizQualitySupervisionRepService; - - public BizQualitySupervisionRepController(IBizQualitySupervisionRepService bizQualitySupervisionRepService) { - this.bizQualitySupervisionRepService = bizQualitySupervisionRepService; + public BizQualitySupervisionRepController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); } /** diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index bc14fac..47665fc 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -58,7 +58,10 @@ SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl", MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb", MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb", MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb", MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"); + SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb", MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + + /*******************************************质量活动***********************************************/ + QUALITY_REP_APPROVAL("zlhdzlbgspgl", MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"); private String code; private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java index e890c3b..f4e975c 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java @@ -2,8 +2,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.BaseApprovalListRequest; +import com.casic.missiles.mapper.GeneralApprovalMapper; import com.casic.missiles.model.quality.BizQualitySupervisionRecord; import com.casic.missiles.model.quality.BizQualitySupervisionRep; import org.apache.ibatis.annotations.Param; @@ -18,7 +19,7 @@ * @author lwh * @date 2023-10-21 */ -public interface BizQualitySupervisionRepMapper extends BaseMapper { +public interface BizQualitySupervisionRepMapper extends GeneralApprovalMapper { /** * 质量监督报告 分页检索 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index a5bf5ec..5f02d25 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -3,11 +3,12 @@ import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.core.base.json.DateDeserializer; +import com.casic.missiles.dto.BaseRequest; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; import java.util.Date; import java.util.List; @@ -20,7 +21,7 @@ */ @Data @TableName("biz_quality_supervision_rep") -public class BizQualitySupervisionRep extends Model { +public class BizQualitySupervisionRep extends BaseRequest implements Serializable { private static final long serialVersionUID = 1L; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java index 3823a20..61c1992 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -4,8 +4,9 @@ import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.dto.BaseApprovalListRequest; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.enums.quality.QualityFileNoEnum; import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; @@ -13,6 +14,7 @@ import com.casic.missiles.model.quality.BizQualityRepRel; import com.casic.missiles.model.quality.BizQualitySupervisionRecord; import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.quality.IBizQualityNonConformanceRepService; import com.casic.missiles.service.quality.IBizQualityRepRelService; import com.casic.missiles.service.quality.IBizQualitySupervisionRepService; @@ -34,7 +36,7 @@ * @date 2023-10-21 */ @Service -public class BizQualitySupervisionRepServiceImpl extends ServiceImpl implements IBizQualitySupervisionRepService { +public class BizQualitySupervisionRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualitySupervisionRepService { private final IBizQualityRepRelService bizQualityRepRelService; private final AbstractPermissionContext permissionContext; private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualitySupervisionRepService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualitySupervisionRepService.java index be74488..b47c65e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualitySupervisionRepService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualitySupervisionRepService.java @@ -3,7 +3,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.dto.BaseApprovalListRequest; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.model.quality.BizQualitySupervisionRep; +import com.casic.missiles.service.IGeneralApprovalService; import java.util.List; @@ -16,7 +19,7 @@ * @author lwh * @date 2023-10-21 */ -public interface IBizQualitySupervisionRepService extends IService { +public interface IBizQualitySupervisionRepService extends IGeneralApprovalService { /** * 质量监督报告 分页检索 */