检测管理完善

src/main/java/com/patzn/lims/drug/controller/DrugItemController.java

@@ -408,4 +408,11 @@ public class DrugItemController extends ServiceController<IDrugItemService, Drug
     public PtResult<Boolean> bathAddEquip(@RequestBody DrugItemRelEquipDTO equipDTO) {
         return success(baseService.bathAddEquip(equipDTO));
     }
+
+
+    @ApiOperation(value = "编辑修改检测项目", notes = "编辑修改检测项目")
+    @PostMapping("/edit")
+    public PtResult<Boolean> edit(DrugItem item) {
+        return success(baseService.updateById(item));
+    }
 }

src/main/java/com/patzn/lims/drug/controller/TestValueExtendController.java

+package com.patzn.lims.drug.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.patzn.lims.core.PtConstants;
+import com.patzn.lims.core.api.PtResult;
+import com.patzn.lims.core.web.ServiceController;
+import com.patzn.lims.drug.entity.TestValueExtend;
+import com.patzn.lims.drug.service.ITestValueExtendService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 检测值扩展表 前端控制器
+ * </p>
+ *
+ * @author wwd
+ * @since 2020-05-19
+ */
+@Api(tags = "检测值扩展表")
+@RestController
+@RequestMapping("/v1/value_extend")
+public class TestValueExtendController extends ServiceController<ITestValueExtendService, TestValueExtend> {
+
+    @ApiOperation(value = "分页列表", notes = "分页查询数据列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = PtConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
+            @ApiImplicitParam(name = PtConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataType = "int"),
+            @ApiImplicitParam(name = PtConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = PtConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataType = "String"),
+    })
+    @PostMapping("/page")
+	public PtResult<IPage<TestValueExtend>> getPage(TestValueExtend testValueExtend) {
+        return success(baseService.page(getPage(), testValueExtend));
+	}
+
+
+    @PostMapping("/edit")
+    public PtResult<Boolean> edit(TestValueExtend testValueExtend) {
+        return success(baseService.updateById(testValueExtend));
+    }
+
+}

src/main/java/com/patzn/lims/drug/entity/DrugItem.java

@@ -88,6 +88,8 @@ public class DrugItem extends BaseEntity {
 	private ItemStatusEnum progress;
     @ApiModelProperty(value = "单项判定")
 	private SingleJudgeEnum singleJudge;
+	@ApiModelProperty(value = "样品量")
+	private BigDecimal sampleQuantity;
 
 
 }

src/main/java/com/patzn/lims/drug/mapper/TestValueExtendMapper.java

+package com.patzn.lims.drug.mapper;
+
+import com.patzn.lims.drug.entity.TestValueExtend;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 检测值扩展表 Mapper 接口
+ * </p>
+ *
+ * @author wwd
+ * @since 2020-05-19
+ */
+public interface TestValueExtendMapper extends BaseMapper<TestValueExtend> {
+
+}

src/main/java/com/patzn/lims/drug/service/ITestValueExtendService.java

+package com.patzn.lims.drug.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.patzn.lims.core.web.IBaseService;
+import com.patzn.lims.drug.entity.TestValueExtend;
+
+/**
+ * <p>
+ * 检测值扩展表 服务类
+ * </p>
+ *
+ * @author wwd
+ * @since 2020-05-19
+ */
+public interface ITestValueExtendService extends IBaseService<TestValueExtend> {
+
+    Page<TestValueExtend> page(Page<TestValueExtend> page, TestValueExtend testValueExtend);
+}

src/main/java/com/patzn/lims/drug/service/impl/TestValueExtendServiceImpl.java

+package com.patzn.lims.drug.service.impl;
+
+import com.patzn.lims.drug.entity.TestValueExtend;
+import com.patzn.lims.drug.mapper.TestValueExtendMapper;
+import com.patzn.lims.drug.service.ITestValueExtendService;
+import com.patzn.lims.core.web.BaseServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 检测值扩展表 服务实现类
+ * </p>
+ *
+ * @author wwd
+ * @since 2020-05-19
+ */
+@Service
+public class TestValueExtendServiceImpl extends BaseServiceImpl<TestValueExtendMapper, TestValueExtend> implements ITestValueExtendService {
+
+    @Override
+    public Page<TestValueExtend> page(Page<TestValueExtend> page, TestValueExtend testValueExtend) {
+        QueryWrapper<TestValueExtend> wrapper = Wrappers.<TestValueExtend>query(testValueExtend);
+        wrapper.orderByAsc("ctime");
+        return this.page(page, wrapper);
+    }
+}

src/main/java/com/patzn/lims/drug/vo/DrugItemVO.java

@@ -57,4 +57,7 @@ public class DrugItemVO extends DrugItem {
     @ApiModelProperty(value = "仪器名称")
     private String equipNames;
 
+    @ApiModelProperty(value = "缺陷")
+    private String defects;
+
 }

src/main/resources/mapper/drug/DrugItemMapper.xml

@@ -139,6 +139,6 @@
         JOIN drug_item_operation o ON i.id = o.item_id
         WHERE c.user_id =#{vo.uid}
 
-        ORDER BY i.order_by ,i.name
+        ORDER BY i.order_by ,i.type,i.name
     </select>
 </mapper>

src/main/resources/mapper/drug/TestValueExtendMapper.xml

+<?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.patzn.lims.drug.mapper.TestValueExtendMapper">
+
+</mapper>

src/test/java/com/patzn/lims/test/PtCodeGenerator.java → src/test/java/com/patzn/lims/test/PtTobaccoCodeGenerator.java

@@ -17,13 +17,13 @@ import java.util.Collections;
  * @author hubin
  * @Date 2017-08-28
  */
-public class PtCodeGenerator {
+public class PtTobaccoCodeGenerator {
 
     public static void main(String[] args) {
         new PostgresqlGenerator().setDataSourceConfig(new DataSourceConfig()
                 .setDbType(DbType.POSTGRE_SQL)
                 .setDriverName("org.postgresql.Driver")
-                .setUrl("jdbc:postgresql://192.168.0.115:5432/drug_lims_dev")
+                .setUrl("jdbc:postgresql://192.168.0.115:5432/tobacco_lims_dev")
                 .setUsername("postgres")
                 .setPassword("123456")
         ).execute();