添加撤销

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

@@ -74,6 +74,10 @@ public class CostIncomeFile implements Serializable {
 	 * 月份
 	 */
 	private Integer dateMonth;
+	/**
+	 * 是否撤销
+	 */
+	private Integer rollbackStatus;
 	/**
 	 * 创建时间13位时间戳
 	 */

src/main/java/com/imed/costaccount/model/vo/CostIncomeFileVO.java

@@ -33,6 +33,10 @@ public class CostIncomeFileVO {
     private Integer totalAmount;
     @ApiModelProperty(name = "userName",value = "导入人员")
     private String userName;
+    /**
+     * 是否撤销
+     */
+    private Integer rollbackStatus;
     /**
      * 年份
      */

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

@@ -15,7 +15,9 @@ 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.model.*;
+import com.imed.costaccount.model.CostIncomeFile;
+import com.imed.costaccount.model.CostIncomeGroup;
+import com.imed.costaccount.model.User;
 import com.imed.costaccount.model.vo.CostIncomeFileVO;
 import com.imed.costaccount.model.vo.IncomeErrorMessage;
 import com.imed.costaccount.service.CostIncomeFileService;
@@ -107,22 +109,6 @@ public class CostIncomeFileServiceImpl extends ServiceImpl<CostIncomeFileMapper,
             }
             i.setDateTime(DateUtil.format(DateUtil.date(i.getCreateTime()),"yyyy-MM-dd"));
         });
-        // 判断当前数据是否撤销
-        List<CostIncomeGroup> costIncomeGroupList = costIncomeGroupMapper.selectList(new QueryWrapper<CostIncomeGroup>().lambda()
-                .eq(CostIncomeGroup::getHospId, hospId));
-        List<CostCostingGroup> costCostingGroupList = costCostingGroupMapper.selectList(new QueryWrapper<CostCostingGroup>().lambda()
-                .eq(CostCostingGroup::getHospId, hospId));
-        List<CostShareParamGroup> costShareParamGroupList = costShareParamGroupMapper.selectList(new QueryWrapper<CostShareParamGroup>().lambda()
-                .eq(CostShareParamGroup::getHospId, hospId));
-        costIncomeFileVOList.forEach(i->{
-            Long id = i.getId();
-            String fileType = i.getFileType();
-            if (fileType.equals("收入数据")){
-
-            }else if (fileType.equals("成本数据")){
-
-            }
-        });
         PageUtils pageUtils = new PageUtils(page);
         pageUtils.setList(costIncomeFileVOList);
         return pageUtils;
@@ -149,6 +135,8 @@ public class CostIncomeFileServiceImpl extends ServiceImpl<CostIncomeFileMapper,
         }
         List<Long> list = costIncomeGroupList.stream().map(CostIncomeGroup::getId).collect(Collectors.toList());
         costIncomeGroupMapper.deleteBatchIds(list);
+        costIncomeFile.setRollbackStatus(NumberConstant.ONE);
+        this.updateById(costIncomeFile);
     }
 
     /**

src/main/resources/mapper/CostIncomeFileMapper.xml

@@ -15,6 +15,7 @@
         <result property="userId" column="user_id"/>
         <result property="userName" column="user_name"/>
         <result property="errorList" column="error_list"/>
+        <result property="rollbackStatus" column="rollback_status"/>
         <result property="dateYear" column="date_year"/>
         <result property="dateMonth" column="date_month"/>
         <result property="createTime" column="create_time"/>