Merge branch 'develop' into dev

# Conflicts:
#	src/main/resources/application-dev312.yml
#	src/main/resources/application-k8stest.yml
#	src/main/resources/application-local.yml

.gitignore

+.gradle
+.idea
+.run
+build
+gradle*
+Dockerfile
+Jenkinsfile-test
+libs
+*env.json
+*.log
\ No newline at end of file

Dockerfile

-FROM java:8
+FROM centos
 VOLUME /tmp
-EXPOSE 8005
-# Path to jar created by gradle build
-ADD build/libs/patzn-cloud-service-lims-1.0.jar app.jar
-RUN bash -c 'touch /app.jar'
-ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]
\ No newline at end of file
+#ADD ./src/test/resources/simsunttc/simsun.ttf
+ARG JAR_FILE
+COPY ${JAR_FILE} app.jar
+ENV JAVA_HOME="/usr/java/jdk1.8"
+ENV PATH="${PATH}:${JAVA_HOME}/bin:${JAVA_HOME}/sbin"
+# 解决docker环境中文乱码问题
+ENV LANG zh_CN.UTF-8
+# 解决时间同步问题
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+RUN echo 'Asia/Shanghai' >/etc/timezone
+ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-XX:MaxRAMPercentage=90.0","-XX:MinRAMPercentage=90.0","-Dfile.encoding=UTF-8","-Dsun.jnu.encoding=utf-8","-jar","/app.jar"]

Jenkinsfile-test

+
+pipeline {
+    agent any
+
+    stages {
+        stage('Build hmhj') {
+            steps {
+	            echo '=== Build hmhj Begin'
+                checkout([$class: 'GitSCM', branches: [[name: 'master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'CleanBeforeCheckout']], submoduleCfg: [],
+                 userRemoteConfigs: [[credentialsId: 'Git', url: 'git@git.patzn.com:wangweidong/patzn-cloud-service-hmhj.git']]])
+            	sh """
+            	chmod +x gradlew
+            	./gradlew build  docker -x test
+            	"""
+            	echo '=== Build hmhj End'
+            }
+        }
+        stage('Docker Push') {
+            steps {
+            	echo '=== Build docker image Begin'
+                sh """
+                docker login -u patzn -p Patzn12345 https://192.168.0.192
+
+				docker tag patzn-cloud-service-hmhj:1.0 192.168.0.192/project/patzn-cloud-service-hmhj:${Tag}
+
+				docker push 192.168.0.192/project/patzn-cloud-service-hmhj:${Tag}
+                """
+            	echo '=== Build docker image End'
+            }
+        }
+        stage('Kubernetes CI/CD') {
+            steps {
+                echo '=== Kubernetes CI/CD Begin'
+                sh """
+                curl -X PUT \
+                    -H "content-type: application/json" \
+                    -H "Cookie: KuboardUsername=admin; KuboardAccessKey=7n2wfwkzz5dk.t5afebia666wya5wky3tzx5ainndnf6w" \
+                    -d '{"kind":"deployments","namespace":"patzn-project","name":"patzn-cloud-service-hmhj","images":{"192.168.0.192/project/patzn-cloud-service-hmhj":"192.168.0.192/project/patzn-cloud-service-hmhj:${Tag}"}}' \
+                    "http://192.168.0.187:10080/kuboard-api/cluster/patzn/kind/CICDApi/admin/resource/updateImageTag"
+                """
+                echo '=== Kubernetes CI/CD End'
+            }
+        }
+    }
+}

build.gradle

@@ -11,8 +11,8 @@ ext {
         maven { url 'https://repo.spring.io/milestone' }
         maven { url 'http://repo.spring.io/snapshot' }
         maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
-        maven { url 'http://119.3.176.130:8081/repository/patzn-releases/' }
-        maven { url 'http://119.3.176.130:8081/repository/patzn-snapshots/' }
+        maven { url 'http://112.6.246.185:8081/repository/patzn-releases/' }
+        maven { url 'http://112.6.246.185:8081/repository/patzn-snapshots/' }
         jcenter()
     }
 }
@@ -38,6 +38,7 @@ buildscript {
 
     dependencies {
         classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
+        classpath "com.palantir.gradle.docker:gradle-docker:0.25.0"
     }
 }
 
@@ -46,6 +47,7 @@ apply plugin: "maven"
 apply plugin: "idea"
 apply plugin: 'org.springframework.boot'
 apply plugin: "io.spring.dependency-management"
+apply plugin: "com.palantir.docker"
 
 group = "com.patzn.cloud"
 version = "1.0"
@@ -136,3 +138,10 @@ dependencies {
     implementation('org.springframework.boot:spring-boot-starter-data-mongodb')
 
 }
+
+docker {
+    dependsOn build
+    name "${project.name}:${project.version}"
+    copySpec.from(jar).rename(".*", "app.jar")
+    buildArgs(['JAR_FILE': "app.jar"])
+}
\ No newline at end of file

src/main/java/com/patzn/cloud/service/lims/HmhjServiceApplication.java

@@ -8,6 +8,7 @@ import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
@@ -20,6 +21,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @EnableAsync
 @EnableCaching
 @EnableSwagger2
+@EnableScheduling
 @EnableDiscoveryClient
 @SpringBootApplication
 @EnableTransactionManagement
@@ -31,7 +33,7 @@ public class HmhjServiceApplication {
             SpringApplication application = new SpringApplication(HmhjServiceApplication.class);
             application.setBannerMode(Banner.Mode.CONSOLE);
             SpringHelper.setApplicationContext(application.run(args));
-            System.out.println("SoilService start!\thttp://api.dev.patzn.com:7000/hmhj/swagger-ui.html");
+            System.out.println("HmhjService start!\thttp://api.dev.patzn.com:7000/hmhj/swagger-ui.html");
         } catch (Throwable t) {
             t.printStackTrace();
         }

src/main/java/com/patzn/cloud/service/lims/base/controller/LmsPropertyController.java

+package com.patzn.cloud.service.lims.base.controller;
+
+import com.baomidou.mybatisplus.mapper.Condition;
+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.feign.lims.base.client.LmsPropertyClient;
+import com.patzn.cloud.service.lims.base.dto.LmsCompareDifferentDTO;
+import com.patzn.cloud.service.lims.base.entity.LmsProperty;
+import com.patzn.cloud.service.lims.base.service.ILmsPropertyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 字段数据对比表 前端控制器
+ *
+ * @author patzn
+ * @since 2021-07-16
+ */
+@Api(tags = "字段数据对比表")
+@RestController
+@RequestMapping("/v1/property")
+public class LmsPropertyController extends ServiceController implements LmsPropertyClient {
+
+    @Autowired
+    private ILmsPropertyService lmsPropertyService;
+
+
+    @ApiOperation(value = "分页列表", notes = "分页查询数据列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataType = "int"),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataType = "String"),
+    })
+    @PostMapping("/page")
+    @Override
+    public RestResult<Page<LmsProperty>> getPage(LmsProperty lmsProperty) {
+        return success(lmsPropertyService.page(getPage(), lmsProperty));
+    }
+
+
+    @ApiOperation(value = "查询列表", notes = "查询数据列表")
+    @PostMapping("/list")
+    @Override
+    public RestResult<List<LmsProperty>> getList(LmsProperty lmsProperty) {
+        return success(lmsPropertyService.list(lmsProperty));
+    }
+
+    @PostMapping("/list_by_type")
+    @Override
+    public RestResult<List<LmsProperty>> getListByType(@RequestParam("typeList") List<String> typeList) {
+        if (CollectionUtils.isEmpty(typeList)) {
+            return null;
+        }
+        return success(lmsPropertyService.getListByType(typeList));
+    }
+
+    @PostMapping("/list_by_type_companyId")
+    public RestResult<List<LmsProperty>> getListByTypeCompanyId(@RequestParam("companyId") Long companyId, @RequestParam("typeList") List<String> typeList) {
+        if (CollectionUtils.isEmpty(typeList) || null == companyId) {
+            return null;
+        }
+        return success(lmsPropertyService.getListByTypeCompanyId(typeList, companyId));
+    }
+
+
+    @ApiOperation(value = "查询 id 信息", notes = "查询指定 id 的数据内容")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataType = "long"),
+    })
+    @GetMapping("/{id}")
+    @Override
+    public RestResult<LmsProperty> get(@PathVariable("id") Long id) {
+        return success(lmsPropertyService.getById(id));
+    }
+
+
+    @ApiOperation(value = "根据 id 修改信息", notes = "根据指定 id 修改该条数据内容")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataType = "long"),
+    })
+    @PutMapping("/{id}")
+    @Override
+    public RestResult<Boolean> edit(@PathVariable("id") Long id, LmsProperty lmsProperty) {
+        lmsProperty.setId(id);
+        return success(lmsPropertyService.updateById(lmsProperty));
+    }
+
+
+    @ApiOperation(value = "添加", notes = "添加一条数据")
+    @PostMapping("/")
+    @Override
+    public RestResult<Boolean> add(LmsProperty lmsProperty) {
+        return success(lmsPropertyService.save(lmsProperty));
+    }
+
+
+    @ApiOperation(value = "根据 ids 删除", notes = "根据 id 数组删除指定的数据内容")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "ids", value = "主键数组", required = true, paramType = "query", dataType = "array"),
+    })
+    @DeleteMapping("/")
+    @Override
+    public RestResult<Boolean> delete(@RequestParam("ids") Long[] ids) {
+        return success(lmsPropertyService.remove(Condition.create().in("id", ids)));
+    }
+
+    @ApiOperation(value = "对象信息对比", notes = "对象信息对比")
+    @PostMapping("/obj_compare")
+    @Override
+    public RestResult<String> getCompareDifferent(@RequestBody LmsCompareDifferentDTO dto) {
+        return success(lmsPropertyService.getCompareDifferent(dto.getView(), dto.getOld(), dto.getType(), dto.getTitle()));
+    }
+
+    @ApiOperation(value = "对象信息对比", notes = "对象信息对比")
+    @PostMapping("/copy")
+    public RestResult<Boolean> copy(@RequestParam("fromType") String fromType, @RequestParam("toType") String toType) {
+        return success(lmsPropertyService.copy(fromType, toType));
+    }
+}
\ No newline at end of file

src/main/java/com/patzn/cloud/service/lims/base/mapper/LmsPropertyMapper.java

+package com.patzn.cloud.service.lims.base.mapper;
+
+import com.baomidou.mybatisplus.annotations.SqlParser;
+import com.patzn.cloud.commons.mapper.BatchMapper;
+import com.patzn.cloud.service.lims.base.entity.LmsProperty;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 字段数据对比表 Mapper 接口
+ * </p>
+ *
+ * @author patzn
+ * @since 2021-07-16
+ */
+public interface LmsPropertyMapper extends BatchMapper<LmsProperty> {
+    @SqlParser(filter = true)
+    List<LmsProperty> selectLmsPropertyList(@Param("type") String type);
+
+    @SqlParser(filter = true)
+    List<LmsProperty> selectLmsPropertyLists(@Param("types") List<String> typeList);
+
+    @SqlParser(filter = true)
+    List<LmsProperty> selectLmsPropertyCompanyIdLists(@Param("types") List<String> typeList, @Param("companyId") Long companyId);
+
+}

src/main/java/com/patzn/cloud/service/lims/base/service/ILmsPropertyService.java

+package com.patzn.cloud.service.lims.base.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.patzn.cloud.commons.service.IBaseService;
+import com.patzn.cloud.service.lims.base.entity.LmsProperty;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 字段数据对比表 服务类
+ *
+ * @author patzn
+ * @since 2021-07-16
+ */
+public interface ILmsPropertyService extends IBaseService<LmsProperty> {
+
+    Page<LmsProperty> page(Page<LmsProperty> page, LmsProperty lmsProperty);
+
+
+    List<LmsProperty> list(LmsProperty lmsProperty);
+
+
+    Map<String ,Object> getPropertyDetailData(String type);
+
+
+    String  getObjectCompareDifferent(Object one,Object old,String type,String title);
+
+
+    String getCompareDifferent(Object one, Object old, String type, String title);
+
+    String getCompareTimeFormatDifferent(Object one, Object old, String type, String title);
+
+    String  getObjectCompareDifferent(Map<String,List<Object>> map,String title);
+
+
+    List<LmsProperty> listPropertyDetailData(String type);
+
+
+    boolean copy(String fromType, String toType);
+
+
+    List<LmsProperty> getListByType(List<String> typeList);
+
+    List<LmsProperty> getListByTypeCompanyId(List<String> typeList, Long companyId);
+}

src/main/java/com/patzn/cloud/service/lims/base/service/impl/LmsPropertyServiceImpl.java

+package com.patzn.cloud.service.lims.base.service.impl;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.toolkit.IdWorker;
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import com.patzn.cloud.commons.api.RestAssert;
+import com.patzn.cloud.commons.constant.CommonConstants;
+import com.patzn.cloud.commons.controller.LoginHelper;
+import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
+import com.patzn.cloud.commons.toolkit.ObjectUtils;
+import com.patzn.cloud.service.lims.base.entity.LmsProperty;
+import com.patzn.cloud.service.lims.base.mapper.LmsPropertyMapper;
+import com.patzn.cloud.service.lims.base.service.ILmsPropertyService;
+import com.patzn.cloud.service.lims.common.StringHandleUtils;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 字段数据对比表 服务实现类
+ *
+ * @author patzn
+ * @since 2021-07-16
+ */
+@Service
+public class LmsPropertyServiceImpl extends BaseServiceImpl<LmsPropertyMapper, LmsProperty> implements ILmsPropertyService {
+
+    @Override
+    public Page<LmsProperty> page(Page<LmsProperty> page, LmsProperty lmsProperty) {
+        Wrapper wrapper = new EntityWrapper<>(lmsProperty);
+
+        return page(page, wrapper);
+    }
+
+
+    @Override
+    public List<LmsProperty> list(LmsProperty lmsProperty) {
+        return list(new EntityWrapper<>(lmsProperty));
+    }
+
+
+    @Override
+    public Map<String, Object> getPropertyDetailData(String type) {
+
+
+        List<LmsProperty> list = listPropertyDetailData(type);
+
+        Map<String, String> propertyMap = new HashMap<>();
+        List<String> propertyList = new ArrayList<>();
+        for (LmsProperty property : list) {
+            propertyList.add(property.getCode());
+            propertyMap.put(property.getCode(), property.getName());
+        }
+
+        Map<String, Object> objectMap = new HashMap<>();
+        objectMap.put("property", propertyList);
+        objectMap.put("propertyMap", propertyMap);
+        return objectMap;
+    }
+
+    @Override
+    public String getObjectCompareDifferent(Object one, Object old, String type, String title) {
+        Map<String, Object> map = getPropertyDetailData(type);
+        List<String> propertyList = (List<String>) map.get("property");
+        Map<String, String> propertyValueMap = (Map<String, String>) map.get("propertyMap");
+        Map<String, List<Object>> returnMap = ObjectUtils.compareFields(one, old, propertyList);
+        return StringHandleUtils.getObjectDifferent(title, propertyValueMap, returnMap);
+    }
+
+    @Override
+    public String getCompareDifferent(Object one, Object old, String type, String title) {
+        Map<String, Object> map = getPropertyDetail(type);
+        List<String> propertyList = (List<String>) map.get("property");
+        Map<String, String> propertyValueMap = (Map<String, String>) map.get("propertyMap");
+        Map<String, List<Object>> returnMap = ObjectUtils.compareFields(one, old, propertyList);
+        return StringHandleUtils.getObjectDifferent(title, propertyValueMap, returnMap);
+    }
+
+    @Override
+    public String getCompareTimeFormatDifferent(Object one, Object old, String type, String title) {
+        Map<String, Object> map = getPropertyDetail(type);
+        List<String> propertyList = (List<String>) map.get("property");
+        Map<String, String> propertyValueMap = (Map<String, String>) map.get("propertyMap");
+        Map<String, List<Object>> returnMap = ObjectUtils.compareTimeFormatFields(one, old, propertyList);
+        return StringHandleUtils.getObjectDifferent(title, propertyValueMap, returnMap);
+    }
+
+    private Map<String, Object> getPropertyDetail(String type) {
+        List<LmsProperty> list = baseMapper.selectLmsPropertyList(type);
+
+        Map<String, String> propertyMap = new HashMap<>();
+        List<String> propertyList = new ArrayList<>();
+        for (LmsProperty property : list) {
+            propertyList.add(property.getCode());
+            propertyMap.put(property.getCode(), property.getName());
+        }
+
+        Map<String, Object> objectMap = new HashMap<>();
+        objectMap.put("property", propertyList);
+        objectMap.put("propertyMap", propertyMap);
+        return objectMap;
+    }
+
+    @Override
+    public String getObjectCompareDifferent(Map<String, List<Object>> mapCompare, String title) {
+
+        List<Map<String, List<Object>>> list = new ArrayList<>();
+        Map<String, String> allProperty = new HashMap<>();
+        for (Map.Entry<String, List<Object>> mapEntry : mapCompare.entrySet()) {
+            Map<String, Object> map = getPropertyDetailData(mapEntry.getKey());
+            List<String> propertyList = (List<String>) map.get("property");
+            Map<String, String> propertyValueMap = (Map<String, String>) map.get("propertyMap");
+            Map<String, List<Object>> returnMap = ObjectUtils.compareFields(mapEntry.getValue().get(0), mapEntry.getValue().get(1), propertyList);
+            allProperty.putAll(propertyValueMap);
+            list.add(returnMap);
+        }
+        return StringHandleUtils.getObjectDifferent(title, allProperty, list);
+
+
+    }
+
+    private final Cache<String, List<LmsProperty>> LMSPROPERTY_FLOW_CACHE = Caffeine.newBuilder()
+            .expireAfterWrite(1, TimeUnit.HOURS).build();
+
+
+    @Override
+    public List<LmsProperty> listPropertyDetailData(String type) {
+        StringBuilder key = new StringBuilder();
+        key.append(LoginHelper.getAccount().getCompanyId()).append(CommonConstants.SYMBOL_JING).append(type);
+        List<LmsProperty> cfList = LMSPROPERTY_FLOW_CACHE.getIfPresent(key.toString());
+        if (CollectionUtils.isEmpty(cfList)) {
+
+            List<LmsProperty> returnList = baseMapper.selectLmsPropertyList(type);
+
+            LMSPROPERTY_FLOW_CACHE.put(key.toString(), returnList);
+            cfList = returnList;
+        }
+        return cfList;
+    }
+
+    @Override
+    public boolean copy(String fromType, String toType) {
+        RestAssert.fail(StringUtils.isBlank(fromType) || StringUtils.isBlank(toType), "参数不能为空");
+        String[] froms = fromType.split("、");
+        String[] tos = toType.split("、");
+        RestAssert.fail(froms.length != tos.length, "参数对应数量不等");
+        List<LmsProperty> saveList = new ArrayList<>();
+        for (int i = 0; i < froms.length; i++) {
+            List<LmsProperty> dbs = baseMapper.selectLmsPropertyList(froms[i]);
+            if (CollectionUtils.isNotEmpty(dbs)) {
+                int sort = 1;
+                for (LmsProperty p : dbs) {
+                    p.setId(IdWorker.getId());
+                    p.setType(tos[i]);
+                    p.setSort(sort);
+                    sort++;
+                }
+                saveList.addAll(dbs);
+            }
+        }
+        return CollectionUtils.isEmpty(saveList) || saveBatch(saveList);
+    }
+
+    @Override
+    public List<LmsProperty> getListByType(List<String> typeList) {
+        return baseMapper.selectLmsPropertyLists(typeList);
+    }
+
+    @Override
+    public List<LmsProperty> getListByTypeCompanyId(List<String> typeList, Long companyId) {
+        return baseMapper.selectLmsPropertyCompanyIdLists(typeList, companyId);
+    }
+}

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

-package com.patzn.cloud.service.lims.common;
-
-import com.aspose.cells.SaveFormat;
-import com.aspose.cells.Workbook;
-import com.baomidou.mybatisplus.toolkit.CollectionUtils;
-import com.patzn.cloud.commons.toolkit.DateUtils;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.util.Date;
-import java.util.List;
-
-public class AsposeUtil {
-    protected static final Logger logger = LoggerFactory.getLogger(AsposeUtil.class);
-    public static File mergeWork(String name,Workbook workbook, List<Workbook> workbooksList){
-        if (CollectionUtils.isEmpty(workbooksList)){
-            return null;
-        }
-        FileOutputStream fileOutputStream=null;
-        FileOutputStream fileOut=null;
-        try {
-
-            logger.error("mergeWork----------1");
-            for (Workbook book:workbooksList) {
-                workbook.combine(book);
-            }
-            logger.error("mergeWork----------2");
-
-            File tempFile = File.createTempFile(DateUtils.toYearMonthDayEasy(new Date())+"shiyan",".xlsx");
-            logger.error("mergeWork----------3");
-            fileOut =new FileOutputStream(tempFile);
-            logger.error("mergeWork----------4");
-            workbook.save(fileOut, SaveFormat.XLSX);
-            logger.error("mergeWork----------5");
-
-            XSSFWorkbook workbookOk = new XSSFWorkbook(tempFile);
-            workbookOk.setActiveSheet(0);
-            workbookOk.removeSheetAt(workbookOk.getNumberOfSheets()-1);
-            logger.error("mergeWork----------6");
-            File file = File.createTempFile(DateUtils.toYearMonthDayEasy(new Date())+name,".xlsx");
-            logger.error("mergeWork----------7");
-            fileOutputStream=new FileOutputStream(file);
-            workbookOk.write(fileOutputStream);
-            fileOut.flush();
-            return  file;
-        }catch (Exception e){
-            logger.error("合并EXCEL失败"+e.getMessage());
-            e.printStackTrace();
-        }finally {
-            try {
-                if (null !=fileOut){
-                    fileOut.close();
-                }
-
-                if (null !=fileOutputStream){
-                    fileOutputStream.close();
-                }
-            }catch (Exception e){
-
-            }
-
-        }
-
-
-
-        return null;
-
-    }
-}

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

+package com.patzn.cloud.service.lims.common;
+
+import org.apache.commons.beanutils.ConvertUtils;
+import org.apache.commons.beanutils.converters.DateConverter;
+import org.springframework.beans.BeanWrapper;
+import org.springframework.beans.BeanWrapperImpl;
+
+import java.beans.PropertyDescriptor;
+import java.util.HashSet;
+import java.util.Set;
+
+public class BeanUtils {
+
+    public static String[] getNullPropertyNames(Object source) {
+        final BeanWrapper src = new BeanWrapperImpl(source);
+        PropertyDescriptor[] pds = src.getPropertyDescriptors();
+        Set<String> emptyNames = new HashSet<>();
+        for (PropertyDescriptor pd : pds) {
+            Object srcValue = src.getPropertyValue(pd.getName());
+            if (srcValue == null)
+                emptyNames.add(pd.getName());
+        }
+        String[] result = new String[emptyNames.size()];
+        return emptyNames.toArray(result);
+    }
+
+    public static void copyProperties(Object source, Object target) {
+        copyProperties(source, target, null);
+    }
+
+    public static void copyProperties(Object source, Object target, Boolean ignoreNull) {
+        ConvertUtils.register(new DateConverter(null), java.util.Date.class);
+        String[] ignoreArr = null != ignoreNull && ignoreNull.booleanValue() ? getNullPropertyNames(source) : null;
+        org.springframework.beans.BeanUtils.copyProperties(source, target, ignoreArr);
+    }
+
+}

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/common/DateKit.java

+package com.patzn.cloud.service.lims.common;
+
+import com.patzn.cloud.commons.constant.CommonConstants;
+
+import java.time.*;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class DateKit {
+
+    public static final String FORMAT_DEFAULT = "yyyy-MM-dd HH:mm:ss";
+
+    public static LocalDate date2Local(Date date) {
+        if (null == date) {
+            return null;
+        }
+        return date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+    }
+
+    public static Date local2Date(LocalDate localDate) {
+        if (null == localDate) {
+            return null;
+        }
+        ZonedDateTime zonedDateTime = localDate.atStartOfDay(ZoneId.systemDefault());
+        return Date.from(zonedDateTime.toInstant());
+    }
+
+
+    public static LocalDateTime date2LocalDateTime(Date date) {
+        if (null == date) {
+            return null;
+        }
+        Instant instant = date.toInstant();
+        ZoneId zone = ZoneId.systemDefault();
+        return LocalDateTime.ofInstant(instant, zone);
+    }
+
+
+    public static LocalTime date2LocalTime(Date date) {
+        LocalDateTime localDateTime = date2LocalDateTime(date);
+        return localDateTime.toLocalTime();
+    }
+
+    public static Integer monthsBetweenTwoDates(Date start, Date end) {
+        if (null == start || null == end) {
+            return null;
+        }
+        return monthsBetweenTwoDates(date2Local(start), date2Local(end));
+    }
+
+    public static Integer monthsBetweenTwoDates(LocalDate start, LocalDate end) {
+        if (null == start || null == end) {
+            return null;
+        }
+        return Period.between(start, end).getMonths();
+    }
+
+    public static Integer daysBetweenTwoDates(Date start, Date end) {
+        return daysBetweenTwoDates(date2Local(start), date2Local(end));
+    }
+
+    public static Integer daysBetweenTwoDates(LocalDate start, LocalDate end) {
+        if (null == start || null == end) {
+            return null;
+        }
+        return Period.between(start, end).getDays();
+    }
+
+    public static String getYearMonth(LocalDate date) {
+        if (null == date) {
+            return null;
+        }
+        return date.format(DateTimeFormatter.ofPattern("yyyy-MM"));
+    }
+
+    public static List<String> monthStrBetweenTwoDates(LocalDate start, LocalDate end) {
+        if (null == start || null == end) {
+            return null;
+        }
+        List<String> monthList = new ArrayList<>();
+        Period diff = Period.between(start, end);
+        int months = diff.getYears() * 12 + diff.getMonths();
+        for (int i = 0; i < months; i++) {
+            monthList.add(getYearMonth(start.plusMonths(i)));
+        }
+        return monthList;
+    }
+
+    public static List<String> dateBetweenTwoDates(LocalDate start, LocalDate end) {
+        if (null == start || null == end) {
+            return null;
+        }
+        String pattern = CommonConstants.YEAR_MONTH_DAY;
+        List<String> dateList = new ArrayList<>();
+        LocalDate localDate = start;
+        while (localDate.isBefore(end)) {
+            dateList.add(localDate.format(DateTimeFormatter.ofPattern(pattern)));
+            localDate = localDate.plusDays(1);
+        }
+        return dateList;
+    }
+
+    public static List<String> dateInMonth(String yearMonth) {
+        LocalDate start = LocalDate.parse(yearMonth + "-01", DateTimeFormatter.ofPattern(CommonConstants.YEAR_MONTH_DAY));
+        return dateBetweenTwoDates(start, start.plusMonths(1));
+    }
+
+    /**
+     * 根据当前系统时间获取班次
+     *
+     * @return
+     */
+    public static String getShiftByNow() {
+        // 根据当前系统时间获取班次
+        return getShiftByDate(new Date());
+    }
+
+    /**
+     * 根据时间获取班次
+     *
+     * @param date
+     * @return
+     */
+    public static String getShiftByDate(Date date) {
+        if (null == date) {
+            return null;
+        }
+        LocalTime now = date2LocalTime(date);
+        LocalTime zero = LocalTime.parse("00:00:00");
+        LocalTime eight = LocalTime.parse("08:00:00");
+        LocalTime sixth = LocalTime.parse("16:00:00");
+        String clazz = "C";
+        if (now.isAfter(zero) && now.isBefore(eight)) {
+            clazz = "E";
+        } else if (now.isAfter(eight) && now.isBefore(sixth)) {
+            clazz = "A";
+        }
+        return clazz;
+    }
+}

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

@@ -3,6 +3,9 @@ package com.patzn.cloud.service.lims.common;
 import com.google.common.collect.Lists;
 import com.patzn.cloud.commons.enums.IBaseEnum;
 import com.patzn.cloud.commons.toolkit.DateUtils;
+import com.patzn.cloud.service.hmhj.entity.EntrustSampleItemIndex;
+import com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO;
+import com.patzn.cloud.service.hmhj.vo.EntrustSampleVO;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -609,5 +612,37 @@ public class StringHandleUtils {
     }
 
 
+    public static String getFieldValue(String dataAttribute, EntrustSampleVO vo) {
+        if (StringUtils.isBlank(dataAttribute)){
+            return  "";
+        }
+        if (StringHandleUtils.is_alpha(dataAttribute)){
+
 
+              String value=  StringHandleUtils.getFieldIfNummReturnBlankValueByFieldName(dataAttribute,vo);
+              if (StringUtils.isNotBlank(value)){
+                  return   value;
+              }
+                List<EntrustSampleItemIndex> sampleItemVOList = vo.getIndexList();
+                if (CollectionUtils.isEmpty(sampleItemVOList)){
+                    return "";
+                }
+                for (EntrustSampleItemIndex itemVO : sampleItemVOList) {
+                    if (dataAttribute.equals(itemVO.getName())){
+                        return itemVO.getTestValue();
+                    }
+                }
+        }else{
+            List<EntrustSampleItemIndex> sampleItemVOList = vo.getIndexList();
+            if (CollectionUtils.isEmpty(sampleItemVOList)){
+                return "";
+            }
+            for (EntrustSampleItemIndex itemVO : sampleItemVOList) {
+                if (dataAttribute.equals(itemVO.getName())){
+                    return itemVO.getTestValue();
+                }
+            }
+        }
+        return  "";
+    }
 }

src/main/java/com/patzn/cloud/service/lims/common/consts/Symbol.java

+package com.patzn.cloud.service.lims.common.consts;
+
+/**
+ * @title: 标点符号
+ * @author: meazty
+ * @ondate: 2021/8/9 11:43
+ **/
+public class Symbol {
+    public static final String POINT = ".";
+    public static final String COMMA = ",";
+    public static final String COLON = ":";
+    public static final String PAUSE = "...";
+    public static final String PERIOD = "。";
+    public static final String HALT = "、";
+    public static final String COMMA_CN = "，";
+    public static final String SLASH = "/";
+    public static final String BACKSLASH = "\\";
+    public static final String FORWARD = "->";
+}

src/main/java/com/patzn/cloud/service/lims/config/RestTemplateConfig.java

+package com.patzn.cloud.service.lims.config;
+
+import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestTemplate;
+
+
+/**
+ * @author Meazty
+ */
+@Configuration
+public class RestTemplateConfig {
+
+    @Bean
+    public RestTemplate restTemplate(RestTemplateBuilder builder) {
+        return builder.build();
+    }
+
+}
+
+

src/main/java/com/patzn/cloud/service/lims/config/ServiceProperties.java

@@ -21,6 +21,19 @@ public class ServiceProperties {
 
     private String url;
 
+    private String apiUrl;
+
+    private String erpUrl;
+
+    private String erpToken;
+
+    private String wmsUrl;
+
+    private String foodUrl;
+
+    private String staticUrl;
+
+    private String provinceItemUrl;
 
     public String getSoffice() {
         return soffice;
@@ -37,4 +50,64 @@ public class ServiceProperties {
     public void setUrl(String url) {
         this.url = url;
     }
+
+    public String getApiUrl() {
+        return apiUrl;
+    }
+
+    public void setApiUrl(String apiUrl) {
+        this.apiUrl = apiUrl;
+    }
+
+    public String getErpUrl() {
+        return erpUrl;
+    }
+
+    public void setErpUrl(String erpUrl) {
+        this.erpUrl = erpUrl;
+    }
+
+    public String getErpToken() {
+        return erpToken;
+    }
+
+    public void setErpToken(String erpToken) {
+        this.erpToken = erpToken;
+    }
+
+    public String getWmsUrl() {
+        return wmsUrl;
+    }
+
+    public void setWmsUrl(String wmsUrl) {
+        this.wmsUrl = wmsUrl;
+    }
+
+    public String getFoodUrl() {
+        return foodUrl;
+    }
+
+    public void setFoodUrl(String foodUrl) {
+        this.foodUrl = foodUrl;
+    }
+
+    public String getStaticUrl() {
+        return staticUrl;
+    }
+
+    public void setStaticUrl(String staticUrl) {
+        this.staticUrl = staticUrl;
+    }
+
+    public String getProvinceItemUrl() {
+        return provinceItemUrl;
+    }
+
+    public void setProvinceItemUrl(String provinceItemUrl) {
+        this.provinceItemUrl = provinceItemUrl;
+    }
+
+    public String buildWmsUrl(String method) {
+        return this.wmsUrl + method;
+    }
 }

src/main/java/com/patzn/cloud/service/lims/excel/controller/ExcelController.java

@@ -43,6 +43,8 @@ public class ExcelController extends ServiceController {
         ExcelController.TPL.put("MeterSendSampleImport", "出检样品导入模板");
         ExcelController.TPL.put("SoilEntrustImport", "试验委托单导入模板");
         ExcelController.TPL.put("SoilAptExpImport", "试样项目导入模板");
+        ExcelController.TPL.put("ContractImport", "合同导入模板");
+        ExcelController.TPL.put("ContractSampleImport", "报验单导入模板");
 
 
         ExcelController.TPL.put("TenderContractSupplement.docx", "标书合同（协议）补充单.docx");

src/main/java/com/patzn/cloud/service/lims/hmhj/common/EntrustFlowUtils.java

+package com.patzn.cloud.service.lims.hmhj.common;
+
+import com.baomidou.mybatisplus.toolkit.CollectionUtils;
+import com.patzn.cloud.commons.api.RestAssert;
+import com.patzn.cloud.service.hmhj.enums.*;
+import com.patzn.cloud.service.lims.common.consts.Symbol;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 委托流程控制（状态控制）
+ *
+ * @author Meazty
+ */
+public class EntrustFlowUtils {
+
+    private static final Logger logger = LoggerFactory.getLogger(EntrustFlowUtils.class);
+    private static final int FLOW_TEST = 7;
+    private static final int FLOW_ALLOT = 6;
+    private static final int FLOW_RECEIVE = 5;
+
+    public static final String SEQ = Symbol.FORWARD;
+
+    public static List<String> getFlowStatusList(String statusPath) {
+        if (StringUtils.isBlank(statusPath)) {
+            return null;
+        }
+        return Arrays.asList(statusPath.split(SEQ));
+    }
+
+    public static EntrustFlowEnum getPrevFlowStatus(String name, String statusPath) {
+        if (StringUtils.isBlank(name) || StringUtils.isBlank(statusPath)) {
+            return null;
+        }
+
+        List<String> list = getFlowStatusList(statusPath);
+
+        if (CollectionUtils.isEmpty(list)) {
+            return null;
+        }
+        int index = list.indexOf(name);
+
+        RestAssert.fail(-1 == index,
+                String.format("状态路径【%s】中不存在【%s】节点！",
+                        statusPathName(list),
+                        EntrustFlowEnum.convert(name).getDisplay()
+                )
+        );
+
+        if (0 == index) {
+            return null;
+        }
+        return EntrustFlowEnum.convert(list.get(index - 1));
+    }
+
+    public static EntrustStatusEnum getPrevStatus(String name, String statusPath) {
+        EntrustFlowEnum prevFlowEnum = getPrevFlowStatus(name, statusPath);
+        return null == prevFlowEnum ? null : getStatus(prevFlowEnum.getValue());
+    }
+
+    public static EntrustStatusEnum getStatus(EntrustFlowEnum flowEnum) {
+        return null == flowEnum ? null : getStatus(flowEnum.getValue());
+    }
+
+    public static EntrustFlowEnum getNextFlowStatus(String name, String statusPath) {
+        if (StringUtils.isBlank(name)) {
+            return null;
+        }
+        List<String> list = getFlowStatusList(statusPath);
+        if (CollectionUtils.isEmpty(list)) {
+            return null;
+        }
+        int index = list.indexOf(name);
+
+        RestAssert.fail(-1 == index,
+                String.format("状态路径【%s】中不存在【%s】节点！",
+                        statusPathName(list),
+                        EntrustFlowEnum.convert(name).getDisplay()
+                )
+        );
+
+        if (list.size() - 1 == index) {
+            return null;
+        }
+        return EntrustFlowEnum.convert(list.get(index + 1));
+    }
+
+    /**
+     * @param name       节点名称
+     * @param statusPath 状态路径
+     * @return EntrustStatusEnum
+     */
+    public static EntrustStatusEnum getNextStatus(String name, String statusPath) {
+        EntrustFlowEnum flowEnum = getNextFlowStatus(name, statusPath);
+        return null == flowEnum ? null : getStatus(flowEnum.getValue());
+    }
+
+    /**
+     * 根据流程状态值获取委托状态
+     *
+     * @param flowValue 流程节点值
+     * @return EntrustStatusEnum
+     */
+    public static EntrustStatusEnum getStatus(int flowValue) {
+        EntrustStatusEnum statusEnum = null;
+        switch (flowValue) {
+            case 1:
+                statusEnum = EntrustStatusEnum.DRAFT;
+                break;
+            case 2:
+                statusEnum = EntrustStatusEnum.OUT_DRAFT;
+                break;
+            case 3:
+                statusEnum = EntrustStatusEnum.CHECK;
+                break;
+            case 4:
+                statusEnum = EntrustStatusEnum.MAKE;
+                break;
+            case 5:
+            case 6:
+            case 7:
+            case 8:
+            case 9:
+            case 10:
+            case 11:
+            case 12:
+            case 13:
+                statusEnum = EntrustStatusEnum.TEST;
+                break;
+            case 14:
+            case 15:
+                statusEnum = EntrustStatusEnum.QUALITY_CHECK;
+                break;
+            default:
+        }
+        return statusEnum;
+    }
+
+    public static boolean contains(String flowStatus, String statusPath) {
+        if (StringUtils.isBlank(statusPath) || StringUtils.isBlank(flowStatus)) {
+            return false;
+        }
+        return Arrays.asList(statusPath.split(SEQ)).contains(flowStatus);
+    }
+
+    public static EntrustSampleStatusEnum getSampleStatus(EntrustFlowEnum flowEnum) {
+        if (null == flowEnum) {
+            return null;
+        }
+        int flowStatus = flowEnum.getValue();
+        EntrustSampleStatusEnum sampleStatusEnum = null;
+        switch (flowStatus) {
+            case 1:
+            case 2:
+            case 3:
+            case 4:
+                sampleStatusEnum = EntrustSampleStatusEnum.DRAFT;
+                break;
+            case 5:
+                sampleStatusEnum = EntrustSampleStatusEnum.RECEIVE;
+                break;
+            case 6:
+            case 7:
+                sampleStatusEnum = EntrustSampleStatusEnum.TEST;
+                break;
+            case 8:
+                sampleStatusEnum = EntrustSampleStatusEnum.REPORT_MAKE;
+                break;
+            case 9:
+                sampleStatusEnum = EntrustSampleStatusEnum.REPORT_CHECK;
+                break;
+            case 10:
+                sampleStatusEnum = EntrustSampleStatusEnum.REPORT_ALLOW;
+                break;
+            case 11:
+                sampleStatusEnum = EntrustSampleStatusEnum.REPORT_ISSUE;
+                break;
+            case 12:
+                sampleStatusEnum = EntrustSampleStatusEnum.REPORT_SEND;
+                break;
+            case 13:
+                sampleStatusEnum = EntrustSampleStatusEnum.QUALITY_INSPECT;
+                break;
+            case 14:
+            case 15:
+                sampleStatusEnum = EntrustSampleStatusEnum.END;
+                break;
+            default:
+        }
+        return sampleStatusEnum;
+    }
+
+    public static EntrustSampleItemStatusEnum getItemStatus(EntrustFlowEnum flowEnum) {
+        if (null == flowEnum) {
+            return null;
+        }
+        int flowStatus = flowEnum.getValue();
+        EntrustSampleItemStatusEnum itemStatusEnum;
+        if (flowStatus > FLOW_TEST) {
+            itemStatusEnum = EntrustSampleItemStatusEnum.END;
+        } else if (flowStatus > FLOW_ALLOT) {
+            itemStatusEnum = EntrustSampleItemStatusEnum.TEST;
+        } else if (flowStatus > FLOW_RECEIVE) {
+            itemStatusEnum = EntrustSampleItemStatusEnum.ALLOT;
+        } else {
+            itemStatusEnum = EntrustSampleItemStatusEnum.DRAFT;
+        }
+        return itemStatusEnum;
+    }
+
+    public static EntrustReportStatusEnum getReportStatus(EntrustFlowEnum flowEnum) {
+        if (null == flowEnum) {
+            return null;
+        }
+        if (flowEnum == EntrustFlowEnum.REPORT_MAKE) {
+            return EntrustReportStatusEnum.MAKING;
+        } else if (flowEnum == EntrustFlowEnum.REPORT_CHECK) {
+            return EntrustReportStatusEnum.CHECK;
+        } else if (flowEnum == EntrustFlowEnum.REPORT_ALLOW) {
+            return EntrustReportStatusEnum.ALLOW;
+        } else if (flowEnum == EntrustFlowEnum.REPORT_ISSUE) {
+            return EntrustReportStatusEnum.ISSUE;
+        } else if (flowEnum == EntrustFlowEnum.REPORT_SEND) {
+            return EntrustReportStatusEnum.SEND;
+        } else if (flowEnum == EntrustFlowEnum.QUALITY_INSPECT) {
+            return EntrustReportStatusEnum.INSPECT;
+        } else if (flowEnum == EntrustFlowEnum.QUALITY_JUDGE) {
+            return EntrustReportStatusEnum.END;
+        } else if (flowEnum == EntrustFlowEnum.ARCHIVES) {
+            return EntrustReportStatusEnum.END;
+        }
+        return null;
+    }
+
+    public static String statusPathName(List<String> list) {
+        if (CollectionUtils.isEmpty(list)) {
+            return "";
+        }
+        return list.stream().map(t -> {
+            try {
+                EntrustFlowEnum flowEnum = EntrustFlowEnum.convert(t);
+                return flowEnum.getDisplay();
+            } catch (Exception e) {
+                logger.error("类型转换错误");
+            }
+            return t;
+        }).collect(Collectors.joining(SEQ));
+    }
+
+    public static String statusPathName(String statusPath) {
+        if (StringUtils.isBlank(statusPath)) {
+            return "";
+        }
+        return statusPathName(Arrays.asList(statusPath.split(SEQ)));
+    }
+}

src/main/java/com/patzn/cloud/service/lims/hmhj/common/LabreOfficeUtil.java

+package com.patzn.cloud.service.lims.hmhj.common;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.*;
+
+
+public class LabreOfficeUtil {
+    private static final Logger logger = LoggerFactory.getLogger(LabreOfficeUtil.class);
+    public static void main(String[] args) {
+       convertOffice2PDF("D:/program/libreoffice",new File("D:/二氧化碳.xlsx"));
+    }
+
+
+    public static File inputStream2File (InputStream is)  {
+        File file = null;
+        try {
+            file = File.createTempFile("original",".xlsx");
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        OutputStream os = null;
+        try {
+            try {
+                os = new FileOutputStream(file);
+                int len = 0;
+                byte[] buffer = new byte[8192];
+
+                while ((len = is.read(buffer)) != -1) {
+                    os.write(buffer, 0, len);
+                }
+            } catch (FileNotFoundException e) {
+                e.printStackTrace();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+        } finally {
+            try {
+                if (null!=os)
+                    os.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            try {
+                if (null!=is)
+                    is.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+
+        return file;
+    }
+
+    public static synchronized File convertOffice2PDF(String url,File inputFile){
+        long start = System.currentTimeMillis();
+        boolean flag;
+
+        String parent= inputFile.getParent();
+        String pdfFile = parent+"/"+(inputFile.getName().replace(".xlsx",".pdf"));
+
+//        String osName = System.getProperty("os.name");
+//        if (osName.contains("Windows")) {
+//       }else {
+//            command = "libreoffice --headless --invisible --convert-to pdf:writer_pdf_Export " + inputFile + " --outdir " + pdfFile;
+//        }
+
+        String osName = System.getProperty("os.name");
+        String command="";
+        if(osName.contains("win")||osName.contains("Win")){
+            command  = "cmd /c soffice --headless --invisible --convert-to pdf " + inputFile.getPath() + " --outdir " + parent;
+            flag = executeLibreOfficeCommand(command,url);
+        }else{
+            command = "libreoffice6.2 --headless --invisible --convert-to pdf:writer_pdf_Export " + inputFile.getPath() + " --outdir " + parent;
+            flag = executeLibreOfficeCommand(command);
+        }
+        long end = System.currentTimeMillis();
+        logger.debug("用时:{} ms", end - start);
+        if (true){
+           return new File(pdfFile);
+        }
+        return null;
+    }
+
+
+    public static synchronized File convertOfficeWord2PDF(String url,File inputFile){
+        long start = System.currentTimeMillis();
+        boolean flag;
+
+        String parent= inputFile.getParent();
+        String pdfFile = parent+"/"+(inputFile.getName().replace(".docx",".pdf"));
+
+//        String osName = System.getProperty("os.name");
+//        if (osName.contains("Windows")) {
+//       }else {
+//            command = "libreoffice --headless --invisible --convert-to pdf:writer_pdf_Export " + inputFile + " --outdir " + pdfFile;
+//        }
+
+        String osName = System.getProperty("os.name");
+        String command="";
+        if(osName.contains("win")||osName.contains("Win")){
+            command  = "cmd /c soffice --headless --invisible --convert-to pdf " + inputFile.getPath() + " --outdir " + parent;
+            flag = executeLibreOfficeCommand(command,url);
+        }else{
+            command = "libreoffice6.2 --headless --invisible --convert-to pdf:writer_pdf_Export " + inputFile.getPath() + " --outdir " + parent;
+            flag = executeLibreOfficeCommand(command);
+        }
+        long end = System.currentTimeMillis();
+        logger.debug("用时:{} ms", end - start);
+        if (true){
+            return new File(pdfFile);
+        }
+        return null;
+    }
+
+    /**
+     * 执行command指令
+     * @param command
+     * @return
+     */
+    public static boolean executeLibreOfficeCommand(String command,String url) {
+        logger.info("开始进行转化.......");
+        Process process;// Process可以控制该子进程的执行或获取该子进程的信息
+        try {
+            logger.debug("convertOffice2PDF cmd : {}", command);
+            process = Runtime.getRuntime().exec(command,null,new File(url+"/program"));// exec()方法指示Java虚拟机创建一个子进程执行指定的可执行程序，并返回与该子进程对应的Process对象实例。
+            // 下面两个可以获取输入输出流
+//            InputStream errorStream = process.getErrorStream();
+//            InputStream inputStream = process.getInputStream();
+        } catch (IOException e) {
+            logger.error(" convertOffice2PDF {} error", command, e);
+            return false;
+        }
+        int exitStatus = 0;
+        try {
+            exitStatus = process.waitFor();// 等待子进程完成再往下执行，返回值是子线程执行完毕的返回值,返回0表示正常结束
+            // 第二种接受返回值的方法
+            int i = process.exitValue(); // 接收执行完毕的返回值
+            logger.debug("i----" + i);
+        } catch (InterruptedException e) {
+            logger.error("InterruptedException  convertOffice2PDF {}", command, e);
+            return false;
+        }
+        if (exitStatus != 0) {
+            logger.error("convertOffice2PDF cmd exitStatus {}", exitStatus);
+        } else {
+            logger.debug("convertOffice2PDF cmd exitStatus {}", exitStatus);
+        }
+        process.destroy(); // 销毁子进程
+        logger.info("转化结束.......");
+        return true;
+    }
+
+
+    public static boolean executeLibreOfficeCommand(String command) {
+        logger.info("开始进行转化.......");
+        Process process;// Process可以控制该子进程的执行或获取该子进程的信息
+        try {
+            logger.debug("convertOffice2PDF cmd : {}", command);
+            process = Runtime.getRuntime().exec(command);// exec()方法指示Java虚拟机创建一个子进程执行指定的可执行程序，并返回与该子进程对应的Process对象实例。
+            // 下面两个可以获取输入输出流
+//            InputStream errorStream = process.getErrorStream();
+//            InputStream inputStream = process.getInputStream();
+        } catch (IOException e) {
+            logger.error(" convertOffice2PDF {} error", command, e);
+            return false;
+        }
+        int exitStatus = 0;
+        try {
+            exitStatus = process.waitFor();// 等待子进程完成再往下执行，返回值是子线程执行完毕的返回值,返回0表示正常结束
+            // 第二种接受返回值的方法
+            int i = process.exitValue(); // 接收执行完毕的返回值
+            logger.debug("i----" + i);
+        } catch (InterruptedException e) {
+            logger.error("InterruptedException  convertOffice2PDF {}", command, e);
+            return false;
+        }
+        if (exitStatus != 0) {
+            logger.error("convertOffice2PDF cmd exitStatus {}", exitStatus);
+        } else {
+            logger.debug("convertOffice2PDF cmd exitStatus {}", exitStatus);
+        }
+        process.destroy(); // 销毁子进程
+        logger.info("转化结束.......");
+        return true;
+    }
+
+
+}

src/main/java/com/patzn/cloud/service/lims/hmhj/common/OkHttpUtils.java

+package com.patzn.cloud.service.lims.hmhj.common;
+
+import com.patzn.cloud.commons.api.RestAssert;
+import com.patzn.cloud.commons.constant.CommonConstants;
+import com.patzn.cloud.service.lims.hmhj.common.consts.HttpConst;
+import okhttp3.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * okHttpUtils
+ *
+ * @author: meazty
+ * @since: 2022/2/14 12:58
+ **/
+public class OkHttpUtils {
+
+    private static final Logger logger = LoggerFactory.getLogger(OkHttpUtils.class);
+
+    private static final MediaType MEDIA_TYPE_JSON = MediaType.parse(CommonConstants.CONTENT_TYPE_JSON);
+
+    public static String sendByPostJson(String url, String token, String json) {
+
+        logger.error("DO====SEND====DATA==== 准备组装数据。");
+        RequestBody body = RequestBody.create(MEDIA_TYPE_JSON, json);
+        Request request = new Request.Builder()
+                .url(url)
+                .post(body)
+                .addHeader("Content-Type", HttpConst.CONTENT_TYPE)
+                .addHeader("Accept-Encoding", HttpConst.ACCEPT_ENCODING)
+                .addHeader("token", token)
+                .build();
+
+        OkHttpClient client = new OkHttpClient()
+                .newBuilder()
+                .connectTimeout(10, TimeUnit.SECONDS)
+                .readTimeout(120, TimeUnit.SECONDS)
+                .build();
+
+        try {
+            logger.error("DO====SEND====ERPS==== 装备发送了。");
+            Response response = client.newCall(request).execute();
+            if (null == response.body()) {
+                logger.error("SEND====ERP====RESULT==== 响应结果体为空。");
+                return null;
+            }
+            String result = response.body().string();
+            logger.error("GET====ERP====RESULT==== ：{}", result);
+            return result;
+        } catch (IOException e) {
+            logger.error("SEND====DATA====EXCEPTION====: {}", e.getMessage());
+            logger.error(e.getMessage(), e.getCause());
+            RestAssert.fail("发送异常，请检查网络是否畅通！");
+        }
+        return null;
+    }
+
+}

src/main/java/com/patzn/cloud/service/lims/hmhj/common/RestTemplateUtils.java

+package com.patzn.cloud.service.lims.hmhj.common;
+
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Component;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @author Meazty
+ */
+@Component
+public class RestTemplateUtils {
+
+    private static RestTemplate restTemplate;
+
+    public RestTemplateUtils(RestTemplate restTemplate) {
+        RestTemplateUtils.restTemplate = restTemplate;
+    }
+
+    public static String sendSimple(String url) {
+        return sendSimple(url, null, HttpMethod.GET, new HttpHeaders());
+    }
+
+    public static String sendSimple(String url, Map<String, ?> urlParam) {
+        return sendSimple(url, urlParam, HttpMethod.GET);
+    }
+
+    public static String sendSimple(String url, Map<String, ?> urlParam, HttpHeaders headers) {
+        return sendSimple(url, urlParam, HttpMethod.GET, headers);
+    }
+
+    public static String sendSimple(String url, Map<String, ?> urlParam, HttpMethod method) {
+        return sendSimple(url, urlParam, method, new HttpHeaders());
+    }
+
+    /**
+     * 发送简单请求，不含body
+     *
+     * @param url      url
+     * @param urlParam 用?和&拼接在url后面的参数
+     * @param method   请求方式
+     * @param headers  请求头
+     * @return body
+     */
+    public static String sendSimple(String url, Map<String, ?> urlParam, HttpMethod method, HttpHeaders headers) {
+        if (urlParam == null) {
+            urlParam = new HashMap<>(0);
+        }
+        // url参数拼接
+        url = handleUrlParam(url, urlParam);
+
+        HttpEntity<MultiValueMap<String, ?>> requestEntity = new HttpEntity<>(null, headers);
+
+        return restTemplate.exchange(url, method, requestEntity, String.class, urlParam).getBody();
+    }
+
+    public static String sendForm(String url, Map<String, ?> body) {
+        return sendForm(url, null, body, HttpMethod.POST, new HttpHeaders());
+    }
+
+    public static String sendForm(String url, Map<String, ?> urlParam, Map<String, ?> body) {
+        return sendForm(url, urlParam, body, HttpMethod.POST, new HttpHeaders());
+    }
+
+    public static String sendForm(String url, Map<String, ?> urlParam, Map<String, ?> body, HttpMethod method) {
+        return sendForm(url, urlParam, body, method, new HttpHeaders());
+    }
+
+    public static String sendForm(String url, Map<String, ?> urlParam, Map<String, ?> body,
+                                  HttpMethod method, HttpHeaders headers) {
+        headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+        return send(url, urlParam, body, method, headers);
+    }
+
+    public static String sendJson(String url, Map<String, ?> body) {
+        return sendJson(url, null, body, HttpMethod.POST, new HttpHeaders());
+    }
+
+    public static String sendJson(String url, Map<String, ?> urlParam, Map<String, ?> body) {
+        return sendJson(url, urlParam, body, HttpMethod.POST, new HttpHeaders());
+    }
+
+    public static String sendJson(String url, Map<String, ?> urlParam, Map<String, ?> body, HttpMethod method) {
+        return sendJson(url, urlParam, body, method, new HttpHeaders());
+    }
+
+    public static String sendJson(String url, Map<String, ?> urlParam, Map<String, ?> body,
+                                  HttpMethod method, HttpHeaders headers) {
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        return send(url, urlParam, body, method, headers);
+    }
+
+    /**
+     * 复杂请求发送
+     *
+     * @param url      url
+     * @param urlParam 用?和&拼接在url后面的参数
+     * @param body     请求体
+     * @param method   请求方式
+     * @param headers  请求头
+     * @return body
+     */
+    public static String send(String url, Map<String, ?> urlParam, Map<String, ?> body, HttpMethod method,
+                              HttpHeaders headers) {
+        if (urlParam == null) {
+            urlParam = new HashMap<>(0);
+        }
+        // url参数拼接
+        url = handleUrlParam(url, urlParam);
+
+        HttpEntity<Map<String, ?>> requestEntity = null;
+        if (Objects.equals(headers.getContentType(), MediaType.APPLICATION_JSON)) {
+            requestEntity = new HttpEntity<>(body, headers);
+        }
+        if (Objects.equals(headers.getContentType(), MediaType.APPLICATION_FORM_URLENCODED)) {
+            // body参数处理
+            MultiValueMap<String, Object> param = new LinkedMultiValueMap<>();
+            Iterator<? extends Map.Entry<String, ?>> iterator = body.entrySet().iterator();
+            while (iterator.hasNext()) {
+                Map.Entry<String, ?> next = iterator.next();
+                param.add(next.getKey(), next.getValue());
+            }
+            requestEntity = new HttpEntity<>(param, headers);
+        }
+
+        return restTemplate.exchange(url, method, requestEntity, String.class, urlParam).getBody();
+    }
+
+    /**
+     * url参数拼接
+     *
+     * @param url
+     * @param urlParam
+     * @return
+     */
+    private static String handleUrlParam(String url, Map<String, ?> urlParam) {
+        if (urlParam == null || urlParam.isEmpty()) {
+            return url;
+        }
+        Iterator<? extends Map.Entry<String, ?>> iterator = urlParam.entrySet().iterator();
+        StringBuilder urlBuilder = new StringBuilder(url);
+        urlBuilder.append("?");
+        while (iterator.hasNext()) {
+            Map.Entry<String, ?> entry = iterator.next();
+            urlBuilder.append(entry.getKey()).append("={").append(entry.getKey()).append("}").append("&");
+        }
+        urlBuilder.deleteCharAt(urlBuilder.length() - 1);
+        return urlBuilder.toString();
+    }
+}
+

src/main/java/com/patzn/cloud/service/lims/hmhj/common/WmsRequest.java

+package com.patzn.cloud.service.lims.hmhj.common;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.patzn.cloud.commons.toolkit.JacksonUtils;
+import com.patzn.cloud.service.hmhj.model.WmsRespResult;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Map;
+
+/**
+ * @author Meazty
+ */
+public class WmsRequest {
+
+    private static final Logger logger = LoggerFactory.getLogger(WmsRequest.class);
+
+    public static <T> T sendJson(String url, Map<String, ?> params, TypeReference<WmsRespResult<T>> typeReference) {
+        try {
+            String resultStr = RestTemplateUtils.sendJson(url, params);
+            if (StringUtils.isBlank(resultStr)) {
+                logger.error("✦✦✦✦ WmsRequest ✦✦✦✦ sendJson ✦✦✦✈ WMS响应结果为空!");
+                return null;
+            }
+            WmsRespResult<T> result = JacksonUtils.readValue(resultStr, typeReference);
+            if (!WmsRespResult.isSuccess(result)) {
+                logger.error("✦✦✦✦ WmsRequest ✦✦✦✦ sendJson ✦✦✦✈ 请求WMS接口失败：{}", JacksonUtils.toJSONString(result));
+                return null;
+            }
+            T data = result.getData();
+            logger.info("✦✦✦✦ WmsRequest ✦✦✦✦ sendJson ✦✦✦✈ [url, params]: {}", JacksonUtils.toJSONString(data.toString()));
+            return data;
+        } catch (Exception e) {
+            logger.error("✦✦✦✦ WmsRequest ✦✦✦✦ sendJson ✦✦✦✈ 请求WMS接口异常：", e);
+        }
+        return null;
+    }
+
+    public static WmsRespResult sendJson(String url, Map<String, ?> params) {
+        try {
+            String resultStr = RestTemplateUtils.sendJson(url, params);
+            if (StringUtils.isBlank(resultStr)) {
+                logger.error("✦✦✦✦ WmsRequest ✦✦✦✦ sendJson ✦✦✦✈ WMS响应结果为空!");
+                return null;
+            }
+            WmsRespResult result = JacksonUtils.readValue(resultStr, new TypeReference<WmsRespResult>() {
+            });
+            if (!WmsRespResult.isSuccess(result)) {
+                logger.error("✦✦✦✦ WmsRequest ✦✦✦✦ sendJson ✦✦✦✈ 请求WMS接口失败：{}", JacksonUtils.toJSONString(result));
+                return null;
+            }
+            return result;
+        } catch (Exception e) {
+            logger.error("✦✦✦✦ WmsRequest ✦✦✦✦ sendJson ✦✦✦✈ 请求WMS接口异常：", e);
+        }
+        return null;
+    }
+}

src/main/java/com/patzn/cloud/service/lims/hmhj/common/consts/HmConst.java

+package com.patzn.cloud.service.lims.hmhj.common.consts;
+
+/**
+ * @title: 霍煤常量
+ * @author: meazty
+ * @ondate: 2021/8/9 11:49
+ **/
+public class HmConst {
+
+    public static final int MINUS_ONE = -1;
+    public static final int ZERO = 0;
+    public static final int ONE = 1;
+    public static final int TWO = 2;
+    public static final String Y = "是";
+    public static final String N = "否";
+    public static final String PRIMARY_ALUMINUM = "原铝";
+    public static final String ELECTROLYTE = "电解质";
+    public static final String EXTERNAL_INSPECTION_MATERIALS = "外委检测物资";
+    public static final String THIRD_CODE_MATERIALS = "三级编码物资";
+    public static final String EXIST_CODE_MATERIALS = "已有编码物资";
+    public static final String SCATTERED = "散样";
+    public static final String FIRST_PERIOD = "一期";
+    public static final String FIRST_SECOND_PERIOD = "一二期";
+    public static final String SECOND_PERIOD = "二期";
+    public static final String THIRD_PERIOD = "三期";
+    public static final String NO_MATCH = "NO_MATCH";
+
+    public static final String[] STORAGE_BRANCH = {"储运分厂（二期）", "储运分厂（三期）"};
+    public static final String[] PURIFY_BRANCH = {"净化分厂一二期", "净化分厂三期"};
+    public static final String[] PURIFY_ASSAY = {"净化化验一二期", "净化化验三期"};
+    public static final String[] ACCEPTANCE_ROOM = {"二期验收室", "三期验收室"};
+    public static final String[] LABORATORY = {"二期化验室", "三期化验室"};
+    public static final String[] QUALITY_ROOM = {"二期质量室", "三期质量室"};
+}
\ No newline at end of file

src/main/java/com/patzn/cloud/service/lims/hmhj/common/consts/HttpConst.java

+package com.patzn.cloud.service.lims.hmhj.common.consts;
+
+/**
+ * http请求相关常量
+ *
+ * @author: meazty
+ * @since: 2022/2/14 12:42
+ **/
+public class HttpConst {
+
+    public static final String ACCEPT_ENCODING = "identity";
+    public static final String CONTENT_TYPE = "application/json";
+
+    /**
+     * 委托编码同步接口
+     */
+    public static final String WMS_SYNC_WTBH = "/SyncWTbh";
+
+    public static final String WMS_SYNC_STOCK = "/SyncStock";
+
+    public static final String WMS_SYNC_STOCK_SITUATION = "/SyncStockSituation";
+
+}

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/AcceptanceExpertController.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.AcceptanceExpert;
+import com.patzn.cloud.service.lims.hmhj.service.IAcceptanceExpertService;
+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-09-22
+ */
+@Api(tags = "验收专家配置表")
+@RestController
+@RequestMapping("/v1/expert")
+public class AcceptanceExpertController extends ServiceController {
+
+    @Autowired
+    private IAcceptanceExpertService acceptanceExpertService;
+
+    @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<AcceptanceExpert>> getPage(AcceptanceExpert acceptanceExpert) {
+        return success(acceptanceExpertService.page(getPage(), acceptanceExpert));
+    }
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<AcceptanceExpert> get(@PathVariable("id") Long id) {
+        return success(acceptanceExpertService.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, AcceptanceExpert acceptanceExpert) {
+        acceptanceExpert.setId(id);
+        return success(acceptanceExpertService.updateById(acceptanceExpert));
+    }
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+    public RestResult<Boolean> add(AcceptanceExpert acceptanceExpert) {
+        return success(acceptanceExpertService.save(acceptanceExpert));
+    }
+
+    @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(acceptanceExpertService.removeByIds(ids));
+    }
+}

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

+package com.patzn.cloud.service.lims.hmhj.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+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.AnodeSpotCheckLedger;
+import com.patzn.cloud.service.lims.hmhj.service.IAnodeSpotCheckLedgerService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+/**
+ * 阳极组抽检台账 前端控制器
+ *
+ * @author meazty
+ * @since 2021-07-16
+ */
+@Api(tags = "阳极组抽检台账")
+@RestController
+@RequestMapping("/v1/spot_check_ledger")
+public class AnodeSpotCheckLedgerController extends ServiceController {
+
+    @Autowired
+    private IAnodeSpotCheckLedgerService anodeSpotCheckLedgerService;
+
+    @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<AnodeSpotCheckLedger>> getPage(AnodeSpotCheckLedger anodeSpotCheckLedger) {
+        return success(anodeSpotCheckLedgerService.page(getPage(), anodeSpotCheckLedger));
+    }
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<AnodeSpotCheckLedger> get(@PathVariable("id") Long id) {
+        return success(anodeSpotCheckLedgerService.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, AnodeSpotCheckLedger anodeSpotCheckLedger) {
+        anodeSpotCheckLedger.setId(id);
+        return success(anodeSpotCheckLedgerService.updateById(anodeSpotCheckLedger));
+    }
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+    public RestResult<Boolean> add(AnodeSpotCheckLedger anodeSpotCheckLedger) {
+        return success(anodeSpotCheckLedgerService.save(anodeSpotCheckLedger));
+    }
+
+    @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(anodeSpotCheckLedgerService.removeByIds(ids));
+    }
+}

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/BusinessDataController.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.BusinessData;
+import com.patzn.cloud.service.hmhj.enums.BusinessDataEnum;
+import com.patzn.cloud.service.lims.hmhj.service.IBusinessDataService;
+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-08-07
+ */
+@Api(tags = "业务数据表")
+@RestController
+@RequestMapping("/v1/data")
+public class BusinessDataController extends ServiceController {
+
+    @Autowired
+    private IBusinessDataService businessDataService;
+
+    @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<BusinessData>> getPage(BusinessData businessData) {
+        return success(businessDataService.page(getPage(), businessData));
+	}
+
+    @PostMapping("/list_sample_from")
+    public RestResult<List<BusinessData>> getListSampleFrom(BusinessData businessData) {
+        businessData.setBizType(BusinessDataEnum.SAMPLE_SOURCE.getName());
+        return success(businessDataService.list(businessData));
+    }
+
+    @PostMapping("/list_product_standard")
+    public RestResult<List<BusinessData>> getListProductStandard(BusinessData businessData) {
+        businessData.setBizType(BusinessDataEnum.PRODUCT_STANDARD.getName());
+        return success(businessDataService.list(businessData));
+    }
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<BusinessData> get(@PathVariable("id") Long id) {
+        return success(businessDataService.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, BusinessData businessData) {
+        businessData.setId(id);
+        return success(businessDataService.updateById(businessData));
+	}
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+	public RestResult<Boolean> add(BusinessData businessData) {
+        return success(businessDataService.save(businessData));
+	}
+
+    @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(businessDataService.removeByIds(ids));
+	}
+
+    @ApiOperation("批量添加或修改样品来源")
+    @PostMapping("/save_or_update_batch_sample_from")
+    public RestResult<Boolean> saveOrUpdateBatchSampleFrom(@RequestBody String dataJson) {
+        return success(businessDataService.saveOrUpdateBatch(BusinessDataEnum.SAMPLE_SOURCE, dataJson));
+    }
+
+    @ApiOperation("批量添加或修改产品标准")
+    @PostMapping("/save_or_update_batch_project_standard")
+    public RestResult<Boolean> saveOrUpdateBatchProjectStandard(@RequestBody String dataJson) {
+        return success(businessDataService.saveOrUpdateBatch(BusinessDataEnum.PRODUCT_STANDARD, dataJson));
+    }
+}

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/BusinessStaffController.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.BusinessStaff;
+import com.patzn.cloud.service.hmhj.enums.BusinessStaffEnum;
+import com.patzn.cloud.service.lims.hmhj.service.IBusinessStaffService;
+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-08-07
+ */
+@Api(tags = "业务人员表")
+@RestController
+@RequestMapping("/v1/staff")
+public class BusinessStaffController extends ServiceController {
+
+    @Autowired
+    private IBusinessStaffService businessStaffService;
+
+    @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<BusinessStaff>> getPage(BusinessStaff businessStaff) {
+        return success(businessStaffService.page(getPage(), businessStaff));
+    }
+
+    @ApiOperation("委托人员列表")
+    @PostMapping("/list_assignor")
+    public RestResult<List<BusinessStaff>> getListSampleFrom(BusinessStaff businessStaff) {
+        businessStaff.setBizType(BusinessStaffEnum.ASSIGNOR.getName());
+        return success(businessStaffService.listData(businessStaff));
+    }
+
+    @ApiOperation("报告接收人员列表")
+    @PostMapping("/list_report_recipient")
+    public RestResult<List<BusinessStaff>> getListProductStandard(BusinessStaff businessStaff) {
+        businessStaff.setBizType(BusinessStaffEnum.REPORT_RECIPIENT.getName());
+        return success(businessStaffService.listData(businessStaff));
+    }
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<BusinessStaff> get(@PathVariable("id") Long id) {
+        return success(businessStaffService.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, BusinessStaff businessStaff) {
+        businessStaff.setId(id);
+        return success(businessStaffService.updateById(businessStaff));
+    }
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+    public RestResult<Boolean> add(BusinessStaff businessStaff) {
+        return success(businessStaffService.save(businessStaff));
+    }
+
+    @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(businessStaffService.removeByIds(ids));
+    }
+
+    @ApiOperation("批量添加委托人员")
+    @PostMapping("/save_batch_assignor")
+    public RestResult<Boolean> saveBatchAssignor(@RequestBody String staffJson) {
+        return success(businessStaffService.saveBatchStaff(BusinessStaffEnum.ASSIGNOR, staffJson));
+    }
+
+    @ApiOperation("批量添加报告接收人员")
+    @PostMapping("/save_batch_report_recipient")
+    public RestResult<Boolean> saveBatchRecipient(@RequestBody String staffJson) {
+        return success(businessStaffService.saveBatchStaff(BusinessStaffEnum.REPORT_RECIPIENT, staffJson));
+    }
+}

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/CarbonAppearanceCheckLedgerController.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.CarbonAppearanceCheckLedger;
+import com.patzn.cloud.service.lims.hmhj.service.ICarbonAppearanceCheckLedgerService;
+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;
+
+/**
+ * ${table.comment} 前端控制器
+ *
+ * @author meazty
+ * @since 2021-07-16
+ */
+@Api(tags = "炭块外观检测台账")
+@RestController
+@RequestMapping("/v1/appearance_check_ledger")
+public class CarbonAppearanceCheckLedgerController extends ServiceController {
+
+    @Autowired
+    private ICarbonAppearanceCheckLedgerService carbonAppearanceCheckLedgerService;
+
+    @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<CarbonAppearanceCheckLedger>> getPage(CarbonAppearanceCheckLedger carbonAppearanceCheckLedger) {
+        return success(carbonAppearanceCheckLedgerService.page(getPage(), carbonAppearanceCheckLedger));
+    }
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<CarbonAppearanceCheckLedger> get(@PathVariable("id") Long id) {
+        return success(carbonAppearanceCheckLedgerService.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, CarbonAppearanceCheckLedger carbonAppearanceCheckLedger) {
+        carbonAppearanceCheckLedger.setId(id);
+        setFailureRate(carbonAppearanceCheckLedger);
+        return success(carbonAppearanceCheckLedgerService.updateById(carbonAppearanceCheckLedger));
+    }
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+    public RestResult<Boolean> add(CarbonAppearanceCheckLedger carbonAppearanceCheckLedger) {
+        setFailureRate(carbonAppearanceCheckLedger);
+        return success(carbonAppearanceCheckLedgerService.save(carbonAppearanceCheckLedger));
+    }
+
+
+    @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(carbonAppearanceCheckLedgerService.removeByIds(ids));
+    }
+
+    private void setFailureRate(CarbonAppearanceCheckLedger ledger) {
+        Integer total = ledger.getQualityCheckTotal();
+        Integer missedNum = ledger.getMissedBlocksNum();
+        if (null == total || missedNum == null || 0 == total) {
+            return;
+        }
+        ledger.setRandomCheckFailureRate(((float) missedNum / total * 100) + "%");
+    }
+}

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/CargoSpaceController.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.CargoSpace;
+import com.patzn.cloud.service.lims.hmhj.service.ICargoSpaceService;
+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-08-20
+ */
+@Api(tags = "货位管理")
+@RestController
+@RequestMapping("/v1/cargo_space")
+public class CargoSpaceController extends ServiceController {
+
+    @Autowired
+    private ICargoSpaceService cargoSpaceService;
+
+    @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<CargoSpace>> getPage(CargoSpace cargoSpace) {
+        return success(cargoSpaceService.page(getPage(), cargoSpace));
+    }
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<CargoSpace> get(@PathVariable("id") Long id) {
+        return success(cargoSpaceService.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, CargoSpace cargoSpace) {
+        cargoSpace.setId(id);
+        return success(cargoSpaceService.updateById(cargoSpace));
+    }
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+    public RestResult<Boolean> add(CargoSpace cargoSpace) {
+        return success(cargoSpaceService.save(cargoSpace));
+    }
+
+    @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(cargoSpaceService.removeByIds(ids));
+    }
+}

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/CenterCostController.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.CenterCost;
+import com.patzn.cloud.service.lims.hmhj.service.ICenterCostService;
+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 patzn
+ * @since 2021-07-16
+ */
+@Api(tags = "中心成本")
+@RestController
+@RequestMapping("/v1/cost")
+public class CenterCostController extends ServiceController {
+
+    @Autowired
+    private ICenterCostService centerCostService;
+
+    @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<CenterCost>> getPage(CenterCost centerCost) {
+        return success(centerCostService.page(getPage(), centerCost));
+	}
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<CenterCost> get(@PathVariable("id") Long id) {
+        return success(centerCostService.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, CenterCost centerCost) {
+        centerCost.setId(id);
+        return success(centerCostService.update(centerCost));
+	}
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+	public RestResult<Boolean> add(CenterCost centerCost) {
+        return success(centerCostService.save(centerCost));
+	}
+
+    @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(centerCostService.removeByIds(ids));
+	}
+}

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/CenterCostRecordController.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.CenterCostRecord;
+import com.patzn.cloud.service.lims.hmhj.service.ICenterCostRecordService;
+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 patzn
+ * @since 2021-07-16
+ */
+@Api(tags = "中心成本操作日志")
+@RestController
+@RequestMapping("/v1/cost_record")
+public class CenterCostRecordController extends ServiceController {
+
+    @Autowired
+    private ICenterCostRecordService centerCostRecordService;
+
+    @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<CenterCostRecord>> getPage(CenterCostRecord centerCostRecord) {
+        return success(centerCostRecordService.page(getPage(), centerCostRecord));
+	}
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<CenterCostRecord> get(@PathVariable("id") Long id) {
+        return success(centerCostRecordService.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, CenterCostRecord centerCostRecord) {
+        centerCostRecord.setId(id);
+        return success(centerCostRecordService.updateById(centerCostRecord));
+	}
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+	public RestResult<Boolean> add(CenterCostRecord centerCostRecord) {
+        return success(centerCostRecordService.save(centerCostRecord));
+	}
+
+    @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(centerCostRecordService.removeByIds(ids));
+	}
+}

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/ClientInfoController.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.ClientInfo;
+import com.patzn.cloud.service.lims.hmhj.service.IClientInfoService;
+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;
+import java.util.Map;
+
+/**
+ * 委托单位配置信息 前端控制器
+ *
+ * @author meazty
+ * @since 2021-08-07
+ */
+@Api(tags = "委托单位配置信息")
+@RestController
+@RequestMapping("/v1/client_info")
+public class ClientInfoController extends ServiceController {
+
+    @Autowired
+    private IClientInfoService clientInfoService;
+
+    @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<ClientInfo>> getPage(ClientInfo clientInfo) {
+        return success(clientInfoService.page(getPage(), clientInfo));
+    }
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<ClientInfo> get(@PathVariable("id") Long id) {
+        return success(clientInfoService.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, ClientInfo clientInfo) {
+        clientInfo.setId(id);
+        return success(clientInfoService.updateById(clientInfo));
+    }
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+    public RestResult<Boolean> add(ClientInfo clientInfo) {
+        return success(clientInfoService.save(clientInfo));
+    }
+
+    @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(clientInfoService.removeByIds(ids));
+    }
+
+    @ApiOperation("获取委托单位列表")
+    @PostMapping("/info")
+    public RestResult<ClientInfo> getInfo() {
+        return success(clientInfoService.getClientInfo(getAccount()));
+    }
+
+    @ApiOperation("获取委托单位及相关信息")
+    @PostMapping("/client_about")
+    public RestResult<Map> getClientAbout() {
+        return success(clientInfoService.getClientAbout(getAccount()));
+    }
+
+    @ApiOperation("批量添加委托单位")
+    @PostMapping("/save_batch")
+    public RestResult<Boolean> saveBatch(@RequestBody String clientJson) {
+        return success(clientInfoService.saveBatchClient(clientJson, getAccount()));
+    }
+}

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/ClientTestSideController.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.ClientTestSide;
+import com.patzn.cloud.service.lims.hmhj.service.IClientTestSideService;
+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-08-07
+ */
+@Api(tags = "委托单位下检测单位信息")
+@RestController
+@RequestMapping("/v1/test_side")
+public class ClientTestSideController extends ServiceController {
+
+    @Autowired
+    private IClientTestSideService clientTestSideService;
+
+    @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<ClientTestSide>> getPage(ClientTestSide clientTestSide) {
+        return success(clientTestSideService.page(getPage(), clientTestSide));
+	}
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<ClientTestSide> get(@PathVariable("id") Long id) {
+        return success(clientTestSideService.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, ClientTestSide clientTestSide) {
+        clientTestSide.setId(id);
+        return success(clientTestSideService.updateById(clientTestSide));
+	}
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+	public RestResult<Boolean> add(ClientTestSide clientTestSide) {
+        return success(clientTestSideService.save(clientTestSide));
+	}
+
+    @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(clientTestSideService.removeByIds(ids));
+	}
+
+    @ApiOperation("批量添加检测单位")
+    @PostMapping("/save_or_update_batch")
+    public RestResult<Boolean> saveOrUpdateBatch(@RequestBody String testSideJson) {
+        return success(clientTestSideService.saveOrUpdateBatch(testSideJson, getAccount()));
+    }
+}

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

@@ -2,22 +2,20 @@ package com.patzn.cloud.service.lims.hmhj.controller;
 
 import com.baomidou.kisso.annotation.Action;
 import com.baomidou.kisso.annotation.Login;
-import com.patzn.cloud.service.hmhj.entity.CodeRule;
-import com.patzn.cloud.service.lims.base.dto.CodeTypeDTO;
-import com.patzn.cloud.service.lims.base.enums.CodeTypeEnum;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
 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.CodeRule;
+import com.patzn.cloud.service.lims.base.dto.CodeTypeDTO;
+import com.patzn.cloud.service.lims.base.enums.CodeTypeEnum;
 import com.patzn.cloud.service.lims.hmhj.service.ICodeRuleService;
-
 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;
 
@@ -44,6 +42,7 @@ public class CodeRuleController extends ServiceController {
     })
     @PostMapping("/page")
 	public RestResult<Page<CodeRule>> getPage(CodeRule codeRule) {
+        codeRule.setRecessive(0);
         return success(codeRuleService.page(getPage(), codeRule));
 	}
 

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

 package com.patzn.cloud.service.lims.hmhj.controller;
 
-import com.patzn.cloud.service.hmhj.entity.CodeRuleRecord;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
 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.CodeRuleRecord;
 import com.patzn.cloud.service.lims.hmhj.service.ICodeRuleRecordService;
-
 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;
 

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

+package com.patzn.cloud.service.lims.hmhj.controller;
+
+import com.baomidou.kisso.annotation.Action;
+import com.baomidou.kisso.annotation.Login;
+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.ContractInfoAnnex;
+import com.patzn.cloud.service.lims.hmhj.service.IContractInfoAnnexService;
+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 org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+
+import java.util.List;
+
+/**
+ * 合同物资 前端控制器
+ *
+ * @author wwd
+ * @since 2021-02-01
+ */
+@Api(tags = "合同物资附件")
+@RestController
+@RequestMapping("/v1/info_annex")
+public class ContractInfoAnnexController extends ServiceController {
+
+    @Autowired
+    private IContractInfoAnnexService contractInfoAnnexService;
+
+    @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),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
+    })
+    @PostMapping("/page")
+	public RestResult<Page<ContractInfoAnnex>> getPage(ContractInfoAnnex contractInfoAnnex) {
+        return success(contractInfoAnnexService.page(getPage(), contractInfoAnnex));
+	}
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<ContractInfoAnnex> get(@PathVariable("id") Long id) {
+        return success(contractInfoAnnexService.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, ContractInfoAnnex contractInfoAnnex) {
+        contractInfoAnnex.setId(id);
+        return success(contractInfoAnnexService.updateById(contractInfoAnnex));
+	}
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+	public RestResult<Boolean> add(ContractInfoAnnex contractInfoAnnex) {
+        return success(contractInfoAnnexService.save(contractInfoAnnex));
+	}
+
+    @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(contractInfoAnnexService.removeByIds(ids));
+	}
+
+
+    @ApiOperation(value = "附件上传", notes = "附件上传")
+    @PostMapping("/upload/{contractId}")
+    public RestResult<Boolean> upload(@PathVariable("contractId") Long contractId, MultipartFile file) {
+        return success(contractInfoAnnexService.upload(file, contractId));
+    }
+
+
+    @ApiOperation(value = "附件批量上传", notes = "附件批量上传")
+    @PostMapping("/upload_bath/{contractId}")
+    public RestResult<Boolean> uploadBath(@PathVariable("contractId") Long contractId, MultipartHttpServletRequest httpServletRequest) {
+        return success(contractInfoAnnexService.uploadBath(httpServletRequest, contractId,getAccount()));
+    }
+
+    @ApiOperation(value = "下载附件", notes = "下载指定附件")
+    @GetMapping("/download/{id}")
+    public void downloadFile(@PathVariable("id")Long id) {
+        contractInfoAnnexService.downloadFile(id, response);
+    }
+
+
+    @ApiOperation(value = "预览图片", notes = "预览图片")
+    @Login(action = Action.Skip)
+    @GetMapping("/view")
+    public void view(String objectKey) {
+        contractInfoAnnexService.view(response, objectKey);
+    }
+}

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/ContractInfoController.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.dto.ContractInfoDTO;
+import com.patzn.cloud.service.hmhj.entity.ContractInfo;
+import com.patzn.cloud.service.hmhj.enums.ContractInfoStatusEnum;
+import com.patzn.cloud.service.hmhj.vo.ContractInfoVO;
+import com.patzn.cloud.service.lims.hmhj.service.IContractInfoService;
+import com.patzn.cloud.service.lims.hmhj.service.impl.UserInfoServiceImpl;
+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 org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+/**
+ * 合同物资 前端控制器
+ *
+ * @author wwd
+ * @since 2021-02-01
+ */
+@Api(tags = "合同物资")
+@RestController
+@RequestMapping("/v1/contract_info")
+public class ContractInfoController extends ServiceController {
+
+    @Autowired
+    private IContractInfoService contractInfoService;
+
+    @Autowired
+    private UserInfoServiceImpl userInfoService;
+
+
+    @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),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
+    })
+    @PostMapping("/page")
+    public RestResult<Page<ContractInfoVO>> getPage(ContractInfoVO contractInfo) {
+        contractInfo.setStatus(ContractInfoStatusEnum.DRAFT);
+        return success(contractInfoService.pageVO(getPage(), contractInfo));
+    }
+
+    @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),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
+    })
+    @PostMapping("/page_reg")
+    public RestResult<Page<ContractInfoVO>> getRegPage(ContractInfoVO contractInfo) {
+        contractInfo.setStatus(ContractInfoStatusEnum.DRAFT);
+        contractInfo.setPeriod(userInfoService.getUserPeriod(getAccount()));
+        return success(contractInfoService.pageVO(getPage(), contractInfo));
+    }
+
+    @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),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
+    })
+    @PostMapping("/page_reg_his")
+    public RestResult<Page<ContractInfoVO>> getRegPageHis(ContractInfoVO contractInfo) {
+        contractInfo.setStatus(ContractInfoStatusEnum.HISTORY);
+        return success(contractInfoService.pageVO(getPage(), contractInfo));
+    }
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<ContractInfo> get(@PathVariable("id") Long id) {
+        return success(contractInfoService.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, ContractInfo contractInfo) {
+        contractInfo.setId(id);
+        return success(contractInfoService.updateById(contractInfo));
+    }
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+    public RestResult<Boolean> add(ContractInfo contractInfo) {
+        return success(contractInfoService.save(contractInfo));
+    }
+
+
+    @ApiOperation("添加")
+    @PostMapping("/add_contract")
+    public RestResult<Boolean> addDTO(@RequestBody ContractInfoDTO dto) {
+        return success(contractInfoService.addDTO(dto));
+    }
+
+
+    @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(contractInfoService.removeByIds(ids));
+    }
+
+    @ApiOperation("批量导入合同单")
+    @PostMapping("/batch_import")
+    public RestResult<Boolean> batchImport(@RequestPart MultipartFile file) {
+        return success(contractInfoService.batchImport(file, getAccount()));
+    }
+
+    @ApiOperation("批量修改合同信息")
+    @PostMapping("/batch_update")
+    public RestResult<Boolean> batchUpdate(@RequestParam("ids") Long[] ids, ContractInfo contractInfo) {
+        return success(contractInfoService.updateContractBatch(ids, contractInfo, getAccount()));
+    }
+
+}

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/ContractInfoItemController.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.ContractInfoItem;
+import com.patzn.cloud.service.lims.hmhj.service.IContractInfoItemService;
+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 wwd
+ * @since 2021-02-01
+ */
+@Api(tags = "合同物资所检项目")
+@RestController
+@RequestMapping("/v1/contract_info_item")
+public class ContractInfoItemController extends ServiceController {
+
+    @Autowired
+    private IContractInfoItemService contractInfoItemService;
+
+    @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),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
+    })
+    @PostMapping("/page")
+	public RestResult<Page<ContractInfoItem>> getPage(ContractInfoItem contractInfoItem) {
+        return success(contractInfoItemService.page(getPage(), contractInfoItem));
+	}
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<ContractInfoItem> get(@PathVariable("id") Long id) {
+        return success(contractInfoItemService.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, ContractInfoItem contractInfoItem) {
+        contractInfoItem.setId(id);
+        return success(contractInfoItemService.updateById(contractInfoItem));
+	}
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+	public RestResult<Boolean> add(ContractInfoItem contractInfoItem) {
+        return success(contractInfoItemService.save(contractInfoItem));
+	}
+
+    @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(contractInfoItemService.removeByIds(ids));
+	}
+}

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

 package com.patzn.cloud.service.lims.hmhj.controller;
 
-import com.patzn.cloud.service.hmhj.entity.ContractItem;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
 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.ContractItem;
 import com.patzn.cloud.service.lims.hmhj.service.IContractItemService;
-
 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;
 

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

 package com.patzn.cloud.service.lims.hmhj.controller;
 
+import com.patzn.cloud.service.hmhj.dto.ContractOkOrganizerDTO;
 import com.patzn.cloud.service.hmhj.entity.ContractOkOrganizer;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import com.baomidou.mybatisplus.plugins.Page;
 import com.patzn.cloud.commons.api.RestConstants;
@@ -75,6 +69,18 @@ public class ContractOkOrganizerController extends ServiceController {
         return success(contractOkOrganizerService.save(contractOkOrganizer));
 	}
 
+    @ApiOperation("批量添加")
+    @PostMapping("/addBatch")
+    public RestResult<Boolean> addBatch(@RequestBody String itemJson) {
+        return success(contractOkOrganizerService.saveBatch(itemJson));
+    }
+
+    @ApiOperation("批量维护验收专家")
+    @PostMapping("/add_organizer_batch")
+    public RestResult<Boolean> addOrganizerBatch(@RequestBody String organizerJson) {
+        return success(contractOkOrganizerService.saveOrganizerBatch(organizerJson));
+    }
+
     @ApiOperation("根据 ids 删除")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "ids", value = "主键列表", required = true, paramType = "query", allowMultiple = true, dataTypeClass = Long.class),

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/ContractSamplingController.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.ContractSampling;
+import com.patzn.cloud.service.lims.hmhj.service.IContractSamplingService;
+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;
+
+/**
+ * 合同样品控制器
+ */
+@Api(tags = "合同样品")
+@RestController
+@RequestMapping("/v1/contract_sampling")
+public class ContractSamplingController extends ServiceController {
+
+    @Autowired
+    private IContractSamplingService contractSamplingService;
+
+    @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),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
+    })
+    @PostMapping("/page")
+    public RestResult<Page<ContractSampling>> getPage(ContractSampling contractSampling) {
+        return success(contractSamplingService.page(getPage(), contractSampling));
+    }
+
+    @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),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
+    })
+    @PostMapping("/page_sample")
+    public RestResult<Page<ContractSampling>> getPageMake(ContractSampling contractSampling) {
+        if (null == contractSampling.getContractSampleId()) {
+            return success(null);
+        }
+        return success(contractSamplingService.page(getPage(), contractSampling));
+    }
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<ContractSampling> get(@PathVariable("id") Long id) {
+        return success(contractSamplingService.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, ContractSampling contractSampling) {
+        contractSampling.setId(id);
+        return success(contractSamplingService.updateSampling(contractSampling));
+    }
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+    public RestResult<Boolean> add(ContractSampling contractSampling) {
+        return success(contractSamplingService.save(contractSampling));
+    }
+
+    @ApiOperation("批量添加或修改")
+    @PostMapping("/add_batch")
+    public RestResult<Boolean> add(@RequestBody List<ContractSampling> sampleList) {
+        return success(contractSamplingService.saveOrUpdateInfoBatch(sampleList));
+    }
+
+    @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(contractSamplingService.removeByIds(ids));
+    }
+
+}

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/controller/EntrustAnnexController.java

@@ -2,31 +2,23 @@ package com.patzn.cloud.service.lims.hmhj.controller;
 
 import com.baomidou.kisso.annotation.Action;
 import com.baomidou.kisso.annotation.Login;
-import com.patzn.cloud.service.hmhj.entity.EntrustAnnex;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
 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.EntrustAnnex;
 import com.patzn.cloud.service.lims.hmhj.service.IEntrustAnnexService;
-
 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 org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 委托附件表 前端控制器
@@ -115,4 +107,12 @@ public class EntrustAnnexController extends ServiceController {
     public void view(String objectKey) {
         entrustAnnexService.view(response, objectKey);
     }
+
+    @ApiOperation(value = "根据委托id获取ObjectKey", notes = "获取key")
+    @Login(action = Action.Skip)
+    @PostMapping("/get_key_by_businessId/{businessId}")
+    Map<String,String> getKeyByBusinessId(@PathVariable("businessId") String businessId){
+        return entrustAnnexService.getLastKey(businessId);
+    }
+
 }

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

 package com.patzn.cloud.service.lims.hmhj.controller;
 
-import com.patzn.cloud.service.hmhj.entity.EntrustRecord;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.kisso.annotation.Action;
+import com.baomidou.kisso.annotation.Login;
 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.EntrustRecord;
 import com.patzn.cloud.service.lims.hmhj.service.IEntrustRecordService;
-
 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.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 委托操作日志表 前端控制器
@@ -80,4 +76,12 @@ public class EntrustRecordController extends ServiceController {
 	public RestResult<Boolean> delete(@RequestParam("ids") List<Long> ids) {
         return success(entrustRecordService.removeByIds(ids));
 	}
+
+    @ApiOperation("统计各月报告总量相关统计")
+    @PostMapping("/month_statistic")
+    @Login(action = Action.Skip)
+    public RestResult<Map<String, String>> monthStatistic(@RequestParam("start") Date start,
+                                                                    @RequestParam("end") Date end) {
+        return success(entrustRecordService.monthStatistic(start,end));
+    }
 }

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

+package com.patzn.cloud.service.lims.hmhj.controller;
+
+import com.patzn.cloud.service.hmhj.entity.EntrustReportTemplateConfig;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+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.lims.hmhj.service.IEntrustReportTemplateConfigService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 报告模板配置 前端控制器
+ *
+ * @author wwd
+ * @since 2021-05-06
+ */
+@Api(tags = "报告模板配置")
+@RestController
+@RequestMapping("/v1/report_template_config")
+public class EntrustReportTemplateConfigController extends ServiceController {
+
+    @Autowired
+    private IEntrustReportTemplateConfigService entrustReportTemplateConfigService;
+
+    @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<EntrustReportTemplateConfig>> getPage(EntrustReportTemplateConfig entrustReportTemplateConfig) {
+        return success(entrustReportTemplateConfigService.page(getPage(), entrustReportTemplateConfig));
+	}
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<EntrustReportTemplateConfig> get(@PathVariable("id") Long id) {
+        return success(entrustReportTemplateConfigService.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, EntrustReportTemplateConfig entrustReportTemplateConfig) {
+        entrustReportTemplateConfig.setId(id);
+        return success(entrustReportTemplateConfigService.updateById(entrustReportTemplateConfig));
+	}
+
+    @ApiOperation("根据 id 修改信息")
+    @PostMapping("/update")
+    public RestResult<Boolean> update(@RequestBody EntrustReportTemplateConfig entrustReportTemplateConfig) {
+        return success(entrustReportTemplateConfigService.updateConfigById(entrustReportTemplateConfig,getAccount()));
+    }
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+	public RestResult<Boolean> add(EntrustReportTemplateConfig entrustReportTemplateConfig) {
+        return success(entrustReportTemplateConfigService.save(entrustReportTemplateConfig));
+	}
+
+    @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(entrustReportTemplateConfigService.removeByIds(ids));
+	}
+}

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

@@ -2,14 +2,7 @@ package com.patzn.cloud.service.lims.hmhj.controller;
 
 import com.patzn.cloud.service.hmhj.entity.EntrustReportTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import com.baomidou.mybatisplus.plugins.Page;
 import com.patzn.cloud.commons.api.RestConstants;
@@ -45,9 +38,9 @@ public class EntrustReportTemplateController extends ServiceController {
             @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
     })
     @PostMapping("/page")
-	public RestResult<Page<EntrustReportTemplate>> getPage(EntrustReportTemplate entrustReportTemplate) {
+    public RestResult<Page<EntrustReportTemplate>> getPage(EntrustReportTemplate entrustReportTemplate) {
         return success(entrustReportTemplateService.page(getPage(), entrustReportTemplate));
-	}
+    }
 
     @ApiOperation("查询 id 信息")
     @ApiImplicitParams({
@@ -63,30 +56,36 @@ public class EntrustReportTemplateController extends ServiceController {
             @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
     })
     @PutMapping("/{id}")
-	public RestResult<Boolean> edit(@PathVariable("id") Long id, EntrustReportTemplate entrustReportTemplate) {
+    public RestResult<Boolean> edit(@PathVariable("id") Long id, EntrustReportTemplate entrustReportTemplate) {
         entrustReportTemplate.setId(id);
         return success(entrustReportTemplateService.updateById(entrustReportTemplate));
-	}
+    }
+
+    @ApiOperation("根据 id 修改信息")
+    @PostMapping("/update")
+    public RestResult<Boolean> update(@RequestBody EntrustReportTemplate entrustReportTemplate) {
+        return success(entrustReportTemplateService.updateTemplateById(entrustReportTemplate, getAccount()));
+    }
 
     @ApiOperation("添加")
     @PostMapping("/")
-	public RestResult<Boolean> add(EntrustReportTemplate entrustReportTemplate) {
+    public RestResult<Boolean> add(EntrustReportTemplate entrustReportTemplate) {
         return success(entrustReportTemplateService.save(entrustReportTemplate));
-	}
+    }
 
     @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) {
+    @DeleteMapping("/")
+    public RestResult<Boolean> delete(@RequestParam("ids") List<Long> ids) {
         return success(entrustReportTemplateService.removeByIds(ids));
-	}
+    }
 
 
     @ApiOperation(value = "附件上传", notes = "附件上传")
     @PostMapping("/upload_template/")
-    public RestResult<Boolean> uploadTemplate(@RequestParam("name") String  name,@RequestParam("remark") String  remark, MultipartFile file) {
-        return success(entrustReportTemplateService.uploadTemplate(file,name,remark));
+    public RestResult<Boolean> uploadTemplate(@RequestParam("name") String name, @RequestParam("classType") String classType, @RequestParam("remark") String remark, MultipartFile file) {
+        return success(entrustReportTemplateService.uploadTemplate(file, name, classType, remark));
     }
 }

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/EntrustSampleItemIndexController.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.EntrustSampleItemIndex;
+import com.patzn.cloud.service.hmhj.vo.EntrustSampleItemIndexVO;
+import com.patzn.cloud.service.lims.hmhj.service.IEntrustSampleItemIndexService;
+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.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 项目指标表 前端控制器
+ *
+ * @author wwd
+ * @since 2021-06-15
+ */
+@Api(tags = "项目指标表")
+@RestController
+@RequestMapping("/v1/sample_item_index")
+public class EntrustSampleItemIndexController extends ServiceController {
+
+    @Autowired
+    private IEntrustSampleItemIndexService entrustSampleItemIndexService;
+
+    @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<EntrustSampleItemIndex>> getPage(EntrustSampleItemIndex entrustSampleItemIndex) {
+        return success(entrustSampleItemIndexService.page(getPage(), entrustSampleItemIndex));
+    }
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<EntrustSampleItemIndex> get(@PathVariable("id") Long id) {
+        return success(entrustSampleItemIndexService.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, EntrustSampleItemIndex entrustSampleItemIndex) {
+        entrustSampleItemIndex.setId(id);
+        return success(entrustSampleItemIndexService.updateById(entrustSampleItemIndex));
+    }
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+    public RestResult<Boolean> add(EntrustSampleItemIndex entrustSampleItemIndex) {
+        return success(entrustSampleItemIndexService.save(entrustSampleItemIndex));
+    }
+
+    @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(entrustSampleItemIndexService.removeByIds(ids));
+    }
+
+    @ApiOperation("根据检测项目ID查询信息")
+    @GetMapping("/get_by_item_info")
+    public RestResult<EntrustSampleItemIndex> getByItemIdName(@RequestParam("itemId") Long itemId) {
+        return success(entrustSampleItemIndexService.getByItemIdName(itemId));
+    }
+
+    @ApiOperation("添加或修改指标")
+    @PostMapping("/save_or_update")
+    public RestResult<Boolean> saveOrUpdate(EntrustSampleItemIndex entrustSampleItemIndex) {
+        return success(entrustSampleItemIndexService.saveOrUpdateData(entrustSampleItemIndex));
+    }
+
+    @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_index_with_item")
+    public RestResult<Page<EntrustSampleItemIndexVO>> pageIndexWithItem(EntrustSampleItemIndexVO entrustSampleItemIndexVO) {
+        return success(entrustSampleItemIndexService.pageIndexWithItem(getPage(), entrustSampleItemIndexVO));
+    }
+
+    @ApiOperation("获取成品指标信息列表")
+    @PostMapping("/list_cp_item_index")
+    public RestResult<List<Map<String, Object>>> listCpSampleItemIndex(Long entrustId, Long[] sampleIds) {
+        return success(entrustSampleItemIndexService.getCpSampleItemIndexList(entrustId, sampleIds));
+    }
+}

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

 package com.patzn.cloud.service.lims.hmhj.controller;
 
-import com.patzn.cloud.service.hmhj.dto.SamplePrepareDTO;
-import com.patzn.cloud.service.hmhj.entity.EntrustSamplePrepare;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
 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.dto.SamplePrepareDTO;
+import com.patzn.cloud.service.hmhj.entity.EntrustSamplePrepare;
 import com.patzn.cloud.service.lims.hmhj.service.IEntrustSamplePrepareService;
-
 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;
 
@@ -80,7 +78,13 @@ public class EntrustSamplePrepareController extends ServiceController {
     @ApiOperation("样品接收提交")
     @PostMapping("/submit_sample_receive")
     public RestResult<Boolean> submitSampleReceive(@RequestParam("ids")Long[] ids) {
-        return success(entrustSamplePrepareService.submitSampleReceive(ids,getAccount()));
+        return success(entrustSamplePrepareService.submitSampleReceive(ids,null,getAccount()));
+    }
+
+    @ApiOperation("样品批量接收")
+    @PostMapping("/receive_sample_batch")
+    public RestResult<Boolean> receiveSampleBatch(@RequestParam("ids")Long[] ids) {
+        return success(entrustSamplePrepareService.receiveSampleBatch(ids,getAccount()));
     }
 
 

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/EntrustSampleRecordController.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.EntrustSampleRecord;
+import com.patzn.cloud.service.lims.hmhj.service.IEntrustSampleRecordService;
+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-07-08
+ */
+@Api(tags = "样品操作日志表")
+@RestController
+@RequestMapping("/v1/entrust_sample_record")
+public class EntrustSampleRecordController extends ServiceController {
+
+    @Autowired
+    private IEntrustSampleRecordService entrustSampleRecordService;
+
+    @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<EntrustSampleRecord>> getPage(EntrustSampleRecord entrustSampleRecord) {
+        return success(entrustSampleRecordService.page(getPage(), entrustSampleRecord));
+    }
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<EntrustSampleRecord> get(@PathVariable("id") Long id) {
+        return success(entrustSampleRecordService.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, EntrustSampleRecord entrustSampleRecord) {
+        entrustSampleRecord.setId(id);
+        return success(entrustSampleRecordService.updateById(entrustSampleRecord));
+    }
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+    public RestResult<Boolean> add(EntrustSampleRecord entrustSampleRecord) {
+        return success(entrustSampleRecordService.save(entrustSampleRecord));
+    }
+
+    @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(entrustSampleRecordService.removeByIds(ids));
+    }
+}

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

+package com.patzn.cloud.service.lims.hmhj.controller;
+
+import com.baomidou.kisso.annotation.Action;
+import com.baomidou.kisso.annotation.Login;
+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.GradingAnnex;
+import com.patzn.cloud.service.lims.hmhj.service.IGradingAnnexService;
+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 org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+
+import java.util.List;
+
+/**
+ * 判级标准附件表 前端控制器
+ *
+ * @author wwd
+ * @since 2021-05-14
+ */
+@Api(tags = "判级标准附件表")
+@RestController
+@RequestMapping("/v1/grading_standard_annex")
+public class GradingAnnexController extends ServiceController {
+
+    @Autowired
+    private IGradingAnnexService gradingAnnexService;
+
+    @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<GradingAnnex>> getPage(GradingAnnex gradingAnnex) {
+        return success(gradingAnnexService.page(getPage(), gradingAnnex));
+	}
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<GradingAnnex> get(@PathVariable("id") Long id) {
+        return success(gradingAnnexService.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, GradingAnnex gradingAnnex) {
+        gradingAnnex.setId(id);
+        return success(gradingAnnexService.updateById(gradingAnnex));
+	}
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+	public RestResult<Boolean> add(GradingAnnex gradingAnnex) {
+        return success(gradingAnnexService.save(gradingAnnex));
+	}
+
+    @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(gradingAnnexService.removeByIds(ids));
+	}
+
+
+    @ApiOperation(value = "附件上传", notes = "附件上传")
+    @PostMapping("/upload/{gradingStandardId}")
+    public RestResult<Boolean> upload(@PathVariable("gradingStandardId") Long gradingStandardId, MultipartFile file) {
+        return success(gradingAnnexService.upload(file, gradingStandardId));
+    }
+
+
+    @ApiOperation(value = "附件批量上传", notes = "附件批量上传")
+    @PostMapping("/upload_bath/{gradingStandardId}")
+    public RestResult<Boolean> uploadBath(@PathVariable("gradingStandardId") Long gradingStandardId, MultipartHttpServletRequest httpServletRequest) {
+        return success(gradingAnnexService.uploadBath(httpServletRequest, gradingStandardId,getAccount()));
+    }
+
+
+
+    @ApiOperation(value = "下载附件", notes = "下载指定附件")
+    @GetMapping("/download/{id}")
+    public void downloadFile(@PathVariable("id")Long id) {
+        gradingAnnexService.downloadFile(id, response);
+    }
+
+
+    @ApiOperation(value = "预览图片", notes = "预览图片")
+    @Login(action = Action.Skip)
+    @GetMapping("/view")
+    public void view(String objectKey) {
+        gradingAnnexService.view(response, objectKey);
+    }
+
+
+}

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/GradingItemController.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.GradingItem;
+import com.patzn.cloud.service.lims.hmhj.service.IGradingItemService;
+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 wwd
+ * @since 2021-05-14
+ */
+@Api(tags = "判级产品检测项目表")
+@RestController
+@RequestMapping("/v1/grading_item")
+public class GradingItemController extends ServiceController {
+
+    @Autowired
+    private IGradingItemService gradingItemService;
+
+    @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<GradingItem>> getPage(GradingItem gradingItem) {
+        return success(gradingItemService.page(getPage(), gradingItem));
+	}
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<GradingItem> get(@PathVariable("id") Long id) {
+        return success(gradingItemService.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, GradingItem gradingItem) {
+        gradingItem.setId(id);
+        return success(gradingItemService.updateById(gradingItem));
+	}
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+	public RestResult<Boolean> add(GradingItem gradingItem) {
+        return success(gradingItemService.save(gradingItem));
+	}
+
+    @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(gradingItemService.removeByIds(ids));
+	}
+}

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

+package com.patzn.cloud.service.lims.hmhj.controller;
+
+import com.patzn.cloud.service.hmhj.entity.GradingProduct;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+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.lims.hmhj.service.IGradingProductService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+/**
+ * 判级产品表 前端控制器
+ *
+ * @author wwd
+ * @since 2021-05-14
+ */
+@Api(tags = "判级产品表")
+@RestController
+@RequestMapping("/v1/grading_product")
+public class GradingProductController extends ServiceController {
+
+    @Autowired
+    private IGradingProductService gradingProductService;
+
+    @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<GradingProduct>> getPage(GradingProduct gradingProduct) {
+        return success(gradingProductService.page(getPage(), gradingProduct));
+	}
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<GradingProduct> get(@PathVariable("id") Long id) {
+        return success(gradingProductService.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, GradingProduct gradingProduct) {
+        gradingProduct.setId(id);
+        return success(gradingProductService.updateById(gradingProduct));
+	}
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+	public RestResult<Boolean> add(GradingProduct gradingProduct) {
+        return success(gradingProductService.save(gradingProduct));
+	}
+
+    @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(gradingProductService.removeByIds(ids));
+	}
+}

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/GradingRecordController.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.GradingRecord;
+import com.patzn.cloud.service.lims.hmhj.service.IGradingRecordService;
+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 wwd
+ * @since 2021-05-14
+ */
+@Api(tags = "判级标准附件表")
+@RestController
+@RequestMapping("/v1/grading_record")
+public class GradingRecordController extends ServiceController {
+
+    @Autowired
+    private IGradingRecordService gradingRecordService;
+
+    @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<GradingRecord>> getPage(GradingRecord gradingRecord) {
+        return success(gradingRecordService.page(getPage(), gradingRecord));
+	}
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<GradingRecord> get(@PathVariable("id") Long id) {
+        return success(gradingRecordService.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, GradingRecord gradingRecord) {
+        gradingRecord.setId(id);
+        return success(gradingRecordService.updateById(gradingRecord));
+	}
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+	public RestResult<Boolean> add(GradingRecord gradingRecord) {
+        return success(gradingRecordService.save(gradingRecord));
+	}
+
+    @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(gradingRecordService.removeByIds(ids));
+	}
+}

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

+package com.patzn.cloud.service.lims.hmhj.controller;
+
+import com.patzn.cloud.service.hmhj.dto.GradingStandardDTO;
+import com.patzn.cloud.service.hmhj.entity.GradingStandard;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+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.lims.hmhj.service.IGradingStandardService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+/**
+ * 判级标准表 前端控制器
+ *
+ * @author wwd
+ * @since 2021-05-14
+ */
+@Api(tags = "判级标准表")
+@RestController
+@RequestMapping("/v1/grading_standard")
+public class GradingStandardController extends ServiceController {
+
+    @Autowired
+    private IGradingStandardService gradingStandardService;
+
+    @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<GradingStandard>> getPage(GradingStandard gradingStandard) {
+        return success(gradingStandardService.page(getPage(), gradingStandard));
+	}
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<GradingStandard> get(@PathVariable("id") Long id) {
+        return success(gradingStandardService.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, GradingStandard gradingStandard) {
+        gradingStandard.setId(id);
+        return success(gradingStandardService.updateById(gradingStandard));
+	}
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+	public RestResult<Boolean> add(GradingStandard gradingStandard) {
+        return success(gradingStandardService.save(gradingStandard));
+	}
+
+    @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(gradingStandardService.removeByIds(ids));
+	}
+
+
+    @ApiOperation(value = "添加判级标准", notes = "添加判级标准")
+    @PostMapping("/add_grading_standard")
+    public RestResult<Boolean> addGradingStandard(@RequestBody GradingStandardDTO dto) {
+        return success(gradingStandardService.addGradingStandard(dto,getAccount()));
+    }
+
+
+    @ApiOperation(value = "编辑判级标准", notes = "添加判级标准")
+    @PostMapping("/edit_grading_standard")
+    public RestResult<Boolean> editGradingStandard(@RequestBody GradingStandardDTO dto) {
+        return success(gradingStandardService.editGradingStandard(dto,getAccount()));
+    }
+
+
+    @ApiOperation("作废")
+    @PostMapping("/abolish_grading_standard")
+    public RestResult<Boolean> abolish(@RequestParam("ids")Long [] ids, @RequestParam("reason")String reason) {
+        return success(gradingStandardService.abolish(ids,reason,getAccount()));
+    }
+}

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

+package com.patzn.cloud.service.lims.hmhj.controller;
+
+import com.patzn.cloud.service.hmhj.dto.SlotQueryDTO;
+import com.patzn.cloud.service.hmhj.entity.ItemComparison;
+import com.patzn.cloud.service.hmhj.vo.ItemComparisonVO;
+import com.patzn.cloud.service.lims.hmhj.service.IItemComparisonService;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+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 io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 检测项目比对表 前端控制器
+ *
+ * @author meazty
+ * @since 2022-08-17
+ */
+@Api(tags = "检测项目比对表")
+@RestController
+@RequestMapping("/v1/comparison")
+public class ItemComparisonController extends ServiceController {
+
+    @Resource
+    private IItemComparisonService itemComparisonService;
+
+    @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<ItemComparison>> getPage(SlotQueryDTO queryDTO) {
+
+        return success(itemComparisonService.page(getPage(), queryDTO));
+    }
+
+    @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("/pageVO")
+    public RestResult<Page<ItemComparisonVO>> getPageVO(SlotQueryDTO queryDTO) {
+
+        return success(itemComparisonService.pageVO(getPage(), queryDTO));
+    }
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<ItemComparison> get(@PathVariable("id") Long id) {
+        return success(itemComparisonService.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, ItemComparison itemComparison) {
+        itemComparison.setId(id);
+        return success(itemComparisonService.updateById(itemComparison));
+    }
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+    public RestResult<Boolean> add(ItemComparison itemComparison) {
+        return success(itemComparisonService.save(itemComparison));
+    }
+
+    @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(itemComparisonService.removeByIds(ids));
+    }
+}

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/ItemDeviateController.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.ItemDeviate;
+import com.patzn.cloud.service.lims.hmhj.service.IItemDeviateService;
+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 wwd
+ * @since 2021-04-17
+ */
+@Api(tags = "偏离表")
+@RestController
+@RequestMapping("/v1/deviate")
+public class ItemDeviateController extends ServiceController {
+
+    @Autowired
+    private IItemDeviateService itemDeviateService;
+
+    @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<ItemDeviate>> getPage(ItemDeviate itemDeviate) {
+        return success(itemDeviateService.page(getPage(), itemDeviate));
+	}
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<ItemDeviate> get(@PathVariable("id") Long id) {
+        return success(itemDeviateService.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, ItemDeviate itemDeviate) {
+        itemDeviate.setId(id);
+        return success(itemDeviateService.updateById(itemDeviate));
+	}
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+	public RestResult<Boolean> add(ItemDeviate itemDeviate) {
+        return success(itemDeviateService.save(itemDeviate));
+	}
+
+    @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(itemDeviateService.removeByIds(ids));
+	}
+}

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

 package com.patzn.cloud.service.lims.hmhj.controller;
 
-import com.patzn.cloud.service.hmhj.entity.Material;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
 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.feign.lims.hmhj.client.LmsChemicalCategoryClient;
+import com.patzn.cloud.service.hmhj.entity.Material;
 import com.patzn.cloud.service.lims.hmhj.service.IMaterialService;
-
 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;
 
@@ -38,6 +30,9 @@ public class MaterialController extends ServiceController {
     @Autowired
     private IMaterialService materialService;
 
+    @Autowired
+    private LmsChemicalCategoryClient lmsChemicalCategoryClient;
+
     @ApiOperation("分页列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@@ -46,9 +41,33 @@ public class MaterialController extends ServiceController {
             @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
     })
     @PostMapping("/page")
-	public RestResult<Page<Material>> getPage(Material material) {
+    public RestResult<Page<Material>> getPage(Material material) {
         return success(materialService.page(getPage(), material));
-	}
+    }
+
+    @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),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
+    })
+    @PostMapping("/page_material")
+    public RestResult<Page<Material>> getPageMaterial(Material material) {
+        return success(materialService.getPageMaterialByPerson(getPage(), material, "ASSIGNOR", getAccount()));
+    }
+
+    @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),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
+    })
+    @PostMapping("/page_materials")
+    public RestResult<Page<Material>> getPageMaterialByPerson(Material material) {
+        return success(materialService.getPageMaterialByPerson(getPage(), material, "REPORT_RECIPIENT", getAccount()));
+    }
 
     @ApiOperation("查询 id 信息")
     @ApiImplicitParams({
@@ -64,23 +83,24 @@ public class MaterialController extends ServiceController {
             @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
     })
     @PutMapping("/{id}")
-	public RestResult<Boolean> edit(@PathVariable("id") Long id, Material material) {
+    public RestResult<Boolean> edit(@PathVariable("id") Long id, Material material) {
         material.setId(id);
         return success(materialService.updateById(material));
-	}
+    }
 
     @ApiOperation("添加")
     @PostMapping("/")
-	public RestResult<Boolean> add(Material material) {
+    public RestResult<Boolean> add(Material material) {
         return success(materialService.save(material));
-	}
+    }
 
     @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) {
+    @DeleteMapping("/")
+    public RestResult<Boolean> delete(@RequestParam("ids") List<Long> ids) {
         return success(materialService.removeByIds(ids));
-	}
+    }
+
 }

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

 package com.patzn.cloud.service.lims.hmhj.controller;
 
-import com.patzn.cloud.service.hmhj.entity.MaterialItem;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
 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.MaterialItem;
 import com.patzn.cloud.service.lims.hmhj.service.IMaterialItemService;
-
 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;
 

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

+package com.patzn.cloud.service.lims.hmhj.controller;
+
+import com.baomidou.kisso.annotation.Action;
+import com.baomidou.kisso.annotation.Login;
+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.NoticeAnnouncement;
+import com.patzn.cloud.service.lims.hmhj.service.INoticeAnnouncementService;
+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 patzn
+ * @since 2021-07-25
+ */
+@Api(tags = "通知公告表")
+@RestController
+@RequestMapping("/v1/announcement")
+public class NoticeAnnouncementController extends ServiceController {
+
+    @Autowired
+    private INoticeAnnouncementService noticeAnnouncementService;
+
+    @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<NoticeAnnouncement>> getPage(NoticeAnnouncement noticeAnnouncement) {
+        return success(noticeAnnouncementService.page(getPage(), noticeAnnouncement));
+    }
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<NoticeAnnouncement> get(@PathVariable("id") Long id) {
+        return success(noticeAnnouncementService.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, NoticeAnnouncement noticeAnnouncement) {
+        noticeAnnouncement.setId(id);
+        noticeAnnouncement.setUpdater(getAccount().getUserName());
+        return success(noticeAnnouncementService.updateAndRecord(noticeAnnouncement));
+    }
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+    public RestResult<Boolean> add(NoticeAnnouncement noticeAnnouncement) {
+        noticeAnnouncement.setCreator(getAccount().getUserName());
+        return success(noticeAnnouncementService.save(noticeAnnouncement));
+    }
+
+    @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(noticeAnnouncementService.removeByIds(ids));
+    }
+
+    @ApiOperation("显示最近修改的通知")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "count", value = "几条数据", required = false, paramType = "query", allowMultiple = true, dataTypeClass = Integer.class),
+    })
+    @PostMapping("/recent/")
+    public RestResult<List<NoticeAnnouncement>> recent(
+            @RequestParam(value = "count", required = false) Integer count) {
+        if (count == null) {
+            count = 3;
+        }
+        return success(noticeAnnouncementService.recent(count));
+    }
+
+    @ApiOperation("显示最新 N 条通知公告")
+    @Login(action = Action.Skip)
+    @PostMapping("/latest")
+    public RestResult<List<NoticeAnnouncement>> latestNotices(Integer limit) {
+        return success(noticeAnnouncementService.latestNotices(limit));
+    }
+}

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/NoticeRecordController.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.NoticeRecord;
+import com.patzn.cloud.service.lims.hmhj.service.INoticeRecordService;
+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 patzn
+ * @since 2021-07-25
+ */
+@Api(tags = "通知公告操作日志")
+@RestController
+@RequestMapping("/v1/notice_record")
+public class NoticeRecordController extends ServiceController {
+
+    @Autowired
+    private INoticeRecordService noticeRecordService;
+
+    @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<NoticeRecord>> getPage(NoticeRecord noticeRecord) {
+        return success(noticeRecordService.page(getPage(), noticeRecord));
+	}
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<NoticeRecord> get(@PathVariable("id") Long id) {
+        return success(noticeRecordService.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, NoticeRecord noticeRecord) {
+        noticeRecord.setId(id);
+        return success(noticeRecordService.updateById(noticeRecord));
+	}
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+	public RestResult<Boolean> add(NoticeRecord noticeRecord) {
+        return success(noticeRecordService.save(noticeRecord));
+	}
+
+    @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(noticeRecordService.removeByIds(ids));
+	}
+}

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

 package com.patzn.cloud.service.lims.hmhj.controller;
 
-import com.patzn.cloud.service.hmhj.entity.OriginalRecord;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
 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.OriginalRecord;
+import com.patzn.cloud.service.hmhj.enums.EntrustFlowEnum;
+import com.patzn.cloud.service.hmhj.vo.OriginalRecordVO;
 import com.patzn.cloud.service.lims.hmhj.service.IOriginalRecordService;
-
 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;
+import java.util.Objects;
 
 /**
  * 土工原始记录表 前端控制器
@@ -44,9 +38,23 @@ public class OriginalRecordController extends ServiceController {
             @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
     })
     @PostMapping("/page")
-	public RestResult<Page<OriginalRecord>> getPage(OriginalRecord originalRecord) {
+    public RestResult<Page<OriginalRecord>> getPage(OriginalRecord originalRecord) {
         return success(originalRecordService.page(getPage(), originalRecord));
-	}
+    }
+
+    @ApiOperation(value = "分页列表查询", notes = "分页列表查询")
+    @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("/pageVO")
+    public RestResult<Page<OriginalRecordVO>> getPageVO(OriginalRecordVO originalRecordVO) {
+        // 数据检测只能当前人看
+        if (Objects.equals(originalRecordVO.getSource(), EntrustFlowEnum.TEST.getName())) {
+            originalRecordVO.setTesterId(getAccount().getUserId());
+        }
+        return success(originalRecordService.pageVO(getPage(), originalRecordVO));
+    }
 
     @ApiOperation("查询 id 信息")
     @ApiImplicitParams({
@@ -62,23 +70,28 @@ public class OriginalRecordController extends ServiceController {
             @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
     })
     @PutMapping("/{id}")
-	public RestResult<Boolean> edit(@PathVariable("id") Long id, OriginalRecord originalRecord) {
+    public RestResult<Boolean> edit(@PathVariable("id") Long id, OriginalRecord originalRecord) {
         originalRecord.setId(id);
         return success(originalRecordService.updateById(originalRecord));
-	}
+    }
 
     @ApiOperation("添加")
     @PostMapping("/")
-	public RestResult<Boolean> add(OriginalRecord originalRecord) {
+    public RestResult<Boolean> add(OriginalRecord originalRecord) {
         return success(originalRecordService.save(originalRecord));
-	}
+    }
 
     @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) {
+    @DeleteMapping("/")
+    public RestResult<Boolean> delete(@RequestParam("ids") List<Long> ids) {
         return success(originalRecordService.removeByIds(ids));
-	}
+    }
+
+    @PostMapping("/download")
+    public void download(@RequestParam("entrustId") Long entrustId, @RequestParam("id") Long id) {
+        originalRecordService.download(entrustId, id, response);
+    }
 }