2024-04-24 样品缺陷指数

JYW

2024-04-24 1c26d05a692239825921c146348db52540261d7c

2024-04-24 样品缺陷指数

 inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java

@@ -36,8 +36,6 @@

    private InsOrderService insOrderService;

    private InsSampleService insSampleService;

    private InsProductService insProductService;

    private InsOrderTemplateService insOrderTemplateService;
@@ -134,5 +132,11 @@
        CostStatisticsDto costStatisticsDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), CostStatisticsDto.class);
        return Result.success(insOrderService.costStatistics(page, costStatisticsDto));
    }
    @ApiOperation(value = "样品缺陷指数", tags = "样品缺陷指数")
    @PostMapping("/selectSampleDefects")
    public Result selectSampleDefects(Integer size, Integer current, String inspectionItems, String orderNumber) {
        return Result.success(insOrderService.selectSampleDefects(new Page<>(current, size),inspectionItems, orderNumber));

    }

}

 inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java

@@ -3,11 +3,13 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.mom.dto.CostStatisticsDto;
import com.yuanchu.mom.dto.SampleOrderDto;
import com.yuanchu.mom.dto.SampleProductDto;
import com.yuanchu.mom.dto.SampleProductDto2;
import com.yuanchu.mom.pojo.InsOrder;
import com.yuanchu.mom.vo.SampleDefectsFatherVo;

import java.util.List;
import java.util.Map;
@@ -34,7 +36,9 @@
    IPage<CostStatisticsDto> selectCostStatistics(IPage<CostStatisticsDto> page, QueryWrapper<CostStatisticsDto> ew);

    List<Map<String, String>> selectDeviceList(Set<String> names);
    List<SampleDefectsFatherVo> selectSampleDefects(Page page, String inspectionItems, String orderNumber);

    Long getCount(String inspectionItems, String orderNumber);
}



 inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderStateMapper.java

@@ -11,6 +11,7 @@
*/
public interface InsOrderStateMapper extends BaseMapper<InsOrderState> {


}



 inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java

@@ -26,7 +26,6 @@
    List<SampleProductDto> selectSampleProductListByOrderId(Integer id);

    List<SampleProductDto> getInsOrderAndSample(Integer id, String laboratory);

}



 inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java

@@ -1,6 +1,7 @@
package com.yuanchu.mom.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.mom.dto.*;
import com.yuanchu.mom.pojo.InsOrder;
@@ -33,4 +34,5 @@

    Map<String, Object> costStatistics(IPage<CostStatisticsDto> page, CostStatisticsDto costStatisticsDto);

    Map<String, Object> selectSampleDefects(Page page, String inspectionItems, String orderNumber);
}

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java

@@ -6,6 +6,7 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
@@ -16,6 +17,7 @@
import com.yuanchu.mom.service.StandardTemplateService;
import com.yuanchu.mom.utils.GiveCode;
import com.yuanchu.mom.utils.QueryWrappers;
import com.yuanchu.mom.vo.SampleDefectsFatherVo;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -48,6 +50,9 @@
    private InsSampleUserMapper insSampleUserMapper;

    private InsOrderStateMapper insOrderStateMapper;
    
   
 

    //获取检验下单数据
    @Override
@@ -159,6 +164,16 @@
        map.put("body", insOrderMapper.selectCostStatistics(page, QueryWrappers.queryWrappers(costStatisticsDto)));
        return map;
    }
    @Override
    public Map<String, Object> selectSampleDefects(Page page, String inspectionItems, String orderNumber) {
        List<SampleDefectsFatherVo> sampleDefectsFatherVos = insOrderMapper.selectSampleDefects(page, inspectionItems, orderNumber);
        Map<String, Object> map = new HashMap<>();
        map.put("records", sampleDefectsFatherVos);
        Long aLong = insOrderMapper.getCount(inspectionItems, orderNumber);
        map.put("total", aLong);
        return map;

    }
}



 inspect-server/src/main/java/com/yuanchu/mom/vo/SampleDefectsChildrenVo.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
package com.yuanchu.mom.vo;

import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.time.LocalDateTime;

@Data
@AllArgsConstructor
@NoArgsConstructor
public class SampleDefectsChildrenVo {
    private String entrust_code;//委托编码
    private String inspection_item;//检验项
    private String name;//检验人
    private LocalDateTime create_time;//检验日期
}

 inspect-server/src/main/java/com/yuanchu/mom/vo/SampleDefectsFatherVo.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
package com.yuanchu.mom.vo;

import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.util.List;

@Data
@AllArgsConstructor
@NoArgsConstructor
public class SampleDefectsFatherVo {
    private Integer id;//样品id
    private String sample;//样品名称

    private List<SampleDefectsChildrenVo> children;//子类
}

 inspect-server/src/main/resources/mapper/InsOrderMapper.xml

@@ -50,6 +50,18 @@
        <result property="remark" column="remark"/>
    </resultMap>

    <resultMap id="selectSampleDefectsMap" type="com.yuanchu.mom.vo.SampleDefectsFatherVo">
        <id column="id" property="id"/>
        <result column="sample" property="sample"/>
        <association property="children" resultMap="SampleDefectsChildrenMap" javaType="java.util.List"/>
    </resultMap>

    <resultMap id="SampleDefectsChildrenMap" type="com.yuanchu.mom.vo.SampleDefectsChildrenVo">
        <result column="entrust_code" property="entrust_code" />
        <result column="inspection_item" property="inspection_item" />
        <result column="name" property="name"/>
        <result column="create_time" property="create_time" />
    </resultMap>
    <select id="selectInsOrderParameter" resultType="com.yuanchu.mom.pojo.InsOrder">
        select *
        from (
@@ -174,4 +186,42 @@
        </where>
    </update>

    <select id="selectSampleDefects" resultMap="selectSampleDefectsMap">
        SELECT io.entrust_code,sam.sample,ip.inspection_item,u.name,b.create_time, sam.id
        from ins_order io
        left JOIN ins_sample sam on io.id=sam.ins_order_id
        LEFT JOIN ins_product ip on ip.ins_sample_id=sam.id
        LEFT JOIN
        (SELECT create_time,create_user,ins_product_id FROM (select * FROM ins_product_user  ORDER BY ins_product_user.create_time DESC) a GROUP BY a.ins_product_id) b
        on b.ins_product_id=ip.id
        left JOIN  `user` u on u.id=b.create_user
        WHERE (ip.ins_result=0 OR ip.state=0)
        <if test="inspectionItems != null and inspectionItems != ''">
            and inspection_item like concat('%', #{inspectionItems}, '%')
        </if>
        <if test="orderNumber != null and orderNumber != ''">
            and io.entrust_code like concat('%', #{orderNumber}, '%')
        </if>
    </select>

    <select id="getCount" resultType="long">
        select count(1)
        from (
        SELECT io.entrust_code,sam.sample,ip.inspection_item,u.name,b.create_time, sam.id
        from ins_order io
        left JOIN ins_sample sam on io.id=sam.ins_order_id
        LEFT JOIN ins_product ip on ip.ins_sample_id=sam.id
        LEFT JOIN
        (SELECT create_time,create_user,ins_product_id FROM (select * FROM ins_product_user  ORDER BY ins_product_user.create_time DESC) a GROUP BY a.ins_product_id) b
        on b.ins_product_id=ip.id
        left JOIN  `user` u on u.id=b.create_user
         where (ip.ins_result=0 OR ip.state=0)
        <if test="inspectionItems != null and inspectionItems != ''">
            and  inspection_item like concat('%', #{inspectionItems}, '%')
        </if>
        <if test="orderNumber != null and orderNumber != ''">
            and io.entrust_code like concat('%', #{orderNumber}, '%')
        </if>
             ) temp
    </select>
</mapper>