瀏覽代碼

设置责任中心

ljx 4 年之前
父節點
當前提交
797f976b43

+ 6 - 0
src/main/java/com/imed/costaccount/service/impl/CostIncomeGroupServiceImpl.java

@@ -495,6 +495,12 @@ public class CostIncomeGroupServiceImpl extends ServiceImpl<CostIncomeGroupMappe
                         afterIncomegroup.setResponsibilityCode(responsibility.getResponsibilityCode());
                         afterIncomegroup.setResponsibilityName(responsibility.getResponsibilityName());
                     }
+                }else if (NumberConstant.ONE.equals(openDepartmentStatus) && NumberConstant.ZERO.equals(startDepartmentStatus)){
+                    afterIncomegroup.setResponsibilityCode(costIncomeGroup.getOpenResponsibilityCode());
+                    afterIncomegroup.setResponsibilityName(costIncomeGroup.getOpenResponsibilityName());
+                }if (NumberConstant.ZERO.equals(openDepartmentStatus) && NumberConstant.ONE.equals(startDepartmentStatus)){
+                    afterIncomegroup.setResponsibilityCode(costIncomeGroup.getStartResponsibilityCode());
+                    afterIncomegroup.setResponsibilityName(costIncomeGroup.getStartResponsibilityName());
                 }
                 costIncomeGroup.setAfterIncomeGroup(JSON.toJSONString(afterIncomegroup));
             }

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

@@ -36,9 +36,9 @@ public class CostIncomeFileController {
     @ApiOperation("分页查询记录数据")
     public Result list(@RequestParam(value = "current", defaultValue = "1") Integer current,
                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                       @RequestParam(value = "name",required = false) String name){
+                       @RequestParam(value = "fileName",required = false) String fileName){
         Long hospId = UserContext.getHospId();
-        PageUtils pageUtils = costIncomeFileService.queryList(current,pageSize,name,hospId);
+        PageUtils pageUtils = costIncomeFileService.queryList(current,pageSize,fileName,hospId);
         return Result.ok(pageUtils);
     }