LicenseBack(update)

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

@@ -19,19 +19,12 @@ public interface LicenceBackgroundDao {
 
     void insertOrganizations(LicenseOrganizationsDO organizationsDO);
 
-    void insertLicenseOrgTraining(List<Integer> orgTrainingIds, Integer orgId);
-
     int countId(LicenseOrganizationsDO organizationsDO);
 
     void removeOrgAndTraining(Integer id);
 
     void updateOrganizations(LicenseOrganizationsDO organizationsDO);
 
-    void removeOrganizations(Integer id);
-
-    void removeOrgTraining(Integer id);
-
-    int countPro(Integer modelsId, Integer gradeId, Integer typeId, Integer id);
 
     void insertProject(LicenseTrainingProgramsDO programsDO);
 
@@ -39,8 +32,6 @@ public interface LicenceBackgroundDao {
 
     void removeProject(Integer id);
 
-    List<LicenseProgramsDO> LicenseTrainingProgramsDTO(Integer id);
-
     int countListOrgPage(LicenseOrganizationsQO organizationsQO);
 
     List<LicenseOrganizationsDO> listOrgPage(LicenseOrganizationsQO organizationsQO);

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

@@ -51,6 +51,9 @@ public class LicenseTrainingProgramsDO {
     @NotBlank(message = "培训主图不能为空", groups = {Create.class, Update.class})
     private String mainImage;
 
+    @ApiModelProperty(value = "机构id", example = "1", required = true)
+    private Integer orgId;
+
 
     /**
      * VO类转换

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

@@ -49,22 +49,25 @@ public class LicenceBackgroundServiceImpl implements LicenceBackgroundService {
         LicenseTrainingProgramsDO programsDO = null;
         if (organizations.getTrainingProgramsVOS() != null && organizations.getTrainingProgramsVOS().size() != 0) {
             HashMap<LicenseTrainingProgramsVO, Integer> hashMap = new HashMap<>();
+            licenceBackgroundDao.insertOrganizations(organizationsDO);
             for (LicenseTrainingProgramsVO trainingProgramsVO : organizations.getTrainingProgramsVOS()) {
                 Integer pro = hashMap.get(trainingProgramsVO);
                 if (pro == null) {
                     hashMap.put(trainingProgramsVO, 1);
                     programsDO = new LicenseTrainingProgramsDO(trainingProgramsVO);
+                    Integer id = organizationsDO.getId();
+                    programsDO.setOrgId(id);
                     licenceBackgroundDao.insertProject(programsDO);
                     list.add(programsDO.getId());
                     organizationsDO.setOrgTrainingIds(list);
                 } else {
                     licenceBackgroundDao.removeProject(programsDO.getId());
+                    licenceBackgroundDao.removeOrg(organizationsDO.getId());
                     hashMap.put(trainingProgramsVO, pro++);
                     return ResultBody.error(ResultEnum.THREE_FIELDS_CAN_BE_REPEATED);
                 }
             }
-            licenceBackgroundDao.insertOrganizations(organizationsDO);
-            licenceBackgroundDao.insertLicenseOrgTraining(organizationsDO.getOrgTrainingIds(), organizationsDO.getId());
+          //  licenceBackgroundDao.insertLicenseOrgTraining(organizationsDO.getOrgTrainingIds(), organizationsDO.getId());
         }
         return ResultBody.success();
     }
@@ -91,15 +94,17 @@ public class LicenceBackgroundServiceImpl implements LicenceBackgroundService {
                     hashMap.put(trainingProgramsVO, pro++);
                     return ResultBody.error(ResultEnum.THREE_FIELDS_CAN_BE_REPEATED);
                 }
-                licenceBackgroundDao.removeOrganizations(organizations.getId());
+               // licenceBackgroundDao.removeOrganizations(organizations.getId());
                 programsDO = new LicenseTrainingProgramsDO(trainingProgramsVO);
+                Integer id = organizations.getId();
+                programsDO.setOrgId(id);
                 licenceBackgroundDao.insertProject(programsDO);
                 list.add(programsDO.getId());
                 organizationsDO.setOrgTrainingIds(list);
 
             }
             licenceBackgroundDao.updateOrganizations(organizationsDO);
-            licenceBackgroundDao.insertLicenseOrgTraining(organizationsDO.getOrgTrainingIds(), organizationsDO.getId());
+           // licenceBackgroundDao.insertLicenseOrgTraining(organizationsDO.getOrgTrainingIds(), organizationsDO.getId());
         }
         return ResultBody.success();
     }
@@ -116,7 +121,7 @@ public class LicenceBackgroundServiceImpl implements LicenceBackgroundService {
     @Override
     public ResultBody removeOrganizations(Integer id) {
         licenceBackgroundDao.removeOrg(id);
-        licenceBackgroundDao.removeOrganizations(id);
+        licenceBackgroundDao.removeOrgAndTraining(id);
         return ResultBody.success();
     }
 
@@ -148,7 +153,7 @@ public class LicenceBackgroundServiceImpl implements LicenceBackgroundService {
             }
             return true;
         }).collect(Collectors.toList());
-      
+
 
         List<LicenseOrganizationsDTO> subList = collect.stream().skip((pageNo - 1) * organizationsQO.getPageSize()).limit(organizationsQO.getPageSize()).
                 collect(Collectors.toList());

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

@@ -26,13 +26,7 @@
                 #{description}, #{detail}, NOW(), NOW(), #{longitude}, #{latitude})
     </insert>
 
-    <insert id="insertLicenseOrgTraining">
-        insert into license_org_training(training_programs_id,organizations_id) values
-        <foreach item="list" index="index" collection="orgTrainingIds"
-                 separator=",">
-            (#{list},#{orgId})
-        </foreach>
-    </insert>
+
 
     <select id="countId" resultType="java.lang.Integer">
         select count(*)
@@ -47,15 +41,9 @@
     </select>
 
     <delete id="removeOrgAndTraining" parameterType="java.lang.Integer">
-        DELETE
-        license_org_training,
-        license_training_programs
-        FROM
-	    license_org_training
-	    LEFT JOIN license_training_programs ON license_org_training.training_programs_id = license_training_programs.id
-        WHERE
-	   license_org_training.organizations_id =
-        #{id}
+        delete
+        from license_training_programs
+        where org_id = #{id}
     </delete>
 
     <update id="updateOrganizations" parameterType="com.mmc.csf.release.entity.licence.LicenseOrganizationsDO">
@@ -105,53 +93,18 @@
         where id = #{id}
     </update>
 
-    <delete id="removeOrganizations" parameterType="java.lang.Integer">
-        DELETE
-        license_org_training,
-        license_training_programs
-        FROM
-	    license_org_training
-	    LEFT JOIN license_training_programs ON license_org_training.training_programs_id = license_training_programs.id
-        WHERE
-	   license_org_training.organizations_id =
-        #{id}
-    </delete>
 
-    <delete id="removeOrgTraining" parameterType="java.lang.Integer">
-        delete
-        from license_org_training
-        where organizations_id = #{id}
-    </delete>
 
 
-    <select id="countPro" resultType="java.lang.Integer">
-        SELECT
-        count(*)
-        FROM
-        license_training_programs ltp
-        LEFT JOIN license_org_training lot ON ltp.id = lot.training_programs_id
-        LEFT JOIN license_organizations lo ON lo.id = lot.organizations_id
-        WHERE
-        1 =1
-        <if test=" modelsId != null and modelsId != '' ">
-            and ltp.models_id = #{modelsId}
-        </if>
-        <if test=" gradeId != null and gradeId != '' ">
-            and ltp.grade_id = #{gradeId}
-        </if>
-        <if test=" typeId != null and typeId != '' ">
-            and ltp.type_id = #{typeId}
-        </if>
-        <if test=" id != null and id != '' ">
-            and lot.organizations_id = #{id}
-        </if>
-    </select>
+
+
+
 
     <insert id="insertProject" useGeneratedKeys="true" keyProperty="id"
             parameterType="com.mmc.csf.release.entity.licence.LicenseOrganizationsDO">
         insert into license_training_programs(grade_id, models_id, type_id, price, place, main_image, create_time,
-                                              update_time)
-        values (#{gradeId}, #{modelsId}, #{typeId}, #{price}, #{place}, #{mainImage}, NOW(), NOW())
+                                              update_time,org_id)
+        values (#{gradeId}, #{modelsId}, #{typeId}, #{price}, #{place}, #{mainImage}, NOW(), NOW(),#{orgId})
     </insert>
 
     <update id="updateProject" parameterType="com.mmc.csf.release.entity.licence.LicenseTrainingProgramsDO">
@@ -200,25 +153,6 @@
         </foreach>
     </select>
 
-    <select id="LicenseTrainingProgramsDTO" resultType="com.mmc.csf.release.entity.licence.LicenseProgramsDO">
-        SELECT 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
-        FROM license_training_programs ltp
-                 INNER JOIN licence_type lt ON ltp.type_id = lt.id
-                 INNER JOIN licence_grade lg ON ltp.grade_id = lg.id
-                 INNER JOIN licence_models lm ON ltp.models_id = lm.id
-                 INNER JOIN license_org_training lot ON lot.training_programs_id = ltp.id
-        WHERE lot.organizations_id = #{id}
-    </select>
-
 
     <select id="countListOrgPage" resultType="int">
         select count(*)
@@ -279,7 +213,8 @@
     </select>
 
     <select id="trainingProgram" resultType="com.mmc.csf.release.entity.licence.LicenseProgramsDO">
-        SELECT DISTINCT ltp.id,
+        SELECT DISTINCT
+        ltp.id,
         ltp.grade_id AS gradeId,
         lg.`name` AS gradeName,
         ltp.models_id AS modelsId,
@@ -289,13 +224,14 @@
         ltp.price,
         ltp.place,
         ltp.main_image AS mainImage,
-        lot.organizations_id AS orgId
-        FROM license_training_programs ltp
+        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
-        LEFT JOIN license_org_training lot ON ltp.id = lot.training_programs_id
-        where 1=1
+        WHERE
+        1 =1
         <if test=" modelsId != null and modelsId != '' ">
             and ltp.models_id =#{modelsId}
         </if>