瀏覽代碼

设置科室返回

ljx 4 年之前
父節點
當前提交
93bb5db062

+ 2 - 0
src/main/java/com/imed/costaccount/model/vo/HospitalVO.java

@@ -37,4 +37,6 @@ public class HospitalVO {
 
     @ApiModelProperty(name = "createTime",value = "创建时间13位时间戳")
     private Long createTime;
+
+    private String createDateTime;
 }

+ 1 - 1
src/main/java/com/imed/costaccount/service/impl/CostAccountShareServiceImpl.java

@@ -125,7 +125,7 @@ public class CostAccountShareServiceImpl extends ServiceImpl<CostAccountShareMap
                 throw new CostException(500,"合并计算不允许选择成本科目");
             }
         }else {
-            throw new CostException(500,"对不起该责任中心没有计算方式");
+            throw new CostException(500,"对不起该责任中心没有对应分摊层级");
         }
     }
 

+ 4 - 0
src/main/java/com/imed/costaccount/service/impl/HospitalServiceImpl.java

@@ -1,6 +1,7 @@
 package com.imed.costaccount.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -54,6 +55,9 @@ public class HospitalServiceImpl extends ServiceImpl<HospitalMapper, Hospital> i
                 i.setParentId(null);
                 i.setParentName(null);
             }
+            String format = DateUtil.format(DateUtil.date(i.getCreateTime()), "yyyy-MM-dd HH:mm:ss");
+            i.setCreateDateTime(format);
+
         });
 
         PageUtils pageUtils = new PageUtils(pages);

+ 1 - 1
src/main/resources/mapper/ResponsibilityDepartmentMapper.xml

@@ -17,7 +17,7 @@
     <select id="getDepartByCenterId" resultType="com.imed.costaccount.model.vo.DepartVO">
         select sd.id as departmentId,concat(sd.department_name,sd.department_code) as departmentName
             from cost_responsibility_department crd left join  sys_department sd on sd.id = crd.department_id
-        where crd.responsibility_id = #{responsibilityId}
+        where crd.responsibility_id = #{responsibilityId} and crd.delete_time = 0 and sd.delete_time = 0
     </select>