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

project_data/sql/0.0.2/soc/soc.sql

@@ -1096,8 +1096,8 @@ END IF;
 
     -- 安全检查检查项所属机构id
     IF
-        NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and  TABLE_NAME = 'core_resumption_plan_to_point' AND COLUMN_NAME = 'of_org_id' ) THEN
-        ALTER TABLE `core_resumption_plan_to_point` ADD COLUMN `of_org_id` INT NULL DEFAULT NULL COMMENT '所属机构id';
+        NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and  TABLE_NAME = 'core_safecheck_plan_to_point' AND COLUMN_NAME = 'of_org_id' ) THEN
+        ALTER TABLE `core_safecheck_plan_to_point` ADD COLUMN `of_org_id` INT NULL DEFAULT NULL COMMENT '所属机构id';
 
     END IF;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/mapper/CoreMonitoringRetrievalTaskMapper.java

@@ -107,30 +107,37 @@ public interface CoreMonitoringRetrievalTaskMapper extends BaseMapper<CoreMonito
 
     /**
      * 根据计划删除
+     *
      * @param planId
      */
     void deleteAllTaskByPlanId(@Param("planId") Long planId);
-    void deleteDayTaskByTime(Long planId, String cycle, Date startTime, Date endTime);
-    void deleteDayTaskByTimeAndPlanId(Long planId, String cycle, Date startTime, Date endTime);
+
+    void deleteDayTaskByTime(@Param("planId") Long planId, @Param("cycle") String cycle, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
+
+    void deleteDayTaskByTimeAndPlanId(@Param("planId") Long planId, @Param("cycle") String cycle, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
+
     /**
      * 删除周任务
+     *
      * @param planId
      * @param cycle
      * @param week
      * @param year
      */
-   void deleteWeekTaskByPlanId(Long planId, String cycle, String week, String year);
+    void deleteWeekTaskByPlanId(Long planId, String cycle, String week, String year);
 
     /**
      * 删除天任务
+     *
      * @param planId
      * @param cycle
      * @param ymdDate
      */
-    void deleteDayTaskByPlanId(Long planId, String cycle, String ymdDate);
+    void deleteDayTaskByPlanId(@Param("planId") Long planId, @Param("cycle") String cycle, @Param("ymdDate") String ymdDate);
 
     /**
      * 删除月任务
+     *
      * @param planId
      * @param cycle
      * @param month
@@ -140,15 +147,17 @@ public interface CoreMonitoringRetrievalTaskMapper extends BaseMapper<CoreMonito
 
     /**
      * 删除季度
+     *
      * @param planId
      * @param cycle
      * @param quarter
      * @param year
      */
-    void  deleteQuarterTaskByPlanId(Long planId, String cycle, String quarter, String year);
+    void deleteQuarterTaskByPlanId(Long planId, String cycle, String quarter, String year);
 
     /**
      * 已完成
+     *
      * @param planId
      * @return
      */

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

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