Merge remote-tracking branch 'origin/V0.0.4' into V0.0.4

project_data/sql/0.0.4/soc/soc.sql

@@ -0,0 +1,7 @@
+UPDATE sys_dict_data set dict_label='停用' WHERE (dict_type='plan_status' and dict_value=1 ) or (dict_type='sys_user_is_lock' and dict_value=1 );
+
+DELETE FROM `sys_dict_type` WHERE dict_type='rule_status';
+DELETE FROM `sys_dict_data` WHERE dict_type='rule_status';
+INSERT INTO `sys_dict_type` (`dict_id`, `dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (20231113157, '手册状态', 'rule_status', '0', 'jwx', '2023-11-27 14:55:51', '', NULL, NULL);
+INSERT INTO `sys_dict_data` (`dict_code`, `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 (20231114641, 0, '启用', '0', 'rule_status', NULL, 'default', 'N', '0', 'jwx', '2023-11-27 14:56:36', '', NULL, NULL);
+INSERT INTO `sys_dict_data` (`dict_code`, `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 (20231114643, 1, '停用', '1', 'rule_status', NULL, 'default', 'N', '0', 'jwx', '2023-11-27 14:56:44', '', NULL, NULL);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/service/impl/QuestionServiceImpl.java

@@ -176,17 +176,9 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
     public int insertQuestion(Question question) {
         question.setId(IDHelper.id());
 
-        if (ObjectUtil.equal(question.getSrcType(), QuestionSrcType.Resumption.getValue())) {
+        if (ObjectUtil.equal(question.getOrgId(),SecurityUtils.getLoginUser().getOrgId())) {
             question.setConfirmStatus(QuestionConfirmEnum.Confirmed.getValue());
             question.setReformStatus(QuestionReformEnum.Unreform.getValue());
-//            QuestionFlow flow = new QuestionFlow();
-//            flow.setQuestionId(question.getId());
-//            flow.setExecuteTime(new Date());
-//            flow.setExecutorId(SecurityUtils.getUserId());
-//            flow.setExecutorName(SecurityUtils.getLoginUser().getName());
-//            flow.setExecuteStatus(0);
-//            flow.setExecuteStep(QuestionStepEnum.confirm.getValue());
-//            questionFlowMapper.insert(flow);
         } else {
             question.setConfirmStatus(QuestionConfirmEnum.Unconfirm.getValue());
             question.setReformStatus(null);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/ProtectionServiceImpl.java

@@ -160,7 +160,7 @@ public class ProtectionServiceImpl extends ServiceImpl<ProtectionMapper, Protect
         }
         //按规则分页
         page = this.protectionLogMapper.pageLog(page, request);
-        TableDataInfo<ProtectionPageVo> data = TableDataInfo.success(page);
+        TableDataInfo<ProtectionLogPageVo> data = TableDataInfo.success(page);
 //        int order=request.getPage()*request.getSize();
 //        for (Object row : data.getRows()) {
 //            ((ProtectionLogPageVo)row).setOrder(++order);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/protection/ProtectionLogPageVo.java

@@ -39,7 +39,7 @@ public class ProtectionLogPageVo {
 //    private String orgName;
 
     @ApiModelProperty("更新时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     private Date updateTime;
 
     @ApiModelProperty("防区状态")

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/protection/ProtectionPageVo.java

@@ -72,7 +72,7 @@ public class ProtectionPageVo {
     /**
      * 布撤防时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     @ExcelProperty(value = "最近登记时间",index = 6)
     @ColumnWidth(20)
     private  Date statusUpdateTime;