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

project_data/sql/0.0.3/soc/soc.sql

@@ -584,6 +584,23 @@ END IF;
             add pdf_url varchar(255) DEFAULT NULL COMMENT 'pdf下载地址';
     END IF;
 
+    -- 作息添加是否值班打卡
+    IF NOT EXISTS(SELECT *
+                  FROM information_schema.columns
+                  WHERE table_schema = DATABASE()
+                    AND table_name = 'sys_work_time'
+                    AND column_name = 'is_duty') THEN
+        alter table sys_work_time
+            add is_duty int  NULL COMMENT '是否值班打卡';
+    END IF;
+    IF NOT EXISTS(SELECT *
+                  FROM information_schema.columns
+                  WHERE table_schema = DATABASE()
+                    AND table_name = 'sys_work_time_set_dayofweek'
+                    AND column_name = 'is_duty') THEN
+        alter table sys_work_time_set_dayofweek
+            add is_duty int  NULL COMMENT '是否值班打卡';
+    END IF;
     -- 演练范本库表增加演练类型字段
     IF NOT EXISTS(SELECT *
                   FROM information_schema.columns

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/worktime/domain/SysWorkTime.java

@@ -91,7 +91,7 @@ public class SysWorkTime extends BaseEntity {
     @TableField(exist = false)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date month;
-    
+
     @TableField(exist = false)
     private String monthStr;
     /**
@@ -140,7 +140,11 @@ public class SysWorkTime extends BaseEntity {
      */
     @ApiModelProperty(value = "上班时间")
     private String workTime;
-
+    /**
+     * 是否值班打卡
+     */
+    @ApiModelProperty(value = "是否值班打卡")
+    private Long isDuty;
     /**
      * 作息月
      */
@@ -319,6 +323,7 @@ public class SysWorkTime extends BaseEntity {
                 .append("isManual", getIsManual())
                 .toString();
     }
+
     @Override
     public boolean equals(Object obj) {
         if (this == obj) {
@@ -328,7 +333,7 @@ public class SysWorkTime extends BaseEntity {
             return false;
         }
         SysWorkTime sysWorkTime = (SysWorkTime) obj;
-        return (ymdDate .compareTo( sysWorkTime.ymdDate)==0) && orgId.equals(sysWorkTime.orgId);
+        return (ymdDate.compareTo(sysWorkTime.ymdDate) == 0) && orgId.equals(sysWorkTime.orgId);
     }
 
     @Override

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/domain/TMonitoringRetrievalPlan.java

@@ -107,10 +107,10 @@ private String organization;
     private Long planFrequency;
 
     /**
-     * 计划状态（0启用、1禁用）
+     * 计划状态
      */
-    @ApiModelProperty(value = "计划状态", notes = "0=启用、1禁用")
-    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "计划状态")
+
     private Integer planStatus;
 
     /**

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/TMonitoringRetrievalPlanServiceImpl.java

@@ -643,7 +643,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         plan.setRoleName(sysRole.getRoleName());
         int i = tMonitoringRetrievalPlanMapper.updateById(plan);
         if (CollectionUtils.isEmpty(coreMonitoringRetrievalTasks)) {
-            iCoreMonitoringRetrievalTaskService.deleteTaskByPlanId(tMonitoringRetrievalPlan.getId());
+            iCoreMonitoringRetrievalTaskService.deleteWaitTaskByPlanId(tMonitoringRetrievalPlan.getId());
             try {
                 QueryWrapper queryWrapper = new QueryWrapper();
                 queryWrapper.eq(PARENT_ID, plan.getId());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/service/impl/CoreMonitoringRetrievalTaskServiceImpl.java

@@ -252,19 +252,26 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
         //立即生效的计划要排除截至时间在当前时间之前的数据
         List<CoreMonitoringRetrievalTask> lista = taskList.stream().filter(r -> r.getPlanEndTime().after(new Date())).collect(Collectors.toList());
         if (CollectionUtil.isNotEmpty(lista)) {
+            List<CoreMonitoringRetrievalTask> listAll = new ArrayList<>();
             //对list进行重新编号和保存
-            for(int i=0;i<lista.size();i++){
-                lista.get(i).setOrderNum(i+1);
-               // 第" + frequency + "次调阅
-                String oldName =  lista.get(i).getTaskName();
-                String str  =  "第"+(i+1)+"次调阅";
-                int index = oldName.lastIndexOf("第");
-                if (index>0){
-                    lista.get(i).setTaskName(oldName.substring(0,index)+str);
+            //对lista 按机构进行分组
+            Map<Long, List<CoreMonitoringRetrievalTask>> map = lista.stream().collect(Collectors.groupingBy(CoreMonitoringRetrievalTask::getOrgId));
+            for(Long  orgId:map.keySet()){
+                List<CoreMonitoringRetrievalTask> listb = map.get(orgId);
+                for(int i=0;i<listb.size();i++){
+                    listb.get(i).setOrderNum(i+1);
+                    // 第" + frequency + "次调阅
+                    String oldName =  listb.get(i).getTaskName();
+                    String str  =  "第"+(i+1)+"次调阅";
+                    int index = oldName.lastIndexOf("第");
+                    if(index>0){
+                        listb.get(i).setTaskName(oldName.substring(0,index)+str);
+                    }
                 }
-
+                listAll.addAll(listb);
             }
-            this.saveBatch(lista);
+
+            this.saveBatch(listAll);
         }
     }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/controller/SafetyCheckRegisterController.java

@@ -65,7 +65,6 @@ public class SafetyCheckRegisterController extends BaseController {
 
     @ApiOperation(value = "授权")
     @PostMapping("grant")
-    @RequiresPermissions(value = {"core:safetycheck:grant"})
     public AjaxResult grant(@RequestBody GrantDto dto) {
         boolean r = safetyCheckRegisterSerice.grant(dto);
         return success(r);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/job/SafetyCheckJobBusiness.java

@@ -341,14 +341,17 @@ public class SafetyCheckJobBusiness extends TaskCreatingServiceImplBase<CoreSafe
 
         //此处循环所有执行检查的机构
         for (SysOrg org : execOrgs) {
-            List<SysOrg> checkOrgs = null;
+            List<SysOrg> checkOrgs = new ArrayList<>();
             if (ObjectUtil.isEmpty(checkOrg)) {
                 //如果没有选择具体受检的机构，则根据受检机构类型查询
-                if (checkOrgTypes.contains(execOrgType) && checkOrgTypes.size() == 1) {
-                    //如果检查机构类型与被检机构类型一致，则表示查自己
-                    checkOrgs = Arrays.asList(org);
-                } else {
-                    checkOrgs = orgService.findByOrgTypesAndParent(new FindOrgTypes(checkOrgTypes, org.getPath()), SecurityConstants.INNER);
+                if (checkOrgTypes.contains(execOrgType)) {
+                    checkOrgs.add(org);
+                }
+
+                List<Integer> orgTypes = checkOrgTypes.stream().filter(t -> ObjectUtil.notEqual(t,execOrgType)).collect(Collectors.toList());
+                if(CollectionUtil.isNotEmpty(orgTypes)){
+                    List<SysOrg>  checkOrgsTmp = orgService.findByOrgTypesAndParent(new FindOrgTypes(orgTypes, org.getPath()), SecurityConstants.INNER);
+                    checkOrgs.addAll(checkOrgsTmp);
                 }
             } else {
                 //选择了具体的受检机构

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/mapper/CoreSafetyTaskMapper.java

@@ -78,7 +78,7 @@ public interface CoreSafetyTaskMapper extends BaseMapper<CoreSafetyTask> {
      * @param taskId
      * @return
      */
-    List<AppTaskRegisterPointVo> selectPoint(@Param("planId") Long planId, @Param("taskId") Long taskId);
+    List<AppTaskRegisterPointVo> selectPoint(@Param("planId") Long planId, @Param("taskId") Long taskId,@Param("orgType") Integer orgType);
 
     /**
      * 查找来源于计划的任务检查内容信息

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

@@ -242,7 +242,7 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
             points = baseMapper.selectPointByTask(taskId);
             nfcs = baseMapper.selectNfcByTask(taskId);
         } else {
-            points = baseMapper.selectPoint(plan.getId(), taskId);
+            points = baseMapper.selectPoint(plan.getId(), taskId,beCheckedOrg.getType());
             nfcs = baseMapper.selectNfc(plan.getId(), taskId, task.getOrgId());
         }
 

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

@@ -147,12 +147,12 @@ public class SafetyCheckRuleItemServiceImpl
     public TableDataInfo pageQuery(SafetyCheckRuleItemPageDto itemPageDto) {
         Page<SafetyCheckRuleItemPageVo> page;
 
-        String pointName= itemPageDto.getPointName();
+        String pointName = itemPageDto.getPointName();
         page = safetyCheckRuleItemMapper.pageQuery(itemPageDto.getPageDto(), itemPageDto);
 //        int order = itemPageDto() * itemPageDto.getSize();
         for (SafetyCheckRuleItemPageVo vo : page.getRecords()) {
 //            vo.setOrder(++order);
-            final List<SafetyCheckRulePointDetailDto> pointList = safetyCheckRulePointMapper.selectDataListByItemId(vo.getId(),pointName);
+            final List<SafetyCheckRulePointDetailDto> pointList = safetyCheckRulePointMapper.selectDataListByItemId(vo.getId(), pointName);
             vo.setPointDtoList(pointList);
         }
 
@@ -168,7 +168,7 @@ public class SafetyCheckRuleItemServiceImpl
         SafetyCheckRuleItemDetailDto appRuleItemDto = new SafetyCheckRuleItemDetailDto();
         BeanUtils.copyProperties(appRuleItem, appRuleItemDto);
 
-        List<SafetyCheckRulePointDetailDto> list = safetyCheckRulePointMapper.selectDataListByItemId(id,null);
+        List<SafetyCheckRulePointDetailDto> list = safetyCheckRulePointMapper.selectDataListByItemId(id, null);
         appRuleItemDto.setPointDtoList(list);
         return appRuleItemDto;
     }
@@ -203,7 +203,12 @@ public class SafetyCheckRuleItemServiceImpl
             return tree;
         }
 
-        Map<Long, SysOrgVO> orgMap = orgs.stream().collect(Collectors.toMap(o -> o.getId(), o -> o));
+        Map<Long, SysOrgVO> orgMap = new HashMap<>();
+        orgs.forEach(org -> {
+            if (!orgMap.containsKey(org.getId())) {
+                orgMap.put(org.getId(), org);
+            }
+        });
         if (!orgMap.containsKey(orgId)) {
             return tree;
         }

soc-modules/soc-modules-core/src/main/resources/mapper/access/TMonitoringRetrievalPlanMapper.xml

@@ -120,7 +120,7 @@
         <if test="request.planCycle != null  and request.planCycle != ''">
             AND        a.plan_cycle = #{request.planCycle}
         </if>
-        <if test="request.planStatus != null  and request.planStatus != ''">
+        <if test="request.planStatus != null">
             AND        a.plan_status = #{request.planStatus}
         </if>
         ORDER BY     a.parent_id ASC,

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

@@ -657,10 +657,11 @@
         rd.submit_by,
         rd.submit_time
         FROM core_safecheck_plan_to_point b
-        LEFT JOIN core_safetycheck_rule_point a ON a.id = b.point_id
-        LEFT JOIN core_safecheck_plan c ON b.plan_id = c.id
-        LEFT JOIN core_safetycheck_rule_item e ON a.item_id = e.id
-        LEFT JOIN sys_area f ON a.area_id = f.id
+        Inner JOIN core_safetycheck_rule_point a ON a.id = b.point_id
+        INNER join core_safetycheck_rule r on a.rule_id=r.id and r.deleted=0 and r.org_type=#{orgType}
+        Inner JOIN core_safecheck_plan c ON b.plan_id = c.id
+        Inner JOIN core_safetycheck_rule_item e ON a.item_id = e.id
+        Inner JOIN sys_area f ON a.area_id = f.id
         LEFT JOIN core_safety_task_data rd ON rd.point_id = b.point_id and rd.task_id = #{taskId}
         WHERE
         <choose>

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/SysWorkTimeSet.java

@@ -61,7 +61,6 @@ public class SysWorkTimeSet extends BaseEntity {
      */
     @ApiModelProperty(value = "机构 名称")
     private String orgName;
-
     /**
      * 0: 关闭，1：开启
      */

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/SysWorkTimeSetDayofweek.java

@@ -34,7 +34,7 @@ public class SysWorkTimeSetDayofweek extends BaseEntity {
      */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
-
+    private Long isDuty;
     /**
      * 作息配置表主键
      */
@@ -46,7 +46,6 @@ public class SysWorkTimeSetDayofweek extends BaseEntity {
      */
     @ApiModelProperty(value = "是否为工作日")
     private Long isWorkday;
-
     /**
      * 一周的第几天，1表示周日,2表示周一
      */