Просмотр исходного кода

生成文件目录时,外部文件也需要年度审查

wy 5 месяцев назад
Родитель
Сommit
6482304df2

+ 22 - 22
ibps-provider-root/modules/provider-platform/src/main/java/com/lc/ibps/platform/enumeration/FileEnumeration.java

@@ -7,21 +7,21 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 @JsonFormat(shape = JsonFormat.Shape.OBJECT)
 public enum FileEnumeration {
     //内部文件
-    NEI_BU_WEN_JIAN("FILE_TYPE","内部文件","nbwj","1","286814138233389367","1","Y","0","-999", JSONUtil.parseObj("{\"buMen\":[[]],\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
+    NEI_BU_WEN_JIAN("FILE_TYPE","内部文件","nbwj","1","286814138233389367","1","Y","0","-999", JSONUtil.parseObj("{\"buMen\":[[]],\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
     //质量手册
     ZHI_LIANG_SHOU_CE("FILE_TYPE","质量手册","zlsc","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"shspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
     //程序文件
     CHENG_XU_WEN_JIAN("FILE_TYPE","程序文件","cxwj","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"shspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
     //安全手册
-    AN_QUAN_SHOU_CE("FILE_TYPE","安全手册","aqsc","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"shspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
+    AN_QUAN_SHOU_CE("FILE_TYPE","安全手册","aqsc","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"shspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
     //临床样品采集手册
     LING_CHUANG_YANG_PING_CAI_JI_SHOU_CE("FILE_TYPE","临床样品采集手册","lcypcjsc","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"shspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
     //信息系统文件
-    XIN_XI_XI_TONG_WEN_JIAN("FILE_TYPE","信息系统文件","xxxtwj","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"shspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
+    XIN_XI_XI_TONG_WEN_JIAN("FILE_TYPE","信息系统文件","xxxtwj","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"shspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
     //科室制度文件
-    KE_SHI_ZHI_DU_WEN_JIAN("FILE_TYPE","科室制度文件","kszdwj","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"shspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
+    KE_SHI_ZHI_DU_WEN_JIAN("FILE_TYPE","科室制度文件","kszdwj","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"shspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
     //记录表单
-    JI_LU_BIAO_DAN("FILE_TYPE","记录表单","jlbd","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspbgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
+    JI_LU_BIAO_DAN("FILE_TYPE","记录表单","jlbd","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspbgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
     //项目类sop
     N_XIANG_MU_LEI_SOP ("FILE_TYPE","项目类sop","xmlSOP","1","","3","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"shspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"部门查阅\"}")),
     //管理类sop
@@ -29,39 +29,39 @@ public enum FileEnumeration {
     //设备类sop
     N_SHE_BEI_LEI_SOP("FILE_TYPE","设备类sop","sblSOP","1","","3","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"shspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"部门查阅\"}")),
     //受限类
-    N_SHOU_XIAN_LEI("FILE_TYPE","受限类","sxl","1","","3","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"shspgz\",\"buMen\":\"\",\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"受限查阅\"}")),
+    N_SHOU_XIAN_LEI("FILE_TYPE","受限类","sxl","1","","3","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"shspgz\",\"buMen\":\"\",\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"受限查阅\"}")),
     //外部文件
-    WAI_BU_WEN_JIAN("FILE_TYPE","外部文件","wbwj","1","286814138233389367","1","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":\"\",\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
+    WAI_BU_WEN_JIAN("FILE_TYPE","外部文件","wbwj","1","286814138233389367","1","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":\"\",\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
     //国家标准
-    GUO_JIA_BIAO_ZHUN("FILE_TYPE","国家标准","gjbz","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":\"\",\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
+    GUO_JIA_BIAO_ZHUN("FILE_TYPE","国家标准","gjbz","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":\"\",\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
     //卫生行业标准
-    WEI_SHENG_HANG_YE_BIAO_ZHUN("FILE_TYPE","卫生行业标准","wsxybz","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":\"\",\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
+    WEI_SHENG_HANG_YE_BIAO_ZHUN("FILE_TYPE","卫生行业标准","wsxybz","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":\"\",\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
     //技术标准
-    JI_SHU_BIAO_ZHUN("FILE_TYPE","技术标准","jsbz","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":\"\",\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
+    JI_SHU_BIAO_ZHUN("FILE_TYPE","技术标准","jsbz","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":\"\",\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
     //安全管理文件
-    AN_QUAN_GUAN_LI_WEN_JIAN("FILE_TYPE","安全管理文件","aqglwj","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":\"\",\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
+    AN_QUAN_GUAN_LI_WEN_JIAN("FILE_TYPE","安全管理文件","aqglwj","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":\"\",\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
     //认可规范及指南
-    REN_KE_GUI_FAN_JI_ZHINAN("FILE_TYPE","认可规范及指南","rkwj","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":\"\",\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
+    REN_KE_GUI_FAN_JI_ZHINAN("FILE_TYPE","认可规范及指南","rkwj","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":\"\",\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
     //法律法规
-    FA_LU_FA_GUI("FILE_TYPE","法律法规","flfg","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":\"\",\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
+    FA_LU_FA_GUI("FILE_TYPE","法律法规","flfg","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":\"\",\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
     //其他
-    QITA("FILE_TYPE","其他","qt","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":\"\",\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
+    QITA("FILE_TYPE","其他","qt","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":\"\",\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
     //设备使用说明
-    W_SHE_BEI_SHI_YONG_SHUO_MING_SHU("FILE_TYPE","设备使用说明","sbsysms","1","","3","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"部门查阅\"}")),
+    W_SHE_BEI_SHI_YONG_SHUO_MING_SHU("FILE_TYPE","设备使用说明","sbsysms","1","","3","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"部门查阅\"}")),
     //试剂使用说明书
-    W_SHI_JI_SHI_YONG_SHUO_MING_SHU("FILE_TYPE","试剂使用说明书","sjsysms","1","","3","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"部门查阅\"}")),
+    W_SHI_JI_SHI_YONG_SHUO_MING_SHU("FILE_TYPE","试剂使用说明书","sjsysms","1","","3","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"部门查阅\"}")),
     //法律法规
-    W_FA_LU_FAG_UI("FILE_TYPE","法律法规","flfg","1","","3","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"部门查阅\"}")),
+    W_FA_LU_FAG_UI("FILE_TYPE","法律法规","flfg","1","","3","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"部门查阅\"}")),
     //行业标准
-    W_HANG_YE_BIAO_ZHUN("FILE_TYPE","行业标准","xybz","1","","3","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"chaYue\":\"部门查阅\",\"diDian\":\"\"}")),
+    W_HANG_YE_BIAO_ZHUN("FILE_TYPE","行业标准","xybz","1","","3","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"chaYue\":\"部门查阅\",\"diDian\":\"\"}")),
     //参考文献
-    W_CAN_KAO_WEN_XIAN("FILE_TYPE","参考文献","ckwx","1","","3","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"chaYue\":\"部门查阅\",\"diDian\":\"\"}")),
+    W_CAN_KAO_WEN_XIAN("FILE_TYPE","参考文献","ckwx","1","","3","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"chaYue\":\"部门查阅\",\"diDian\":\"\"}")),
     //书籍
-    W_SHU_JI("FILE_TYPE","书籍","sj","1","","3","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"chaYue\":\"部门查阅\",\"diDian\":\"\"}")),
+    W_SHU_JI("FILE_TYPE","书籍","sj","1","","3","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"chaYue\":\"部门查阅\",\"diDian\":\"\"}")),
     //其他
-    W_QI_TA ("FILE_TYPE","其他","qt","1","","3","Y","0","-999",JSONUtil.parseObj("{\"buMen\":\"\",\"shenCha\":\"需要\",\"chaYue\":\"部门查阅\",\"diDian\":\"\"}")),
+    W_QI_TA ("FILE_TYPE","其他","qt","1","","3","Y","0","-999",JSONUtil.parseObj("{\"buMen\":\"\",\"shenCha\":\"需要\",\"chaYue\":\"部门查阅\",\"diDian\":\"\"}")),
     //受限类
-    W_SHOU_XIAN_LIE("FILE_TYPE","受限类","sxl","1","","3","Y","0","-999",JSONUtil.parseObj("{\"buMen\":\"\",\"shenCha\":\"需要\",\"chaYue\":\"受限查阅\",\"diDian\":\"\"}"));
+    W_SHOU_XIAN_LIE("FILE_TYPE","受限类","sxl","1","","3","Y","0","-999",JSONUtil.parseObj("{\"buMen\":\"\",\"shenCha\":\"需要\",\"chaYue\":\"受限查阅\",\"diDian\":\"\"}"));
 
     public String categoryKey;
     public String name;

+ 2 - 2
ibps-provider-root/modules/provider-platform/src/main/java/com/lc/ibps/platform/plan/job/InitializeFolderJob.java

@@ -182,10 +182,10 @@ public class InitializeFolderJob extends BaseJob2 {
     public List<Map<String, Object>> assemblyData(List<Map<String, Object>> deptList,String neiId,String neiFu ,String waiId,String waiFu,String diDian) throws Exception{
         List<Map<String, Object>> list = new ArrayList<>();
         if(Collections.isNotEmpty(deptList)){
-            JSONObject neiAuthName = new JSONObject(JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"部门查阅\"}"));
+            JSONObject neiAuthName = new JSONObject(JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"部门查阅\"}"));
             JSONObject waiAuthName = new JSONObject(JSONUtil.parseObj("{\"shenHeZouXiang\":\"shspgz\",\"fenLei\":\"通用\",\"buMen\":\"\",\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}"));
 
-            JSONObject neiAuthNameForu = new JSONObject(JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"部门查阅\"}"));
+            JSONObject neiAuthNameForu = new JSONObject(JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"部门查阅\"}"));
             JSONObject waiAuthNameFour = new JSONObject(JSONUtil.parseObj("{\"shenHeZouXiang\":\"shspgz\",\"fenLei\":\"通用\",\"buMen\":\"\",\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}"));
 
             for (Map<String, Object> item : deptList ) {