Merge branch 'develop'

csf-common/csf-common-model/src/main/java/com/mmc/csf/licence/qo/LicenseOrganizationsQO.java

@@ -46,6 +46,9 @@ public class LicenseOrganizationsQO {
     @ApiModelProperty(value = "地域region", example = "110000", required = false)
     private String region;
 
+    @ApiModelProperty(value = "后台id")
+    private Integer backUserId;
+
     @ApiModelProperty(value = "当前页", required = true, example = "1")
     @NotNull(message = "当前页不能为空", groups = {Page.class, Freeze.class})
     @Min(value = 1, groups = Page.class)

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

 package com.mmc.csf.licence.vo;
 
 import com.mmc.csf.release.model.group.Create;
-import com.mmc.csf.release.model.group.Page;
 import com.mmc.csf.release.model.group.Update;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.Value;
-import org.springframework.validation.annotation.Validated;
 
 import javax.validation.Valid;
-import javax.validation.constraints.*;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 import java.util.List;
 
 /**
@@ -41,7 +41,7 @@ public class LicenseOrganizationsVO {
     private String name;
 
     @ApiModelProperty(value = "机构地区编号", example = "110000,130100", required = true)
-    @NotBlank(message = "机构地区不能为空", groups = {Create.class, Update.class})
+//    @NotBlank(message = "机构地区不能为空", groups = {Create.class, Update.class})
     private String region;
 
     @ApiModelProperty(value = "机构地区名称", example = "河北省,石家庄市", required = false)
@@ -82,5 +82,7 @@ public class LicenseOrganizationsVO {
     @Valid
     private List<LicenseTrainingProgramsVO> trainingProgramsVOS;
 
+    @ApiModelProperty(value = "后台id")
+    private Integer backUserId;
 
 }

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-  newTag: e3eef4e3db93af56ce838d17bace47d371ff8afe
+  newTag: 9802b49dcf66c804248a8b17e962db12b3af47ac

release-service/src/main/java/com/mmc/csf/release/controller/licence/LicenceBackgroundController.java

@@ -36,6 +36,13 @@ public class LicenceBackgroundController extends BaseController {
         return licenceBackgroundService.insertOrganizations(organizations, this.getUserLoginInfoFromRedis(request));
     }
 
+    @ApiOperation(value = "机构-根据后台id查询")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("/selectOrg")
+    public ResultBody<LicenseOrganizationsDTO> selectOrganizations(@ApiParam(value = "机构id", required = true) @RequestParam Integer backUserId) {
+        return licenceBackgroundService.selectOrganizations(backUserId);
+    }
+
     @ApiOperation(value = "机构-修改")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @PostMapping("/updateOrg")

release-service/src/main/java/com/mmc/csf/release/dao/licence/LicenceBackgroundDao.java

@@ -36,6 +36,9 @@ public interface LicenceBackgroundDao {
 
     List<LicenseOrganizationsDO> listOrgPage(LicenseOrganizationsQO organizationsQO);
 
+    LicenseOrganizationsDO selectOrganizations(Integer backUserId);
+
+    List<LicenseProgramsDO> selectPrograms(Integer orgId);
 
     List<LicenseProgramsDO> trainingProgram(LicenseOrganizationsQO organizationsQO);
 

release-service/src/main/java/com/mmc/csf/release/entity/licence/LicenseOrganizationsDO.java

@@ -93,6 +93,9 @@ public class LicenseOrganizationsDO {
     @ApiModelProperty(value = "更新时间", example = "2023-07-14", required = true)
     private Date updateTime;
 
+    @ApiModelProperty(value = "后台账号id")
+    private Integer backUserId;
+
     /**
      * VO类转换
      */
@@ -111,6 +114,7 @@ public class LicenseOrganizationsDO {
         this.regionName = organizationsVO.getRegionName();
         this.longitude = organizationsVO.getLongitude();
         this.latitude = organizationsVO.getLatitude();
+        this.backUserId = organizationsVO.getBackUserId();
     }
 
 

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

@@ -18,6 +18,6 @@ public interface LicenceBackgroundService {
 
     ResultBody removeOrganizations(Integer id);
 
-
+    ResultBody selectOrganizations(Integer backUserId);
     PageResult listOrgPage(LicenseOrganizationsQO organizationsQO, LoginSuccessDTO userLoginInfoFromRedis);
 }

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

@@ -117,11 +117,13 @@ public class LicenceBackgroundServiceImpl implements LicenceBackgroundService {
 
     private void getOrgName(LicenseOrganizationsVO organizations) {
         String region = organizations.getRegion();
-        List<String> strings = Arrays.asList(region.split(","));
-        List<Integer> collect = strings.stream().map(Integer::valueOf).collect(Collectors.toList());
-        List<String> orgName = licenceBackgroundDao.getOrgName(collect);
-        String join = StringUtils.join(orgName, ",");
-        organizations.setRegionName(join);
+        if(region != null) {
+            List<String> strings = Arrays.asList(region.split(","));
+            List<Integer> collect = strings.stream().map(Integer::valueOf).collect(Collectors.toList());
+            List<String> orgName = licenceBackgroundDao.getOrgName(collect);
+            String join = StringUtils.join(orgName, ",");
+            organizations.setRegionName(join);
+        }
     }
 
     @Override
@@ -132,11 +134,24 @@ public class LicenceBackgroundServiceImpl implements LicenceBackgroundService {
     }
 
     @Override
+    public ResultBody selectOrganizations(Integer backUserId) {
+        LicenseOrganizationsDO licenseOrganizationsDO = licenceBackgroundDao.selectOrganizations(backUserId);
+        LicenseOrganizationsDTO licenseOrganizationsDTO = licenseOrganizationsDO.organizationsDTO();
+        Integer orgId = licenseOrganizationsDTO.getId();
+        List<LicenseProgramsDO> licenseProgramsDOS = licenceBackgroundDao.selectPrograms(orgId);
+        List<LicenseTrainingProgramsDTO> orgList = licenseProgramsDOS.stream().map(LicenseProgramsDO :: buildTrainingProgramsDTO).collect(Collectors.toList());
+        licenseOrganizationsDTO.setProgramsDOList(orgList);
+        return ResultBody.success(licenseOrganizationsDTO);
+    }
+
+    @Override
     public PageResult listOrgPage(LicenseOrganizationsQO organizationsQO, LoginSuccessDTO userLoginInfoFromRedis) {
         int count = licenceBackgroundDao.countListOrgPage(organizationsQO);
         if (count == 0) {
             return PageResult.buildPage(organizationsQO.getPageNo(), organizationsQO.getPageSize(), count);
         }
+        Integer backUserId = userLoginInfoFromRedis.getUserAccountId();
+        organizationsQO.setBackUserId(backUserId);
         Integer pageNo = organizationsQO.getPageNo();
         organizationsQO.buildCurrentPage();
         List<LicenseOrganizationsDO> licenseOrganizationsDOS = licenceBackgroundDao.listOrgPage(organizationsQO);

release-service/src/main/resources/mapper/licence/LicenceBackgroundDao.xml

@@ -19,11 +19,11 @@
         insert into license_organizations(main_image, auxiliary_picture, video, `name`, region, region_name,
                                           detailed_address,
                                           test_center, scale_id,
-                                          description, detail, create_time, update_time, longitude, latitude)
+                                          description, detail, create_time, update_time, longitude, latitude,back_user_id)
         values (#{mainImage}, #{auxiliaryPicture}, #{video}, #{name}, #{region}, #{regionName}, #{detailedAddress},
                 #{testCenter},
                 #{scaleId},
-                #{description}, #{detail}, NOW(), NOW(), #{longitude}, #{latitude})
+                #{description}, #{detail}, NOW(), NOW(), #{longitude}, #{latitude},#{backUserId})
     </insert>
 
 
@@ -189,6 +189,9 @@
         FROM license_organizations lo
         LEFT JOIN licence_scale ls ON lo.scale_id = ls.id
         where 1=1
+          <if test="backUserId != 1">
+              and lo.back_user_id = #{backUserId}
+          </if>
         <if test=" name != null and name != '' ">
             and lo.`name` like CONCAT('%',#{name},'%')
         </if>
@@ -234,6 +237,52 @@
             and ltp.type_id =#{typeId}
         </if>
     </select>
+    <select id="selectOrganizations" resultType="com.mmc.csf.release.entity.licence.LicenseOrganizationsDO">
+        SELECT lo.id,
+        lo.main_image AS mainImage,
+        lo.auxiliary_picture AS auxiliaryPicture,
+        lo.video,
+        lo.`name`,
+        lo.region,
+        lo.test_center AS testCenter,
+        lo.scale_id AS scaleId,
+        ls.`name` AS scaleName,
+        lo.description,
+        lo.detail,
+        lo.create_time AS createTime,
+        lo.update_time AS updateTime,
+        lo.detailed_address AS detailedAddress,
+        lo.region_name AS regionName,
+        lo.longitude,
+        lo.latitude,
+        lo.create_time AS createTime,
+        lo.update_time AS updateTime
+        FROM license_organizations lo
+        LEFT JOIN licence_scale ls ON lo.scale_id = ls.id
+        where 1=1
+        and lo.back_user_id = #{backUserId}
+    </select>
+    <select id="selectPrograms" resultType="com.mmc.csf.release.entity.licence.LicenseProgramsDO">
+        SELECT DISTINCT
+        ltp.id,
+        ltp.grade_id AS gradeId,
+        lg.`name` AS gradeName,
+        ltp.models_id AS modelsId,
+        lm.`name` AS modelsName,
+        ltp.type_id AS typeId,
+        lt.`name` AS typeName,
+        ltp.price,
+        ltp.place,
+        ltp.main_image AS mainImage,
+        ltp.org_id AS orgId
+        FROM
+        license_training_programs ltp
+        LEFT JOIN licence_grade lg ON ltp.grade_id = lg.id
+        LEFT JOIN licence_models lm ON ltp.models_id = lm.id
+        LEFT JOIN licence_type lt ON ltp.type_id = lt.id
+        WHERE
+        1 =1 and ltp.org_id = #{orgId}
+    </select>
 
 
 </mapper>