Selaa lähdekoodia

修改奖金导入逻辑

zhouyy 5 kuukautta sitten
vanhempi
commit
cd532f3c7b

+ 1 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/excel/ProjectContractBonusExlceHead.java

@@ -4,7 +4,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;
 
 @Data
-public class ProjectContractBonusExlceHead {
+public class ProjectContractBonusExcelHead {
     @ExcelProperty(value = "合同主体",index = 0)
     private String contract;
     @ExcelProperty(value = "项目名称",index = 1)

+ 2 - 2
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/ContractBonusDetailMapper.java

@@ -2,7 +2,7 @@ package com.management.platform.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.management.platform.entity.ContractBonusDetail;
-import com.management.platform.entity.excel.ProjectContractBonusExlceHead;
+import com.management.platform.entity.excel.ProjectContractBonusExcelHead;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -10,5 +10,5 @@ import java.util.List;
 public interface ContractBonusDetailMapper extends BaseMapper<ContractBonusDetail> {
     void batchInsert(@Param("toAddList") List<ContractBonusDetail> toAddBonusDetailList);
 
-    List<ProjectContractBonusExlceHead> getExportContractProjectBonus(Integer year, Integer companyId);
+    List<ProjectContractBonusExcelHead> getExportContractProjectBonus(Integer year, Integer companyId);
 }

+ 5 - 5
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ContractBonusDetailServiceImpl.java

@@ -11,7 +11,7 @@ import com.management.platform.entity.ContractBonusSummary;
 import com.management.platform.entity.User;
 import com.management.platform.entity.WxCorpInfo;
 import com.management.platform.entity.bo.BonusDataBO;
-import com.management.platform.entity.excel.ProjectContractBonusExlceHead;
+import com.management.platform.entity.excel.ProjectContractBonusExcelHead;
 import com.management.platform.entity.vo.ImportBonusTemplateVO;
 import com.management.platform.entity.vo.ProjectBonusTimeVO;
 import com.management.platform.entity.vo.ProjectBonusTotalTimeVO;
@@ -440,7 +440,7 @@ public class ContractBonusDetailServiceImpl extends ServiceImpl<ContractBonusDet
         if(null ==user){
             httpRespMsg.setError("登录凭证有误,请联系管理员");
         }
-        List<ProjectContractBonusExlceHead> contractProjectBonusList=contractBonusDetailMapper.getExportContractProjectBonus(year,user.getCompanyId());
+        List<ProjectContractBonusExcelHead> contractProjectBonusList=contractBonusDetailMapper.getExportContractProjectBonus(year,user.getCompanyId());
         httpRespMsg.setData(contractProjectBonusList);
         return httpRespMsg;
     }
@@ -456,7 +456,7 @@ public class ContractBonusDetailServiceImpl extends ServiceImpl<ContractBonusDet
                 e.printStackTrace();
             }
         }
-        List<ProjectContractBonusExlceHead> dataList=contractBonusDetailMapper.getExportContractProjectBonus(year,user.getCompanyId());
+        List<ProjectContractBonusExcelHead> dataList=contractBonusDetailMapper.getExportContractProjectBonus(year,user.getCompanyId());
 
         String fileName = null;
         try {
@@ -469,11 +469,11 @@ public class ContractBonusDetailServiceImpl extends ServiceImpl<ContractBonusDet
         response.setHeader("Content-Disposition", "attachment;filename=" + null==fileName?"file":fileName);
 
         try (ServletOutputStream outputStream = response.getOutputStream()){
-            EasyExcel.write(outputStream, ProjectContractBonusExlceHead.class)
+            EasyExcel.write(outputStream, ProjectContractBonusExcelHead.class)
                     .excelType(ExcelTypeEnum.XLSX)
                     .autoCloseStream(true)
                     .registerWriteHandler(new ExcelMergeStrategy(
-                            dataList.stream().map(ProjectContractBonusExlceHead::getContract)
+                            dataList.stream().map(ProjectContractBonusExcelHead::getContract)
                                     .collect(Collectors.toList()), 0
                     ))
 //                    .registerWriteHandler(new WidthStyleStrategy())

+ 1 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ContractBonusDetailMapper.xml

@@ -25,7 +25,7 @@
 <!--        </collection>-->
 <!--    </resultMap>-->
 
-    <select id="getExportContractProjectBonus" resultType="com.management.platform.entity.excel.ProjectContractBonusExlceHead">
+    <select id="getExportContractProjectBonus" resultType="com.management.platform.entity.excel.ProjectContractBonusExcelHead">
         select tmp1.*,p.project_name as projectName
         from
             (