Forráskód Böngészése

删除图标处理

ljx 4 éve
szülő
commit
ec6ef5ae8f

+ 0 - 1
src/main/java/com/imed/costaccount/model/dto/MenuSaveDTO.java

@@ -26,7 +26,6 @@ public class MenuSaveDTO {
     @NotNull(message = "菜单类型不能为空")
     private Integer type;
 
-    @NotBlank(message = "菜单图标不能为空")
     private String icon;
 
     private Integer orderNum;

+ 3 - 2
src/main/java/com/imed/costaccount/web/ExcelController.java

@@ -248,7 +248,7 @@ public class ExcelController {
         writer.passCurrentRow();
         // 冻结前四行
         writer.setFreezePane(4);
-        writer.writeRow(Arrays.asList("","","开单科室","开单科室代码", "执行科室","执行科室代码","金额"));
+        writer.writeRow(Arrays.asList("成本项目代码","成本项目名称","开单科室","开单科室代码", "执行科室","执行科室代码","金额"));
         int accountType=NumberConstant.ONE;
         int column=NumberConstant.FOUR;
         getProductByAccountType(hospId, writer,accountType,column);
@@ -417,9 +417,10 @@ public class ExcelController {
      * @param fileType 文件类型 1 成本分摊数据  2 收入数据 3 成本数据
      */
     @PostMapping("/importProductAccount")
-    @ApiOperation("批量导入收入数据信息")
+    @ApiOperation("批量导入数据信息")
     public Result importProductAccount(@RequestParam("file") MultipartFile file,Integer fileType){
         InputStream in;
+        // 导入的是成本分摊参数的数据
         try {
             in = file.getInputStream();
             ExcelReader reader = ExcelUtil.getReader(in);