Skip to content

I
ims-ci-test
提交 363f68d4 作者: zhenjie 提交者： 余乾开
操作

课程、招标优化

上级 5c05bb72
正在显示 包含 33 行增加 和 81 行删除
release-service/src/main/java/com/mmc/csf/release/dao/FlyerTrainingDao.java
package com.mmc.csf.release.dao;
import com.mmc.csf.release.entity.CurriculumInfoDO;
import com.mmc.csf.release.entity.curriculum.CurriculumInfoDO;
import com.mmc.csf.release.entity.FlightSkillsDO;
import com.mmc.csf.release.entity.PilotRegistrationDO;
import com.mmc.csf.release.flyer.qo.CurriculumQo;
......
release-service/src/main/java/com/mmc/csf/release/dao/TenderDao.java
package com.mmc.csf.release.dao;
import com.mmc.csf.infomation.qo.IndustryCaseQO;
import com.mmc.csf.release.entity.TenderApplyDO;
import com.mmc.csf.release.entity.TenderInfoDO;
import com.mmc.csf.release.entity.TenderNewsDO;
import com.mmc.csf.release.entity.tender.TenderApplyDO;
import com.mmc.csf.release.entity.tender.TenderInfoDO;
import com.mmc.csf.release.entity.tender.TenderNewsDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
......
release-service/src/main/java/com/mmc/csf/release/entity/CurriculumVideoDO.java deleted 100644 → 0
package com.mmc.csf.release.entity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
import java.io.Serializable;
/**
* 课程视频url地址表(CurriculumVideoDO)实体类
*
* @author makejava
* @since 2023-05-18 17:37:22
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class CurriculumVideoDO implements Serializable {
private static final long serialVersionUID = -50625092373872063L;
private Integer id;
private Integer curriculumInfoId;
/**
* 课程url地址
*/
private String curriculumUrl;
private Date updateTime;
private Integer deleted;
}
release-service/src/main/java/com/mmc/csf/release/entity/CurriculumInfoDO.java → release-service/src/main/java/com/mmc/csf/release/entity/curriculum/CurriculumInfoDO.java
package com.mmc.csf.release.entity;
package com.mmc.csf.release.entity.curriculum;
import com.mmc.csf.release.flyer.vo.CurriculumInfoVO;
import lombok.AllArgsConstructor;
......@@ -27,7 +27,7 @@ public class CurriculumInfoDO implements Serializable {
*/
private String curriculumName;
/**
* 课程供应商（id）
* 课程供应商（id），用户id
*/
private Integer supplierId;
/**
......@@ -38,18 +38,7 @@ public class CurriculumInfoDO implements Serializable {
* 课程简介
*/
private String curriculumDesc;
/**
* 课程是否免费 0:是 1:否
*/
private Integer free;
/**
* 执照考试id
*/
private Integer dronePilotLicenseId;
/**
* 飞行服务技能id
*/
private Integer flightSkills;
/**
* 创建时间
*/
......@@ -78,7 +67,6 @@ public class CurriculumInfoDO implements Serializable {
this.id = curriculumInfoVO.getId();
this.curriculumName = curriculumInfoVO.getCurriculumName();
this.curriculumDesc = curriculumInfoVO.getCurriculumDesc();
this.flightSkills = curriculumInfoVO.getFlightSkills();
this.surfaceUrl = curriculumInfoVO.getSurfaceUrl();
this.detailContent = curriculumInfoVO.getDetailContent();
this.videoUrl = curriculumInfoVO.getVideoUrl();
......@@ -87,8 +75,8 @@ public class CurriculumInfoDO implements Serializable {
public CurriculumInfoVO buildCurriculumInfoVO(){
return CurriculumInfoVO.builder().id(id).curriculumDesc(curriculumDesc).price(curriculumPrice)
.free(free).supplierName("浙江科比特创新科技有限公司").curriculumName(curriculumName)
.videoUrl(videoUrl).surfaceUrl(this.surfaceUrl).flightSkills(this.flightSkills).detailContent(this.detailContent)
.supplierName("浙江科比特创新科技有限公司").curriculumName(curriculumName)
.videoUrl(videoUrl).surfaceUrl(this.surfaceUrl).detailContent(this.detailContent)
.categoriesId(this.categoriesId).build();
}
......
release-service/src/main/java/com/mmc/csf/release/entity/TenderApplyDO.java → release-service/src/main/java/com/mmc/csf/release/entity/tender/TenderApplyDO.java
package com.mmc.csf.release.entity;
package com.mmc.csf.release.entity.tender;
import com.mmc.csf.infomation.dto.TenderApplyDTO;
import com.mmc.csf.infomation.vo.TenderApplyVO;
......@@ -21,7 +21,6 @@ public class TenderApplyDO implements Serializable {
private static final long serialVersionUID = 4290565153507919210L;
private Integer id;
private Integer userAccountId;
private Integer tenderNewsId;
private Integer tenderInfoId;
private String nickName;
private String userName;
......@@ -35,7 +34,6 @@ public class TenderApplyDO implements Serializable {
public TenderApplyDO(TenderApplyVO tenderApplyVO) {
this.userAccountId = tenderApplyVO.getUserAccountId();
this.tenderNewsId = tenderApplyVO.getTenderNewsId();
this.tenderInfoId = tenderApplyVO.getTenderInfoId();
this.nickName = tenderApplyVO.getNickName();
this.userName = tenderApplyVO.getUserName();
......
release-service/src/main/java/com/mmc/csf/release/entity/TenderInfoDO.java → release-service/src/main/java/com/mmc/csf/release/entity/tender/TenderInfoDO.java
package com.mmc.csf.release.entity;
package com.mmc.csf.release.entity.tender;
import com.mmc.csf.infomation.dto.AppTenderInfoDTO;
import com.mmc.csf.infomation.dto.TenderInfoDTO;
......
release-service/src/main/java/com/mmc/csf/release/entity/TenderNewsDO.java → release-service/src/main/java/com/mmc/csf/release/entity/tender/TenderNewsDO.java
package com.mmc.csf.release.entity;
package com.mmc.csf.release.entity.tender;
import com.mmc.csf.infomation.dto.TenderNewsDTO;
import com.mmc.csf.infomation.vo.TenderNewsVO;
......@@ -10,6 +10,7 @@ import java.io.Serializable;
import java.util.Date;
/**
* @description 招标快讯
* author:zhenjie
* Date:2022/5/21
* time:15:56
......@@ -21,7 +22,9 @@ public class TenderNewsDO implements Serializable {
private static final long serialVersionUID = 3403042130524788589L;
private Integer id;
private String tenderName;
//是否展示
private Integer using;
//所属产品，可以删除
private Integer port;
private Integer deleted;
private Date createTime;
......
release-service/src/main/java/com/mmc/csf/release/service/impl/FlyerTrainingServiceImpl.java
......@@ -3,7 +3,7 @@ package com.mmc.csf.release.service.impl;
import com.mmc.csf.common.util.page.PageResult;
import com.mmc.csf.common.util.web.ResultBody;
import com.mmc.csf.release.dao.FlyerTrainingDao;
import com.mmc.csf.release.entity.CurriculumInfoDO;
import com.mmc.csf.release.entity.curriculum.CurriculumInfoDO;
import com.mmc.csf.release.entity.FlightSkillsDO;
import com.mmc.csf.release.entity.PilotRegistrationDO;
import com.mmc.csf.release.feign.PmsAppApi;
......@@ -15,7 +15,6 @@ import com.mmc.csf.release.flyer.vo.DronePilotLicenseVO;
import com.mmc.csf.release.flyer.vo.FlightSkillsVO;
import com.mmc.csf.release.flyer.vo.RegistrationVO;
import com.mmc.csf.release.service.FlyerTrainingService;
import io.swagger.models.auth.In;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......
release-service/src/main/java/com/mmc/csf/release/service/impl/TenderServiceImpl.java
......@@ -14,9 +14,9 @@ import com.mmc.csf.infomation.vo.TenderNewsVO;
import com.mmc.csf.release.auth.dto.LoginSuccessDTO;
import com.mmc.csf.release.constant.TokenConstant;
import com.mmc.csf.release.dao.TenderDao;
import com.mmc.csf.release.entity.TenderApplyDO;
import com.mmc.csf.release.entity.TenderInfoDO;
import com.mmc.csf.release.entity.TenderNewsDO;
import com.mmc.csf.release.entity.tender.TenderApplyDO;
import com.mmc.csf.release.entity.tender.TenderInfoDO;
import com.mmc.csf.release.entity.tender.TenderNewsDO;
import com.mmc.csf.release.entity.tender.ExcelTenderInfo;
import com.mmc.csf.release.feign.UserAppApi;
import com.mmc.csf.release.service.TenderService;
......
release-service/src/main/resources/mapper/flyer/FlyerTrainingDao.xml
......@@ -24,12 +24,12 @@
#{uavLicenseLevelTwo}, #{uavLicenseLevelThree}, #{industryAppAuth}, #{remark})
</insert>
<insert id="addCurriculum" keyProperty="id" useGeneratedKeys="true" parameterType="com.mmc.csf.release.entity.CurriculumInfoDO">
<insert id="addCurriculum" keyProperty="id" useGeneratedKeys="true" parameterType="com.mmc.csf.release.entity.curriculum.CurriculumInfoDO">
INSERT INTO `curriculum_info`(`curriculum_name`, `supplier_id`, `curriculum_desc`, `drone_pilot_license_id`, `flight_skills`, `categories_id`, `surface_url`, `video_url`, `detail_content`)
VALUES (#{curriculumName},#{supplierId},#{curriculumDesc},#{dronePilotLicenseId},#{flightSkills},#{categoriesId},#{surfaceUrl},#{videoUrl},#{detailContent});
</insert>
<update id="updateCurriculum" parameterType="com.mmc.csf.release.entity.CurriculumInfoDO">
<update id="updateCurriculum" parameterType="com.mmc.csf.release.entity.curriculum.CurriculumInfoDO">
UPDATE curriculum_info
<set>
<if test="curriculumName != null">
......@@ -98,7 +98,7 @@
</if>
</where>
</select>
<select id="listPageCurriculumInfo" resultType="com.mmc.csf.release.entity.CurriculumInfoDO">
<select id="listPageCurriculumInfo" resultType="com.mmc.csf.release.entity.curriculum.CurriculumInfoDO">
SELECT
ci.id,
ci.curriculum_name,
......@@ -131,7 +131,7 @@
order by ci.create_time desc
LIMIT #{pageNo},#{pageSize}
</select>
<select id="selectLicensesCurriculum" resultType="com.mmc.csf.release.entity.CurriculumInfoDO">
<select id="selectLicensesCurriculum" resultType="com.mmc.csf.release.entity.curriculum.CurriculumInfoDO">
SELECT ci.id,
ci.curriculum_name,
ci.supplier_id,
......@@ -145,7 +145,7 @@
INNER JOIN curriculum_video cv ON ci.id = cv.curriculum_info_id
where ci.drone_pilot_license_id is not null
</select>
<select id="selectSkillCurriculum" resultType="com.mmc.csf.release.entity.CurriculumInfoDO">
<select id="selectSkillCurriculum" resultType="com.mmc.csf.release.entity.curriculum.CurriculumInfoDO">
SELECT ci.id,
ci.curriculum_name,
ci.supplier_id,
......@@ -159,7 +159,7 @@
INNER JOIN curriculum_video cv ON ci.id = cv.curriculum_info_id
where ci.flight_skills is not null
</select>
<select id="curriculumDetails" resultType="com.mmc.csf.release.entity.CurriculumInfoDO">
<select id="curriculumDetails" resultType="com.mmc.csf.release.entity.curriculum.CurriculumInfoDO">
SELECT ci.id,
ci.curriculum_name,
ci.supplier_id,
......
release-service/src/main/resources/mapper/tender/TenderDao.xml
......@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.mmc.csf.release.dao.TenderDao">
<resultMap id="tenderNewsResultMap" type="com.mmc.csf.release.entity.TenderNewsDO">
<resultMap id="tenderNewsResultMap" type="com.mmc.csf.release.entity.tender.TenderNewsDO">
<id column="id" property="id"/>
<result column="tender_name" property="tenderName"/>
<result column="is_using" property="using"/>
......@@ -13,7 +13,7 @@
<result column="update_time" property="updateTime"/>
</resultMap>
<resultMap id="tenderInfoResultMap" type="com.mmc.csf.release.entity.TenderInfoDO">
<resultMap id="tenderInfoResultMap" type="com.mmc.csf.release.entity.tender.TenderInfoDO">
<id column="id" property="id"/>
<result column="tender_news_id" property="tenderNewsId"/>
<result column="tender_info_no" property="tenderInfoNo"/>
......@@ -25,7 +25,7 @@
<result column="tender_content" property="tenderContent"/>
</resultMap>
<resultMap id="tenderApplyResultMap" type="com.mmc.csf.release.entity.TenderApplyDO">
<resultMap id="tenderApplyResultMap" type="com.mmc.csf.release.entity.tender.TenderApplyDO">
<id column="id" property="id"/>
<result column="tender_news_id" property="tenderNewsId"/>
<result column="user_account_id" property="userAccountId"/>
......@@ -41,13 +41,13 @@
</resultMap>
<insert id="addTenderNewsDO" useGeneratedKeys="true"
keyProperty="id" parameterType="com.mmc.csf.release.entity.TenderNewsDO">
keyProperty="id" parameterType="com.mmc.csf.release.entity.tender.TenderNewsDO">
insert into tender_news(tender_name, is_using, port, create_time)
values (#{tenderName}, #{using}, #{port}, NOW())
</insert>
<insert id="batchAddTenderInfo" useGeneratedKeys="true"
keyProperty="id" parameterType="com.mmc.csf.release.entity.TenderInfoDO">
keyProperty="id" parameterType="com.mmc.csf.release.entity.tender.TenderInfoDO">
insert into
tender_info(tender_news_id,tender_info_no,tender_title,tender_price,create_time)
values
......@@ -63,7 +63,7 @@
</foreach>
</insert>
<insert id="addTenderApply" parameterType="com.mmc.csf.release.entity.TenderApplyDO">
<insert id="addTenderApply" parameterType="com.mmc.csf.release.entity.tender.TenderApplyDO">
insert into tender_apply(user_account_id, tender_news_id, tender_info_id, nick_name, user_name, phone_num,
create_time)
values (#{userAccountId}, #{tenderNewsId}, #{tenderInfoId}, #{nickName}, #{userName}, #{phoneNum}, NOW());
......@@ -75,7 +75,7 @@
where tender_news_id = #{tenderNewsId}
</update>
<update id="updateTenderNews" parameterType="com.mmc.csf.release.entity.TenderNewsDO">
<update id="updateTenderNews" parameterType="com.mmc.csf.release.entity.tender.TenderNewsDO">
update tender_news
<set>
<if test=" tenderName != null and tenderName != ''">
......@@ -302,7 +302,7 @@
</if>
</select>
<select id="listNewListTenderInfo" resultType="com.mmc.csf.release.entity.TenderInfoDO">
<select id="listNewListTenderInfo" resultType="com.mmc.csf.release.entity.tender.TenderInfoDO">
select
ti.id, ti.tender_news_id, ti.tender_price, ti.tender_info_no, ti.tender_title, ti.is_deleted, ti.create_time,
ti.update_time
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论