安全指数代码提交

project_data/sql/0.0.3/soc/soc.sql

@@ -384,7 +384,8 @@ ALTER TABLE  core_safetycheck_rule MODIFY COLUMN id bigint auto_increment NOT NU
 ALTER TABLE  core_safetycheck_rule MODIFY COLUMN create_time datetime NULL COMMENT '创建时间';
 ALTER TABLE  core_safetycheck_rule MODIFY COLUMN update_time datetime NULL COMMENT '更新时间';
 ALTER TABLE  core_safetycheck_rule MODIFY COLUMN create_by varchar(255) CHARACTER SET utf8mb4;
-
+-- 修改演练任务表状态字段释义
+alter table core_drill_task  modify status int default 0 null comment '任务状态:0:待登记,5:待提交,1:待签名,2待评价,3:已完成,4:已逾期';
 
 
 DELIMITER ??
@@ -590,3 +591,5 @@ INSERT INTO `sync_fjnx_org_business_relation` (`id`, `org_code`, `business_paren
 -- 天气接口配置
 delete from sys_config where config_key='WEATHER_URL';
 INSERT INTO sys_config (config_id, config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark) VALUES (191, '天气接口', 'WEATHER_URL', 'https://ali-weather.showapi.com', 'Y', NULL, now(), NULL, now(), NULL);
+
+

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/safetyindex/vo/CoreSafeMonthScoreDetailPageVo.java

@@ -14,6 +14,7 @@ public class CoreSafeMonthScoreDetailPageVo {
     private String orgName;
 
     private Integer orgType;
+    private String orgTypeText;
 
     //该机构月度得分
     private Double orgScore;

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

@@ -126,7 +126,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
             for (CoreDrillTaskPageVo record : records) {
                 dealData(record, records, null);
             }
-            records.sort(getComparator());
+           // records.sort(getComparator());
         }
         //抓换为TableDataInfo适配前端
         return TableDataInfo.build(pageData);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyindex/service/impl/CoreSafeMonthScoreServiceImpl.java

@@ -64,11 +64,9 @@ public class CoreSafeMonthScoreServiceImpl extends ServiceImpl<CoreSafeMonthScor
     @Override
     public TableDataInfo<CoreSafeMonthScoreDetailPageVo> selectDetailPageData(CoreSafeMonthScoreDetailPageDto request) {
         SysOrg sysOrg = orgService.selectOrgById(request.getOrgId(), SecurityConstants.INNER);
-        List<SysOrg> childrenIds = this.orgService.selectByOrgPathAndOrgType(sysOrg.getPath(), OrgTypeEnum.YINGYE_WANGDIAN.getCode(), SecurityConstants.INNER);
-        List<Long> idList = childrenIds.stream().map(SysOrg::getId).collect(Collectors.toList());
-        idList.add(request.getOrgId());
+
         LambdaQueryWrapper<CoreSafeMonthScore> wrapper = Wrappers.lambdaQuery();
-        wrapper.in(CoreSafeMonthScore::getOrgId, idList);
+        wrapper.likeRight(CoreSafeMonthScore::getOrgPath, sysOrg.getPath());
         if (request.getDate() != null) {
             wrapper.eq(CoreSafeMonthScore::getDataMonth, request.getDataMonth())
                     .eq(CoreSafeMonthScore::getDataYear, request.getDataYear());
@@ -77,7 +75,8 @@ public class CoreSafeMonthScoreServiceImpl extends ServiceImpl<CoreSafeMonthScor
         if (null != levelId) {
             wrapper.eq(CoreSafeMonthScore::getLevelId, levelId);
         }
-        Page<CoreSafeMonthScore> page = baseMapper.selectPage(request.getPageRequest(), wrapper);
+        Page<CoreSafeMonthScore> pageRequest = request.getPageRequest();
+        Page<CoreSafeMonthScore> page = baseMapper.selectPage(pageRequest, wrapper);
         if (page.getRecords().size() > 0) {
             IPage<CoreSafeMonthScoreDetailPageVo> page1 = page.convert(this::getSafeMonthScoreDetailPageVo);
             return TableDataInfo.build(page1);
@@ -95,6 +94,7 @@ public class CoreSafeMonthScoreServiceImpl extends ServiceImpl<CoreSafeMonthScor
         SysOrg org = this.orgService.selectOrgById(orgId, SecurityConstants.INNER);
         vo.setOrgName(org.getName());
         vo.setOrgType(org.getType());
+        vo.setOrgTypeText(OrgTypeEnum.getName(org.getType()));
         vo.setOrgId(org.getId());
         return vo;
     }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyindex/service/impl/CoreSafetyExceptionDataServiceImpl.java

@@ -89,7 +89,7 @@ public class CoreSafetyExceptionDataServiceImpl extends ServiceImpl<CoreSafetyEx
         DateTime time = dealTimeParam(date);
 
         //清空本月的异常数据
-        this.deleteExceptionData(new Date());
+        this.deleteExceptionData(time);
         //获取安保履职的数据
         doResumptionExceptionData(time);
         //获取问题整改的异常数据
@@ -106,7 +106,7 @@ public class CoreSafetyExceptionDataServiceImpl extends ServiceImpl<CoreSafetyEx
 
         DateTime time = dealTimeParam(date);
         int year = time.year();
-        int month = time.month();
+        int month = time.month()+1;
         //获取指标配置
         List<SafeIndexRuleCountVo> safeIndexConfigVoList = ruleService.findSafeIndexRuleVoList();
         //履职的指标配置
@@ -487,7 +487,7 @@ public class CoreSafetyExceptionDataServiceImpl extends ServiceImpl<CoreSafetyEx
         List<CoreSafetySourceData> sourceDataList = new ArrayList<>();
         //获取累计数的配置，并根据配置的连续数日期进行排序
         resumptionUndoIndexList.stream()
-                .filter(r -> r.getCalculateType().equals(Constants.TWO))
+                .filter(r -> r.getCalculateType().equals(Constants.ONE))
                 .findFirst()
                 .ifPresent(config -> {
                     double deductScore = dataList.size() * config.getItemValue();
@@ -728,25 +728,17 @@ public class CoreSafetyExceptionDataServiceImpl extends ServiceImpl<CoreSafetyEx
         //删除上个月所有的数据
         LambdaQueryWrapper<CoreSafetyExceptionData> queryWrapper = new LambdaQueryWrapper<>();
         //大于等于第一天
-        queryWrapper.ge(CoreSafetyExceptionData::getDataTime, DateUtil.beginOfDay(date));
+        queryWrapper.ge(CoreSafetyExceptionData::getDataTime, DateUtil.beginOfMonth(date));
         //小于等于最后一天
-        queryWrapper.le(CoreSafetyExceptionData::getDataTime, DateUtil.endOfDay(date));
+        queryWrapper.le(CoreSafetyExceptionData::getDataTime, DateUtil.endOfMonth(date));
         coreSafetyExceptionDataMapper.delete(queryWrapper);
     }
 
     private DateTime dealTimeParam(String date) {
-        int year = Integer.parseInt(date.split("-")[0]);
-        int month = Integer.parseInt(date.split("-")[1]);
-        DateTime time = new DateTime();
-        time.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
-        time.setField(DateField.YEAR, year);
-        time.setField(DateField.MONTH, month - 1);
-        time.setField(DateField.DAY_OF_MONTH, 1);
-        time.setField(DateField.HOUR_OF_DAY, 0);
-        time.setField(DateField.MINUTE, 0);
-        time.setField(DateField.SECOND, 0);
-        time.setField(DateField.MILLISECOND, 0);
-        return time;
+        DateTime parse = DateUtil.beginOfMonth(DateUtil.parse(date));
+        parse.setField(DateField.MONTH, DateUtil.offsetMonth(parse,-1).month());
+
+        return parse;
     }
 
     /**

soc-modules/soc-modules-core/src/main/resources/mapper/drill/CoreDrillTaskMapper.xml

@@ -89,7 +89,7 @@
             </if>
             <include refid="timeRangeSql"/>
         </where>
-        order by t.update_time desc
+        order by field(t.status,0,5,1,2,3,4),t.update_time desc
     </select>
 
     <select id="selectReport" resultType="com.xunmei.common.core.domain.drill.vo.CoreDrillTaskReportVo">

soc-modules/soc-modules-core/src/main/resources/mapper/question/QuestionMapper.xml

@@ -287,7 +287,7 @@
         FROM core_question a
         where submit_time >= #{startTime}
         and submit_time <![CDATA[<=]]> #{endTime}
-        and reform_deadline <![CDATA[<]]> now()
+        and reform_deadline <![CDATA[<]]> #{endTime}
         and (confirm_status = 0 or (confirm_status = 2 and reform_status = 10))
         <if test="orgIds !=null and orgIds.size>0">
             and org_id in