Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc into V0.0.2

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/AppPlanServiceImpl.java

@@ -358,7 +358,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
                 ap.setPlanExec(plan.getPlanExec());
                 ap.setModifiedBy(SecurityUtils.getUserId());
                 ap.setPlanName(plan.getPlanName());
-
+                ap.setCount(plan.getCount());
                 baseMapper.updateById(ap);
 
                 if (app.getRoleList().size() > 0) {
@@ -547,7 +547,8 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
         if (orgs.size() > 0) {
             appPlanVo.setOrgId(orgs.get(0).getOrgId());
         }
-
+        AppPlan ap = baseMapper.selectById(appPlan.getParentId());
+        appPlanVo.setParentCount(ap != null ? Integer.parseInt(ap.getCount()) : 1);
 
         return appPlanVo;
     }

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

@@ -404,7 +404,7 @@ public class ResumptionTaskBusiness extends TaskCreatingServiceImplBase<Resumpti
             Ymd ymd = Ymd.of(planStartTime);
             resumption.setStatus(1);
             resumption.setYmd(ymd);
-            resumption.setName(appPlan.getPlanName());
+            resumption.setName(count==1L?appPlan.getPlanName():appPlan.getPlanName()+"第"+(i+1)+"次");
             resumption.setYmdDate(ymd.getDate());
             resumption.setYmdDay(Long.valueOf(ymd.getDay()));
             resumption.setYmdMonth(Long.valueOf(ymd.getMonth()));

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/appPlan/AppPlanVo.java

@@ -20,7 +20,7 @@ import java.util.List;
 @NoArgsConstructor
 @AllArgsConstructor
 public class AppPlanVo extends PageDto<AppPlan> {
-
+    private Integer parentCount;
     private List<Long> ids;
     private Long id;
     private Integer buildTaskNow;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyindex/controller/CoreSafeMonthScoreController.java

@@ -31,14 +31,14 @@ public class CoreSafeMonthScoreController extends BaseController {
     private ICoreSafeMonthScoreService coreSafeMonthScoreService;
 
 
-    @ApiOperation(value = "查询CoreSafeMonthScore列表")
+    @ApiOperation(value = "查询指数分布列表")
     @RequiresPermissions("core:safeMonthScore:list")
     @GetMapping("/list")
     public TableDataInfo<CoreSafeMonthScorePageVo> list(CoreSafeMonthScorePageDto request) {
         return coreSafeMonthScoreService.selectPage(request);
     }
 
-    @ApiOperation(value = "获取CoreSafeMonthScore详细信息")
+    @ApiOperation(value = "查询某机构下级机构指数分布情况")
     @RequiresPermissions("core:safeMonthScore:query")
     @PostMapping(value = "/detail")
     public TableDataInfo<CoreSafeMonthScoreDetailPageVo> getInfo(@RequestBody CoreSafeMonthScoreDetailPageDto request) {
@@ -46,7 +46,7 @@ public class CoreSafeMonthScoreController extends BaseController {
     }
 
 
-    @ApiOperation(value = "获取CoreSafeMonthScore详细信息")
+    @ApiOperation(value = "获取某机构指数分布详情")
     @RequiresPermissions("core:safeMonthScore:query")
     @PostMapping("/find/singleOrg")
     public Object singleOrg(@RequestBody CoreSafeMonthScorePageDto request) {

soc-modules/soc-modules-job/src/main/java/com/xunmei/job/task/SyncFjnxOrgUserTask.java

@@ -33,7 +33,7 @@ public class SyncFjnxOrgUserTask {
     }
 
     /**
-     * 同步 fjnx 机构、用户
+     * 同步 fjnx 机构
      */
     public void syncFjnxOrg()
     {
@@ -43,7 +43,7 @@ public class SyncFjnxOrgUserTask {
     }
 
     /**
-     * 同步 fjnx 机构、用户
+     * 同步 fjnx 用户
      */
     public void syncFjnxUser()
     {