Merge remote-tracking branch 'origin/master'

src/main/java/com/patzn/cloud/service/lims/common/CompareUtils.java

+package com.patzn.cloud.service.lims.common;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class CompareUtils {
+
+    public interface Operation {
+        boolean calc(double a, double b);
+    }
+
+    public static final Map<String, Operation> Comparator = new HashMap<>();
+
+    static {
+        Comparator.put(">", ((a, b) -> a > b));
+        Comparator.put(">=", ((a, b) -> a >= b));
+        Comparator.put("<", ((a, b) -> a < b));
+        Comparator.put("<=", ((a, b) -> a <= b));
+        Comparator.put("=", ((a, b) -> a == b));
+    }
+}

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/ElectrolyzerController.java

+package com.patzn.cloud.service.lims.hmhj.controller;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.patzn.cloud.commons.api.RestConstants;
+import com.patzn.cloud.commons.api.RestResult;
+import com.patzn.cloud.commons.controller.ServiceController;
+import com.patzn.cloud.service.hmhj.entity.Electrolyzer;
+import com.patzn.cloud.service.lims.hmhj.service.IElectrolyzerService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 电解槽管理 - 前端控制器
+ *
+ * @author meazty
+ * @since 2021-06-17
+ */
+@Api(tags = "电解槽管理")
+@RestController
+@RequestMapping("/v1/electrolyzer")
+public class ElectrolyzerController extends ServiceController {
+
+    @Autowired
+    private IElectrolyzerService electrolyzerService;
+
+    @ApiOperation("分页列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
+    })
+    @PostMapping("/page")
+    public RestResult<Page<Electrolyzer>> getPage(Electrolyzer electrolyzer) {
+        return success(electrolyzerService.page(getPage(), electrolyzer));
+    }
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<Electrolyzer> get(@PathVariable("id") Long id) {
+        return success(electrolyzerService.getById(id));
+    }
+
+    @ApiOperation("根据 id 修改信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @PutMapping("/{id}")
+    public RestResult<Boolean> edit(@PathVariable("id") Long id, Electrolyzer electrolyzer) {
+        electrolyzer.setId(id);
+        return success(electrolyzerService.updateById(electrolyzer));
+    }
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+    public RestResult<Boolean> add(Electrolyzer electrolyzer) {
+        electrolyzer.setCreator(getAccount().getUserName());
+        return success(electrolyzerService.save(electrolyzer));
+    }
+
+    @ApiOperation("根据 ids 删除")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "ids", value = "主键列表", required = true, paramType = "query", allowMultiple = true, dataTypeClass = Long.class),
+    })
+    @DeleteMapping("/")
+    public RestResult<Boolean> delete(@RequestParam("ids") List<Long> ids) {
+        return success(electrolyzerService.removeByIds(ids));
+    }
+}

src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/ElectrolyzerMapper.java

+package com.patzn.cloud.service.lims.hmhj.mapper;
+
+import com.patzn.cloud.commons.mapper.BatchMapper;
+import com.patzn.cloud.service.hmhj.entity.Electrolyzer;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author meazty
+ * @since 2021-06-17
+ */
+public interface ElectrolyzerMapper extends BatchMapper<Electrolyzer> {
+
+}

src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/EntrustSampleItemMapper.java

@@ -31,6 +31,8 @@ public interface EntrustSampleItemMapper extends BatchMapper<EntrustSampleItem>
 
     List<EntrustSampleItemVO> selectVOListByIds(@Param("ids")Long[] ids);
 
+    List<EntrustSampleItemVO> selectByEntrustSampleId(@Param("sampleId")Long sampleId);
+
     List<EntrustSampleItemVO> selectByItemDeviate(RowBounds rowBounds, @Param("vo")EntrustSampleItemVO entrustSampleItem);
 
     List<EntrustSampleItemVO> selectListVOByIds(@Param("ids")List<Long> expIdsList);

src/main/java/com/patzn/cloud/service/lims/hmhj/service/IElectrolyzerService.java

+package com.patzn.cloud.service.lims.hmhj.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.patzn.cloud.commons.service.IBaseService;
+import com.patzn.cloud.service.hmhj.entity.Electrolyzer;
+
+import java.util.List;
+
+/**
+ * 服务类
+ *
+ * @author meazty
+ * @since 2021-06-17
+ */
+public interface IElectrolyzerService extends IBaseService<Electrolyzer> {
+
+    Page<Electrolyzer> page(Page<Electrolyzer> page, Electrolyzer electrolyzer);
+
+    boolean removeByIds(List<Long> ids);
+}

src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustSampleItemService.java

@@ -61,4 +61,8 @@ public interface IEntrustSampleItemService extends IBaseService<EntrustSampleIte
     List<EntrustSampleItemVO>  getItemByOriginalRecordId(Long originalRecordId);
 
     List<EntrustSampleItemVO> listVOByIds(List<Long> expIdsList);
+
+    List<EntrustSampleItemVO> getListBySampleId(Long sampleId);
+
+    boolean updateQualityJudge(Long[] ids, Account account);
 }

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/ElectrolyzerServiceImpl.java

+package com.patzn.cloud.service.lims.hmhj.service.impl;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
+import com.patzn.cloud.service.hmhj.entity.Electrolyzer;
+import com.patzn.cloud.service.lims.hmhj.mapper.ElectrolyzerMapper;
+import com.patzn.cloud.service.lims.hmhj.service.IElectrolyzerService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 服务实现类
+ *
+ * @author meazty
+ * @since 2021-06-17
+ */
+@Service
+public class ElectrolyzerServiceImpl extends BaseServiceImpl<ElectrolyzerMapper, Electrolyzer> implements IElectrolyzerService {
+
+    @Override
+    public Page<Electrolyzer> page(Page<Electrolyzer> page, Electrolyzer electrolyzer) {
+        Wrapper wrapper = new EntityWrapper<>(electrolyzer);
+        return this.page(page, wrapper);
+    }
+
+    @Override
+    public boolean removeByIds(List<Long> ids) {
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

src/main/java/com/patzn/cloud/service/lims/hmhj/sql/ElectrolyzerMapper.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.cloud.service.lims.hmhj.mapper.ElectrolyzerMapper">
+
+</mapper>

src/main/resources/mapper/hmhj/Electrolyzer.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.cloud.service.lims.hmhj.mapper.ElectrolyzerMapper">
+
+</mapper>

src/main/resources/mapper/hmhj/EntrustSampleItemMapper.xml

@@ -231,6 +231,18 @@
         WHERE i.deleted = 0 AND s.deleted = 0 and rr.deleted = 0 and rr.record_id = #{originalRecordId} limit 1
     </select>
 
+    <select id="selectByEntrustSampleId" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO">
+        SELECT
+            i.id,i.name,i.entrust_sample_id,s.entrust_id,i.agreed_value,i.test_value,i.standard,i.compose_judge,
+            s.code AS "sampleCode",s.name AS "sampleName", s.sample_shape ,s.sample_quantity, s.standard, s.sample_from,
+            s.product_code,s.name_code
+        FROM
+            entrust_sample_item i
+        JOIN entrust_sample s ON i.entrust_sample_id = s.ID
+        WHERE i.deleted = 0 AND s.deleted = 0 and i.entrust_sample_id = #{sampleId}
+        order by i.name asc
+    </select>
+
     <select id="selectListVOByIds" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO">
 
         SELECT i.id,i.name,i.entrust_sample_id,s.entrust_id,i.agreed_value,i.test_value,i.standard,s.code AS "sampleCode",s.name AS "sampleName",

src/test/java/com/patzn/cloud/service/lims/test/LimsCodeGenerator.java

@@ -18,7 +18,7 @@ public class LimsCodeGenerator {
         new PostgresqlGenerator().setDataSourceConfig(new DataSourceConfig()
                 .setDbType(DbType.POSTGRE_SQL)
                 .setDriverName("org.postgresql.Driver")
-                .setUrl("jdbc:postgresql://139.9.144.39:5432/dev_lims_hmhj")
+                .setUrl("jdbc:postgresql://localhost:5432/dev_lims_hmhj")
                 .setUsername("dbdev")
                 .setPassword("Project312&QdPt!")
         ).execute("lims");

src/test/java/resources/db_sql/hmhj/v113/修改部分表字段.sql

+ALTER TABLE "public"."entrust"
+ALTER TABLE "public"."entrust"
+    ADD COLUMN "type" int2;
+
+ALTER TABLE "public"."entrust_sample"
+    ADD COLUMN "surplus_sample_limit" timestamp(6),
+    ADD COLUMN "supplier" varchar(64) COLLATE "pg_catalog"."default";
+
+ALTER TABLE "public"."material"
+    ADD COLUMN "surplus_sample_limit" int2,
+    ADD COLUMN "supplier" varchar(64) COLLATE "pg_catalog"."default",
+    ADD COLUMN "category" varchar(64) COLLATE "pg_catalog"."default";
+
+ALTER TABLE "public"."entrust_report_template"
+    ADD COLUMN "class_type" varchar(64) COLLATE "pg_catalog"."default";
+
+ALTER TABLE "public"."entrust_sample_backup"
+    ADD COLUMN "type" varchar(16) COLLATE "pg_catalog"."default";
+
+ALTER TABLE "public"."grading_item"
+    ADD COLUMN "compose_judge" int2;
+
+ALTER TABLE "public"."entrust_sample_item"
+    ADD COLUMN "compose_judge" int2;
+
+COMMENT ON COLUMN "public"."entrust"."type" IS '委托类型【0：自产，1：进场】';
+
+COMMENT ON COLUMN "public"."entrust_sample"."surplus_sample_limit" IS '余样保存期限';
+COMMENT ON COLUMN "public"."entrust_sample"."supplier" IS '供货单位';
+
+COMMENT ON COLUMN "public"."material"."surplus_sample_limit" IS '余样保存期限(更改为天数)';
+COMMENT ON COLUMN "public"."material"."supplier" IS '供货单位';
+COMMENT ON COLUMN "public"."material"."category" IS '样本分类';
+
+COMMENT ON COLUMN "public"."entrust_report_template"."class_type" IS '模板报告类别';
+
+COMMENT ON COLUMN "public"."entrust_sample_backup"."type" IS '类别：BY:备样，YP:样品';
+
+COMMENT ON COLUMN "public"."grading_item"."compose_judge" IS '是否组合判定【0：否，1：是】';
+
+COMMENT ON COLUMN "public"."entrust_sample_item"."compose_judge" IS '是否组合判定【0：否，1：是】';
\ No newline at end of file

src/test/java/resources/db_sql/hmhj/v113/新增电解槽表-electrolyzer.sql

+/*
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : 本地库
+ Source Server Type    : PostgreSQL
+ Source Server Version : 120006
+ Source Host           : localhost:5432
+ Source Catalog        : dev_lims_hmhj
+ Source Schema         : public
+
+ Target Server Type    : PostgreSQL
+ Target Server Version : 120006
+ File Encoding         : 65001
+
+ Date: 17/06/2021 16:46:07
+*/
+
+
+-- ----------------------------
+-- Table structure for electrolyzer
+-- ----------------------------
+DROP TABLE IF EXISTS "public"."electrolyzer";
+CREATE TABLE "public"."electrolyzer" (
+  "id" int8 NOT NULL,
+  "name" varchar(120) COLLATE "pg_catalog"."default",
+  "branch" varchar(32) COLLATE "pg_catalog"."default",
+  "plant" varchar(64) COLLATE "pg_catalog"."default",
+  "partition" varchar(64) COLLATE "pg_catalog"."default",
+  "slot_no" varchar(32) COLLATE "pg_catalog"."default",
+  "model" varchar(32) COLLATE "pg_catalog"."default",
+  "status" int2,
+  "remark" varchar(255) COLLATE "pg_catalog"."default",
+  "creator" varchar(64) COLLATE "pg_catalog"."default",
+  "company_id" int8,
+  "uid" int8,
+  "ctime" timestamp(0),
+  "ltime" timestamp(0),
+  "lid" int8,
+  "deleted" int2 DEFAULT 0
+)
+;
+COMMENT ON COLUMN "public"."electrolyzer"."name" IS '产品名称';
+COMMENT ON COLUMN "public"."electrolyzer"."branch" IS '分厂';
+COMMENT ON COLUMN "public"."electrolyzer"."plant" IS '厂房';
+COMMENT ON COLUMN "public"."electrolyzer"."partition" IS '分区';
+COMMENT ON COLUMN "public"."electrolyzer"."slot_no" IS '槽号';
+COMMENT ON COLUMN "public"."electrolyzer"."model" IS '型号';
+COMMENT ON COLUMN "public"."electrolyzer"."status" IS '状态【0：启动、1：停槽】';
+COMMENT ON COLUMN "public"."electrolyzer"."remark" IS '备注';
+COMMENT ON COLUMN "public"."electrolyzer"."creator" IS '创建人';
+COMMENT ON COLUMN "public"."electrolyzer"."company_id" IS '企业ID';
+COMMENT ON COLUMN "public"."electrolyzer"."uid" IS '创建人ID';
+COMMENT ON COLUMN "public"."electrolyzer"."ctime" IS '创建时间';
+COMMENT ON COLUMN "public"."electrolyzer"."ltime" IS '最后修改时间';
+COMMENT ON COLUMN "public"."electrolyzer"."lid" IS '最后修改人ID';
+COMMENT ON COLUMN "public"."electrolyzer"."deleted" IS '是否删除0否1是';
+COMMENT ON TABLE "public"."electrolyzer" IS '电解槽基础数据';
+
+-- ----------------------------
+-- Primary Key structure for table electrolyzer
+-- ----------------------------
+ALTER TABLE "public"."electrolyzer" ADD CONSTRAINT "electrolyzer_pkey" PRIMARY KEY ("id");