添加业务参数配置模块：

1、展示参数配置列表；
2、添加参数配置；
3、编辑参数配置；
4、删除参数配置；
5、获取参数配置

huimv-manage/src/main/java/com/huimv/manage/eartag/controller/BusinessConfigController.java

@@ -0,0 +1,120 @@
+package com.huimv.manage.eartag.controller;
+
+import com.huimv.manage.eartag.service.impl.BusinessConfigService;
+import com.huimv.manage.util.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+@RestController
+@RequestMapping(value = "/system/config")
+public class BusinessConfigController {
+    @Autowired
+    private BusinessConfigService configService;
+
+    /**
+     * @Method      : listEarmark
+     * @Description : 展示列表
+     * @Params      : [paramType, pageSize, pageNo]
+     * @Return      : com.huimv.manage.util.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2021/11/10       
+     * @Time        : 20:57
+     */
+    @RequestMapping(value = "/listEarmark",method = RequestMethod.GET)
+    public Result listEarmark(
+            @RequestParam(value = "paramType",required = false) String paramType,
+            @RequestParam(value = "pageSize",required = true) Integer pageSize,
+            @RequestParam(value = "pageNum", required = true) Integer pageNo){
+        //
+        return configService.listEarmark(paramType,pageSize,pageNo);
+    }
+
+    /**
+     * @Method      : addConfigParam
+     * @Description : 添加配置参数
+     * @Params      : [paramName, paramId, aramValue, paramType, remark]
+     * @Return      : com.huimv.manage.util.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2021/11/10       
+     * @Time        : 21:03
+     */
+    @RequestMapping(value = "/addConfigParam",method = RequestMethod.GET)
+    public Result addConfigParam(@RequestParam(value = "paramName") String paramName,
+                                 @RequestParam(value = "paramId") String paramId,
+                                 @RequestParam(value = "aramValue") String paramValue,
+                                 @RequestParam(value = "paramType") String paramType,
+                                 @RequestParam(value = "remark") String remark){
+        //
+        return configService.addConfigParam(paramName,paramId,paramValue,paramType,remark);
+    }
+
+    /**
+     * @Method      : editConfigParam
+     * @Description : 编辑配置参数
+     * @Params      : [id, paramName, paramId, aramValue, paramType, remark]
+     * @Return      : com.huimv.manage.util.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2021/11/10       
+     * @Time        : 21:04
+     */
+    @RequestMapping(value = "/editConfigParam",method = RequestMethod.GET)
+    public Result editConfigParam(@RequestParam(value = "id") Integer id,
+                                  @RequestParam(value = "paramName") String paramName,
+                                  @RequestParam(value = "paramId") String paramId,
+                                  @RequestParam(value = "aramValue") String aramValue,
+                                  @RequestParam(value = "paramType") String paramType,
+                                  @RequestParam(value = "remark") String remark){
+        //
+        return configService.editConfigParam(id,paramName,paramId,aramValue,paramType,remark);
+    }
+
+    /**
+     * @Method      : editConfigParam
+     * @Description : 删除配置参数
+     * @Params      : [ids]
+     * @Return      : com.huimv.manage.util.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2021/11/10       
+     * @Time        : 20:54
+     */
+    @RequestMapping(value = "/removeConfigParam",method = RequestMethod.GET)
+    public Result editConfigParam(@RequestParam(value = "ids") String ids){
+        //
+        return configService.removeConfigParam(ids);
+    }
+    
+    /**
+     * @Method      : getConfigParam
+     * @Description : 
+     * @Params      : [param_id]
+     * @Return      : com.huimv.manage.util.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2021/11/10       
+     * @Time        : 21:30
+     */
+    @RequestMapping(value = "/getConfigParam",method = RequestMethod.GET)
+    public Result getConfigParam(@RequestParam(value = "paramId") String paramId){
+        //
+        return configService.getConfigParam(paramId);
+    }
+
+}

huimv-manage/src/main/java/com/huimv/manage/eartag/controller/EarmarkController.java

@@ -40,19 +40,7 @@ public class EarmarkController {
     private IEarmarkService earmarkService;
 
     @RequestMapping(value = "/listEarmark",method = RequestMethod.GET)
-//    public Result listEarmark(@RequestParam(value = "pageSize") int pageSize, HttpServletRequest request){
     public Result listEarmark(
-//                              @RequestParam(value = "applyId",required = false) String applyId,
-//                              @RequestParam(value = "packageId",required = false) String packageId,
-//                              @RequestParam(value = "earMarkId",required = false) String earMarkId,
-//                              @RequestParam(value = "earMarkNumber",required = false) String earMarkNumber,
-//                              @RequestParam(value = "returnState",required = false) String returnState,
-//                              @RequestParam(value = "writeState",required = false) String writeState,
-//                              @RequestParam(value = "printState",required = false) String printState,
-//                              @RequestParam(value = "startDate",required = false) Date startDate,
-//                              @RequestParam(value = "endDate",required = false) Date endDate,
-//                              @RequestParam(value = "pageSize",required = true) String pageSize,
-//                              @RequestParam(value = "pageNum", required = true) String pageNo){
             @RequestParam(value = "applyId",required = false) Integer applyId,
             @RequestParam(value = "packageId",required = false) Integer packageId,
             @RequestParam(value = "earMarkId",required = false) Integer earMarkId,
@@ -66,7 +54,6 @@ public class EarmarkController {
             @RequestParam(value = "pageNum", required = true) Integer pageNo){
         //
         return earmarkService.listEarmark(applyId,packageId,earMarkId,earMarkNumber,returnState,writeState,printState,startDate,endDate,pageSize,pageNo);
-//        return earmarkService.listEarmark(Integer.parseInt(applyId),Integer.parseInt(packageId),Integer.parseInt(earMarkId),Integer.parseInt(earMarkNumber),Integer.parseInt(returnState),Integer.parseInt(writeState),Integer.parseInt(printState),startDate,endDate,Integer.parseInt(pageSize),Integer.parseInt(pageNo));
     }
 
     /**
@@ -151,7 +138,7 @@ public class EarmarkController {
 
     /**
      * @Method      : exportEarmarkByApply
-     * @Description : 通过任务号下载耳标号
+     * @Description : 通过任务号导出耳标号（不分页导出）
      * @Params      : [applyId, printState, response]
      * @Return      : void
      *
@@ -172,8 +159,30 @@ public class EarmarkController {
     }
 
     /**
+     * @Method      : exportPageEarmarkByApply
+     * @Description : 通过任务号导出耳标号（分页导出）
+     * @Params      : [applyId, printState, quantity, response]
+     * @Return      : void
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2021/11/10       
+     * @Time        : 17:23
+     */
+    @RequestMapping(value = "/exportPageEarmarkByApply",method = RequestMethod.GET)
+    public void exportPageEarmarkByApply(@RequestParam(value = "applyId",required = true) Integer applyId,
+                                     @RequestParam(value = "printState",required = false) Integer printState,
+                                     @RequestParam(value = "quantity",required = true) Integer quantity,
+                                     HttpServletResponse response) throws IOException {
+        log.info("applyId="+applyId);
+        log.info("printState="+printState);
+        log.info("quantity="+quantity);
+        //
+        earmarkService.exportEarmarkByApply(applyId,printState,quantity,response);
+    }
+
+    /**
      * @Method      : exportEarmarkByEarmark
-     * @Description : 通过耳标号下载耳标数据
+     * @Description : 通过耳标号到处耳标数据
      * @Params      : [ids, printState, quantity, response]
      * @Return      : void
      * 

huimv-manage/src/main/java/com/huimv/manage/dao/entity/EtApplyEntity.java

@@ -1,4 +1,4 @@
-package com.huimv.manage.dao.entity;
+package com.huimv.manage.eartag.dao.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.data.annotation.CreatedDate;

huimv-manage/src/main/java/com/huimv/manage/dao/entity/EtEarmarkEntity.java

@@ -1,4 +1,4 @@
-package com.huimv.manage.dao.entity;
+package com.huimv.manage.eartag.dao.entity;
 
 import javax.persistence.*;
 import java.io.Serializable;

huimv-manage/src/main/java/com/huimv/manage/dao/entity/EtPackageEntity.java

@@ -1,4 +1,4 @@
-package com.huimv.manage.dao.entity;
+package com.huimv.manage.eartag.dao.entity;
 
 import javax.persistence.*;
 import java.io.Serializable;

huimv-manage/src/main/java/com/huimv/manage/eartag/dao/entity/SysBusiConfigParamEntity.java

@@ -0,0 +1,91 @@
+package com.huimv.manage.eartag.dao.entity;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "sys_busi_config_param")
+public class SysBusiConfigParamEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    private Integer id;
+
+    @Column(name = "param_name")
+    private String paramName;
+
+    @Column(name = "param_id")
+    private String paramId;
+
+    @Column(name = "param_value")
+    private String paramValue;
+
+    @Column(name = "param_type")
+    private String paramType;
+
+    @Column(name = "remark")
+    private String remark;
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setParamName(String paramName) {
+        this.paramName = paramName;
+    }
+
+    public String getParamName() {
+        return paramName;
+    }
+
+    public void setParamId(String paramId) {
+        this.paramId = paramId;
+    }
+
+    public String getParamId() {
+        return paramId;
+    }
+
+    public void setParamValue(String paramValue) {
+        this.paramValue = paramValue;
+    }
+
+    public String getParamValue() {
+        return paramValue;
+    }
+
+    public void setParamType(String paramType) {
+        this.paramType = paramType;
+    }
+
+    public String getParamType() {
+        return paramType;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    @Override
+    public String toString() {
+        return "SysBusiConfigParamEntity{" +
+                "id=" + id + '\'' +
+                "paramName=" + paramName + '\'' +
+                "paramId=" + paramId + '\'' +
+                "paramValue=" + paramValue + '\'' +
+                "paramType=" + paramType + '\'' +
+                "remark=" + remark + '\'' +
+                '}';
+    }
+}

huimv-manage/src/main/java/com/huimv/manage/dao/repo/EarmarkRepo.java

@@ -1,6 +1,6 @@
-package com.huimv.manage.dao.repo;
+package com.huimv.manage.eartag.dao.repo;
 
-import com.huimv.manage.dao.entity.EtEarmarkEntity;
+import com.huimv.manage.eartag.dao.entity.EtEarmarkEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;

huimv-manage/src/main/java/com/huimv/manage/dao/repo/EtApplyRepo.java

@@ -1,7 +1,6 @@
-package com.huimv.manage.dao.repo;
+package com.huimv.manage.eartag.dao.repo;
 
-import com.huimv.manage.dao.entity.EtApplyEntity;
-import org.apache.ibatis.annotations.Param;
+import com.huimv.manage.eartag.dao.entity.EtApplyEntity;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;

huimv-manage/src/main/java/com/huimv/manage/dao/repo/PackageRepo.java

@@ -1,6 +1,6 @@
-package com.huimv.manage.dao.repo;
+package com.huimv.manage.eartag.dao.repo;
 
-import com.huimv.manage.dao.entity.EtPackageEntity;
+import com.huimv.manage.eartag.dao.entity.EtPackageEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;

huimv-manage/src/main/java/com/huimv/manage/eartag/dao/repo/SysBusiConfigParamRepo.java

@@ -0,0 +1,9 @@
+package com.huimv.manage.eartag.dao.repo;
+
+import com.huimv.manage.eartag.dao.entity.SysBusiConfigParamEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+public interface SysBusiConfigParamRepo extends JpaRepository<SysBusiConfigParamEntity, Integer>, JpaSpecificationExecutor<SysBusiConfigParamEntity> {
+
+}

huimv-manage/src/main/java/com/huimv/manage/eartag/service/IApplyService.java

@@ -1,12 +1,9 @@
 package com.huimv.manage.eartag.service;
 
 import com.alibaba.fastjson.JSONArray;
-import com.huimv.manage.dao.entity.EtApplyEntity;
 import com.huimv.manage.util.Result;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.Date;
-import java.util.List;
 
 public interface IApplyService {
     // 展示任务列表

huimv-manage/src/main/java/com/huimv/manage/eartag/service/IBusinessConfigService.java

@@ -0,0 +1,21 @@
+package com.huimv.manage.eartag.service;
+
+import com.huimv.manage.util.Result;
+
+public interface IBusinessConfigService {
+
+    //
+    Result listEarmark(String paramType, Integer pageSize, Integer pageNo);
+
+    //
+    Result addConfigParam(String paramName, String paramId, String aramValue, String paramType, String remark);
+
+    //
+    Result editConfigParam(Integer id, String paramName, String paramId, String paramValue, String paramType, String remark);
+
+    //
+    Result removeConfigParam(String ids);
+
+    //
+    Result getConfigParam(String paramId);
+}

huimv-manage/src/main/java/com/huimv/manage/eartag/service/impl/ApplyServiceImpl.java

@@ -2,11 +2,10 @@ package com.huimv.manage.eartag.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.huimv.manage.dao.entity.EtApplyEntity;
-import com.huimv.manage.dao.repo.EtApplyRepo;
+import com.huimv.manage.eartag.dao.entity.EtApplyEntity;
+import com.huimv.manage.eartag.dao.repo.EtApplyRepo;
 import com.huimv.manage.eartag.service.IApplyService;
 import com.huimv.manage.util.Const;
-import com.huimv.manage.util.DataUtil;
 import com.huimv.manage.util.Result;
 import com.huimv.manage.util.ResultCode;
 import lombok.extern.slf4j.Slf4j;
@@ -15,12 +14,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.*;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
 
 import javax.persistence.criteria.*;
-import javax.servlet.http.HttpServletResponse;
 import java.sql.Timestamp;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;

huimv-manage/src/main/java/com/huimv/manage/eartag/service/impl/BusinessConfigService.java

@@ -0,0 +1,186 @@
+package com.huimv.manage.eartag.service.impl;
+
+import com.huimv.manage.eartag.dao.entity.EtEarmarkEntity;
+import com.huimv.manage.eartag.dao.entity.SysBusiConfigParamEntity;
+import com.huimv.manage.eartag.dao.repo.SysBusiConfigParamRepo;
+import com.huimv.manage.eartag.service.IBusinessConfigService;
+import com.huimv.manage.util.Const;
+import com.huimv.manage.util.Result;
+import com.huimv.manage.util.ResultCode;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+import javax.persistence.criteria.Order;
+import javax.persistence.criteria.Predicate;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+@Service
+@Slf4j
+public class BusinessConfigService implements IBusinessConfigService {
+    @Autowired
+    private SysBusiConfigParamRepo configParamRepo;
+
+    /**
+     * @Method      : listEarmark
+     * @Description : 
+     * @Params      : [paramType, pageSize, pageNo]
+     * @Return      : com.huimv.manage.util.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2021/11/10       
+     * @Time        : 21:18
+     */
+    @Override
+    public Result listEarmark(String paramType, Integer pageSize, Integer pageNo) {
+        Specification<SysBusiConfigParamEntity> sf = (Specification<SysBusiConfigParamEntity>) (root, criteriaQuery, criteriaBuilder) -> {
+            //
+            List<Predicate> predList = new ArrayList<>();
+            if (null != paramType) {
+                predList.add(criteriaBuilder.equal(root.get("paramType").as(Integer.class), paramType));
+            }
+            //
+            Predicate[] pred = new Predicate[predList.size()];
+            Predicate and = criteriaBuilder.and(predList.toArray(pred));
+            criteriaQuery.where(and);
+            //
+            List<Order> orders = new ArrayList<>();
+            orders.add(criteriaBuilder.desc(root.get("id")));
+            return criteriaQuery.orderBy(orders).getRestriction();
+        };
+        // 分页
+        Pageable pageable = PageRequest.of( pageNo - 1, pageSize);
+        return new Result(ResultCode.SUCCESS, configParamRepo.findAll(sf, pageable));
+    }
+
+    /**
+     * @Method      : addConfigParam
+     * @Description : 
+     * @Params      : [paramName, paramId, paramValue, paramType, remark]
+     * @Return      : com.huimv.manage.util.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2021/11/10       
+     * @Time        : 21:18
+     */
+    @Override
+    public Result addConfigParam(String paramName, String paramId, String paramValue, String paramType, String remark) {
+        SysBusiConfigParamEntity configParamEntity = new SysBusiConfigParamEntity();
+        configParamEntity.setParamName(paramName);
+        configParamEntity.setParamId(paramId);
+        configParamEntity.setParamValue(paramValue);
+        configParamEntity.setParamType(paramType);
+        configParamEntity.setRemark(remark);
+        SysBusiConfigParamEntity addResult = configParamRepo.saveAndFlush(configParamEntity);
+        log.info("addResult="+addResult);
+        return new Result(ResultCode.SUCCESS, Const.SAVE_OK);
+    }
+
+    /**
+     * @Method      : editConfigParam
+     * @Description : 
+     * @Params      : [id, paramName, paramId, paramValue, paramType, remark]
+     * @Return      : com.huimv.manage.util.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2021/11/10       
+     * @Time        : 21:18
+     */
+    @Override
+    public Result editConfigParam(Integer id, String paramName, String paramId, String paramValue, String paramType, String remark) {
+        SysBusiConfigParamEntity configParamEntity = new SysBusiConfigParamEntity();
+        configParamEntity.setId(id);
+        configParamEntity.setParamName(paramName);
+        configParamEntity.setParamId(paramId);
+        configParamEntity.setParamValue(paramValue);
+        configParamEntity.setParamType(paramType);
+        configParamEntity.setRemark(remark);
+        SysBusiConfigParamEntity addResult = configParamRepo.saveAndFlush(configParamEntity);
+        log.info("addResult="+addResult);
+        return new Result(ResultCode.SUCCESS, Const.SAVE_OK);
+    }
+
+    /**
+     * @Method      : removeConfigParam
+     * @Description : 
+     * @Params      : [ids]
+     * @Return      : com.huimv.manage.util.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2021/11/10       
+     * @Time        : 21:29
+     */
+    @Override
+    public Result removeConfigParam(String ids) {
+        Specification<SysBusiConfigParamEntity> specific = (Specification<SysBusiConfigParamEntity>) (root, criteriaQuery, criteriaBuilder) -> {
+            //
+            List<Predicate> predList = new ArrayList<>();
+            if (null != ids && !ids.trim().equalsIgnoreCase("null")) {
+                String[] idsArray =  ids.split(",");
+                Integer[] idArrInt = new Integer[idsArray.length];
+                for(int a=0;a<idsArray.length;a++){
+                    idArrInt[a]=Integer.parseInt(idsArray[a]);
+                }
+                predList.add(root.get("id").as(Integer.class).in(idArrInt));
+            }
+            //
+            Predicate[] pred = new Predicate[predList.size()];
+            Predicate and = criteriaBuilder.and(predList.toArray(pred));
+            criteriaQuery.where(and);
+            //
+            List<Order> orders = new ArrayList<>();
+            orders.add(criteriaBuilder.asc(root.get("id")));
+            return criteriaQuery.orderBy(orders).getRestriction();
+        };
+        //
+        List<SysBusiConfigParamEntity> dataList = configParamRepo.findAll(specific);
+        configParamRepo.deleteAll(dataList);
+        return new Result(ResultCode.SUCCESS, Const.OPERATE_OK);
+    }
+
+    /**
+     * @Method      : getConfigParam
+     * @Description : 
+     * @Params      : [paramId]
+     * @Return      : com.huimv.manage.util.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2021/11/10       
+     * @Time        : 21:31
+     */
+    @Override
+    public Result getConfigParam(String paramId) {
+        Specification<SysBusiConfigParamEntity> spec = (Specification<SysBusiConfigParamEntity>) (root, criteriaQuery, criteriaBuilder) -> {
+            //
+            List<Predicate> predList = new ArrayList<>();
+            if (null != paramId) {
+                predList.add(criteriaBuilder.equal(root.get("paramId").as(Integer.class), paramId));
+            }
+            //
+            Predicate[] pred = new Predicate[predList.size()];
+            Predicate and = criteriaBuilder.and(predList.toArray(pred));
+            criteriaQuery.where(and);
+            //
+            List<Order> orders = new ArrayList<>();
+            orders.add(criteriaBuilder.desc(root.get("id")));
+            return criteriaQuery.orderBy(orders).getRestriction();
+        };
+        //
+        return new Result(ResultCode.SUCCESS, configParamRepo.findAll(spec));
+    }
+
+
+}

huimv-manage/src/main/java/com/huimv/manage/eartag/service/impl/EarmarkServiceImpl.java

@@ -2,9 +2,8 @@ package com.huimv.manage.eartag.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.huimv.manage.dao.entity.EtApplyEntity;
-import com.huimv.manage.dao.entity.EtEarmarkEntity;
-import com.huimv.manage.dao.repo.EarmarkRepo;
+import com.huimv.manage.eartag.dao.entity.EtEarmarkEntity;
+import com.huimv.manage.eartag.dao.repo.EarmarkRepo;
 import com.huimv.manage.eartag.service.IEarmarkService;
 import com.huimv.manage.util.*;
 import com.huimv.manage.webservice.Soap;
@@ -336,7 +335,6 @@ public class EarmarkServiceImpl implements IEarmarkService {
     @Override
     public void exportEarmarkByEarmark(String ids, Integer printState,Integer quantity, HttpServletResponse response) throws IOException {
         Specification<EtEarmarkEntity> specific = (Specification<EtEarmarkEntity>) (root, criteriaQuery, criteriaBuilder) -> {
-
             //
             List<Predicate> predList = new ArrayList<>();
             if (null != ids && !ids.trim().equalsIgnoreCase("null")) {

huimv-manage/src/main/java/com/huimv/manage/eartag/service/impl/PackageServiceImpl.java

@@ -2,9 +2,8 @@ package com.huimv.manage.eartag.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.huimv.manage.dao.entity.EtApplyEntity;
-import com.huimv.manage.dao.entity.EtPackageEntity;
-import com.huimv.manage.dao.repo.PackageRepo;
+import com.huimv.manage.eartag.dao.entity.EtPackageEntity;
+import com.huimv.manage.eartag.dao.repo.PackageRepo;
 import com.huimv.manage.eartag.service.IPackageService;
 import com.huimv.manage.util.Const;
 import com.huimv.manage.util.Result;

huimv-manage/src/main/java/com/huimv/manage/util/Const.java

@@ -12,6 +12,8 @@ public final class Const {
     //Constants
     public static final Integer CODE_OK = 10000;
     public static final String SAVE_NEW_MESSION = "保存新任务成功.";
+    public static final String SAVE_OK = "保存成功。";
+    public static final String OPERATE_OK = "保存成功。";
 
     public static final Integer CODE_APPLY_NO_NEW = 10001;
     public static final String APPLY_NO_NEW = "目前暂无新任务.";

huimv-manage/src/main/java/com/huimv/manage/util/ExcelUtil.java

@@ -1,9 +1,7 @@
 package com.huimv.manage.util;
 
-import com.huimv.manage.dao.entity.EtEarmarkEntity;
+import com.huimv.manage.eartag.dao.entity.EtEarmarkEntity;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.apache.poi.hssf.util.HSSFColor;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.streaming.SXSSFSheet;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
@@ -78,7 +76,7 @@ public class ExcelUtil {
                 //序号是从1开始的
                 int count = 0;
                 for(int a=0;a<dataList.size();a++){
-                    log.info("行数="+excelRow);
+//                    log.info("行数="+excelRow);
                     EtEarmarkEntity earmarkEntity = dataList.get(a);
                     count = 0;
                     Row dataRow = sheet1.createRow(++excelRow);

huimv-manage/src/test/java/com/huimv/manage/eartag/controller/ApplyTest.java

@@ -1,6 +1,6 @@
 package com.huimv.manage.eartag.controller;
 
-import com.huimv.manage.dao.entity.EtApplyEntity;
+import com.huimv.manage.eartag.dao.entity.EtApplyEntity;
 import com.huimv.manage.eartag.service.IApplyService;
 import com.huimv.manage.util.Result;
 import org.junit.jupiter.api.Test;