修改bug4.0 9.9

zss

2023-09-09 276a147601837be1f738e087b6828f95f33d7d1b

修改bug4.0  9.9

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

@@ -27,7 +27,7 @@
    IPage<Map<String, Object>> selectRawInspectsList(Page<Object> page, String formTime, String code, Integer insState, String name);

    //根据原材料检验单id查看详情
    List<Map<String, Object>> selectRawInspectsListById(Integer id);
    Map<String, Object> selectRawInspectsListById(Integer id);

}


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

@@ -39,7 +39,7 @@
     * @param id
     * @return
     */
    List<Map<String,Object>> selectRawInspectsListById(Integer id);
    Map<String,Object> selectRawInspectsListById(Integer id);

    /**
     * 更新检验状态

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

@@ -105,7 +105,7 @@

    //根据检验单id查询原材料检验单详情
    @Override
    public List<Map<String, Object>> selectRawInspectsListById(Integer id) {
    public Map<String, Object> selectRawInspectsListById(Integer id) {
        return rawInspectMapper.selectRawInspectsListById(id);
    }


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

@@ -62,6 +62,7 @@
    <resultMap id="oneMap" type="map">
        <id property="rcode" column="rcode"/>
        <result property="formTime" column="formTime"/>
        <result property="creatTime" column="creatTime"/>
        <result property="rname" column="rname"/>
        <result property="specifications" column="specifications"/>
        <result property="runit" column="runit"/>
@@ -84,24 +85,25 @@
    </resultMap>

    <select id="selectRawInspectsListById" resultMap="oneMap">
        select DATE_FORMAT(form_time, '%Y-%m-%d') formTime,
               r.code                             rcode,
               r.name                             rname,
        select DATE_FORMAT(form_time, '%Y-%m-%d')     formTime,
               r.code                                 rcode,
               r.name                                 rname,
               specifications,
               r.unit                             runit,
               r.unit                                 runit,
               number,
               DATE_FORMAT(r.create_time, '%Y-%m-%d') creatTime,
               supplier,
               judge_state,
               user_name,
               rp.id                              rpId,
               rp.name                            rpName,
               rp.unit                            rpUnit,
               rp.id                                  rpId,
               rp.name                                rpName,
               rp.unit                                rpUnit,
               required,
               internal,
               test_value,
               test_state,
               device.name                        devName,
               user.name                          uName
               device.name                            devName,
               user.name                              uName
        from mom_ocean.raw_ins_product rp
                 left join mom_ocean.raw_inspect r on rp.raw_inspect_id = r.id
                 left join mom_ocean.device