文件类型

src/main/java/com/imed/costaccount/mapper/CostIncomeFileMapper.java

@@ -0,0 +1,16 @@
+package com.imed.costaccount.mapper;
+
+import com.imed.costaccount.model.CostIncomeFile;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 文件上传记录
+ * 
+ * @author KCYG
+ * @date 2021-08-10 14:42:20
+ */
+@Mapper
+public interface CostIncomeFileMapper extends BaseMapper<CostIncomeFile> {
+	
+}

src/main/java/com/imed/costaccount/model/CostIncomeFile.java

@@ -0,0 +1,77 @@
+package com.imed.costaccount.model;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 文件上传记录
+ * 
+ * @author KCYG
+ * @email KCYG@xinxicom
+ * @date 2021-08-10 14:42:20
+ */
+@Data
+@Accessors(chain = true)
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName("cost_income_file")
+public class CostIncomeFile implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键  文件编号
+	 */
+	@TableId
+	private Long id;
+	/**
+	 * 文件类型
+	 */
+	private String fileType;
+	/**
+	 * 文件名称
+	 */
+	private Integer fileName;
+	/**
+	 * 文件上传路径
+	 */
+	private String fileUrl;
+	/**
+	 * 成功导入记录数
+	 */
+	private Integer successAmount;
+	/**
+	 * 总记录数
+	 */
+	private Integer totalAmount;
+	/**
+	 * 医院Id
+	 */
+	private Long hospId;
+	/**
+	 * 用户Id
+	 */
+	private Long userId;
+	/**
+	 * 用户名称
+	 */
+	private String userName;
+	/**
+	 * 错误详情
+	 */
+	private String errorList;
+	/**
+	 * 创建时间13位时间戳
+	 */
+	private Long createTime;
+	/**
+	 * 删除时间，如果存在表示已删除13位时间戳
+	 */
+	private Long deleteTime;
+
+}

src/main/java/com/imed/costaccount/model/CostIncomeGroup.java

@@ -9,6 +9,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 收入归集
@@ -137,7 +138,7 @@ public class CostIncomeGroup implements Serializable {
 	/**
 	 * 费用发生时间
 	 */
-	private Integer feeDatetime;
+	private Date feeDatetime;
 	/**
 	 * 年份
 	 */

src/main/java/com/imed/costaccount/service/CostIncomeFileService.java

@@ -0,0 +1,16 @@
+package com.imed.costaccount.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.imed.costaccount.model.CostIncomeFile;
+
+/**
+ * 文件上传记录
+ *
+ * @author KCYG
+ * @email KCYG@xinxicom
+ * @date 2021-08-10 14:42:20
+ */
+public interface CostIncomeFileService extends IService<CostIncomeFile> {
+
+}
+

src/main/java/com/imed/costaccount/service/CostIncomeGroupService.java

@@ -35,6 +35,6 @@ public interface CostIncomeGroupService extends IService<CostIncomeGroup> {
      * @param file
      * @return
      */
-    Result importIncomeGroup(List<List<Object>> read, Long hospId, MultipartFile file);
+    Result importIncomeGroup(List<List<Object>> read, Long hospId, MultipartFile file,Integer year,Integer month);
 }
 

src/main/java/com/imed/costaccount/service/impl/CostAccountShareServiceImpl.java

@@ -119,8 +119,8 @@ public class CostAccountShareServiceImpl extends ServiceImpl<CostAccountShareMap
         // 检验输入的责任中心是否存在
         List<CostAccountShare> costAccountShareList = baseMapper.selectList(new QueryWrapper<CostAccountShare>().lambda()
                 .eq(CostAccountShare::getHospId, hospId));
-        Map<Long, List<CostAccountShare>> map = costAccountShareList.stream().collect(Collectors.groupingBy(CostAccountShare::getResponsibilityId));
-        if (!CollectionUtils.isEmpty(map.get(costAccountShareSaveDto.getResponsibilityId()))){
+        Map<Long, CostAccountShare> map = costAccountShareList.stream().collect(Collectors.toMap(CostAccountShare::getResponsibilityId,synOe->synOe));
+        if (Objects.nonNull(map.get(costAccountShareSaveDto.getResponsibilityId()))){
             throw new CostException(500,"添加的责任中心已存在");
         }
         CostAccountShare costAccountShareRequest = BeanUtil.convertObj(costAccountShareSaveDto, CostAccountShare.class);

src/main/java/com/imed/costaccount/service/impl/CostIncomeFileServiceImpl.java

@@ -0,0 +1,14 @@
+package com.imed.costaccount.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.imed.costaccount.mapper.CostIncomeFileMapper;
+import com.imed.costaccount.model.CostIncomeFile;
+import com.imed.costaccount.service.CostIncomeFileService;
+import org.springframework.stereotype.Service;
+
+
+@Service("costIncomeFileService")
+public class CostIncomeFileServiceImpl extends ServiceImpl<CostIncomeFileMapper, CostIncomeFile> implements CostIncomeFileService {
+
+
+}

src/main/java/com/imed/costaccount/service/impl/CostIncomeGroupServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.imed.costaccount.common.exception.CostException;
 import com.imed.costaccount.common.util.*;
 import com.imed.costaccount.constants.NumberConstant;
+import com.imed.costaccount.enums.DateStyleEnum;
 import com.imed.costaccount.enums.ErrorCodeEnum;
 import com.imed.costaccount.mapper.CostIncomeGroupMapper;
 import com.imed.costaccount.model.*;
@@ -94,8 +95,10 @@ public class CostIncomeGroupServiceImpl extends ServiceImpl<CostIncomeGroupMappe
         // 进行金额合并
         List<CostIncomeGroupAllAmountVO> costIncomeGroupAllAmountVoS = baseMapper.countMoney(costIncomeGroupBeforeVOList);
         //  对,的金额进行合并
+        BigDecimal totalAmount= null;
         costIncomeGroupAllAmountVoS.forEach(i -> {
             String allMoney = i.getAllMoney();
+
             if (allMoney.contains(StrUtil.COMMA)) {
                 // 存在，在进行求和
                 long sum;
@@ -103,6 +106,7 @@ public class CostIncomeGroupServiceImpl extends ServiceImpl<CostIncomeGroupMappe
                 sum = list.stream().mapToLong(m -> m).sum();
                 i.setAmount(BigDecimal.valueOf(sum));
             }
+            //TODO 统计总金额
         });
         PageUtils pageUtils = new PageUtils(pages);
         pageUtils.setList(costIncomeGroupAllAmountVoS);
@@ -119,7 +123,7 @@ public class CostIncomeGroupServiceImpl extends ServiceImpl<CostIncomeGroupMappe
      */
     @Override
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
-    public Result importIncomeGroup(List<List<Object>> list, Long hospId, MultipartFile file) {
+    public Result importIncomeGroup(List<List<Object>> list, Long hospId, MultipartFile file,Integer year,Integer month) {
         // 移除前几行的抬头内容  list的大小对应的就是行数的大小
         for (int i = list.size() - 1; i >= 0; i--) {
             if (i == NumberConstant.ZERO || i == NumberConstant.ONE || i == NumberConstant.TWO || i == NumberConstant.THREE) {
@@ -127,7 +131,6 @@ public class CostIncomeGroupServiceImpl extends ServiceImpl<CostIncomeGroupMappe
             }
         }
         log.info("读取的数据为：{}", list);
-        List<CostIncomeGroup> costIncomeGroupList = new ArrayList<>();
         List<IncomeErrorMessage> incomeErrorMessageList = new ArrayList<>();
         //获取所有的科室 成本项目 责任中心 会计科目
         Map<String, Department> departmentMap = departmentService.list(new QueryWrapper<Department>().lambda().eq(Department::getHospId, hospId)).stream().collect(Collectors.toMap(k -> k.getDepartmentCode() + k.getDepartmentName(), synOe -> synOe));
@@ -146,37 +149,26 @@ public class CostIncomeGroupServiceImpl extends ServiceImpl<CostIncomeGroupMappe
         Map<Long, Long> responsibilityDepMap = responsibilityDepartmentList.stream().collect(Collectors.toMap(ResponsibilityDepartment::getDepartmentId, ResponsibilityDepartment::getResponsibilityId));
         Map<Long, Long> accountProMap = accountingProductList.stream().collect(Collectors.toMap(AccountingProduct::getProductId, AccountingProduct::getAccountingId));
         List<CostIncomeGroup> costIncomeGroupArrayList = new ArrayList<>();
-        // 检验数据
-        checkImportData(list, incomeErrorMessageList, costIncomeGroupArrayList, departmentMap, productMap, responsibilityMap, accountingMap, responsibilityDepMap, accountProMap);
-
-        if (!CollectionUtils.isEmpty(incomeErrorMessageList)) {
-            // 说明存在错误数据
-            // TODO 不把数据保存在收入归集表里面  直将信息保存在提交记录里面
+        // 检验数据  TODO 缺少文件Id
+        checkImportData(list, incomeErrorMessageList, costIncomeGroupArrayList, departmentMap, productMap, responsibilityMap, accountingMap, responsibilityDepMap, accountProMap,hospId,year,month);
 
-        } else {
-            // 实现数据的存储
-            for (int i = 0; i < list.size(); i++) {
-                CostIncomeGroup costIncomeGroup = new CostIncomeGroup();
-                List<Object> data = list.get(i);
-                // 成本项目的代码和名称
-                String productCode = data.get(0).toString();
-                // 开单科室 执行科室的代码和名称
-                String openDepartmentCode = data.get(3).toString();
-                String startDepartmentCode = data.get(5).toString();
-                BigDecimal beforeMoney = (BigDecimal) data.get(15);
-            }
-        }
+        // 文件上传
         String uploadFile = uploadFile(file, UserContext.getCurrentUser());
-        if (StrUtil.isNotBlank(uploadFile)) {
-            // 文件上传成功  将文件记录保存
+        // 上传记录保存
+        if (StrUtil.isBlank(uploadFile)){
+            throw new CostException(500,"文件上传异常");
         }
+
+        if (CollectionUtils.isEmpty(incomeErrorMessageList)) {
+            // 才将数据保存到收入归集里面
+        }
+
         return Result.ok();
     }
 
     /**
      * 检验数据
-     *
-     * @param list                     表单数据
+     *  @param list                     表单数据
      * @param incomeErrorMessageList   存储错误信息的集合
      * @param costIncomeGroupArrayList
      * @param departmentMap            科室Map
@@ -185,14 +177,16 @@ public class CostIncomeGroupServiceImpl extends ServiceImpl<CostIncomeGroupMappe
      * @param accountingMap            会计科目Map
      * @param responsibilityDepMap     责任中心科室对照Map
      * @param accountProMap            责任中心Map
+     * @param hospId
      */
-    private void checkImportData(List<List<Object>> list, List<IncomeErrorMessage> incomeErrorMessageList, List<CostIncomeGroup> costIncomeGroupArrayList, Map<String, Department> departmentMap, Map<String, Product> productMap, Map<Long, Responsibility> responsibilityMap, Map<Long, Accounting> accountingMap, Map<Long, Long> responsibilityDepMap, Map<Long, Long> accountProMap) {
+    private void checkImportData(List<List<Object>> list, List<IncomeErrorMessage> incomeErrorMessageList, List<CostIncomeGroup> costIncomeGroupArrayList, Map<String, Department> departmentMap, Map<String, Product> productMap, Map<Long, Responsibility> responsibilityMap, Map<Long, Accounting> accountingMap, Map<Long, Long> responsibilityDepMap, Map<Long, Long> accountProMap, Long hospId,Integer year,Integer month) {
         for (int i = 0; i < list.size(); i++) {
             CostIncomeGroup costIncomeGroup = new CostIncomeGroup();
             // 用来检验数据合理性的循环
             IncomeErrorMessage incomeErrorMessage = new IncomeErrorMessage();
             List<Object> data = list.get(i);
             log.info("用户输入的数据是{}", data);
+            // TODO 暂时不走循环  直接获取数据的处理
             // 成本项目的代码和名称
             String productCode = data.get(0).toString();
             String productName = data.get(1).toString();
@@ -216,72 +210,107 @@ public class CostIncomeGroupServiceImpl extends ServiceImpl<CostIncomeGroupMappe
                     }
                 }
             }
-            // TODO 暂时不走循环  直接获取数据的处理
-            // 检验数据是否存在
+            // 检验收入成本项目数据是否存在
             Product product = productMap.get(productCode + productName);
             Department department = departmentMap.get(openDepartmentCode + openDepartmentName);
             Department department1 = departmentMap.get(startDepartmentCode + startDepartmentName);
-//            if (!checkNull && !checkOne ){
-//                if (StrUtil.isNotBlank(productCode) && StrUtil.isNotBlank(productName)){
-//                    if (Objects.isNull(product)) {
-//                        incomeErrorMessage.setTotal(i);
-//                        incomeErrorMessage.setErrMessage("代码:" + productCode + " 名称:" + productName + "成本项目不存在");
-//                        incomeErrorMessageList.add(incomeErrorMessage);
-//                    } else {
-//                        // 检验对应的会计科目是否存在
-//                        Long id = product.getId();
-//                        Long accountId = accountProMap.get(id);
-//                        if (Objects.isNull(accountingMap.get(accountId))) {
-//                            incomeErrorMessage.setTotal(i);
-//                            incomeErrorMessage.setErrMessage("代码:" + productCode + " 名称:" + productName + "成本项目对应的会计科目不存在");
-//                            incomeErrorMessageList.add(incomeErrorMessage);
-//                        } else {
-//                            costIncomeGroup.setProductCode(productCode);
-//                            costIncomeGroup.setProductName(productName);
-//                            costIncomeGroup.setAccountCode(accountingMap.get(accountId).getAccountingCode());
-//                            costIncomeGroup.setAccountName(accountingMap.get(accountId).getAccountingName());
-//                        }
-//                    }
-//                }
-//            }
-
-
-            // 开单科室
-            if (Objects.isNull(department)) {
-                incomeErrorMessage.setTotal(i);
-                incomeErrorMessage.setErrMessage("代码:" + productCode + " 名称:" + productName + "开单科室不存在");
-                incomeErrorMessageList.add(incomeErrorMessage);
-            } else {
-                Long id = department.getId();
-                Long responsibilityId = responsibilityDepMap.get(id);
-                if (Objects.isNull(responsibilityMap.get(responsibilityId))) {
-                    incomeErrorMessage.setTotal(i);
-                    incomeErrorMessage.setErrMessage("代码:" + openDepartmentCode + " 名称:" + openDepartmentName + "科室对应的责任中心不存在");
-                    incomeErrorMessageList.add(incomeErrorMessage);
-                } else {
-                    costIncomeGroup.setOpenDepartmentCode(openDepartmentCode);
-                    costIncomeGroup.setOpenResponsibilityCode(responsibilityMap.get(responsibilityId).getResponsibilityCode());
+            if (checkNull || checkOne ){
+                if (StrUtil.isNotBlank(productCode) && StrUtil.isNotBlank(productName)){
+                    if (Objects.isNull(product)) {
+                        incomeErrorMessage.setTotal(i);
+                        incomeErrorMessage.setErrMessage("代码:" + productCode + " 名称:" + productName + "成本项目不存在");
+                        incomeErrorMessageList.add(incomeErrorMessage);
+                    } else {
+                        // 检验对应的会计科目是否存在
+                        Long id = product.getId();
+                        Long accountId = accountProMap.get(id);
+                        if (Objects.isNull(accountingMap.get(accountId))) {
+                            incomeErrorMessage.setTotal(i);
+                            incomeErrorMessage.setErrMessage("代码:" + productCode + " 名称:" + productName + "成本项目对应的会计科目不存在");
+                            incomeErrorMessageList.add(incomeErrorMessage);
+                        } else {
+                            costIncomeGroup.setProductCode(productCode);
+                            costIncomeGroup.setProductName(productName);
+                            costIncomeGroup.setAccountCode(accountingMap.get(accountId).getAccountingCode());
+                            costIncomeGroup.setAccountName(accountingMap.get(accountId).getAccountingName());
+                        }
+                    }
+                }else{
+                    costIncomeGroup.setProductCode(null);
+                    costIncomeGroup.setProductName(null);
+                    costIncomeGroup.setAccountCode( null);
+                    costIncomeGroup.setAccountName(null);
+                }
+            }
+            // 检验开单科室
+            if (checkNull || checkOne ){
+                if (StrUtil.isNotBlank(openDepartmentCode) && StrUtil.isNotBlank(openDepartmentName)){
+                    // 开单科室
+                    if (Objects.isNull(department)) {
+                        incomeErrorMessage.setTotal(i);
+                        incomeErrorMessage.setErrMessage("代码:" + productCode + " 名称:" + productName + "开单科室不存在");
+                        incomeErrorMessageList.add(incomeErrorMessage);
+                    } else {
+                        Long id = department.getId();
+                        Long responsibilityId = responsibilityDepMap.get(id);
+                        if (Objects.isNull(responsibilityMap.get(responsibilityId))) {
+                            incomeErrorMessage.setTotal(i);
+                            incomeErrorMessage.setErrMessage("代码:" + openDepartmentCode + " 名称:" + openDepartmentName + "科室对应的责任中心不存在");
+                            incomeErrorMessageList.add(incomeErrorMessage);
+                        } else {
+                            costIncomeGroup.setOpenDepartmentCode(openDepartmentCode);
+                            costIncomeGroup.setOpenDepartmentName(openDepartmentName);
+                            costIncomeGroup.setOpenResponsibilityCode(responsibilityMap.get(responsibilityId).getResponsibilityCode());
+                            costIncomeGroup.setOpenResponsibilityCode(responsibilityMap.get(responsibilityId).getResponsibilityName());
+                        }
+                    }
+                }else {
+                    costIncomeGroup.setOpenDepartmentCode(null);
+                    costIncomeGroup.setOpenDepartmentName(null);
+                    costIncomeGroup.setOpenResponsibilityCode(null);
+                    costIncomeGroup.setOpenResponsibilityName(null);
                 }
             }
-            //执行科室
-            if (Objects.isNull(department1)) {
-                incomeErrorMessage.setTotal(i);
-                incomeErrorMessage.setErrMessage("代码:" + productCode + " 名称:" + productName + "执行科室不存在");
-                incomeErrorMessageList.add(incomeErrorMessage);
-            } else {
-                Long id = department1.getId();
-                Long responsibilityId = responsibilityDepMap.get(id);
-                if (Objects.isNull(responsibilityMap.get(responsibilityId))) {
-                    incomeErrorMessage.setTotal(i);
-                    incomeErrorMessage.setErrMessage("代码:" + openDepartmentCode + " 名称:" + openDepartmentName + "科室对应的责任中心不存在");
-                    incomeErrorMessageList.add(incomeErrorMessage);
-                } else {
-                    costIncomeGroup.setStartDepartmentCode(startDepartmentCode);
-                    costIncomeGroup.setStartResponsibilityCode(responsibilityMap.get(responsibilityId).getResponsibilityCode());
+            // 检验执行科室
+            if (checkNull || checkOne ){
+                if (StrUtil.isNotBlank(startDepartmentCode) && StrUtil.isNotBlank(startDepartmentName)){
+                    //执行科室
+                    if (Objects.isNull(department1)) {
+                        incomeErrorMessage.setTotal(i);
+                        incomeErrorMessage.setErrMessage("代码:" + productCode + " 名称:" + productName + "执行科室不存在");
+                        incomeErrorMessageList.add(incomeErrorMessage);
+                    } else {
+                        Long id = department1.getId();
+                        Long responsibilityId = responsibilityDepMap.get(id);
+                        if (Objects.isNull(responsibilityMap.get(responsibilityId))) {
+                            incomeErrorMessage.setTotal(i);
+                            incomeErrorMessage.setErrMessage("代码:" + openDepartmentCode + " 名称:" + openDepartmentName + "科室对应的责任中心不存在");
+                            incomeErrorMessageList.add(incomeErrorMessage);
+                        } else {
+                            costIncomeGroup.setStartDepartmentCode(startDepartmentCode);
+                            costIncomeGroup.setOpenDepartmentName(startDepartmentName);
+                            costIncomeGroup.setStartResponsibilityCode(responsibilityMap.get(responsibilityId).getResponsibilityCode());
+                            costIncomeGroup.setStartResponsibilityCode(responsibilityMap.get(responsibilityId).getResponsibilityName());
+                        }
+                    }
+                }else {
+                    costIncomeGroup.setStartDepartmentCode(null);
+                    costIncomeGroup.setStartDepartmentName(null);
+                    costIncomeGroup.setStartResponsibilityCode(null);
+                    costIncomeGroup.setStartResponsibilityName(null);
                 }
             }
+            costIncomeGroup.setDoctorNumber(Long.parseLong(data.get(6).toString())).setDoctorName(data.get(7).toString())
+                    .setPatientId(Long.parseLong(data.get(8).toString())).setOutpatientId(Long.parseLong(data.get(9).toString()))
+                    .setPatientName(data.get(10).toString()).setPatientFee(data.get(11).toString()).setReceiptFee(data.get(12).toString())
+                    .setTotalNumber(Integer.parseInt(data.get(13).toString())).setUnit(data.get(14).toString())
+                    .setFeeDatetime(DateUtils.StringToDate(data.get(16).toString(), DateStyleEnum.YYYY_MM_DD_HH_MM_SS_EN));
+            //
+            costIncomeGroup.setHospId(hospId);
+            costIncomeGroup.setCreateTime(System.currentTimeMillis());
+            costIncomeGroup.setDateYear(year);
+            costIncomeGroup.setDateMonth(month);
             costIncomeGroup.setAmount(beforeMoney);
-
         }
     }
 

src/main/java/com/imed/costaccount/web/CostIncomeFileController.java

@@ -0,0 +1,74 @@
+package com.imed.costaccount.web;
+
+import com.imed.costaccount.common.util.Result;
+import com.imed.costaccount.model.CostIncomeFile;
+import com.imed.costaccount.model.User;
+import com.imed.costaccount.service.CostIncomeFileService;
+import org.apache.shiro.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+
+
+/**
+ * 文件上传记录
+ *
+ * @author KCYG
+ * @date 2021-08-10 14:42:20
+ */
+@RestController
+@RequestMapping("/costincomefile")
+public class CostIncomeFileController {
+    @Autowired
+    private CostIncomeFileService costIncomeFileService;
+
+    /**
+     * 分页查询列表
+     * 查询的是
+     */
+    @RequestMapping("/list")
+    public Result list(@RequestParam(value = "current", defaultValue = "1") Integer current,
+                       @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize){
+        User user = (User) SecurityUtils.getSubject().getPrincipal();
+        return Result.ok();
+    }
+
+
+    /**
+     * 信息
+     */
+    @RequestMapping("/info/{id}")
+    public Result info(@PathVariable("id") Long id){
+		CostIncomeFile costIncomeFile = costIncomeFileService.getById(id);
+        return Result.ok(costIncomeFile);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    public Result save(@RequestBody CostIncomeFile costIncomeFile){
+		costIncomeFileService.save(costIncomeFile);
+        return Result.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    public Result update(@RequestBody CostIncomeFile costIncomeFile){
+		costIncomeFileService.updateById(costIncomeFile);
+        return Result.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    public Result delete(@RequestBody Long[] ids){
+		costIncomeFileService.removeByIds(Arrays.asList(ids));
+        return Result.ok();
+    }
+
+}

src/main/java/com/imed/costaccount/web/ExcelController.java

@@ -416,13 +416,12 @@ public class ExcelController {
         return departmentLinkedList;
     }
     /**
-     *  导入 收入/成本/成本分摊参数数据导入
+     *  导入 收入数据导入
      * @param file 导入的文件
-     * @param fileType 文件类型 1 成本分摊数据  2 收入数据 3 成本数据
      */
     @PostMapping("/importDataByFileType")
     @ApiOperation("批量导入指定类型数据信息")
-    public Result importProductAccount(@RequestParam("file") MultipartFile file,Integer fileType){
+    public Result importProductAccount(@RequestParam("file") MultipartFile file,Integer year,Integer month){
         if (Objects.isNull(file)){
             throw new CostException(500,"请选择文件");
         }
@@ -435,7 +434,7 @@ public class ExcelController {
             log.info("最开始：read={}",read);
             log.info("-------------------------------------------------------------------");
             Long hospId = UserContext.getHospId();
-            return costIncomeGroupService.importIncomeGroup(read, hospId,file);
+            return costIncomeGroupService.importIncomeGroup(read, hospId,file,year,month);
         }catch (IOException e){
             e.printStackTrace();;
             throw new CostException(500, "导入失败");

src/main/resources/mapper/CostIncomeFileMapper.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.imed.costaccount.mapper.CostIncomeFileMapper">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.imed.costaccount.model.CostIncomeFile" id="costIncomeFileMap">
+        <result property="id" column="id"/>
+        <result property="fileType" column="file_type"/>
+        <result property="fileName" column="file_name"/>
+        <result property="fileUrl" column="file_url"/>
+        <result property="successAmount" column="success_amount"/>
+        <result property="totalAmount" column="total_amount"/>
+        <result property="hospId" column="hosp_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="userName" column="user_name"/>
+        <result property="errorList" column="error_list"/>
+        <result property="createTime" column="create_time"/>
+        <result property="deleteTime" column="delete_time"/>
+    </resultMap>
+
+
+</mapper>