diff --git a/ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/WagesCompilationServiceImpl.java b/ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/WagesCompilationServiceImpl.java index 47287fd36986e0692b32ab4257d600c8fd59e0e8..66479030cb7f147f97f86a2a74c0c617e9fa2fc6 100644 --- a/ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/WagesCompilationServiceImpl.java +++ b/ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/WagesCompilationServiceImpl.java @@ -1,38 +1,19 @@ package com.ruoyi.system.service.impl; -import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.ExcelReader; -import com.alibaba.excel.read.metadata.ReadSheet; -import java.io.File; -import java.io.InputStream; import com.alibaba.excel.EasyExcelFactory; -import com.alibaba.excel.read.builder.ExcelReaderBuilder; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.file.FileUtils; import com.ruoyi.system.listener.ExcelListener; import com.ruoyi.system.mapper.WagesCompilationMapper; -import com.ruoyi.system.mapper.WagesDetailsMapper; import com.ruoyi.system.mapper.WagesVersionMapper; -import com.ruoyi.system.model.wages.dao.WagesCompilationDAO; import com.ruoyi.system.model.wages.dao.WagesCompilationExcelDAO; -import com.ruoyi.system.model.wages.dao.WagesDetailsExcelDAO; -import com.ruoyi.system.model.wages.dao.WagesVersionDAO; import com.ruoyi.system.service.WagesCompilationService; import lombok.RequiredArgsConstructor; - -import org.apache.ibatis.annotations.Param; -import org.apache.poi.ss.usermodel.*; -import org.apache.poi.xssf.streaming.SXSSFWorkbook; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; -import java.io.*; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.time.LocalDateTime; -import java.util.*; -import java.util.stream.Collectors; +import java.io.IOException; +import java.io.InputStream; +import java.util.List; /** * @author haiwe @@ -61,9 +42,9 @@ public class WagesCompilationServiceImpl implements WagesCompilationService { WagesCompilationExcelDAO financeWagesHeader = financeWagesList.get(0); wagesHeader.setMineId("011704"); - wagesHeader.setType("2"); + wagesHeader.setType("0"); financeWagesHeader.setMineId("011704"); - financeWagesHeader.setType("3"); + financeWagesHeader.setType("1"); wagesCompilationMapper.insertBatch(wagesHeader); wagesCompilationMapper.insertBatch(financeWagesHeader); diff --git a/ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/WagesServiceImpl.java b/ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/WagesServiceImpl.java index 87be2a84ec596111aa0dd29f2021c5f2ecf1ca25..ef0ef14beb8e870d59c9035aa1ac52d3867a2d15 100644 --- a/ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/WagesServiceImpl.java +++ b/ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/WagesServiceImpl.java @@ -253,10 +253,8 @@ public class WagesServiceImpl implements WagesService { if (customDocument != null) { JSONObject customDocumentJsonObj = (JSONObject) JSON.toJSON(customDocument.getData().get(0)); return customDocumentJsonObj.getJSONArray("recordList"); - } else { - return null; } - + return null; } private String getCodeFromCustomDoc(JSONArray customDoc, String nameZhCn) { diff --git a/ruoyi-wages/src/main/java/com/ruoyi/system/utils/WagesUtils.java b/ruoyi-wages/src/main/java/com/ruoyi/system/utils/WagesUtils.java index 81bb3e74b3c8dc43a1a1acfb98f83693b5c471ec..0b35fd689ffa82410f9e72a8b2156be07a3576d6 100644 --- a/ruoyi-wages/src/main/java/com/ruoyi/system/utils/WagesUtils.java +++ b/ruoyi-wages/src/main/java/com/ruoyi/system/utils/WagesUtils.java @@ -4,7 +4,6 @@ import com.ruoyi.system.mapper.WagesCompilationMapper; import com.ruoyi.system.mapper.WagesVersionMapper; import com.ruoyi.system.model.wages.dao.WagesCompilationExcelDAO; import com.ruoyi.system.model.wages.dao.WagesVersionDAO; -import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Component; import java.util.List; @@ -16,9 +15,8 @@ import java.util.stream.Collectors; */ @Component public class WagesUtils { - private WagesVersionMapper wagesVersionMapper; - private WagesCompilationMapper wagesCompilationMapper; - + private WagesVersionMapper wagesVersionMapper; + private WagesCompilationMapper wagesCompilationMapper; public WagesUtils(WagesVersionMapper wagesVersionMapper, WagesCompilationMapper wagesCompilationMapper) { this.wagesVersionMapper = wagesVersionMapper; @@ -31,7 +29,7 @@ public class WagesUtils { * @param type * @return */ - public Integer getComparisonId(String mineId, String type) { + public Integer getComparisonId(String mineId, String type) { List<WagesCompilationExcelDAO> wagesCompilationExcelDAO = wagesCompilationMapper.selectByMineIdAndType(mineId, type); if (wagesCompilationExcelDAO == null || wagesCompilationExcelDAO.size() == 0) { return null;