LicenceBack(update)

csf-common/csf-common-model/src/main/java/com/mmc/csf/licence/vo/LicenseOrganizationsVO.java

@@ -77,8 +77,8 @@ public class LicenseOrganizationsVO {
     @NotNull(message = "机构详情", groups = {Create.class, Update.class})
     private String detail;
 
-    @ApiModelProperty(value = "培训项目", required = true)
-    @NotNull(message = "培训项目不能为空", groups = {Create.class, Update.class})
+    @ApiModelProperty(value = "培训项目", required = false)
+   // @NotNull(message = "培训项目不能为空", groups = {Create.class, Update.class})
     @Valid
     private List<LicenseTrainingProgramsVO> trainingProgramsVOS;
 

csf-common/csf-common-model/src/main/java/com/mmc/csf/licence/vo/LicenseTrainingProgramsVO.java

@@ -25,23 +25,23 @@ public class LicenseTrainingProgramsVO {
    // @NotNull(message = "培训id不能为空", groups = Update.class)
     private Integer id;
 
-    @ApiModelProperty(value = "培训等级id", example = "1", required = true)
-    @NotNull(message = "培训等级id不能为空", groups = {Create.class, Update.class})
+    @ApiModelProperty(value = "培训等级id", example = "1", required = false)
+    //@NotNull(message = "培训等级id不能为空", groups = {Create.class, Update.class})
     @Max(value = 3,  groups = {Create.class, Update.class},message = "培训等级id不能超过3")
     private Integer gradeId;
 
-    @ApiModelProperty(value = "培训机型id", example = "1", required = true)
-    @NotNull(message = "培训机型id不能为空", groups = {Create.class, Update.class})
+    @ApiModelProperty(value = "培训机型id", example = "1", required = false)
+    //@NotNull(message = "培训机型id不能为空", groups = {Create.class, Update.class})
     @Max(value = 4,  groups = {Create.class, Update.class},message = "培训机型id不能超过4")
     private Integer modelsId;
 
-    @ApiModelProperty(value = "培训类型id", example = "1", required = true)
-    @NotNull(message = "培训类型id不能为空", groups = {Create.class, Update.class})
+    @ApiModelProperty(value = "培训类型id", example = "1", required = false)
+    //@NotNull(message = "培训类型id不能为空", groups = {Create.class, Update.class})
     @Max(value = 2,  groups = {Create.class, Update.class},message = "培训类型id不能超过2")
     private Integer typeId;
 
-    @ApiModelProperty(value = "培训价格", example = "1000", required = true)
-    @NotNull(message = "培训价格不能为空", groups = {Create.class, Update.class})
+    @ApiModelProperty(value = "培训价格", example = "1000", required = false)
+    //@NotNull(message = "培训价格不能为空", groups = {Create.class, Update.class})
     @Range(min = 0, max = 100000, message = "价格不能超过100000")
     private BigDecimal price;
 
@@ -49,11 +49,11 @@ public class LicenseTrainingProgramsVO {
     //@NotBlank(message = "培训地点不能为空", groups = {Create.class, Update.class})
     private String place;
 
-    @ApiModelProperty(value = "培训主图不能为空", example = "http://", required = true)
-    @NotBlank(message = "培训主图不能为空", groups = {Create.class, Update.class})
+    @ApiModelProperty(value = "培训主图不能为空", example = "http://", required = false)
+    //@NotBlank(message = "培训主图不能为空", groups = {Create.class, Update.class})
     private String mainImage;
 
-    @ApiModelProperty(value = "机构id", hidden = true)
+    @ApiModelProperty(value = "机构id", hidden = false)
     private Integer orgId;
 
     @Override

release-service/src/main/java/com/mmc/csf/release/service/licence/impl/LicenceBackgroundServiceImpl.java

@@ -69,6 +69,9 @@ public class LicenceBackgroundServiceImpl implements LicenceBackgroundService {
             }
           //  licenceBackgroundDao.insertLicenseOrgTraining(organizationsDO.getOrgTrainingIds(), organizationsDO.getId());
         }
+        if (organizations.getTrainingProgramsVOS()==null || organizations.getTrainingProgramsVOS().size()==0){
+            licenceBackgroundDao.insertOrganizations(organizationsDO);
+        }
         return ResultBody.success();
     }
 
@@ -106,6 +109,9 @@ public class LicenceBackgroundServiceImpl implements LicenceBackgroundService {
             licenceBackgroundDao.updateOrganizations(organizationsDO);
            // licenceBackgroundDao.insertLicenseOrgTraining(organizationsDO.getOrgTrainingIds(), organizationsDO.getId());
         }
+        if (organizations.getTrainingProgramsVOS()==null || organizations.getTrainingProgramsVOS().size()==0){
+            licenceBackgroundDao.updateOrganizations(organizationsDO);
+        }
         return ResultBody.success();
     }
 
@@ -147,17 +153,17 @@ public class LicenceBackgroundServiceImpl implements LicenceBackgroundService {
                 }
             }
         }
-        List<LicenseOrganizationsDTO> collect = orgList.stream().filter(o -> {
+      /*  List<LicenseOrganizationsDTO> collect = orgList.stream().filter(o -> {
             if (o.getProgramsDOList() == null) {
                 return false;
             }
             return true;
-        }).collect(Collectors.toList());
+        }).collect(Collectors.toList());*/
 
 
-        List<LicenseOrganizationsDTO> subList = collect.stream().skip((pageNo - 1) * organizationsQO.getPageSize()).limit(organizationsQO.getPageSize()).
+        List<LicenseOrganizationsDTO> subList = orgList.stream().skip((pageNo - 1) * organizationsQO.getPageSize()).limit(organizationsQO.getPageSize()).
                 collect(Collectors.toList());
-        return PageResult.buildPage(pageNo, organizationsQO.getPageSize(), collect.size(), subList);
+        return PageResult.buildPage(pageNo, organizationsQO.getPageSize(), orgList.size(), subList);
     }