招标申请bug修复

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

@@ -33,7 +33,7 @@ import java.util.Date;
 @Api(tags = {"招标相关"})
 @RestController
 @RequestMapping("/tender/")
-public class TenderController {
+public class TenderController extends BaseController{
 
     @Autowired
     private TenderService tenderService;
@@ -126,7 +126,7 @@ public class TenderController {
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = AppTenderInfoDTO.class)})
     @PostMapping(value = "listNewTenderInfo")
     public ResultBody listNewTenderInfo(@Validated(value = {Page.class})@RequestBody IndustryCaseQO industryCaseQO, HttpServletRequest request){
-        return tenderService.listNewTenderInfo(industryCaseQO);
+        return tenderService.listNewTenderInfo(industryCaseQO, this.getUserLoginInfoFromRedis(request).getUserAccountId());
     }
 
 }

release-service/src/main/java/com/mmc/csf/release/service/TenderService.java

@@ -36,5 +36,5 @@ public interface TenderService {
 
     ResultBody listTenderInfoAppLatest(Integer pageNo, Integer pageSize, Integer userAccountId);
 
-    ResultBody listNewTenderInfo(IndustryCaseQO industryCaseQO);
+    ResultBody listNewTenderInfo(IndustryCaseQO industryCaseQO, Integer userAccountId);
 }

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

 package com.mmc.csf.release.service.impl;
 
-import cn.afterturn.easypoi.excel.ExcelImportUtil;
-import cn.afterturn.easypoi.excel.entity.ImportParams;
-import com.alibaba.druid.sql.visitor.functions.If;
 import com.mmc.csf.common.util.page.PageResult;
 import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.common.util.web.ResultEnum;
-import com.mmc.csf.infomation.dto.AppTenderInfoDTO;
-import com.mmc.csf.infomation.dto.TenderApplyDTO;
-import com.mmc.csf.infomation.dto.TenderInfoDTO;
-import com.mmc.csf.infomation.dto.TenderNewsDTO;
+import com.mmc.csf.infomation.dto.*;
 import com.mmc.csf.infomation.qo.IndustryCaseQO;
 import com.mmc.csf.infomation.vo.TenderApplyVO;
 import com.mmc.csf.infomation.vo.TenderNewsVO;
@@ -26,7 +20,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.File;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -202,7 +195,11 @@ public class TenderServiceImpl implements TenderService {
         if(beforeTenderApplyDO != null){
             return ResultBody.error(ResultEnum.HAS_BEEN_APPLY_ERROR);
         }
+        UserAccountSimpleDTO userAccountSimpleDTO = userAppApi.feignGetUserSimpleInfo(tenderApplyVO.getUserAccountId());
         TenderApplyDO tenderApplyDO = new TenderApplyDO(tenderApplyVO);
+        tenderApplyDO.setNickName(userAccountSimpleDTO.getNickName());
+        tenderApplyDO.setUserName(userAccountSimpleDTO.getUserName());
+        tenderApplyDO.setPhoneNum(userAccountSimpleDTO.getPhoneNum());
         tenderDao.addTenderApply(tenderApplyDO);
         return ResultBody.success();
     }
@@ -275,9 +272,10 @@ public class TenderServiceImpl implements TenderService {
     }
 
     @Override
-    public ResultBody listNewTenderInfo(IndustryCaseQO industryCaseQO) {
-        //查询对应地区的用户
-        List<Integer> userIds = userAppApi.feignListUserAccountIds(industryCaseQO.getProvinceCode(), industryCaseQO.getCityCode(), industryCaseQO.getDistrictCode());
+    public ResultBody listNewTenderInfo(IndustryCaseQO industryCaseQO, Integer userAccountId) {
+        //查询对应地区的用户， 默认查广东
+        industryCaseQO.setProvinceCode(industryCaseQO.getProvinceCode() == null  ? 440000 : industryCaseQO.getProvinceCode());
+        List<Integer> userIds = userAppApi.feignListUserAccountIds(industryCaseQO.getProvinceCode() , industryCaseQO.getCityCode(), industryCaseQO.getDistrictCode());
         industryCaseQO.setUserIds(userIds);
         int count = tenderDao.countNewListTenderInfo(industryCaseQO);
         if (count == 0) {
@@ -290,9 +288,9 @@ public class TenderServiceImpl implements TenderService {
         List<AppTenderInfoDTO> pageList = list.stream().map(d -> {
             return d.buildAppTenderInfoDTO();
         }).collect(Collectors.toList());
-        Integer applyUserId = 1;
+
         //查出已申请过的并做标记
-        List<Integer> applyTenderInfoIds = tenderDao.listApplyTenderInfoIds(tenderInfoIds, applyUserId);
+        List<Integer> applyTenderInfoIds = tenderDao.listApplyTenderInfoIds(tenderInfoIds, userAccountId);
         if (CollectionUtils.isNotEmpty(applyTenderInfoIds)) {
             pageList.forEach(d->{
                 if(applyTenderInfoIds.contains(d.getId())){

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

@@ -296,10 +296,10 @@
         limit #{pageNo}, #{pageSize}
     </select>
 
-    <select id="listApplyTenderInfoIds" resultType="java.util.List">
+    <select id="listApplyTenderInfoIds" resultType="java.lang.Integer">
         select ti.id
         from tender_news tn INNER JOIN tender_info ti ON tn.id = ti.tender_news_id INNER JOIN tender_apply ta ON ta.tender_info_id = ti.id
-        where ta.user_account_id = #{applyUserId}
+        where ta.user_account_id = #{applyUserId} and ta.is_deleted = 0
         <if test="tenderInfoIds != null">
             <foreach collection="tenderInfoIds" item="id" index="index"
                      open="and ta.tender_info_id in (" close=")" separator=",">