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

project_data/sql/0.1.0/soc/soc.sql

@@ -66,6 +66,26 @@ BEGIN
         ADD COLUMN `yewd_level` int NULL COMMENT '营业网点层级（一级支行，二级支行）' AFTER `breviary`;
     END IF;
 
+    -- core_safetycheck_rule_item 表添加排序字段
+    IF NOT EXISTS(SELECT *
+      FROM information_schema.columns
+      WHERE table_schema = DATABASE()
+        AND table_name = 'core_safetycheck_rule_item'
+        AND column_name = 'sort') THEN
+    ALTER TABLE `core_safetycheck_rule_item`
+        ADD COLUMN `sort` int DEFAULT NULL COMMENT '排序号' AFTER `update_by`;
+    END IF;
+
+    -- core_safetycheck_rule_point 表添加排序字段
+    IF NOT EXISTS(SELECT *
+      FROM information_schema.columns
+      WHERE table_schema = DATABASE()
+        AND table_name = 'core_safetycheck_rule_point'
+        AND column_name = 'sort') THEN
+    ALTER TABLE `core_safetycheck_rule_point`
+        ADD COLUMN `sort` int DEFAULT NULL COMMENT '排序号' AFTER `update_by`;
+    END IF;
+
 
 
 
@@ -107,3 +127,72 @@ INSERT INTO `sys_dict_type` (`dict_name`, `dict_type`, `status`, `create_by`, `c
 DELETE FROM `sys_dict_data` WHERE `dict_type` ='sys_org_yewd_level';
 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, '一级支行', '1', 'sys_org_yewd_level', NULL, 'default', 'N', '0', '超级管理员', '2024-05-30 15:59:45', '', 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 (2, '二级支行', '2', 'sys_org_yewd_level', NULL, 'default', 'N', '0', '超级管理员', '2024-05-30 15:59:55', '', NULL, NULL);
+
+-- core_resumption_rule_item 刷排序号
+UPDATE core_resumption_rule_item
+SET sort = (
+    SELECT
+        newSort
+    FROM
+        ( SELECT id, rule_id, `name`, ROW_NUMBER () OVER ( PARTITION BY rule_id ORDER BY `name` ) AS newSort FROM core_resumption_rule_item WHERE deleted = 0 ) AS SortData
+    WHERE
+            SortData.id = core_resumption_rule_item.id
+);
+
+-- core_resumption_rule_point 刷排序号
+UPDATE core_resumption_rule_point
+SET sort = (
+    SELECT
+        newSort
+    FROM
+        ( SELECT id, item_id, `name`, ROW_NUMBER () OVER ( PARTITION BY item_id ORDER BY `name` ) AS newSort FROM core_resumption_rule_point WHERE deleted = 0 ) AS SortData
+    WHERE
+            SortData.id = core_resumption_rule_point.id
+);
+
+-- core_safetycheck_rule_item 刷排序号
+UPDATE core_safetycheck_rule_item
+SET sort = (
+    SELECT
+        newSort
+    FROM
+        ( SELECT id, rule_id, `name`, ROW_NUMBER () OVER ( PARTITION BY rule_id ORDER BY `name` ) AS newSort FROM core_safetycheck_rule_item WHERE deleted = 0 ) AS SortData
+    WHERE
+            SortData.id = core_safetycheck_rule_item.id
+);
+
+-- core_safetycheck_rule_point 刷排序号
+UPDATE core_safetycheck_rule_point
+SET sort = (
+    SELECT
+        newSort
+    FROM
+        ( SELECT id, item_id, `name`, ROW_NUMBER () OVER ( PARTITION BY item_id ORDER BY `name` ) AS newSort FROM core_safetycheck_rule_point WHERE deleted = 0 ) AS SortData
+    WHERE
+            SortData.id = core_safetycheck_rule_point.id
+);
+
+-- 刷表的创建时间和修改时间
+update core_resumption_rule SET create_time = NOW() where create_time IS NULL;
+update core_resumption_rule SET update_time = create_time where update_time IS NULL;
+
+update core_resumption_plan SET create_time = NOW() where create_time IS NULL;
+update core_resumption_plan SET update_time = create_time where update_time IS NULL;
+
+update core_safetycheck_rule SET create_time = NOW() where create_time IS NULL;
+update core_safetycheck_rule SET update_time = create_time where update_time IS NULL;
+
+update core_safecheck_plan SET create_time = NOW() where create_time IS NULL;
+update core_safecheck_plan SET update_time = create_time where update_time IS NULL;
+
+update core_monitoring_retrieval_plan SET create_time = NOW() where create_time IS NULL;
+update core_monitoring_retrieval_plan SET update_time = create_time where update_time IS NULL;
+
+update core_edu_training_plan SET create_time = NOW() where create_time IS NULL;
+update core_edu_training_plan SET update_time = create_time where update_time IS NULL;
+
+update core_drill_plan SET create_time = NOW() where create_time IS NULL;
+update core_drill_plan SET update_time = create_time where update_time IS NULL;
+
+-- core_safety_task 刷检查开始时间和结束时间
+update core_safety_task set start_time = submit_time,end_time = submit_time where submit_by is not null;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/controller/TaskController.java

@@ -325,8 +325,8 @@ public class TaskController {
             DateTime planstartTime = null;
             DateTime planendTime = null;
             if (workTime != null) {
-                String worktime = workTime.getWorkTime();//上班时间
-                String workofftime = workTime.getWorkOffTime();//下班时间
+//                String worktime = workTime.getWorkTime();//上班时间
+//                String workofftime = workTime.getWorkOffTime();//下班时间
                 String opentime = workTime.getOpenTime();//营业时间
                 String closetime = workTime.getCloseTime();//营业终了
                 if (appPlan.getPlanExec() == 1) {//全天 上班时间-下班时间 00:00:00-23:59:59

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/task/ResumptionTaskBusiness.java

@@ -434,7 +434,7 @@ public class ResumptionTaskBusiness extends TaskCreatingServiceImplBase<Resumpti
             planendTime = DateUtil.endOfDay(time2).setField(DateField.MILLISECOND, 0);
         } else if (appPlan.getPlanExec() == 5) { //非营业时间
             //如果是歇业，时间为晚8点至24点
-            //如果是营业，时间为下班时间至24点
+            //如果是营业，时间为（营业结束）下班时间至24点
             //如果没有值班打卡，则不生成任务
             if (ObjectUtil.notEqual(workTime.getIsDuty(), 1L)) {
                 return new ArrayList<>();
@@ -442,7 +442,8 @@ public class ResumptionTaskBusiness extends TaskCreatingServiceImplBase<Resumpti
 
             String startTime = "20:00";
             if (ObjectUtil.equal(workTime.getIsEnable(), 1L)) {
-                startTime = workTime.getWorkOffTime();
+//                startTime = workTime.getWorkOffTime();
+                startTime = workTime.getCloseTime();
             }
             if (StringUtils.isEmpty(startTime)) {
                 log.error("作息" + workTime.getId() + "缺少下班时间");
@@ -456,8 +457,8 @@ public class ResumptionTaskBusiness extends TaskCreatingServiceImplBase<Resumpti
                     .setField(DateField.MILLISECOND, 0);
             planendTime = DateUtil.endOfDay(time2).setField(DateField.MILLISECOND, 0);
         } else if (appPlan.getPlanExec() == 6) {//工作时间
-            String workStart = workTime.getWorkTime();
-            String workEnd = workTime.getWorkOffTime();
+            String workStart = workTime.getOpenTime();
+            String workEnd = workTime.getCloseTime();
             if (StringUtils.isEmpty(workStart) || StringUtils.isEmpty(workEnd)) {
                 log.error("作息" + workTime.getId() + "缺少上班开始或结束时间");
                 return new ArrayList<>();

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

@@ -80,4 +80,11 @@ public class SafetyCheckRuleItemController extends BaseController {
         TableDataInfo data = safetyCheckRuleItemService.pointSelectionPage(dto);
         return data;
     }
+
+    @ApiOperation(value = "是否有相同履职项排序")
+    @PostMapping("hasSameSort")
+    public AjaxResult hasSameSort(@RequestBody SafetyCheckRuleItemDto safetyCheckRuleItemDto) {
+
+        return success(safetyCheckRuleItemService.hasSameSort(safetyCheckRuleItemDto));
+    }
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/domain/SafetyCheckRuleItem.java

@@ -41,4 +41,8 @@ public class SafetyCheckRuleItem extends BaseEntity {
     @TableLogic(value = "0", delval = "1")
     @ApiModelProperty(value = "是否删除 1是 0否")
     private int deleted;
+
+    @ApiModelProperty(value = "检查项序号")
+    @TableField("sort")
+    private Integer sort;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/domain/SafetyCheckRulePoint.java

@@ -57,4 +57,8 @@ public class SafetyCheckRulePoint extends BaseEntity {
     @ApiModelProperty(value = "是否扫描NFC 1扫描，0不扫描")
     @TableField(exist = false)
     private boolean pointScan;
+
+    @ApiModelProperty(value = "检查内容排序")
+    @TableField("sort")
+    private Integer sort;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/dto/ruleItem/SafetyCheckRuleItemDetailDto.java

@@ -30,4 +30,7 @@ public class SafetyCheckRuleItemDetailDto {
 
     @ApiModelProperty(value = "检查点")
     private List<SafetyCheckRulePointDetailDto> pointDtoList;
+
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/dto/ruleItem/SafetyCheckRuleItemDto.java

@@ -34,4 +34,7 @@ public class SafetyCheckRuleItemDto {
 
     @ApiModelProperty(value = "履职内容")
     private List<SafetyCheckRulePointDto> pointDtoList;
+
+    @ApiModelProperty(value = "检查项排序号")
+    private Integer sort;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/dto/rulePoint/SafetyCheckRulePointDetailDto.java

@@ -70,4 +70,7 @@ public class SafetyCheckRulePointDetailDto {
 
     @ApiModelProperty(value = "要点关联的业务类型")
     private String businessType;
+
+    @ApiModelProperty(value = "排序号")
+    private Integer sort;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/dto/rulePoint/SafetyCheckRulePointDto.java

@@ -59,4 +59,7 @@ public class SafetyCheckRulePointDto {
     @ApiModelProperty(value = "要点关联的业务类型")
     private String businessType;
 
+    @ApiModelProperty(value = "检查内容排序号")
+    private Integer sort;
+
 }

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

@@ -12,6 +12,8 @@ import com.xunmei.core.safetyCheck.vo.ruleItem.SafetyCheckRuleItemPageVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * Mapper 接口
@@ -36,4 +38,6 @@ public interface SafetyCheckRuleItemMapper extends BaseMapper<SafetyCheckRuleIte
 //    Integer checkItemNumRepeat(@Param("id") Long id, @Param("ruleId") Long ruleId, @Param("itemNum") Integer itemNum);
 
     Integer checkItemNameRepeat(@Param("id") Long id, @Param("ruleId") Long ruleId, @Param("itemName") String itemName);
+
+    List<SafetyCheckRuleItem> getByRuleId(@Param("ruleId") Long ruleId);
 }

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

@@ -2,6 +2,7 @@ package com.xunmei.core.safetyCheck.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.core.resumption.dto.ruleItem.AppRuleItemDto;
 import com.xunmei.core.resumption.vo.appRuleItem.RuleTreeItem;
 import com.xunmei.core.safetyCheck.domain.SafetyCheckRuleItem;
 import com.xunmei.core.safetyCheck.dto.ruleItem.SafetyCheckRuleItemDetailDto;
@@ -45,5 +46,6 @@ public interface ISafetyCheckRuleItemService extends IService<SafetyCheckRuleIte
 
 
 //    JsonResponse<?> checkRepeat(AppRuleItemCheckDto checkDto);
+    boolean hasSameSort(SafetyCheckRuleItemDto safetyCheckRuleItemDto);
 
 }

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

@@ -10,6 +10,8 @@ import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.R;
 import com.xunmei.common.core.utils.IDHelper;
 import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.core.resumption.domain.AppRuleItem;
+import com.xunmei.core.resumption.dto.ruleItem.AppRuleItemDto;
 import com.xunmei.core.resumption.vo.appRuleItem.RuleTreeItem;
 import com.xunmei.core.safetyCheck.domain.SafetyCheckRule;
 import com.xunmei.core.safetyCheck.domain.SafetyCheckRuleItem;
@@ -316,4 +318,18 @@ public class SafetyCheckRuleItemServiceImpl
 //        }
 //        return JsonResponse.success();
 //    }
+
+
+    @Override
+    public boolean hasSameSort(SafetyCheckRuleItemDto safetyCheckRuleItemDto) {
+        boolean flag = false;
+        List<SafetyCheckRuleItem> itemList = safetyCheckRuleItemMapper.getByRuleId(safetyCheckRuleItemDto.getRuleId());
+        for (SafetyCheckRuleItem ruleItem : itemList) {
+            if (ObjectUtil.equal(safetyCheckRuleItemDto.getSort(),ruleItem.getSort())){
+                flag = true;
+                break;
+            }
+        }
+        return flag;
+    }
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/vo/ruleItem/SafetyCheckRuleItemPageVo.java

@@ -27,4 +27,6 @@ public class SafetyCheckRuleItemPageVo {
     private Integer pointNums;
     @ApiModelProperty(value = "检查点")
     private List<SafetyCheckRulePointDetailDto> pointDtoList;
+
+    private Integer sort;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/vo/ruleItem/SafetyCheckRulePointSelectVo.java

@@ -42,4 +42,6 @@ public class SafetyCheckRulePointSelectVo {
     private  String areaName;
 
     private String businessType;
+
+    private Integer sort;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/vo/ruleItem/SafetyCheckRulePointVo.java

@@ -40,4 +40,5 @@ public class SafetyCheckRulePointVo {
     private String businessType;
     private boolean pointScan;
     private boolean required;
+    private Integer sort;
 }

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

@@ -20,7 +20,7 @@
                 and i.id in (select item_id from core_safetycheck_rule_point  where rule_id= #{itemPageDto.ruleId} and `name` like concat('%',#{itemPageDto.pointName},'%'))
             </if>
         </where>
-        order by i.id desc
+        order by i.sort asc
     </select>
 
     <select id="checkItemNameRepeat" resultType="java.lang.Integer">
@@ -29,4 +29,7 @@
             and id != #{id}
         </if>
     </select>
+    <select id="getByRuleId" resultType="com.xunmei.core.safetyCheck.domain.SafetyCheckRuleItem">
+        select * from core_safetycheck_rule_item where rule_id = #{ruleId} and deleted=0
+    </select>
 </mapper>

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

@@ -10,6 +10,7 @@
         <if test="pointName!=null and pointName!=''">
             and p.name like concat('%',#{pointName},'%')
         </if>
+        order by p.sort asc
     </select>
 <!--    <select id="findPointByPlan" parameterType="Long" resultType="com.xunmei.core.safetyCheck.vo.ruleItem.SafetyCheckRulePointTaskVo">-->
 <!--        SELECT a.*, b.point_scan-->