质检管理

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/QualityInspectionManagementController.java

@@ -1,9 +1,11 @@
 package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.yh.saas.plugin.yiliangyiyun.entity.QualityInspectionManagement;
+import com.yh.saas.plugin.yiliangyiyun.service.IQualityInspectionManagementService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
@@ -16,6 +18,53 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/qualityInspectionManagement")
 public class QualityInspectionManagementController {
+    @Autowired
+    private IQualityInspectionManagementService qualityInspectionManagementService;
+    /**
+     * 质检管理列表
+     * @param qualityInspectionManagement
+     * @return
+     */
+    @GetMapping("/selectQualityInspection")
+    public Page<QualityInspectionManagement> selectQualityInspection(QualityInspectionManagement qualityInspectionManagement) {
+        return qualityInspectionManagementService.selectQualityInspection(qualityInspectionManagement);
+    }
+    /**
+     * 删除质检管理信息
+     *  @param qualityInspectionManagement
+     * @return
+     */
+    @PostMapping("/api/deleteQualityInspection")
+    public void deleteQualityInspection(@RequestBody QualityInspectionManagement qualityInspectionManagement) {
+        qualityInspectionManagementService.deleteQualityInspection(qualityInspectionManagement.getId());
+    }
+    /**
+     * 查看质检管理信息
+     *  @param qualityInspectionManagement
+     * @return
+     */
+    @GetMapping("/api/getQualityInspection")
+    public QualityInspectionManagement getQualityInspection(@RequestBody QualityInspectionManagement qualityInspectionManagement) {
+         return qualityInspectionManagementService.getQualityInspection(qualityInspectionManagement.getId());
+    }
+    /**
+     * 添加质检管理信息
+     *  @param qualityInspectionManagement
+     * @return
+     */
+    @PostMapping("/api/addQualityInspection")
+    public String addQualityInspection(@RequestBody QualityInspectionManagement qualityInspectionManagement) {
+        return qualityInspectionManagementService.addQualityInspection(qualityInspectionManagement);
+    }
+    /**
+     * 编辑质检管理信息
+     *  @param qualityInspectionManagement
+     * @return
+     */
+    @PostMapping("/api/editQualityInspection")
+    public String editQualityInspection(@RequestBody QualityInspectionManagement qualityInspectionManagement) {
+        return qualityInspectionManagementService.addQualityInspection(qualityInspectionManagement);
+    }
 
 }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/QualityInspectionManagement.java

@@ -4,6 +4,7 @@ import java.util.Date;
 import com.baomidou.mybatisplus.activerecord.Model;
 import java.io.Serializable;
 
+import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.annotations.Version;
@@ -35,6 +36,10 @@ public class QualityInspectionManagement extends BaseModel<QualityInspectionMana
      */
     @TableId(type = IdType.UUID)
     private String id;
+    /**
+     * 公司id
+     */
+    private String compId;
     /**
      * 关联id
      */
@@ -148,6 +153,12 @@ public class QualityInspectionManagement extends BaseModel<QualityInspectionMana
      */
     private String grade;
 
+    /**
+     * 模糊查询
+     */
+    @TableField(exist = false)
+    private String searchKeyWord;
+
 
     @Override
     protected Serializable pkVal() {

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/QualityInspectionManagementMapper.java

@@ -3,6 +3,9 @@ package com.yh.saas.plugin.yiliangyiyun.mapper;
 import com.yh.saas.plugin.yiliangyiyun.entity.QualityInspectionManagement;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 记录质检管理数据信息 Mapper 接口
@@ -12,5 +15,19 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * @since 2021-09-06
  */
 public interface QualityInspectionManagementMapper extends BaseMapper<QualityInspectionManagement> {
+    /**
+     * 根据条件质检管理列表总数
+     *
+     * @param pageView
+     * @return
+     */
+    Integer getCountByCondition(Map<String, Object> pageView);
 
+    /**
+     * 根据条件查询质检管理列表
+     *
+     * @param pageView
+     * @return
+     */
+    List<QualityInspectionManagement> getListByCondition(Map<String, Object> pageView);
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IQualityInspectionManagementService.java

@@ -1,5 +1,6 @@
 package com.yh.saas.plugin.yiliangyiyun.service;
 
+import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.plugin.yiliangyiyun.entity.QualityInspectionManagement;
 import com.baomidou.mybatisplus.service.IService;
 
@@ -12,5 +13,30 @@ import com.baomidou.mybatisplus.service.IService;
  * @since 2021-09-06
  */
 public interface IQualityInspectionManagementService extends IService<QualityInspectionManagement> {
-
+    /**
+     * 质检管理列表
+     * @param qualityInspectionManagement
+     * @return
+     */
+    Page<QualityInspectionManagement> selectQualityInspection(QualityInspectionManagement qualityInspectionManagement);
+    /**
+     * 删除质检管理信息
+     * @param id
+     */
+    void deleteQualityInspection(String id);
+    /**
+     * 查看质检管理信息
+     * @param id
+     */
+    QualityInspectionManagement getQualityInspection(String id);
+    /**
+     * 添加质检管理信息
+     * @param qualityInspectionManagement
+     */
+    String addQualityInspection(QualityInspectionManagement qualityInspectionManagement);
+    /**
+     * 编辑质检管理信息
+     * @param qualityInspectionManagement
+     */
+    String editQualityInspection(QualityInspectionManagement qualityInspectionManagement);
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/QualityInspectionManagementServiceImpl.java

@@ -1,11 +1,18 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
+import com.baomidou.mybatisplus.plugins.Page;
+import com.google.common.collect.Lists;
+import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.plugin.yiliangyiyun.entity.QualityInspectionManagement;
 import com.yh.saas.plugin.yiliangyiyun.mapper.QualityInspectionManagementMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IQualityInspectionManagementService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 记录质检管理数据信息 服务实现类
@@ -16,5 +23,85 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityInspectionManagementMapper, QualityInspectionManagement> implements IQualityInspectionManagementService {
-
+    /**
+     * 质检管理列表
+     * @param qualityInspectionManagement
+     * @return
+     */
+    @Override
+        public Page<QualityInspectionManagement> selectQualityInspection(QualityInspectionManagement qualityInspectionManagement) {
+        Map<String, Object> pageView = new HashMap<>();
+        pageView.put("startRecord", (qualityInspectionManagement.getCurrentPage() - 1)
+                * qualityInspectionManagement.getPageSize());
+        //公司id
+        pageView.put("compId",qualityInspectionManagement.getCompId());
+        pageView.put("searchKeyWord",qualityInspectionManagement.getSearchKeyWord());
+        pageView.put("pageSize",qualityInspectionManagement.getPageSize());
+        pageView.put("currentPage",qualityInspectionManagement.getCurrentPage());
+        // 查询销售订单总数
+        Integer dataCount = baseMapper.getCountByCondition(pageView);
+        List<QualityInspectionManagement> dataList = baseMapper.getListByCondition(pageView);
+        Page<QualityInspectionManagement> page = new Page<>();
+        page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
+        page.setTotal(dataCount == null ? 0 : dataCount);
+        page.setCurrent(qualityInspectionManagement.getCurrentPage());
+        page.setSize(qualityInspectionManagement.getPageSize());
+        return page;
+    }
+    /**
+     * 删除质检管理信息
+     *  @param id
+     * @return
+     */
+    @Override
+    public void deleteQualityInspection(String id) {
+        //查询质检管理信息
+        QualityInspectionManagement qualityInspectionManagement = this.selectById(id);
+        if(qualityInspectionManagement != null){
+            //删除质检管理信息
+            this.deleteById(qualityInspectionManagement.getId());
+        }
+    }
+    /**
+     * 查看质检管理信息
+     *  @param id
+     * @return
+     */
+    @Override
+    public QualityInspectionManagement getQualityInspection(String id) {
+        //查询质检管理信息
+        QualityInspectionManagement qualityInspectionManagement = this.selectById(id);
+        return qualityInspectionManagement;
+    }
+    /**
+     * 编辑质检管理信息
+     * @param qualityInspectionManagement
+     * @return
+     */
+    @Override
+        public String editQualityInspection(QualityInspectionManagement qualityInspectionManagement) {
+        boolean one=this.updateById(qualityInspectionManagement);
+        //成功返回ok
+        if (one ) {
+            return "OK";
+        } else {
+            return "NG";
+        }
+    }
+    /**
+     * 添加质检管理信息
+     * @param qualityInspectionManagement
+     * @return
+     */
+    @Override
+    public String addQualityInspection(QualityInspectionManagement qualityInspectionManagement) {
+        qualityInspectionManagement.setId(IdGenerator.generateUUID());
+        boolean one=this.insert(qualityInspectionManagement);
+        //成功返回ok
+        if (one ) {
+            return "OK";
+        } else {
+            return "NG";
+        }
+    }
 }

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/QualityInspectionManagementMapper.xml

@@ -1,5 +1,46 @@
 <?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.yh.saas.plugin.yiliangyiyun.mapper.QualityInspectionManagementMapper">
-
+    <!-- 获得销售订单总数 -->
+    <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
+        SELECT
+        COUNT(q.id)
+        FROM quality_inspection_management q
+        WHERE
+        q.delete_flag = '0'
+        <if test="searchKeyWord != null and searchKeyWord != ''">
+            AND (lower(q.quality_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(q.customer_name) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(q.car_number) like lower(CONCAT('%',#{searchKeyWord},'%')))
+        </if>
+    </select>
+    <!-- 获得销售订单列表 -->
+    <select id="getListByCondition" parameterType="Map"
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.QualityInspectionManagement">
+        SELECT
+        q.id,
+        q.quality_no as qualityNo,
+        q.customer_name as customerName,
+        q.quality_inspector as qualityInspector,
+        q.car_number as carNumber,
+        q.goods_name as goodsName,
+        q.tidal_grain_price as tidalGrainPrice,
+        q.water_content as waterContent,
+        q.bin_number as binNumber,
+        q.storage_tag_no as storageTagNo,
+        q.status,
+        q.quality_date as qualityDate
+        FROM quality_inspection_management q
+        WHERE
+        q.delete_flag = '0'
+        <if test="searchKeyWord != null and searchKeyWord != ''">
+            AND (lower(q.quality_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(q.customer_name) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(q.car_number) like lower(CONCAT('%',#{searchKeyWord},'%')))
+        </if>
+        ORDER BY q.quality_date DESC
+        <if test="currentPage != null and currentPage != ''">
+            LIMIT ${startRecord}, ${pageSize}
+        </if>
+    </select>
 </mapper>