08 17 02 update import shareParamValue import

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

@@ -1,16 +0,0 @@
-package com.imed.costaccount.mapper;
-
-import com.imed.costaccount.model.CostShareParamGroup;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 成本分摊参数归集
- * 
- * @author KCYG
- * @date 2021-08-12 16:32:47
- */
-@Mapper
-public interface CostShareParamGroupMapper extends BaseMapper<CostShareParamGroup> {
-	
-}

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

@@ -0,0 +1,16 @@
+package com.imed.costaccount.mapper;
+
+import com.imed.costaccount.model.ShareParamValue;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 成本分摊参数值设置
+ * 
+ * @author huangrui
+ * @date 2021-08-17 10:03:48
+ */
+@Mapper
+public interface ShareParamValueMapper extends BaseMapper<ShareParamValue> {
+	
+}

src/main/java/com/imed/costaccount/model/CostShareParamGroup.java → src/main/java/com/imed/costaccount/model/ShareParamValue.java

@@ -2,80 +2,72 @@ package com.imed.costaccount.model;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.math.BigDecimal;
+import java.io.Serializable;
+import java.util.Date;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
-import java.io.Serializable;
-import java.math.BigDecimal;
-
 /**
- * 成本分摊参数归集
+ * 成本分摊参数值设置
  * 
- * @author KCYG
- * @email KCYG@xinxicom
- * @date 2021-08-12 16:32:47
+ * @author huangrui
+ * @email 
+ * @date 2021-08-17 10:03:48
  */
 @Data
 @Accessors(chain = true)
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName("cost_share_param_group")
-public class CostShareParamGroup implements Serializable {
+@TableName("cost_share_param_value")
+public class ShareParamValue implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	/**
-	 * 成本分摊参数归集的Id
+	 * 主键
 	 */
 	@TableId
 	private Long id;
 	/**
-	 * 成本分摊参数代码
+	 * 年
 	 */
-	private String shareParamCode;
+	private Integer dateYear;
 	/**
-	 * 成本分摊参数名称
+	 * 月
 	 */
-	private String shareParamName;
+	private Integer dateMonth;
 	/**
-	 * 责任中心的Code
+	 * 分摊参数代码
 	 */
-	private String responsibilityCode;
+	private String shareParamCode;
 	/**
-	 * 责任中心名称
+	 * 责任中心代码
 	 */
-	private String responsibilityName;
+	private String responsibilityCode;
 	/**
-	 * 金额
+	 * 数值
 	 */
-	private BigDecimal amount;
+	private BigDecimal valueNum;
 	/**
-	 * 归属医院id
+	 * 医院id
 	 */
 	private Long hospId;
 	/**
-	 * 文件id
+	 * 数据来源类型 0.手动输入，1.文件导入，2.全部
 	 */
+	private Integer dataSourceType;
+
 	private Long fileId;
 	/**
-	 * 统计数据
-	 */
-	private String afterIncomeGroup;
-	/**
-	 * 年份
-	 */
-	private Integer dateYear;
-	/**
-	 * 月份
-	 */
-	private Integer dateMonth;
-	/**
-	 * 创建时间13位时间戳
+	 * 
 	 */
 	private Long createTime;
 	/**
-	 * 删除时间，如果存在表示已删除13位时间戳
+	 * 删除时间（逻辑删除）
 	 */
 	private Long deleteTime;
 

src/main/java/com/imed/costaccount/service/CostShareParamGroupService.java → src/main/java/com/imed/costaccount/service/ShareParamValueService.java

@@ -2,20 +2,22 @@ package com.imed.costaccount.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.imed.costaccount.common.util.Result;
-import com.imed.costaccount.model.CostShareParamGroup;
 import com.imed.costaccount.model.User;
+import com.imed.costaccount.model.ShareParamValue;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
+import java.util.Map;
 
 /**
- * 成本分摊参数归集
+ * 成本分摊参数值设置
  *
- * @author KCYG
- * @email KCYG@xinxicom
- * @date 2021-08-12 16:32:47
+ * @author huangrui
+ * @email 
+ * @date 2021-08-17 10:03:48
  */
-public interface CostShareParamGroupService extends IService<CostShareParamGroup> {
+public interface ShareParamValueService extends IService<ShareParamValue> {
+
     /**
      * 成本分摊参数导入
      * @param read
@@ -26,5 +28,6 @@ public interface CostShareParamGroupService extends IService<CostShareParamGroup
      * @return
      */
     Result importShareParamGroup(List<List<Object>> read, User user, MultipartFile file, String dateTime, Integer fileType);
+
 }
 

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

@@ -3,6 +3,7 @@ package com.imed.costaccount.service.impl;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -14,12 +15,12 @@ import com.imed.costaccount.constants.NumberConstant;
 import com.imed.costaccount.mapper.CostCostingGroupMapper;
 import com.imed.costaccount.mapper.CostIncomeFileMapper;
 import com.imed.costaccount.mapper.CostIncomeGroupMapper;
-import com.imed.costaccount.mapper.CostShareParamGroupMapper;
+import com.imed.costaccount.mapper.ShareParamValueMapper;
 import com.imed.costaccount.model.*;
 import com.imed.costaccount.model.vo.CostIncomeFileVO;
 import com.imed.costaccount.model.vo.IncomeErrorMessage;
 import com.imed.costaccount.service.CostIncomeFileService;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.imed.costaccount.service.ShareParamValueService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -34,47 +35,52 @@ import java.util.stream.Collectors;
 @Service("costIncomeFileService")
 public class CostIncomeFileServiceImpl extends ServiceImpl<CostIncomeFileMapper, CostIncomeFile> implements CostIncomeFileService {
 
-    private static final String INCOME_FILETYPE="收入数据";
-    private static final String COST_FILETYPE="成本数据";
-    private static final String SHAREPARAM_FILETYPE="成本分摊参数数据";
-    @Autowired
-    private CostIncomeGroupMapper costIncomeGroupMapper;
-    @Autowired
-    private CostCostingGroupMapper costCostingGroupMapper;
-    @Autowired
-    private CostShareParamGroupMapper costShareParamGroupMapper;
+    private static final String INCOME_FILETYPE = "收入数据";
+    private static final String COST_FILETYPE = "成本数据";
+    private static final String SHAREPARAM_FILETYPE = "成本分摊参数数据";
+
+    private final CostIncomeGroupMapper costIncomeGroupMapper;
+    private final CostCostingGroupMapper costCostingGroupMapper;
+    private final ShareParamValueMapper paramValueMapper;
+
+    public CostIncomeFileServiceImpl(CostIncomeGroupMapper costIncomeGroupMapper, CostCostingGroupMapper costCostingGroupMapper, ShareParamValueMapper paramValueMapper) {
+        this.costIncomeGroupMapper = costIncomeGroupMapper;
+        this.costCostingGroupMapper = costCostingGroupMapper;
+        this.paramValueMapper = paramValueMapper;
+    }
 
     /**
      * 保存文件上传记录
-     * @param list 文件数据
-     * @param user 当前用户
-     * @param file 上传文件
-     * @param hospId 医院Id
+     *
+     * @param list                   文件数据
+     * @param user                   当前用户
+     * @param file                   上传文件
+     * @param hospId                 医院Id
      * @param incomeErrorMessageList 错误信息
-     * @param uploadFile 文件路径
+     * @param uploadFile             文件路径
      * @return
      */
     @Override
-    public CostIncomeFile saveCostIncomeFile(List<List<Object>> list, User user, MultipartFile file, Long hospId, List<IncomeErrorMessage> incomeErrorMessageList, String uploadFile,Integer fileType,Integer year,Integer month) {
+    public CostIncomeFile saveCostIncomeFile(List<List<Object>> list, User user, MultipartFile file, Long hospId, List<IncomeErrorMessage> incomeErrorMessageList, String uploadFile, Integer fileType, Integer year, Integer month) {
         CostIncomeFile costIncomeFile = new CostIncomeFile();
 
-        String substring = file.getOriginalFilename().substring(0, file.getOriginalFilename().lastIndexOf("."))+System.currentTimeMillis()+".xsl";
+        String substring = file.getOriginalFilename().substring(0, file.getOriginalFilename().lastIndexOf(".")) + System.currentTimeMillis() + ".xsl";
         costIncomeFile.setFileName(substring);
         costIncomeFile.setFileUrl(uploadFile);
         costIncomeFile.setTotalAmount(list.size());
         if (!CollectionUtils.isEmpty(incomeErrorMessageList)) {
             costIncomeFile.setSuccessAmount(NumberConstant.ZERO);
             costIncomeFile.setErrorList(JSON.toJSONString(incomeErrorMessageList));
-        }else {
+        } else {
             costIncomeFile.setSuccessAmount(list.size());
         }
-        if (NumberConstant.ONE.equals(fileType)){
+        if (NumberConstant.ONE.equals(fileType)) {
             costIncomeFile.setFileType(INCOME_FILETYPE);
-        }else if (NumberConstant.TWO.equals(fileType)){
+        } else if (NumberConstant.TWO.equals(fileType)) {
             costIncomeFile.setFileType(COST_FILETYPE);
-        }else if (NumberConstant.THREE.equals(fileType)){
+        } else if (NumberConstant.THREE.equals(fileType)) {
             costIncomeFile.setFileType(SHAREPARAM_FILETYPE);
-        }else {
+        } else {
             costIncomeFile.setFileType(file.getContentType());
         }
         costIncomeFile.setHospId(hospId);
@@ -103,12 +109,12 @@ public class CostIncomeFileServiceImpl extends ServiceImpl<CostIncomeFileMapper,
                 .eq(CostIncomeFile::getHospId, hospId).like(StrUtil.isNotBlank(name), CostIncomeFile::getFileName, name).orderByDesc(CostIncomeFile::getCreateTime));
         List<CostIncomeFile> records = page.getRecords();
         List<CostIncomeFileVO> costIncomeFileVOList = BeanUtil.convertList(records, CostIncomeFileVO.class);
-        costIncomeFileVOList.forEach(i->{
+        costIncomeFileVOList.forEach(i -> {
             String errorList = i.getErrorList();
-            if (StrUtil.isNotBlank(errorList)){
+            if (StrUtil.isNotBlank(errorList)) {
                 i.setErrStatus(NumberConstant.ONE);
             }
-            i.setDateTime(DateUtil.format(DateUtil.date(i.getCreateTime()),"yyyy-MM-dd"));
+            i.setDateTime(DateUtil.format(DateUtil.date(i.getCreateTime()), "yyyy-MM-dd"));
         });
         PageUtils pageUtils = new PageUtils(page);
         pageUtils.setList(costIncomeFileVOList);
@@ -122,40 +128,43 @@ public class CostIncomeFileServiceImpl extends ServiceImpl<CostIncomeFileMapper,
      * @param hospId
      */
     @Override
-    @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
+    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void deleteImport(Long id, Long hospId) {
         CostIncomeFile costIncomeFile = this.getById(id);
-        if (Objects.isNull(costIncomeFile)){
-            throw new CostException(500,"文件记录不存在");
+        if (Objects.isNull(costIncomeFile)) {
+            throw new CostException(500, "文件记录不存在");
         }
         String fileType = costIncomeFile.getFileType();
-        if (INCOME_FILETYPE.equals(fileType)){
+        if (INCOME_FILETYPE.equals(fileType)) {
             // 根据文件的Id 和 医院Id获取数据
             List<CostIncomeGroup> costIncomeGroupList = costIncomeGroupMapper.selectList(new QueryWrapper<CostIncomeGroup>().lambda()
                     .eq(CostIncomeGroup::getHospId, hospId).eq(CostIncomeGroup::getFileId, id));
-            if (CollectionUtils.isEmpty(costIncomeGroupList)){
-                throw new CostException(410,"数据已撤销");
+            if (CollectionUtils.isEmpty(costIncomeGroupList)) {
+                throw new CostException(410, "数据已撤销");
             }
             List<Long> list = costIncomeGroupList.stream().map(CostIncomeGroup::getId).collect(Collectors.toList());
             costIncomeGroupMapper.deleteBatchIds(list);
-        }else if (COST_FILETYPE.equals(fileType)){
+        } else if (COST_FILETYPE.equals(fileType)) {
             // 根据文件的Id 和 医院Id获取数据
             List<CostCostingGroup> costIncomeGroupList = costCostingGroupMapper.selectList(new QueryWrapper<CostCostingGroup>().lambda()
                     .eq(CostCostingGroup::getHospId, hospId).eq(CostCostingGroup::getFileId, id));
-            if (CollectionUtils.isEmpty(costIncomeGroupList)){
-                throw new CostException(410,"数据已撤销");
+            if (CollectionUtils.isEmpty(costIncomeGroupList)) {
+                throw new CostException(410, "数据已撤销");
             }
             List<Long> list = costIncomeGroupList.stream().map(CostCostingGroup::getId).collect(Collectors.toList());
             costCostingGroupMapper.deleteBatchIds(list);
-        }if (SHAREPARAM_FILETYPE.equals(fileType)){
+        }
+        if (SHAREPARAM_FILETYPE.equals(fileType)) {
             // 根据文件的Id 和 医院Id获取数据
-            List<CostShareParamGroup> costIncomeGroupList = costShareParamGroupMapper.selectList(new QueryWrapper<CostShareParamGroup>().lambda()
-                    .eq(CostShareParamGroup::getHospId, hospId).eq(CostShareParamGroup::getFileId, id));
-            if (CollectionUtils.isEmpty(costIncomeGroupList)){
-                throw new CostException(410,"数据已撤销");
+            List<ShareParamValue> shareParamValues = paramValueMapper.selectList(
+                    new LambdaQueryWrapper<ShareParamValue>()
+                            .eq(ShareParamValue::getHospId, hospId)
+                            .eq(ShareParamValue::getFileId, id));
+            if (CollectionUtils.isEmpty(shareParamValues)) {
+                throw new CostException(410, "数据已撤销");
             }
-            List<Long> list = costIncomeGroupList.stream().map(CostShareParamGroup::getId).collect(Collectors.toList());
-            costShareParamGroupMapper.deleteBatchIds(list);
+            List<Long> list = shareParamValues.stream().map(ShareParamValue::getId).collect(Collectors.toList());
+            paramValueMapper.deleteBatchIds(list);
         }
         costIncomeFile.setRollbackStatus(NumberConstant.ONE);
         this.updateById(costIncomeFile);
@@ -171,11 +180,11 @@ public class CostIncomeFileServiceImpl extends ServiceImpl<CostIncomeFileMapper,
     @Override
     public List<IncomeErrorMessage> getErrorList(Long id, Long hospId) {
         CostIncomeFile costIncomeFile = this.getById(id);
-        if (Objects.isNull(costIncomeFile)){
-            throw new CostException(500,"文件记录不存在");
+        if (Objects.isNull(costIncomeFile)) {
+            throw new CostException(500, "文件记录不存在");
         }
         String errorList = costIncomeFile.getErrorList();
-        if (StrUtil.isBlank(errorList)){
+        if (StrUtil.isBlank(errorList)) {
             return null;
         }
         List<IncomeErrorMessage> incomeErrorMessageList = JsonUtil.toList(errorList, IncomeErrorMessage.class);

src/main/java/com/imed/costaccount/service/impl/CostShareParamGroupServiceImpl.java → src/main/java/com/imed/costaccount/service/impl/ShareParamValueServiceImpl.java

@@ -3,8 +3,6 @@ package com.imed.costaccount.service.impl;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.druid.util.StringUtils;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.imed.costaccount.common.exception.CostException;
 import com.imed.costaccount.common.util.BeanUtil;
 import com.imed.costaccount.common.util.DateUtils;
@@ -12,13 +10,16 @@ import com.imed.costaccount.common.util.Result;
 import com.imed.costaccount.common.util.UserContext;
 import com.imed.costaccount.constants.NumberConstant;
 import com.imed.costaccount.enums.DateStyleEnum;
-import com.imed.costaccount.mapper.CostShareParamGroupMapper;
 import com.imed.costaccount.model.*;
 import com.imed.costaccount.model.vo.IncomeErrorMessage;
 import com.imed.costaccount.service.CostIncomeFileService;
-import com.imed.costaccount.service.CostShareParamGroupService;
 import com.imed.costaccount.service.CostShareParamService;
 import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import com.imed.costaccount.mapper.ShareParamValueMapper;
+import com.imed.costaccount.service.ShareParamValueService;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -29,8 +30,8 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 
-@Service("costShareParamGroupService")
-public class CostShareParamGroupServiceImpl extends ServiceImpl<CostShareParamGroupMapper, CostShareParamGroup> implements CostShareParamGroupService {
+@Service("shareParamValueService")
+public class ShareParamValueServiceImpl extends ServiceImpl<ShareParamValueMapper, ShareParamValue> implements ShareParamValueService {
 
     private final CostIncomeGroupServiceImpl costIncomeGroupService;
 
@@ -38,12 +39,16 @@ public class CostShareParamGroupServiceImpl extends ServiceImpl<CostShareParamGr
 
     private final CostIncomeFileService costIncomeFileService;
 
-    public CostShareParamGroupServiceImpl(CostIncomeGroupServiceImpl costIncomeGroupService, CostShareParamService costShareParamService, CostIncomeFileService costIncomeFileService) {
+
+    public ShareParamValueServiceImpl(CostIncomeGroupServiceImpl costIncomeGroupService,
+                                      CostShareParamService costShareParamService,
+                                      CostIncomeFileService costIncomeFileService) {
         this.costIncomeGroupService = costIncomeGroupService;
         this.costShareParamService = costShareParamService;
         this.costIncomeFileService = costIncomeFileService;
     }
 
+
     /**
      * 成本分摊参数导入
      *
@@ -66,8 +71,8 @@ public class CostShareParamGroupServiceImpl extends ServiceImpl<CostShareParamGr
             month = DateUtil.month(date) + 1;
         }
         Long hospId = user.getHospId();
-        List<CostShareParamGroup> groups = this.list(new QueryWrapper<CostShareParamGroup>().lambda().eq(CostShareParamGroup::getHospId, hospId)
-                .eq(CostShareParamGroup::getDateYear, year).eq(CostShareParamGroup::getDateMonth, month));
+        List<ShareParamValue> groups = this.list(new QueryWrapper<ShareParamValue>().lambda().eq(ShareParamValue::getHospId, hospId)
+                .eq(ShareParamValue::getDateYear, year).eq(ShareParamValue::getDateMonth, month));
         if (!CollectionUtils.isEmpty(groups)) {
             throw new CostException(500, year + "年" + month + "月数据已存在");
         }
@@ -86,12 +91,13 @@ public class CostShareParamGroupServiceImpl extends ServiceImpl<CostShareParamGr
         Map<Long, Long> responsibilityDepMap = costIncomeGroupService.getDepartmentIdResponsibilityIdMap(responsibilityDepartmentList);
         Map<String, CostShareParam> shareParamMap = costShareParamService.list(new QueryWrapper<CostShareParam>().lambda().eq(CostShareParam::getHospId, hospId)).stream().collect(Collectors.toMap(k -> k.getShareParamCode() + k.getShareParamName(), synOe -> synOe));
         // 要保存的数据
-        List<CostShareParamGroup> costShareParamGroupList = new LinkedList<>();
+        List<ShareParamValue> shareParamValues = new LinkedList<>();
+//        List<CostShareParamGroup> costShareParamGroupList = new LinkedList<>();
         List<Object> departmentCodes = list.get(0);
         List<Object> departmentNames = list.get(1);
 
         //检验数据是否准确  list包含了科室Code行与Name行 所以要从list的第三行开始
-        checkShareParamGroupData(list, year, month, incomeErrorMessageList, departmentMap, responsibilityMap, responsibilityDepMap, shareParamMap, costShareParamGroupList, departmentCodes, departmentNames);
+        checkShareParamGroupData(list, year, month, incomeErrorMessageList, departmentMap, responsibilityMap, responsibilityDepMap, shareParamMap, shareParamValues, departmentCodes, departmentNames);
         // 文件上传
         String uploadFile = costIncomeGroupService.uploadFile(file, UserContext.getCurrentUser());
         // 上传记录保存
@@ -99,32 +105,36 @@ public class CostShareParamGroupServiceImpl extends ServiceImpl<CostShareParamGr
             throw new CostException(500, "文件上传异常");
         }
         // 记录文件上传记录
-        CostIncomeFile costIncomeFile = costIncomeFileService.saveCostIncomeFile(list, user, file, hospId, incomeErrorMessageList, uploadFile, fileType,year,month);
+        CostIncomeFile costIncomeFile = costIncomeFileService.saveCostIncomeFile(list, user, file, hospId, incomeErrorMessageList, uploadFile, fileType, year, month);
         Long id = costIncomeFile.getId();
-        costShareParamGroupList.forEach(i -> {
+        shareParamValues.forEach(i -> {
             // 设置文件Id
             i.setFileId(id);
+            i.setDataSourceType(1);
         });
         if (CollectionUtils.isEmpty(incomeErrorMessageList)) {
-            this.saveBatch(costShareParamGroupList);
+            this.saveBatch(shareParamValues);
             return Result.build(200, "数据导入成功", null);
         } else {
             return Result.build(200, "数据未成功导入", null);
         }
     }
 
-    private void checkShareParamGroupData(List<List<Object>> list, int year, int month, List<IncomeErrorMessage> incomeErrorMessageList, Map<String, Department> departmentMap, Map<Long, Responsibility> responsibilityMap, Map<Long, Long> responsibilityDepMap, Map<String, CostShareParam> shareParamMap, List<CostShareParamGroup> costShareParamGroupList, List<Object> departmentCodes, List<Object> departmentNames) {
+    private void checkShareParamGroupData(List<List<Object>> list, int year, int month,
+                                          List<IncomeErrorMessage> incomeErrorMessageList, Map<String, Department> departmentMap,
+                                          Map<Long, Responsibility> responsibilityMap, Map<Long, Long> responsibilityDepMap,
+                                          Map<String, CostShareParam> shareParamMap, List<ShareParamValue> shareParamValues,
+                                          List<Object> departmentCodes, List<Object> departmentNames) {
         for (int i = 2; i < list.size(); i++) {
             int row = i + 4;
             List<Object> data = list.get(i);
             // 检验成本分摊参数是否正确
-            CostShareParamGroup costShareParamGroupRequest = new CostShareParamGroup();
+            ShareParamValue shareParamValueRequest = new ShareParamValue();
             String shareParamCode = data.get(0).toString();
             String shareParamName = data.get(1).toString();
             CostShareParam costShareParam = shareParamMap.get(shareParamCode + shareParamName);
             if (Objects.nonNull(costShareParam)) {
-                costShareParamGroupRequest.setShareParamCode(shareParamCode);
-                costShareParamGroupRequest.setShareParamName(shareParamName);
+                shareParamValueRequest.setShareParamCode(shareParamCode);
             } else {
                 IncomeErrorMessage incomeErrorMessage = new IncomeErrorMessage();
                 incomeErrorMessage.setTotal(1);
@@ -132,19 +142,19 @@ public class CostShareParamGroupServiceImpl extends ServiceImpl<CostShareParamGr
                 incomeErrorMessageList.add(incomeErrorMessage);
             }
             for (int j = 2; j < departmentCodes.size(); j++) {
-                int column=j+1;
-                if (data.size() > j ) {
-                    if (Objects.isNull(data.get(j))){
+                int column = j + 1;
+                if (data.size() > j) {
+                    if (Objects.isNull(data.get(j))) {
                         data.set(j, NumberConstant.ZERO);
-                    }else if (data.get(j).toString().contains("-")||!StringUtils.isNumber(data.get(j).toString())){
+                    } else if (data.get(j).toString().contains("-") || !StringUtils.isNumber(data.get(j).toString())) {
                         IncomeErrorMessage incomeErrorMessage = new IncomeErrorMessage();
                         incomeErrorMessage.setTotal(row);
-                        incomeErrorMessage.setErrMessage("第"+row+"行 第"+column+"列数据不符合规范");
+                        incomeErrorMessage.setErrMessage("第" + row + "行 第" + column + "列数据不符合规范");
                         incomeErrorMessageList.add(incomeErrorMessage);
-                    }else {
+                    } else {
                         data.set(j, Double.parseDouble(data.get(j).toString()));
                     }
-                }else {
+                } else {
                     data.add(NumberConstant.ZERO);
                 }
             }
@@ -159,7 +169,7 @@ public class CostShareParamGroupServiceImpl extends ServiceImpl<CostShareParamGr
                 }
                 if (NumberConstant.ONE.equals(zeroStatus)) {
                     for (int j = 2; j < data.size(); j++) {
-                        CostShareParamGroup costShareParamGroup = BeanUtil.convertObj(costShareParamGroupRequest, CostShareParamGroup.class);
+                        ShareParamValue shareParamValue = BeanUtil.convertObj(shareParamValueRequest, ShareParamValue.class);
                         // 检验科室信息是否准确
                         String departmentCode = departmentCodes.get(j).toString();
                         String departmentName = departmentNames.get(j).toString();
@@ -171,8 +181,7 @@ public class CostShareParamGroupServiceImpl extends ServiceImpl<CostShareParamGr
                             if (Objects.nonNull(responsibilityId)) {
                                 Responsibility responsibility = responsibilityMap.get(responsibilityId);
                                 if (Objects.nonNull(responsibility)) {
-                                    costShareParamGroup.setResponsibilityCode(responsibility.getResponsibilityCode());
-                                    costShareParamGroup.setResponsibilityName(responsibility.getResponsibilityName());
+                                    shareParamValue.setResponsibilityCode(responsibility.getResponsibilityCode());
 
                                 } else {
                                     IncomeErrorMessage incomeErrorMessage = new IncomeErrorMessage();
@@ -192,12 +201,12 @@ public class CostShareParamGroupServiceImpl extends ServiceImpl<CostShareParamGr
                             incomeErrorMessage.setErrMessage("第" + j + "列科室信息不存在");
                             incomeErrorMessageList.add(incomeErrorMessage);
                         }
-                        costShareParamGroup.setAmount(BigDecimal.valueOf(Double.parseDouble(("0".equals(data.get(j).toString()) || StrUtil.isBlank(data.get(j).toString())) ? "0.00" : data.get(j).toString())));
-                        costShareParamGroup.setHospId(UserContext.getHospId());
-                        costShareParamGroup.setCreateTime(System.currentTimeMillis());
-                        costShareParamGroup.setDateYear(year);
-                        costShareParamGroup.setDateMonth(month);
-                        costShareParamGroupList.add(costShareParamGroup);
+                        shareParamValue.setValueNum(BigDecimal.valueOf(Double.parseDouble(("0".equals(data.get(j).toString()) || StrUtil.isBlank(data.get(j).toString())) ? "0.00" : data.get(j).toString())));
+                        shareParamValue.setHospId(UserContext.getHospId());
+                        shareParamValue.setCreateTime(System.currentTimeMillis());
+                        shareParamValue.setDateYear(year);
+                        shareParamValue.setDateMonth(month);
+                        shareParamValues.add(shareParamValue);
                     }
                 }
 
@@ -205,4 +214,6 @@ public class CostShareParamGroupServiceImpl extends ServiceImpl<CostShareParamGr
 
         }
     }
+
+
 }

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

@@ -9,7 +9,6 @@ import cn.hutool.poi.excel.ExcelWriter;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.imed.costaccount.common.exception.CostException;
 import com.imed.costaccount.common.token.JwtUtil;
-import com.imed.costaccount.common.token.RedisUtil;
 import com.imed.costaccount.common.util.Result;
 import com.imed.costaccount.common.util.UserContext;
 import com.imed.costaccount.constants.NumberConstant;
@@ -62,9 +61,14 @@ public class ExcelController {
 
     private final CostCostingGroupService costCostingGroupService;
 
-    private final CostShareParamGroupService costShareParamGroupService;
+    private final ShareParamValueService shareParamValueService;
 
-    public ExcelController(UserService userService, DepartmentServiceImpl departmentService, ProductServiceImpl productService, AccountingService accountingService, AccountingProductService accountingProductService, ResponsibilityDepartmentService responsibilityDepartmentService, CostShareParamService costShareParamService, CostIncomeGroupService costIncomeGroupService, RedisUtil redisUtil, JwtUtil jwtUtil, CostCostingGroupService costCostingGroupService, CostShareParamGroupService costShareParamGroupService) {
+
+    public ExcelController(UserService userService, DepartmentServiceImpl departmentService, ProductServiceImpl productService,
+                           AccountingService accountingService, AccountingProductService accountingProductService,
+                           ResponsibilityDepartmentService responsibilityDepartmentService,
+                           CostShareParamService costShareParamService, CostIncomeGroupService costIncomeGroupService, JwtUtil jwtUtil,
+                           CostCostingGroupService costCostingGroupService, ShareParamValueService shareParamValueService) {
         this.userService = userService;
         this.departmentService = departmentService;
         this.productService = productService;
@@ -75,7 +79,7 @@ public class ExcelController {
         this.costIncomeGroupService = costIncomeGroupService;
         this.jwtUtil = jwtUtil;
         this.costCostingGroupService = costCostingGroupService;
-        this.costShareParamGroupService = costShareParamGroupService;
+        this.shareParamValueService = shareParamValueService;
     }
 
     @ApiOperation("用户导出模板设置")
@@ -532,7 +536,7 @@ public class ExcelController {
             log.info("最开始：read={}", read);
             log.info("-------------------------------------------------------------------");
             User user = UserContext.getCurrentUser();
-            return costShareParamGroupService.importShareParamGroup(read, user, file, dateTime,fileType);
+            return shareParamValueService.importShareParamGroup(read, user, file, dateTime,fileType);
         } catch (IOException e) {
             e.printStackTrace();
             ;

src/main/java/com/imed/costaccount/web/CostShareParamGroupController.java → src/main/java/com/imed/costaccount/web/ShareParamValueController.java

@@ -1,31 +1,35 @@
 package com.imed.costaccount.web;
 
 import com.imed.costaccount.common.util.Result;
-import com.imed.costaccount.model.CostShareParamGroup;
+import com.imed.costaccount.model.ShareParamValue;
 import com.imed.costaccount.model.User;
-import com.imed.costaccount.service.CostShareParamGroupService;
+import com.imed.costaccount.service.ShareParamValueService;
+import io.swagger.annotations.Api;
 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-12 16:32:47
+ * @author huangrui
+ * @date 2021-08-17 10:03:48
  */
+@Api(tags = "成本分摊参数值管理")
 @RestController
-@RequestMapping("/costAccount/costshareparamgroup")
-public class CostShareParamGroupController {
-    @Autowired
-    private CostShareParamGroupService costShareParamGroupService;
+@RequestMapping("/costAccount/shareParamValue")
+public class ShareParamValueController {
+
+    private final ShareParamValueService shareParamValueService;
+
+    public ShareParamValueController(ShareParamValueService shareParamValueService) {
+        this.shareParamValueService = shareParamValueService;
+    }
 
     /**
      * 分页查询列表
-     * 查询的是
      */
     @RequestMapping("/list")
     public Result list(@RequestParam(value = "current", defaultValue = "1") Integer current,
@@ -40,16 +44,16 @@ public class CostShareParamGroupController {
      */
     @RequestMapping("/info/{id}")
     public Result info(@PathVariable("id") Long id){
-		CostShareParamGroup costShareParamGroup = costShareParamGroupService.getById(id);
-        return Result.ok(costShareParamGroup);
+		ShareParamValue shareParamValue = shareParamValueService.getById(id);
+        return Result.ok(shareParamValue);
     }
 
     /**
      * 保存
      */
     @RequestMapping("/save")
-    public Result save(@RequestBody CostShareParamGroup costShareParamGroup){
-		costShareParamGroupService.save(costShareParamGroup);
+    public Result save(@RequestBody ShareParamValue shareParamValue){
+		shareParamValueService.save(shareParamValue);
         return Result.ok();
     }
 
@@ -57,8 +61,8 @@ public class CostShareParamGroupController {
      * 修改
      */
     @RequestMapping("/update")
-    public Result update(@RequestBody CostShareParamGroup costShareParamGroup){
-		costShareParamGroupService.updateById(costShareParamGroup);
+    public Result update(@RequestBody ShareParamValue shareParamValue){
+		shareParamValueService.updateById(shareParamValue);
         return Result.ok();
     }
 
@@ -67,7 +71,7 @@ public class CostShareParamGroupController {
      */
     @RequestMapping("/delete")
     public Result delete(@RequestBody Long[] ids){
-		costShareParamGroupService.removeByIds(Arrays.asList(ids));
+		shareParamValueService.removeByIds(Arrays.asList(ids));
         return Result.ok();
     }
 

src/main/resources/mapper/CostShareParamGroupMapper.xml → src/main/resources/mapper/ShareParamValueMapper.xml

@@ -1,21 +1,19 @@
 <?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.CostShareParamGroupMapper">
+<mapper namespace="com.imed.costaccount.mapper.ShareParamValueMapper">
 
 	<!-- 可根据自己的需求，是否要使用 -->
-    <resultMap type="com.imed.costaccount.model.CostShareParamGroup" id="costShareParamGroupMap">
+    <resultMap type="com.imed.costaccount.model.ShareParamValue" id="shareParamValueMap">
         <result property="id" column="id"/>
+        <result property="dateYear" column="date_year"/>
+        <result property="dateMonth" column="date_month"/>
         <result property="shareParamCode" column="share_param_code"/>
-        <result property="shareParamName" column="share_param_name"/>
         <result property="responsibilityCode" column="responsibility_code"/>
-        <result property="responsibilityName" column="responsibility_name"/>
-        <result property="amount" column="amount"/>
+        <result property="valueNum" column="value_num"/>
         <result property="hospId" column="hosp_id"/>
-        <result property="fileId" column="file_id"/>
-        <result property="afterIncomeGroup" column="after_income_group"/>
-        <result property="dateYear" column="date_year"/>
-        <result property="dateMonth" column="date_month"/>
+        <result property="fileId" column="fileId" />
+        <result property="dataSourceType" column="data_source_type"/>
         <result property="createTime" column="create_time"/>
         <result property="deleteTime" column="delete_time"/>
     </resultMap>