Merge branch 'V0.0.5' of http://10.87.21.221:8000/jzyd_yyds/soc into V0.0.5

project_data/sql/0.0.5/quartz/quartz.sql

@@ -1,4 +1,8 @@
 UPDATE sys_job set `status`=0 WHERE job_name='生成每周履职任务';
 UPDATE sys_job set `status`=0 WHERE job_name='生成每月履职任务';
 UPDATE sys_job set `status`=0 WHERE job_name='调阅监控每日每周任务补救';
--- UPDATE sys_job set `status`=0 WHERE job_name='调阅监控每月季度半年年任务补救接口';
+-- UPDATE sys_job set `status`=0 WHERE job_name='调阅监控每月季度半年年任务补救接口';
+
+-- 预案演练逾期任务状态修改定时任务
+DELETE from sys_job where invoke_target='CoreDrillTask.updateDrillTaskStatus()';
+INSERT INTO `sys_job`(`job_name`, `job_group`, `invoke_target`, `cron_expression`, `misfire_policy`, `concurrent`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ( '预案演练逾期任务状态修改', 'DEFAULT', 'CoreDrillTask.updateDrillTaskStatus()', '0 0 1 * * ?', '1', '1', '0', 'slsjyc', '2023-10-19 08:56:30', '', NULL);

project_data/sql/0.0.5/soc/soc.sql

@@ -142,6 +142,11 @@ INSERT INTO `sys_dict_data` ( `dict_sort`, `dict_label`, `dict_value`, `dict_typ
 INSERT INTO `sys_dict_data` ( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 11, '已整改', '11', 'app_question_status', NULL, 'default', 'N', '0', '超级管理员', '2023-12-19 15:44:07', '超级管理员', '2023-12-19 15:44:31', NULL);
 INSERT INTO `sys_dict_data` ( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 12, '已逾期', '12', 'app_question_status', NULL, 'default', 'N', '0', '超级管理员', '2023-12-19 15:44:18', '', NULL, NULL);
 
+DELETE from sys_dict_data where dict_type in ('org_extend_standard');
+
+INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 1, 'GA38-2021', '1', 'org_extend_standard', NULL, 'default', 'N', '0', '超级管理员', '2023-09-14 16:57:04', '超级管理员', '2023-10-07 15:24:27', NULL);
+INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 2, 'GA38-2015', '2', 'org_extend_standard', NULL, 'default', 'N', '0', '超级管理员', '2023-09-14 16:57:10', '超级管理员', '2023-10-07 15:24:36', NULL);
+INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 3, '未达标', '3', 'org_extend_standard', NULL, 'default', 'N', '0', '超级管理员', '2023-09-14 16:57:28', '超级管理员', '2023-10-07 15:24:43', NULL);
 -- 新增安全责任书签署层级字典
 DELETE from sys_dict_data where dict_type='sign_level' and dict_label='其他' limit 1;
 INSERT INTO  `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (0, '其他', '3', 'sign_level', NULL, 'default', 'N', '0', null, NOW(), null

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/message/vo/MessageAppPageVo.java

@@ -23,33 +23,44 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 
-@ApiModel(value = "CoreAnnouncementNotification对象" , description = "公告通知")
-public class MessageAppPageVo
-        {
-private static final long serialVersionUID=1L;
+@ApiModel(value = "CoreAnnouncementNotification对象", description = "公告通知")
+public class MessageAppPageVo {
+    private static final long serialVersionUID = 1L;
 
-    /**  */
+    /**
+     *
+     */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
-    /** 标题 */
+    /**
+     * 标题
+     */
     private String title;
 
-    /** 内容 */
-            @ApiModelProperty(value = "内容")
+    /**
+     * 内容
+     */
+    @ApiModelProperty(value = "内容")
     private String content;
-    /** 发布时间 */
-            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-            @ApiModelProperty(value = "发布时间")
+    /**
+     * 发布时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty(value = "发布时间")
     private Date publishTime;
 
 
+    @ApiModelProperty(value = "附件")
+    private List<FileObject> fileList;
 
-            @ApiModelProperty(value = "附件")
-            private List<FileObject> fileList;
+    @ApiModelProperty(value = "附件")
+    private String strFileList;
 
-            @ApiModelProperty(value = "附件")
-            private String strFileList;
+    private Integer isRead;
 
-   private Integer isRead;
-        }
+    /**
+     * 发布机构
+     */
+    private String publishOrg;
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/dto/CoreEvaluatePlanDTO.java

@@ -19,7 +19,7 @@ public class CoreEvaluatePlanDTO {
     @ApiModelProperty(value = "机构类型")
     private String orgType;
     @ApiModelProperty(value = "是否立即生效")
-    private Boolean buildTaskNow;
+    private Boolean buildTaskNow=false;
     /**
      * 外包评价名称
      */

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/service/impl/CoreEvaluatePlanServiceImpl.java

@@ -259,7 +259,9 @@ public class CoreEvaluatePlanServiceImpl extends ServiceImpl<CoreEvaluatePlanMap
             coreEvaluatePlanContentMapper.insert(coreEvaluatePlanContent);
         });
         //下发
-        distribute(coreEvaluatePlan.getId(), coreEvaluatePlan.getBuildTaskNow());
+        if (coreEvaluatePlan.getBuildTaskNow()==true&&coreEvaluateTasks1.isEmpty()){
+            distribute(coreEvaluatePlan.getId(), coreEvaluatePlan.getBuildTaskNow());
+        }
         return i;
     }
 

soc-modules/soc-modules-core/src/main/resources/mapper/information/CoreMessageCenterMapper.xml

@@ -73,6 +73,7 @@
         <if test="request.userId !=null">
             and user_id=#{request.userId}
         </if>
+        ORDER BY create_time DESC
     </select>
     <select id="selectNoRead" resultType="java.lang.Integer">
         SELECT

soc-modules/soc-modules-file/src/main/java/com/xunmei/file/utils/PdfUtil.java

@@ -520,18 +520,17 @@ public class PdfUtil {
     }
 
     public static void dealAccessPBody(Document document, PdfPTable table, Font tableFont, Font tableTitleFont, List<AccessDataVo> data) throws DocumentException {
-
         PdfUtil.createPDFCell(tableTitleFont, table, "序号", Element.ALIGN_MIDDLE, 5, 0);
-        PdfUtil.createPDFCell(tableTitleFont, table, "硬盘录像机", Element.ALIGN_MIDDLE, 15, 0);
+        PdfUtil.createPDFCell(tableTitleFont, table, "硬盘录像机", Element.ALIGN_MIDDLE, 8, 0);
         PdfUtil.createPDFCell(tableTitleFont, table, "通道名称", Element.ALIGN_MIDDLE, 9, 0);
         PdfUtil.createPDFCell(tableTitleFont, table, "检查项目", Element.ALIGN_MIDDLE, 8, 0);
-        PdfUtil.createPDFCell(tableTitleFont, table, "存在问题", Element.ALIGN_MIDDLE, 9, 0);
+        PdfUtil.createPDFCell(tableTitleFont, table, "存在问题", Element.ALIGN_MIDDLE, 16, 0);
         for (int i = 1; i <= data.size(); i++) {
             PdfUtil.createPDFCell(tableFont, table, String.valueOf(i), Element.ALIGN_MIDDLE, 5, 0);
-            PdfUtil.createPDFCell(tableFont, table, data.get(i - 1).getHostName(), Element.ALIGN_MIDDLE, 15, 0);
+            PdfUtil.createPDFCell(tableFont, table, data.get(i - 1).getHostName(), Element.ALIGN_MIDDLE, 8, 0);
             PdfUtil.createPDFCell(tableFont, table, data.get(i - 1).getVideoChannelName(), Element.ALIGN_MIDDLE, 9, 0);
             PdfUtil.createPDFCell(tableFont, table, data.get(i - 1).getProject(), Element.ALIGN_MIDDLE, 8, 0);
-            PdfUtil.createPDFCell(tableFont, table, data.get(i - 1).getAbnormalIllustrate(), Element.ALIGN_MIDDLE, 9, 0);
+            PdfUtil.createPDFCell(tableFont, table, data.get(i - 1).getAbnormalIllustrate(), Element.ALIGN_MIDDLE, 16, 0);
         }
         document.add(table);
     }