| | |
| | | import org.springframework.web.bind.annotation.*; |
| | | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
| | | import com.yuanchu.limslaboratory.service.InspectionService; |
| | | |
| | | import javax.annotation.Resource; |
| | | |
| | | /** |
| | |
| | | @GetMapping("/selectAll") |
| | | public Result selectAll(Integer type) { |
| | | switch (type) { |
| | | case 0 : |
| | | case 0: |
| | | //åææ |
| | | return Result.success(rawMaterialService.selectRawmaAll()); |
| | | case 1 : |
| | | case 1: |
| | | //å§æå |
| | | return Result.success(linkBasicInformationService.selectLinkAll()); |
| | | case 2 : |
| | | case 2: |
| | | //æåæ£éª |
| | | return Result.success("请è¾å
¥æ£éªä¿¡æ¯!"); |
| | | } |
| | |
| | | }) |
| | | @GetMapping("/selectRawmaById") |
| | | public Result selectRawmaById(Integer id, String startTime, String endTime) throws ParseException { |
| | | return Result.success(rawMaterialService.selectRawmaById(id,startTime,endTime)); |
| | | return Result.success(rawMaterialService.selectRawmaById(id, startTime, endTime)); |
| | | } |
| | | |
| | | |
| | |
| | | @ApiImplicitParam(name = "bid", value = "å§ææ¥æ£åid", dataTypeClass = Integer.class, required = true), |
| | | @ApiImplicitParam(name = "did", value = "å§ææ¥æ£æ ·åid", dataTypeClass = Integer.class, required = true) |
| | | }) |
| | | |
| | | |
| | | @GetMapping("/selectLinkByid") |
| | | public Result selectLinkByid(Integer bid, Integer did) { |
| | | return Result.success(linkBasicInformationService.selectLinkByid(bid, did)); |
¶Ô±ÈÐÂÎļþ |
| | |
| | | package com.yuanchu.limslaboratory.controller; |
| | | |
| | | import com.yuanchu.limslaboratory.pojo.Dto.NonConformingFeedbackDto; |
| | | import com.yuanchu.limslaboratory.pojo.NonConformanceReview; |
| | | import com.yuanchu.limslaboratory.pojo.vo.NonConformanceReviewVo; |
| | | import com.yuanchu.limslaboratory.service.NonConformanceReviewService; |
| | | import com.yuanchu.limslaboratory.vo.Result; |
| | | import io.swagger.annotations.Api; |
| | | import io.swagger.annotations.ApiOperation; |
| | | import org.springframework.web.bind.annotation.GetMapping; |
| | | import org.springframework.web.bind.annotation.RequestMapping; |
| | | import org.springframework.web.bind.annotation.RestController; |
| | | |
| | | import javax.annotation.Resource; |
| | | |
| | | /** |
| | | * @Author å¼ å®¾ |
| | | * @Date 2023/8/9 |
| | | */ |
| | | @Api(tags = "è¯éªç®¡ç-->ä¸åæ ¼åè¯å®¡") |
| | | @RestController |
| | | @RequestMapping("/nonConformanceReview") |
| | | public class NonConformanceReviewController { |
| | | |
| | | @Resource |
| | | private NonConformanceReviewService service; |
| | | |
| | | |
| | | @GetMapping("/getNonConformanceReview") |
| | | @ApiOperation("ä¸åæ ¼ååé¦-->è·åä¸åæ ¼åè¯å®¡ä¿¡æ¯") |
| | | public Result<NonConformanceReviewVo> getNonConformanceReview(NonConformingFeedbackDto nonConformingFeedbackDto){ |
| | | return Result.success(service.getNonConformanceReviewVo(nonConformingFeedbackDto)); |
| | | } |
| | | } |
¶Ô±ÈÐÂÎļþ |
| | |
| | | package com.yuanchu.limslaboratory.controller; |
| | | |
| | | import com.yuanchu.limslaboratory.pojo.Dto.NonConformingFeedbackDto; |
| | | import com.yuanchu.limslaboratory.pojo.NonConformingFeedback; |
| | | import com.yuanchu.limslaboratory.pojo.vo.NonConformingFeedbackVo; |
| | | import com.yuanchu.limslaboratory.service.NonConformingFeedbackService; |
| | | import com.yuanchu.limslaboratory.vo.Result; |
| | | import io.swagger.annotations.Api; |
| | | import io.swagger.annotations.ApiOperation; |
| | | import org.springframework.web.bind.annotation.GetMapping; |
| | | import org.springframework.web.bind.annotation.RequestMapping; |
| | | import org.springframework.web.bind.annotation.RestController; |
| | | |
| | | import javax.annotation.Resource; |
| | | |
| | | /** |
| | | * @Author å¼ å®¾ |
| | | * @Date 2023/8/9 |
| | | */ |
| | | @Api(tags = "è¯éªç®¡ç-->ä¸åæ ¼ååé¦") |
| | | @RestController |
| | | @RequestMapping("/non-conforming-feedback") |
| | | public class NonConformingFeedbackController { |
| | | |
| | | @Resource |
| | | private NonConformingFeedbackService service; |
| | | |
| | | @GetMapping("/getNonConformingFeedback") |
| | | @ApiOperation("ä¸åæ ¼ååé¦-->è·åä¸åæ ¼åä¿¡æ¯") |
| | | public Result<NonConformingFeedbackVo> getNonConformingFeedback(NonConformingFeedbackDto nonConformingFeedbackDto){ |
| | | return Result.success(service.getNonConformingFeedback(nonConformingFeedbackDto)); |
| | | } |
| | | |
| | | |
| | | } |
¶Ô±ÈÐÂÎļþ |
| | |
| | | package com.yuanchu.limslaboratory.mapper; |
| | | |
| | | import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
| | | import com.baomidou.mybatisplus.core.metadata.IPage; |
| | | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
| | | import com.yuanchu.limslaboratory.pojo.Dto.NonConformanceReviewDto; |
| | | import com.yuanchu.limslaboratory.pojo.Dto.NonConformingFeedbackDto; |
| | | import com.yuanchu.limslaboratory.pojo.NonConformanceReview; |
| | | import com.yuanchu.limslaboratory.pojo.NonConformingFeedback; |
| | | import org.apache.ibatis.annotations.Param; |
| | | import org.springframework.stereotype.Repository; |
| | | |
| | | /** |
| | | * @Author å¼ å®¾ |
| | | * @Date 2023/8/9 |
| | | */ |
| | | @Repository |
| | | public interface NonConformanceReviewMapper extends BaseMapper<NonConformanceReview> { |
| | | |
| | | } |
¶Ô±ÈÐÂÎļþ |
| | |
| | | package com.yuanchu.limslaboratory.mapper; |
| | | |
| | | import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
| | | import com.baomidou.mybatisplus.core.metadata.IPage; |
| | | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
| | | import com.yuanchu.limslaboratory.mybatis_config.MyBaseMapper; |
| | | import com.yuanchu.limslaboratory.pojo.Dto.NonConformingFeedbackDto; |
| | | import com.yuanchu.limslaboratory.pojo.LinkDetection; |
| | | import com.yuanchu.limslaboratory.pojo.NonConformingFeedback; |
| | | import com.yuanchu.limslaboratory.pojo.RawMaterial; |
| | | import org.apache.ibatis.annotations.Param; |
| | | import org.springframework.stereotype.Repository; |
| | | |
| | | import java.util.Objects; |
| | | |
| | | /** |
| | | * @Author å¼ å®¾ |
| | | * @Date 2023/8/9 |
| | | */ |
| | | @Repository |
| | | public interface NonConformingFeedbackMapper extends BaseMapper<NonConformingFeedback> { |
| | | |
| | | IPage<NonConformingFeedback> selectNonConformingFeedback(@Param("nonConformingFeedbackDto") NonConformingFeedbackDto nonConformingFeedbackDto, Page page); |
| | | } |
¶Ô±ÈÐÂÎļþ |
| | |
| | | package com.yuanchu.limslaboratory.pojo.Dto; |
| | | |
| | | import io.swagger.annotations.ApiModel; |
| | | import io.swagger.annotations.ApiModelProperty; |
| | | import lombok.Data; |
| | | import lombok.EqualsAndHashCode; |
| | | |
| | | import java.io.Serializable; |
| | | |
| | | /** |
| | | * @Author å¼ å®¾ |
| | | * @Date 2023/8/9 |
| | | */ |
| | | @Data |
| | | @EqualsAndHashCode(callSuper = false) |
| | | @ApiModel(value="NonConformanceReviewDto对象", description="") |
| | | public class NonConformanceReviewDto implements Serializable { |
| | | |
| | | private static final long serialVersionUID = 1L; |
| | | |
| | | @ApiModelProperty(value = "å½å页", example = "1", required = true) |
| | | private Long currentPage; |
| | | |
| | | @ApiModelProperty(value = "å页å¤å°æ¡", example = "10", required = true) |
| | | private Long pageNum; |
| | | |
| | | @ApiModelProperty(value = "æ ·åç¼å·", example = "1680929494813868034", required = true) |
| | | private String materialCode; |
| | | |
| | | @ApiModelProperty(value = "æ ·ååç§°", example = "çµçº¿çµç¼", required = true) |
| | | private String materialName; |
| | | |
| | | @ApiModelProperty(value = "ç³è¯·åå·", example = "XG-UGYUGH", required = true) |
| | | private String inspectionCode; |
| | | |
| | | |
| | | } |
¶Ô±ÈÐÂÎļþ |
| | |
| | | package com.yuanchu.limslaboratory.pojo.Dto; |
| | | |
| | | import io.swagger.annotations.ApiModel; |
| | | import io.swagger.annotations.ApiModelProperty; |
| | | import lombok.Data; |
| | | import lombok.EqualsAndHashCode; |
| | | |
| | | import java.io.Serializable; |
| | | |
| | | /** |
| | | * @Author å¼ å®¾ |
| | | * @Date 2023/8/9 |
| | | */ |
| | | @Data |
| | | @EqualsAndHashCode(callSuper = false) |
| | | @ApiModel(value="NonConformingFeedbackDto对象", description="") |
| | | public class NonConformingFeedbackDto implements Serializable { |
| | | |
| | | private static final long serialVersionUID = 1L; |
| | | |
| | | @ApiModelProperty(value = "å½å页", example = "1", required = true) |
| | | private Long currentPage; |
| | | |
| | | @ApiModelProperty(value = "å页å¤å°æ¡", example = "10", required = true) |
| | | private Long pageNum; |
| | | |
| | | @ApiModelProperty(value = "æ ·åç¼å·", example = "1680929494813868034", required = true) |
| | | private String materialCode; |
| | | |
| | | @ApiModelProperty(value = "æ ·ååç§°", example = "çµçº¿çµç¼", required = true) |
| | | private String materialName; |
| | | |
| | | @ApiModelProperty(value = "ç³è¯·åå·", example = "XG-UGYUGH", required = true) |
| | | private String inspectionCode; |
| | | } |
¶Ô±ÈÐÂÎļþ |
| | |
| | | package com.yuanchu.limslaboratory.pojo; |
| | | |
| | | import com.baomidou.mybatisplus.annotation.IdType; |
| | | import com.baomidou.mybatisplus.annotation.TableId; |
| | | import com.baomidou.mybatisplus.annotation.TableLogic; |
| | | import com.baomidou.mybatisplus.annotation.TableName; |
| | | import com.fasterxml.jackson.annotation.JsonFormat; |
| | | import io.swagger.annotations.ApiModel; |
| | | import lombok.Data; |
| | | import lombok.EqualsAndHashCode; |
| | | import org.springframework.format.annotation.DateTimeFormat; |
| | | |
| | | import java.io.Serializable; |
| | | import java.sql.Date; |
| | | import java.time.LocalDateTime; |
| | | |
| | | /** |
| | | * @Author å¼ å®¾ |
| | | * @Date 2023/8/9 |
| | | */ |
| | | @Data |
| | | @EqualsAndHashCode(callSuper = false) |
| | | @ApiModel(value="ä¸ç¬¦ååè¯å®¡å¯¹è±¡", description="") |
| | | @TableName("tb_non_conformance_review") |
| | | public class NonConformanceReview implements Serializable { |
| | | |
| | | private static final long serialVersionUID = 1L; |
| | | |
| | | @TableId(type =IdType.ASSIGN_ID) |
| | | private Long id; |
| | | |
| | | /** |
| | | * æ ·åç¼å· |
| | | */ |
| | | private String materialCode; |
| | | |
| | | /** |
| | | * æ ·ååç§° |
| | | */ |
| | | private String materialName; |
| | | |
| | | /** |
| | | * ç³è¯·åå· |
| | | */ |
| | | private String inspectionCode; |
| | | |
| | | /** |
| | | * ç»è®°æ¥æ |
| | | */ |
| | | @DateTimeFormat(pattern = "yyyy-MM-dd") |
| | | @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") |
| | | private Date createTime; |
| | | |
| | | /** |
| | | * å®éªè´è´£äºº |
| | | */ |
| | | private String testManager; |
| | | |
| | | /** |
| | | * è§æ ¼åå· |
| | | */ |
| | | private String specifications; |
| | | |
| | | /** |
| | | * å建人 |
| | | */ |
| | | private String createdUser; |
| | | |
| | | /** |
| | | * å建æ¶é´ |
| | | */ |
| | | @DateTimeFormat( |
| | | pattern = "yyyy-MM-dd HH:mm:ss" |
| | | ) |
| | | @JsonFormat( |
| | | pattern = "yyyy-MM-dd HH:mm:ss" |
| | | ) |
| | | private LocalDateTime createdTime; |
| | | |
| | | /** |
| | | * ä¿®æ¹äºº |
| | | */ |
| | | private String updatedUser; |
| | | |
| | | |
| | | /** |
| | | * ä¿®æ¹æ¶é´ |
| | | */ |
| | | @DateTimeFormat( |
| | | pattern = "yyyy-MM-dd HH:mm:ss" |
| | | ) |
| | | @JsonFormat( |
| | | pattern = "yyyy-MM-dd HH:mm:ss" |
| | | ) |
| | | private LocalDateTime updatedTime; |
| | | |
| | | /** |
| | | * é»è¾å é¤ |
| | | */ |
| | | @TableLogic(value = "1") |
| | | private Integer state; |
| | | } |
¶Ô±ÈÐÂÎļþ |
| | |
| | | package com.yuanchu.limslaboratory.pojo; |
| | | |
| | | import com.fasterxml.jackson.annotation.JsonFormat; |
| | | import lombok.Data; |
| | | import lombok.EqualsAndHashCode; |
| | | import org.springframework.format.annotation.DateTimeFormat; |
| | | |
| | | import java.io.Serializable; |
| | | import java.sql.Date; |
| | | |
| | | /** |
| | | * @Author å¼ å®¾ |
| | | * @Date 2023/8/9 |
| | | */ |
| | | @Data |
| | | @EqualsAndHashCode(callSuper = false) |
| | | public class NonConformingFeedback implements Serializable { |
| | | |
| | | private static final long serialVersionUID = 1L; |
| | | |
| | | /** |
| | | * æ ·åç¼å· |
| | | */ |
| | | private String materialCode; |
| | | |
| | | /** |
| | | * æ ·ååç§° |
| | | */ |
| | | private String materialName; |
| | | |
| | | /** |
| | | * ç³è¯·åå· |
| | | */ |
| | | private String inspectionCode; |
| | | |
| | | /** |
| | | * ç»è®°æ¥æ |
| | | */ |
| | | @DateTimeFormat(pattern = "yyyy-MM-dd") |
| | | @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") |
| | | private Date createTime; |
| | | |
| | | /** |
| | | * å®éªè´è´£äºº |
| | | */ |
| | | private String testManager; |
| | | |
| | | /** |
| | | * è§æ ¼åå· |
| | | */ |
| | | private String specifications; |
| | | |
| | | } |
¶Ô±ÈÐÂÎļþ |
| | |
| | | package com.yuanchu.limslaboratory.pojo.vo; |
| | | |
| | | import com.fasterxml.jackson.databind.annotation.JsonSerialize; |
| | | import com.yuanchu.limslaboratory.pojo.NonConformanceReview; |
| | | import com.yuanchu.limslaboratory.pojo.NonConformingFeedback; |
| | | import lombok.Data; |
| | | |
| | | import java.io.Serializable; |
| | | import java.util.List; |
| | | |
| | | /** |
| | | * @Author å¼ å®¾ |
| | | * @Date 2023/8/9 |
| | | */ |
| | | @Data |
| | | public class NonConformanceReviewVo implements Serializable { |
| | | |
| | | private static final long serialVersionUID = 1L; |
| | | |
| | | @JsonSerialize |
| | | private List<NonConformanceReview> nonConformanceReviewList; |
| | | |
| | | @JsonSerialize |
| | | private Long total; |
| | | |
| | | public NonConformanceReviewVo(List<NonConformanceReview> nonConformanceReviewList, Long total) { |
| | | this.nonConformanceReviewList = nonConformanceReviewList; |
| | | this.total = total; |
| | | } |
| | | } |
¶Ô±ÈÐÂÎļþ |
| | |
| | | package com.yuanchu.limslaboratory.pojo.vo; |
| | | |
| | | import com.fasterxml.jackson.databind.annotation.JsonSerialize; |
| | | import com.yuanchu.limslaboratory.pojo.Inspection; |
| | | import com.yuanchu.limslaboratory.pojo.InspectionMaterial; |
| | | import com.yuanchu.limslaboratory.pojo.NonConformingFeedback; |
| | | import lombok.Data; |
| | | import lombok.EqualsAndHashCode; |
| | | |
| | | import java.io.Serializable; |
| | | import java.util.List; |
| | | |
| | | /** |
| | | * @Author å¼ å®¾ |
| | | * @Date 2023/8/9 |
| | | */ |
| | | @Data |
| | | public class NonConformingFeedbackVo implements Serializable { |
| | | |
| | | private static final long serialVersionUID = 1L; |
| | | |
| | | @JsonSerialize |
| | | private List<NonConformingFeedback> nonConformingFeedbackList; |
| | | |
| | | @JsonSerialize |
| | | private Long total; |
| | | |
| | | public NonConformingFeedbackVo(List<NonConformingFeedback> nonConformingFeedbackList, Long total) { |
| | | this.nonConformingFeedbackList = nonConformingFeedbackList; |
| | | this.total = total; |
| | | } |
| | | } |
¶Ô±ÈÐÂÎļþ |
| | |
| | | package com.yuanchu.limslaboratory.service; |
| | | |
| | | import com.yuanchu.limslaboratory.pojo.Dto.NonConformingFeedbackDto; |
| | | import com.yuanchu.limslaboratory.pojo.vo.NonConformanceReviewVo; |
| | | import com.yuanchu.limslaboratory.pojo.vo.NonConformingFeedbackVo; |
| | | |
| | | /** |
| | | * @Author å¼ å®¾ |
| | | * @Date 2023/8/9 |
| | | */ |
| | | public interface NonConformanceReviewService { |
| | | |
| | | /** |
| | | * å¾å°ä¸åæ ¼åæäº¤ä¿¡æ¯ |
| | | * @param nonConformingFeedbackDto |
| | | * @return |
| | | */ |
| | | NonConformanceReviewVo getNonConformanceReviewVo(NonConformingFeedbackDto nonConformingFeedbackDto); |
| | | |
| | | } |
¶Ô±ÈÐÂÎļþ |
| | |
| | | package com.yuanchu.limslaboratory.service; |
| | | |
| | | import com.yuanchu.limslaboratory.pojo.Dto.NonConformingFeedbackDto; |
| | | import com.yuanchu.limslaboratory.pojo.vo.NonConformingFeedbackVo; |
| | | |
| | | /** |
| | | * @Author å¼ å®¾ |
| | | * @Date 2023/8/9 |
| | | */ |
| | | public interface NonConformingFeedbackService { |
| | | |
| | | /** |
| | | * å¾å°ä¸åæ ¼ååé¦ä¿¡æ¯ |
| | | * @param nonConformingFeedbackDto |
| | | * @return |
| | | */ |
| | | NonConformingFeedbackVo getNonConformingFeedback(NonConformingFeedbackDto nonConformingFeedbackDto); |
| | | |
| | | } |
¶Ô±ÈÐÂÎļþ |
| | |
| | | package com.yuanchu.limslaboratory.service.impl; |
| | | |
| | | import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
| | | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
| | | import com.baomidou.mybatisplus.core.metadata.IPage; |
| | | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
| | | import com.yuanchu.limslaboratory.mapper.NonConformanceReviewMapper; |
| | | import com.yuanchu.limslaboratory.pojo.Dto.NonConformingFeedbackDto; |
| | | import com.yuanchu.limslaboratory.pojo.NonConformanceReview; |
| | | import com.yuanchu.limslaboratory.pojo.NonConformingFeedback; |
| | | import com.yuanchu.limslaboratory.pojo.vo.NonConformanceReviewVo; |
| | | import com.yuanchu.limslaboratory.service.NonConformanceReviewService; |
| | | import org.springframework.stereotype.Service; |
| | | import org.springframework.util.StringUtils; |
| | | |
| | | import javax.annotation.Resource; |
| | | |
| | | /** |
| | | * @Author å¼ å®¾ |
| | | * @Date 2023/8/9 |
| | | */ |
| | | @Service |
| | | public class NonConformanceReviewServiceImpl implements NonConformanceReviewService { |
| | | |
| | | @Resource |
| | | private NonConformanceReviewMapper mapper; |
| | | |
| | | @Override |
| | | public NonConformanceReviewVo getNonConformanceReviewVo(NonConformingFeedbackDto nonConformingFeedbackDto) { |
| | | QueryWrapper<NonConformanceReview>queryWrapper= new QueryWrapper<>(); |
| | | if (StringUtils.hasText(nonConformingFeedbackDto.getMaterialCode())){ |
| | | queryWrapper.lambda().and(a->a.eq(NonConformanceReview::getMaterialCode,nonConformingFeedbackDto.getMaterialCode())); |
| | | } |
| | | if (StringUtils.hasText(nonConformingFeedbackDto.getMaterialName())){ |
| | | queryWrapper.lambda().and(a->a.eq(NonConformanceReview::getMaterialName,nonConformingFeedbackDto.getMaterialName())); |
| | | } |
| | | if (StringUtils.hasText(nonConformingFeedbackDto.getInspectionCode())){ |
| | | queryWrapper.lambda().and(a->a.eq(NonConformanceReview::getInspectionCode,nonConformingFeedbackDto.getInspectionCode())); |
| | | } |
| | | Page<NonConformanceReview> page = new Page<>(nonConformingFeedbackDto.getCurrentPage(), nonConformingFeedbackDto.getPageNum(), true); |
| | | IPage<NonConformanceReview> iPage = mapper.selectPage(page, queryWrapper); |
| | | return new NonConformanceReviewVo(iPage.getRecords(),iPage.getTotal()); |
| | | } |
| | | } |
¶Ô±ÈÐÂÎļþ |
| | |
| | | package com.yuanchu.limslaboratory.service.impl; |
| | | |
| | | import com.baomidou.mybatisplus.core.metadata.IPage; |
| | | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
| | | import com.yuanchu.limslaboratory.mapper.NonConformingFeedbackMapper; |
| | | import com.yuanchu.limslaboratory.pojo.Dto.NonConformingFeedbackDto; |
| | | import com.yuanchu.limslaboratory.pojo.NonConformingFeedback; |
| | | import com.yuanchu.limslaboratory.pojo.vo.NonConformingFeedbackVo; |
| | | import com.yuanchu.limslaboratory.service.NonConformingFeedbackService; |
| | | import org.springframework.stereotype.Service; |
| | | |
| | | import javax.annotation.Resource; |
| | | |
| | | /** |
| | | * @Author å¼ å®¾ |
| | | * @Date 2023/8/9 |
| | | */ |
| | | @Service |
| | | public class NonConformingFeedbackServiceImpl implements NonConformingFeedbackService { |
| | | |
| | | @Resource |
| | | private NonConformingFeedbackMapper mapper; |
| | | |
| | | @Override |
| | | public NonConformingFeedbackVo getNonConformingFeedback(NonConformingFeedbackDto nonConformingFeedbackDto) { |
| | | Page<Object> page = new Page<>(nonConformingFeedbackDto.getCurrentPage(), nonConformingFeedbackDto.getPageNum(), true); |
| | | IPage<NonConformingFeedback> iPage = mapper.selectNonConformingFeedback(nonConformingFeedbackDto, page); |
| | | return new NonConformingFeedbackVo(iPage.getRecords(),iPage.getTotal()); |
| | | } |
| | | |
| | | |
| | | |
| | | |
| | | } |
¶Ô±ÈÐÂÎļþ |
| | |
| | | <?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="com.yuanchu.limslaboratory.mapper.NonConformingFeedbackMapper"> |
| | | |
| | | <select id="selectNonConformingFeedback" resultType="nonConformingFeedback" parameterType="com.yuanchu.limslaboratory.pojo.Dto.NonConformingFeedbackDto"> |
| | | SELECT |
| | | im.`code` materialCode, |
| | | im.`name` materialName, |
| | | i.`code` inspectionCode, |
| | | i.create_time createTime, |
| | | u.`name` testManager, |
| | | im.specifications specifications |
| | | FROM |
| | | inspection i, |
| | | inspection_material im, |
| | | `user` u |
| | | WHERE |
| | | 1 = 1 |
| | | AND i.id = im.inspection_id |
| | | AND i.user_id = u.id |
| | | <if test="nonConformingFeedbackDto.materialCode!=null and nonConformingFeedbackDto.materialCode!=''"> |
| | | and im.`code` like concat("%",#{nonConformingFeedbackDto.materialCode},"%") |
| | | </if> |
| | | <if test="nonConformingFeedbackDto.materialName!=null and nonConformingFeedbackDto.materialName!=''"> |
| | | and im.`name` like concat("%",#{nonConformingFeedbackDto.materialName},"%") |
| | | </if> |
| | | <if test="nonConformingFeedbackDto.inspectionCode!=null and nonConformingFeedbackDto.inspectionCode!=''"> |
| | | and im.specifications like concat("%",#{nonConformingFeedbackDto.inspectionCode},"%") |
| | | </if> |
| | | and i.state=1 |
| | | and im.state=1 |
| | | and i.inspection_status =0 |
| | | </select> |
| | | |
| | | </mapper> |
| | |
| | | <mapper namespace="com.yuanchu.limslaboratory.mapper.MaterialMapper"> |
| | | |
| | | <select id="selectMaterialLimit" resultType="Map"> |
| | | select id,code, name |
| | | select id, code, name |
| | | from lims_laboratory.material |
| | | where state = 1 |
| | | and type = #{type} |
| | | and type = #{type} |
| | | order by create_time desc |
| | | limit #{num1},#{num2} |
| | | limit #{num1}, #{num2} |
| | | </select> |
| | | <select id="selectMaterialById" resultType="Map"> |
| | | select m.id, |
| | |
| | | lims_laboratory.serial_number sn |
| | | where m.specifications_id = s.id |
| | | and s.serial_id = sn.id |
| | | and m.id=#{materialId} |
| | | and m.id = #{materialId} |
| | | </select> |
| | | |
| | | <resultMap id="OneLevelTreeMap" type="Map"> |
| | |
| | | |
| | | <select id="FourTree" resultMap="OneLevelTreeMap"> |
| | | SELECT m.`id` materialId, m.`name` materialName, s.`id` standardId, s.`name` standardName, |
| | | f.`id` specificationsId, f.`name` specificationsName, p.`id` productId, p.`name` productName |
| | | f.`id` specificationsId, f.`name` specificationsName, p.`id` productId, p.`name` productName |
| | | FROM material m |
| | | LEFT JOIN (SELECT s.`id`, s.`name`, s.`material_id` FROM standard s WHERE s.`state` = 1) s ON m.id = s.`material_id` |
| | | LEFT JOIN (SELECT f.`id`, f.`name`, f.`standard_id` FROM specifications f WHERE f.`state` = 1 |
| | | <if test="specificationsName != null and specificationsName != ''"> |
| | | AND f.`name` = #{specificationsName} |
| | | </if> |
| | | ) f ON s.`id` = f.`standard_id` |
| | | LEFT JOIN (SELECT p.`id`, p.`name`, p.`specifications_id` FROM product p WHERE p.`state` = 1) p ON f.`id` = p.`specifications_id` |
| | | LEFT JOIN (SELECT s.`id`, s.`name`, s.`material_id` FROM standard s WHERE s.`state` = 1) s ON m.id = |
| | | s.`material_id` |
| | | LEFT JOIN (SELECT f.`id`, f.`name`, f.`standard_id` FROM specifications f WHERE f.`state` = 1 |
| | | <if test="specificationsName != null and specificationsName != ''"> |
| | | AND f.`name` = #{specificationsName} |
| | | </if> |
| | | ) f ON s.`id` = f.`standard_id` |
| | | LEFT JOIN (SELECT p.`id`, p.`name`, p.`specifications_id` FROM product p WHERE p.`state` = 1) p ON f.`id` = |
| | | p.`specifications_id` |
| | | WHERE m.`state` = 1 |
| | | </select> |
| | | </mapper> |
| | |
| | | datasource: |
| | | type: com.alibaba.druid.pool.DruidDataSource |
| | | driverClassName: com.mysql.cj.jdbc.Driver |
| | | url: jdbc:mysql://localhost:3306/lims_laboratory?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8 |
| | | username: root |
| | | url: jdbc:mysql://192.168.110.209:3306/lims_laboratory?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8 |
| | | username: user |
| | | password: 123456 |
| | | druid: |
| | | # Druidæ°æ®æºé
ç½® |
| | |
| | | # redisæå¡å¨å°åï¼é»è®¤ä¸ºlocalhostï¼ |
| | | host: localhost |
| | | # redis端å£ï¼é»è®¤ä¸º6379ï¼ |
| | | port: 6380 |
| | | port: 6379 |
| | | # redis访é®å¯ç ï¼é»è®¤ä¸ºç©ºï¼ |
| | | password: null |
| | | # redisè¿æ¥è¶
æ¶æ¶é´ï¼å使¯«ç§ï¼ |