diff --git a/src/main/java/com/xujie/modules/npcIqc/controller/NpcIqcController.java b/src/main/java/com/xujie/modules/npcIqc/controller/NpcIqcController.java new file mode 100644 index 0000000..d1237ac --- /dev/null +++ b/src/main/java/com/xujie/modules/npcIqc/controller/NpcIqcController.java @@ -0,0 +1,29 @@ +package com.xujie.modules.npcIqc.controller; + +import com.xujie.common.utils.PageUtils; +import com.xujie.common.utils.R; +import com.xujie.modules.npcIqc.entity.NpcIqc; +import com.xujie.modules.npcIqc.service.NpcIqcService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("npcIqc") +public class NpcIqcController { + + @Autowired + private NpcIqcService npcIqcService; + + /** + * 分页查询数据 + */ + @PostMapping("/search") + public R search(@RequestBody NpcIqc npciqc){ + PageUtils page = npcIqcService.myPage(npciqc); + return R.ok().put("page", page); + } + +} diff --git a/src/main/java/com/xujie/modules/npcIqc/entity/NpcIqc.java b/src/main/java/com/xujie/modules/npcIqc/entity/NpcIqc.java new file mode 100644 index 0000000..ec61a4d --- /dev/null +++ b/src/main/java/com/xujie/modules/npcIqc/entity/NpcIqc.java @@ -0,0 +1,82 @@ +package com.xujie.modules.npcIqc.entity; + +import com.xujie.common.utils.QueryPage; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import java.math.BigDecimal; +import java.util.Date; + +@Data +public class NpcIqc extends QueryPage { + + private String site; + + private String iqcNo; + + private String inspectionType; + + private String purOrder; + + private String supplierNo; + + private String supplierName; + + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date dateReceived; + + private String itemCode; + + private String itemName; + + private Integer quantity; + + private Integer sampleSize; + + private BigDecimal dimA; + + private BigDecimal dimB; + + private BigDecimal dimC; + + private BigDecimal dimD; + + private BigDecimal dimE; + + private String inspectionTotal; + + private String inspectionStatus; + + private String problem; + + private String comments; + + private String inspectorName; + + private String createdBy; + + private String supplierEmail; + + private Boolean caRequest; + + private BigDecimal reworkHours; + + private BigDecimal reworkRate; + + private BigDecimal reworkTotal; + + private BigDecimal materialCost; + + private String collectionBatch; + + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date entryDate; + + private String issueNo; + + private String updateBy; + + private Date updateDate; +} diff --git a/src/main/java/com/xujie/modules/npcIqc/mapper/NpcIqcMapper.java b/src/main/java/com/xujie/modules/npcIqc/mapper/NpcIqcMapper.java new file mode 100644 index 0000000..a68d99a --- /dev/null +++ b/src/main/java/com/xujie/modules/npcIqc/mapper/NpcIqcMapper.java @@ -0,0 +1,12 @@ +package com.xujie.modules.npcIqc.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.xujie.modules.npcIqc.entity.NpcIqc; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +@Mapper +public interface NpcIqcMapper extends BaseMapper { + Page myPage(Page page,@Param("npciqc") NpcIqc npciqc); +} diff --git a/src/main/java/com/xujie/modules/npcIqc/service/NpcIqcService.java b/src/main/java/com/xujie/modules/npcIqc/service/NpcIqcService.java new file mode 100644 index 0000000..f9ee7ed --- /dev/null +++ b/src/main/java/com/xujie/modules/npcIqc/service/NpcIqcService.java @@ -0,0 +1,9 @@ +package com.xujie.modules.npcIqc.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.xujie.common.utils.PageUtils; +import com.xujie.modules.npcIqc.entity.NpcIqc; + +public interface NpcIqcService extends IService { + PageUtils myPage(NpcIqc npciqc); +} diff --git a/src/main/java/com/xujie/modules/npcIqc/service/impl/NpcIqcServiceImpl.java b/src/main/java/com/xujie/modules/npcIqc/service/impl/NpcIqcServiceImpl.java new file mode 100644 index 0000000..0b0c0d2 --- /dev/null +++ b/src/main/java/com/xujie/modules/npcIqc/service/impl/NpcIqcServiceImpl.java @@ -0,0 +1,19 @@ +package com.xujie.modules.npcIqc.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.xujie.common.utils.PageUtils; +import com.xujie.modules.npcIqc.entity.NpcIqc; +import com.xujie.modules.npcIqc.mapper.NpcIqcMapper; +import com.xujie.modules.npcIqc.service.NpcIqcService; +import org.springframework.stereotype.Service; + +@Service +public class NpcIqcServiceImpl extends ServiceImpl implements NpcIqcService { + @Override + public PageUtils myPage(NpcIqc npciqc) { + Page page = new Page<>(npciqc.getPage(), npciqc.getLimit()); + Page resultList = baseMapper.myPage(page, npciqc); + return new PageUtils(resultList); + } +} diff --git a/src/main/resources/mapper/npcIqc/NpcIqcMapper.xml b/src/main/resources/mapper/npcIqc/NpcIqcMapper.xml new file mode 100644 index 0000000..e026063 --- /dev/null +++ b/src/main/resources/mapper/npcIqc/NpcIqcMapper.xml @@ -0,0 +1,76 @@ + + + + + +