Merge branch 'develop'

csf-common/csf-common-model/src/main/java/com/mmc/csf/release/forum/dto/DynamicInfoDTO.java

@@ -11,8 +11,6 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.List;
-
 /**
  * @Author LW
  *

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

@@ -4,10 +4,6 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.release.forum.dto.DynamicInfoDTO;

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

 package com.mmc.csf.release.dao;
 
-
 import java.util.List;
 
 import org.apache.ibatis.annotations.Mapper;

release-service/src/main/java/com/mmc/csf/release/entity/forum/ForumCommentDO.java

@@ -9,7 +9,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
-
 /**
  * 评论表(ForumCommentDO)实体类
  *

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

 package com.mmc.csf.release.service.impl;
 
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -17,7 +16,6 @@ import org.springframework.stereotype.Service;
 import com.mmc.csf.common.util.page.PageResult;
 import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.infomation.dto.UserAccountSimpleDTO;
-import com.mmc.csf.release.auth.qo.BUserAccountQO;
 import com.mmc.csf.release.auth.qo.UserAccountQO;
 import com.mmc.csf.release.constant.TokenConstant;
 import com.mmc.csf.release.dao.BackstageForumDao;
@@ -52,7 +50,7 @@ public class BackstageForumServiceImpl implements BackstageForumService {
       userAccountQO.setKeyword(dynamic.getKeyword());
       // 获取筛选的用户id
       List<UserAccountSimpleDTO> userAccountSimpleDTOS =
-          userAppApi.feignListBAccountPage(bUserAccountQO, request.getHeader(TokenConstant.TOKEN));
+          userAppApi.feignListAppUserAccount(userAccountQO, request.getHeader(TokenConstant.TOKEN));
       if (CollectionUtils.isNotEmpty(userAccountSimpleDTOS)) {
         // 获取用户id
         userIds =
@@ -82,12 +80,11 @@ public class BackstageForumServiceImpl implements BackstageForumService {
     // 获取用户信息
     Set<Integer> listUserIds =
         dynamicList.stream().map(ForumDynamicDO::getUserAccountId).collect(Collectors.toSet());
-    List<Integer> userIdList = new ArrayList<>(ListUserIds);
-    BUserAccountQO accountQO = new BUserAccountQO();
-
+    List<Integer> userIdList = new ArrayList<>(listUserIds);
+    UserAccountQO accountQO = new UserAccountQO();
     accountQO.setUserIds(userIdList);
     List<UserAccountSimpleDTO> userAccountSimpleList =
-        userAppApi.feignListBAccountPage(accountQO, request.getHeader(TokenConstant.TOKEN));
+        userAppApi.feignListAppUserAccount(accountQO, request.getHeader(TokenConstant.TOKEN));
     Map<Integer, UserAccountSimpleDTO> userAccountInfoMap =
         userAccountSimpleList.stream()
             .collect(Collectors.toMap(UserAccountSimpleDTO::getId, Function.identity()));

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

 package com.mmc.csf.release.service.impl;
 
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -18,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import com.mmc.csf.common.util.page.PageResult;
 import com.mmc.csf.common.util.web.ResultBody;
+import com.mmc.csf.infomation.dto.UserAccountSimpleDTO;
 import com.mmc.csf.release.auth.qo.UserAccountQO;
 import com.mmc.csf.release.constant.TokenConstant;
 import com.mmc.csf.release.dao.CommentDAO;
@@ -32,7 +32,6 @@ import com.mmc.csf.release.forum.vo.MediaVO;
 import com.mmc.csf.release.forum.vo.UserBaseInfoVO;
 import com.mmc.csf.release.service.DynamicService;
 
-
 /**
  * @Author LW
  *

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

@@ -3,8 +3,6 @@ package com.mmc.csf.release.service.impl;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.servlet.http.HttpServletRequest;
-
 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

 package com.mmc.csf.release.service.impl;
 
-import java.io.File;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import org.springframework.web.multipart.MultipartFile;
-
+import cn.afterturn.easypoi.excel.ExcelImportUtil;
+import cn.afterturn.easypoi.excel.entity.ImportParams;
 import com.mmc.csf.common.util.page.PageResult;
 import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.common.util.web.ResultEnum;
@@ -30,17 +14,30 @@ 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.TenderNewsDO;
-import com.mmc.csf.release.entity.tender.ExcelTenderInfo;
 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;
 import com.mmc.csf.release.util.MultipartFileUtil;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.web.multipart.MultipartFile;
 
-import cn.afterturn.easypoi.excel.ExcelImportUtil;
-import cn.afterturn.easypoi.excel.entity.ImportParams;
+import javax.servlet.http.HttpServletRequest;
+import java.io.File;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * author:zhenjie

release-service/src/main/resources/mapper/news/IndustryNewsDao.xml

@@ -148,96 +148,6 @@
         create_time,
         update_time
         from industry_news
-        where is_deleted = 0
-          and id = #{id}
-    </select>
-    <select id="count" resultType="java.lang.Integer" parameterType="com.mmc.csf.release.entity.information.IndustryNewsDO">
-        select count(*)
-        from industry_news
-        <where>
-            is_deleted = 0
-            <if test="newsTitle != null and newsTitle != ''">
-                and news_title = #{newsTitle}
-            </if>
-            <if test="newsAuthor != null and newsAuthor != ''">
-                and news_author = #{newsAuthor}
-            </if>
-            <if test="userAccountId != null">
-                and user_account_id = #{userAccountId}
-            </if>
-            <if test="surfaceImg != null and surfaceImg != ''">
-                and surface_img = #{surfaceImg}
-            </if>
-            <if test="newsContents != null and newsContents != ''">
-                and news_contents = #{newsContents}
-            </if>
-            <if test="origin != null and origin != ''">
-                and origin = #{origin}
-            </if>
-        </where>
-    </select>
-
-    <insert id="insert" parameterType="com.mmc.csf.release.entity.information.IndustryNewsDO" useGeneratedKeys="true"
-            keyColumn="id">
-        insert into industry_news(news_title, news_author, user_account_id, surface_img, news_contents, origin,
-                                  create_time)
-        values (#{newsTitle}, #{newsAuthor}, #{userAccountId}, #{surfaceImg}, #{newsContents}, #{origin}, now())
-    </insert>
-
-    <update id="update" parameterType="com.mmc.csf.release.entity.information.IndustryNewsDO">
-        update industry_news
-        <set>
-            <if test="newsTitle != null and newsTitle != ''">
-                news_title = #{newsTitle},
-            </if>
-            <if test="newsAuthor != null and newsAuthor != ''">
-                news_author = #{newsAuthor},
-            </if>
-            <if test="userAccountId != null">
-                user_account_id = #{userAccountId},
-            </if>
-            <if test="surfaceImg != null and surfaceImg != ''">
-                surface_img = #{surfaceImg},
-            </if>
-            <if test="newsContents != null">
-                news_contents = #{newsContents},
-            </if>
-            <if test="origin != null and origin != ''">
-                origin = #{origin},
-            </if>
-        </set>
-        where is_deleted = 0 and id = #{id}
-    </update>
-
-    <select id="countPage" parameterType="com.mmc.csf.infomation.qo.IndustryNewsQO" resultType="java.lang.Integer">
-        select count(*)
-        from industry_news
-        <where>
-            is_deleted = 0
-            <if test="newsTitle != null and newsTitle != ''">
-                and news_title like concat('%',#{newsTitle},'%')
-            </if>
-            <if test="startTime != null">
-                and create_time &gt;= #{startTime}
-            </if>
-            <if test="endTime != null">
-                and create_time &lt;= #{endTime}
-            </if>
-        </where>
-    </select>
-
-    <select id="backgroundListNewsPage" parameterType="com.mmc.csf.infomation.qo.IndustryNewsQO"
-            resultType="com.mmc.csf.release.entity.information.IndustryNewsDO">
-        select id,
-        news_title,
-        news_author,
-        user_account_id,
-        surface_img,
-        news_contents,
-        origin,
-        create_time,
-        update_time
-        from industry_news
         <where>
             is_deleted = 0
             <if test="newsTitle != null and newsTitle != ''">

release-service/src/main/resources/mapper/requirements/RequirementsDao.xml

@@ -18,10 +18,6 @@
         update requirements_info set is_deleted = 1 where id = #{requirementsInfoId}
     </update>
 
-    <update id="removeRequire">
-        update requirements_info set is_deleted = 1 where id = #{requirementsInfoId}
-    </update>
-
     <select id="listType" resultType="com.mmc.csf.release.entity.requirements.RequirementsTypeDO">
         select id, type_name from requirements_type where is_deleted = 0
     </select>

release-service/src/main/resources/mapper/tender/TenderDao.xml

@@ -297,9 +297,6 @@
         <if test="keyword != null and keyword != ''">
             and ti.tender_title like CONCAT("%",#{keyword},"%")
         </if>
-        <if test="keyword != null and keyword != ''">
-            and ti.tender_title like CONCAT("%",#{keyword},"%")
-        </if>
         <if test=" userIds != null ">
             <foreach collection="userIds" item="id" index="index"
                      open="and tn.user_account_id in (" close=")" separator=",">
@@ -321,9 +318,6 @@
         <if test="keyword != null and keyword != ''">
             and ti.tender_title like CONCAT("%",#{keyword},"%")
         </if>
-        <if test="keyword != null and keyword != ''">
-            and ti.tender_title like CONCAT("%",#{keyword},"%")
-        </if>
         <if test=" userIds != null ">
             <foreach collection="userIds" item="id" index="index"
                      open="and tn.user_account_id in (" close=")" separator=",">