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

project_data/sql/0.0.5/soc/soc.sql

@@ -170,12 +170,12 @@ INSERT INTO `sys_dict_data`(`dict_sort`, `dict_label`, `dict_value`, `dict_type`
 
 -- 整改期限增加60天、180天内，360天内
 DELETE from sys_dict_data WHERE dict_type='rectification_deadline';
-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 (269, 1, '15天内', '15', 'rectification_deadline', NULL, 'default', 'N', '0', '超级管理员', '2023-09-01 16:58:56', 'jwx', '2023-12-26 16:36:34', 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 (270, 2, '30天内', '30', 'rectification_deadline', NULL, 'default', 'N', '0', '超级管理员', '2023-09-01 17:00:07', 'jwx', '2023-12-26 16:36:40', 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 (271, 4, '90天内', '90', 'rectification_deadline', NULL, 'default', 'N', '0', '超级管理员', '2023-09-01 17:00:17', 'jwx', '2023-12-26 16:37:04', 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 (20231114968, 3, '60天内', '60', 'rectification_deadline', NULL, 'default', 'N', '0', '超级管理员', '2023-12-26 16:36:57', 'jwx', '2023-12-26 16:37:08', 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 (20231114970, 5, '180天内', '180', 'rectification_deadline', NULL, 'default', 'N', '0', '超级管理员', '2023-12-26 16:37:23', '', 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 (20231114972, 6, '360天内', '360', 'rectification_deadline', NULL, 'default', 'N', '0', '超级管理员', '2023-12-26 16:37:39', '', NULL, 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 ( 1, '15天内', '15', 'rectification_deadline', NULL, 'default', 'N', '0', '超级管理员', '2023-09-01 16:58:56', 'jwx', '2023-12-26 16:36:34', 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, '30天内', '30', 'rectification_deadline', NULL, 'default', 'N', '0', '超级管理员', '2023-09-01 17:00:07', 'jwx', '2023-12-26 16:36:40', 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 ( 4, '90天内', '90', 'rectification_deadline', NULL, 'default', 'N', '0', '超级管理员', '2023-09-01 17:00:17', 'jwx', '2023-12-26 16:37:04', 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, '60天内', '60', 'rectification_deadline', NULL, 'default', 'N', '0', '超级管理员', '2023-12-26 16:36:57', 'jwx', '2023-12-26 16:37:08', 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 ( 5, '180天内', '180', 'rectification_deadline', NULL, 'default', 'N', '0', '超级管理员', '2023-12-26 16:37:23', '', NULL, 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 ( 6, '360天内', '360', 'rectification_deadline', NULL, 'default', 'N', '0', '超级管理员', '2023-12-26 16:37:39', '', NULL, NULL);
 
 
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillTaskServiceImpl.java

@@ -299,9 +299,8 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
             coreDrillTask.setPlanCycle(DrillPlanCycleEnum.NONE.getCode());
             coreDrillTask.setCreateBy(SecurityUtils.getUserId().toString());
             coreDrillTask.setCreateTime(new Date());
-            coreDrillTask.setStartDate(DateUtils.toDate(request.getDrillStartTime()));
-            coreDrillTask.setEndDate(DateUtils.toDate(request.getDrillEndTime()));
-
+            coreDrillTask.setStartDate(DateUtil.beginOfDay(new Date()));
+            coreDrillTask.setEndDate(DateUtil.endOfDay(new Date()));
         }
         taskToUserMapper.deleteByMap(MapUtil.of("drill_task_id", request.getId()));
         coreDrillTask.setType(request.getType());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingTaskServiceImpl.java

@@ -275,6 +275,8 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         task.setOrgName(sysOrg.getName());
         task.setOrgPath(sysOrg.getPath());
         BeanUtils.copyProperties(request, task);
+        task.setStartDate(DateUtil.beginOfDay(new Date()));
+        task.setEndDate(DateUtil.endOfDay(new Date()));
         task.setCreateTime(DateUtils.getNowDate());
         task.setUpdateTime(DateUtils.getNowDate());
         task.setCreateBy(SecurityUtils.getLoginUser().getSysUser().getId().toString());

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

@@ -180,6 +180,9 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
 
     @Override
     public Map statistics(EvaluateTaskStatisticsDTO evaluateTaskStatisticsDTO) {
+        if (null==evaluateTaskStatisticsDTO.getPlanId()||null==evaluateTaskStatisticsDTO.getOrgId()){
+            return null;
+        }
         Map map = new HashMap();
         List<SysOrg> sysOrgs = remoteOrgService.selectSysOrgByParentId(evaluateTaskStatisticsDTO.getOrgId(), SecurityConstants.INNER);
         List<LinkedHashMap> rows = new ArrayList<>();

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/information/service/ICoreMessageCenterService.java

@@ -35,7 +35,7 @@ public interface ICoreMessageCenterService extends IService<CoreMessageCenter> {
 
 
     TableDataInfo selectByPage(CoreMessageCenterDTO coreMessageCenterDTO);
-    Boolean isRead();
+    Integer isRead();
     /**
      * 新增消息中心
      *

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/information/service/impl/CoreMessageCenterServiceImpl.java

@@ -92,7 +92,7 @@ public class CoreMessageCenterServiceImpl extends ServiceImpl<CoreMessageCenterM
     }
 
     @Override
-    public Boolean isRead() {
+    public Integer isRead() {
         Long userId = SecurityUtils.getUserId();
         Integer integer1 = baseMapper.selectNoRead(userId);
         //通知
@@ -111,12 +111,12 @@ public class CoreMessageCenterServiceImpl extends ServiceImpl<CoreMessageCenterM
         List<Long> collect1 = messageAppPageVos.stream().map(MessageAppPageVo::getId).collect(Collectors.toList());
         Integer i = 0;
         if (CollectionUtils.isNotEmpty(collect1) && CollectionUtils.isNotEmpty(longs) && longs.size() != collect1.size()) {
-            i = 1;
+            i = collect1.size() - longs.size();
         }
-        if (i + integer1 == 0) {
-            return false;
+        if (i + integer1 <= 0) {
+            return 0;
         }
-        return true;
+        return i + integer1;
     }
 
     /**

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/CoreSafecheckPlanServiceImpl.java

@@ -778,7 +778,13 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
      * @return
      */
     private Boolean needCopyOnEdit(CoreSafecheckPlan plan) {
-        DateRange dateRange = DateUtils.getStartAndEnd(new Date(), SafetyPlanCycle.toCommon(plan.getPlanCycle()));
+        DateRange dateRange = null;
+        if (ObjectUtil.equal(plan.getPlanCycle(), SafetyPlanCycle.NONE.getCode())) {
+            dateRange = new DateRange(plan.getStartDate(), plan.getEndDate());
+        } else {
+            dateRange = DateUtils.getStartAndEnd(new Date(), SafetyPlanCycle.toCommon(plan.getPlanCycle()));
+        }
+
         if (ObjectUtil.equal(plan.getPlanStatus(), PlanStatus.USING.getCode()) && new Date().before(plan.getEffectiveTime())) {
             return false;
         } else if (ObjectUtil.equal(plan.getPlanStatus(), PlanStatus.USING.getCode())
@@ -1015,7 +1021,12 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
         registerBookVo.setCheckUserInfo(checkUserInfo);
         registerBookVo.setCheckTeam(appSafetyCheckTask.getCheckTeam());
         final CoreSafecheckPlan plan = coreSafecheckPlanMapper.get(appSafetyCheckTask.getPlanId());
-        registerBookVo.setCheckTypeText(DictUtils.getDictLabel(DictConstants.CHECK_TYPE, plan.getCheckType().intValue()));
+        if (ObjectUtil.isNotNull(plan)) {
+            registerBookVo.setCheckTypeText(DictUtils.getDictLabel(DictConstants.CHECK_TYPE, plan.getCheckType().intValue()));
+        } else {
+            registerBookVo.setCheckTypeText("临时登记");
+        }
+
         List<CheckDataVo> pointCheckDataList = new ArrayList<>();
         List<AppTaskRegisterPointVo> appTaskRegisterPointVos = coreSafetyTaskMapper.selectPointByTask(appSafetyCheckTask.getId());
         for (AppTaskRegisterPointVo vo :

soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/CoreSafecheckPlanMapper.xml

@@ -56,11 +56,13 @@
         <collection property="checkOrgList" ofType="com.xunmei.system.api.domain.SysOrg">
             <result column="check_org_id" property="id"/>
             <result column="check_org_name" property="name"/>
+            <result column="check_org_name" property="shortName"/>
         </collection>
         <!-- 检查机构关系映射 -->
         <collection property="execOrgList" ofType="com.xunmei.system.api.domain.SysOrg">
             <result column="exec_org_id" property="id"/>
             <result column="exec_org_name" property="name"/>
+            <result column="exec_org_name" property="shortName"/>
         </collection>
         <!-- 检查机构类型关系映射 -->
         <collection property="checkOrgTypeList"
@@ -167,9 +169,9 @@
                co.plan_id       AS check_org_plan_id,
                co.org_id        AS check_org_org_id,
                o3.id            AS exec_org_id,
-               o3.NAME          AS exec_org_name,
+               o3.short_NAME    AS exec_org_name,
                o4.id            AS check_org_id,
-               o4.NAME          AS check_org_name,
+               o4.short_NAME    AS check_org_name,
                pp.of_org_id,
                typ.type_id,
                typ.plan_id      as type_plan_id

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

@@ -567,12 +567,13 @@ public class PdfUtil {
             document.add(table);
             return;
         }
+        int questionIndex=1;
         for (int i = 1; i <= data.getCheckDatas().size(); i++) {
             final CheckDataVo checkDataVo = data.getCheckDatas().get(i - 1);
             if (ObjectUtil.isEmpty(checkDataVo.getResRemark())) {
                 continue;
             }
-            PdfUtil.createPDFCell(tableFont, table, String.valueOf(i), Element.ALIGN_MIDDLE, 2, 1);
+            PdfUtil.createPDFCell(tableFont, table, String.valueOf(questionIndex++), Element.ALIGN_MIDDLE, 2, 1);
             PdfUtil.createPDFCell(tableFont, table, checkDataVo.getItemName(), Element.ALIGN_MIDDLE, 6, 1);
             PdfUtil.createPDFCell(tableFont, table, checkDataVo.getResRemark(), Element.ALIGN_MIDDLE, 6, 1);
         }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysNfcBindController.java

@@ -53,7 +53,6 @@ public class SysNfcBindController extends BaseController {
      * 获取【请填写功能名称】详细信息
      */
     @ApiOperation(value = "app获取SysNfcBind详细信息,传入code")
-    @RequiresPermissions("system:bind:query")
     @GetMapping(value = {"/appGetInfo/{code}"})
     public AjaxResult appGetInfo(@PathVariable String code) {
         AjaxResult ajax = AjaxResult.success();