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

project_data/sql/0.0.3/soc/soc.sql

@@ -584,6 +584,16 @@ 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

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/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-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：开启
      */