LIMS管理系统框架-开发7-27下班合并代码

XiaoRuby

2023-07-27 032b976ab803a263e734dcdca3ceadaed48f1070

LIMS管理系统框架-开发7-27下班合并代码

 inspection-server/pom.xml

@@ -26,5 +26,11 @@
            <artifactId>standard-server</artifactId>
            <version>${project.parent.version}</version>
        </dependency>

        <dependency>
            <groupId>com.yunchu.limslaboratory</groupId>
            <artifactId>laboratory-server</artifactId>
            <version>${project.parent.version}</version>
        </dependency>
    </dependencies>
</project>

 inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java

@@ -52,16 +52,6 @@
        return Result.success(productService.selectInstrumentByProname(name));
    }

    @ApiOperation("选择试验方法")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "id", value = "项目id", dataTypeClass = Integer.class, required = true),
    })
    @PostMapping("/selectProMethodById")
    public Result selectProMethodById(Integer id) {
        Product product = productService.getById(id);
        return Result.success(product.getMethod());
    }

    @ApiOperation("分配检验计划中分配项目")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "id", value = "检验样品ID", dataTypeClass = Integer.class, required = true),

 laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/EquipmentPointServiceImpl.java

@@ -36,6 +36,7 @@
        LambdaQueryWrapper<EquipmentPoint> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(EquipmentPoint::getEquipmentPoint, equipmentPoint.getEquipmentPoint());
        wrapper.eq(EquipmentPoint::getState, 1);
        wrapper.eq(EquipmentPoint::getInstrumentId, equipmentPoint.getInstrumentId());
        wrapper.select(EquipmentPoint::getEquipmentPoint);
        EquipmentPoint equipmentPoint1 = equipmentPointMapper.selectOne(wrapper);
        if (ObjectUtils.isEmpty(equipmentPoint1)){

 standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java

@@ -18,7 +18,7 @@
 */
public interface MaterialService extends IService<Material> {

    List<Material> selectMaterialLimit(int pageSize,int countSize, int type);
    List<Map> selectMaterialLimit(int pageSize,int countSize, int type);

    Map selectMaterialById(String materialId);


 sys/src/main/java/com/yuanchu/limslaboratory/CodeGenerator.java

@@ -22,7 +22,7 @@
    public static String database_username = "root";
    public static String database_password= "123456";
    public static String author = "江苏鵷雏网络科技有限公司";
    public static String model_name = "/inspection-server"; // 如果为分布式填子模块名称，如果不是分布式为空即可
    public static String model_name = "/laboratory-server"; // 如果为分布式填子模块名称，如果不是分布式为空即可
    public static String setParent = "com.yuanchu.limslaboratory"; // 包路径
    public static Boolean Override = false; // 是否覆盖原来的文件？


 user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java

@@ -75,7 +75,7 @@
     * 查询所有用户信息
     * @return
     */
    List<User> selectUser();
    List<Map> selectUser();

    /**
     * 获取所有用户的名称与Id