晏有为
2024-05-16 25e4592719e488dd7438ed08b2cd86f9bd9fafa0
不合格管理操作
已修改9个文件
30 ■■■■■ 文件已修改
framework/src/main/java/com/yuanchu/mom/utils/QueryWrappers.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspect-server/src/main/java/com/yuanchu/mom/controller/InsUnPassController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspect-server/src/main/java/com/yuanchu/mom/dto/UnPassPageDto.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsUnPassMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsUnPass.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspect-server/src/main/java/com/yuanchu/mom/service/InsUnPassService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsUnPassServiceImpl.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspect-server/src/main/resources/mapper/InsUnPassMapper.xml 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
user-server/src/main/java/com/yuanchu/mom/service/impl/RoleServiceImp.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
framework/src/main/java/com/yuanchu/mom/utils/QueryWrappers.java
@@ -69,5 +69,4 @@
//        System.out.println(wrapper.getExpression().getSqlSegment());
        return wrapper;
    }
}
}
inspect-server/src/main/java/com/yuanchu/mom/controller/InsUnPassController.java
@@ -37,4 +37,4 @@
        UnPassPageDto unPassPageDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), UnPassPageDto.class);
        return Result.success(insUnPassService.pageInsUnPass(page, unPassPageDto));
    }
}
}
inspect-server/src/main/java/com/yuanchu/mom/dto/UnPassPageDto.java
@@ -12,4 +12,4 @@
@Data
public class UnPassPageDto extends InsUnPass implements Serializable {
}
}
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsUnPassMapper.java
@@ -12,4 +12,4 @@
 */
public interface InsUnPassMapper extends BaseMapper<InsUnPass> {
    IPage<UnPassPageDto> pageInsUnPass(IPage<UnPassPageDto> page, QueryWrapper<UnPassPageDto> ew);
}
}
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsUnPass.java
@@ -37,7 +37,7 @@
     * 检测项
     */
    @ValueTableShow(value = 4, name = "检测项")
    private String inspectionItems;
    private String inspectionItem;
    /**
     * 检测子项
     */
inspect-server/src/main/java/com/yuanchu/mom/service/InsUnPassService.java
@@ -11,4 +11,4 @@
 */
public interface InsUnPassService {
    Map<String, Object> pageInsUnPass(Page page, UnPassPageDto unPassPageDto);
}
}
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsUnPassServiceImpl.java
@@ -30,7 +30,9 @@
    public Map<String, Object> pageInsUnPass(Page page, UnPassPageDto unPassPageDto) {
        Map<String, Object> map = new HashMap<>();
        map.put("head", PrintChina.printChina(UnPassPageDto.class));
//        Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("pageInsUnPass");
//        if (map1.get("look") == 1) unPassPageDto.setCreateUser(map1.get("userId"));
        map.put("body", insUnPassMapper.pageInsUnPass(page, QueryWrappers.queryWrappers(unPassPageDto)));
        return map;
    }
}
}
inspect-server/src/main/resources/mapper/InsUnPassMapper.xml
@@ -6,7 +6,7 @@
    <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsUnPass">
            <id property="id" column="id" jdbcType="INTEGER"/>
            <result property="sample" column="sample" jdbcType="VARCHAR"/>
            <result property="inspectionItems" column="inspection_items" jdbcType="VARCHAR"/>
            <result property="inspectionItem" column="inspection_item" jdbcType="VARCHAR"/>
            <result property="inspectionItemSubclass" column="inspection_item_subclass" jdbcType="VARCHAR"/>
            <result property="lastValue" column="last_value" jdbcType="VARCHAR"/>
            <result property="model" column="model" jdbcType="VARCHAR"/>
@@ -19,7 +19,10 @@
            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
    </resultMap>
    <select id="pageInsUnPass" resultType="com.yuanchu.mom.dto.UnPassPageDto">
        select *
        from ins_un_pass iu
        SELECT * FROM
            ins_un_pass iu
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}
        </if>
    </select>
</mapper>
</mapper>
user-server/src/main/java/com/yuanchu/mom/service/impl/RoleServiceImp.java
@@ -86,4 +86,4 @@
        }
        return 1;
    }
}
}