Merge branch 'develop' of ssh://git.mmcuav.cn:8222/iuav/ims into develop

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: 5fbbf7f31f0cb94c20580add7ccc41f5cacb6f0a
+  newTag: 15aac4031f61c65d34db728d8731d42094f8af46

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

@@ -3,6 +3,7 @@ package com.mmc.csf.release.controller;
 import com.mmc.csf.common.util.group.Create;
 import com.mmc.csf.common.util.group.Page;
 import com.mmc.csf.infomation.vo.TenderApplyQO;
+import com.mmc.csf.release.entity.tender.TenderInfoDO;
 import com.mmc.csf.release.model.group.Update;
 import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.infomation.dto.AppTenderInfoDTO;
@@ -86,6 +87,13 @@ public class TenderController extends BaseController{
         return tenderService.updateTenderInfo(tenderInfoVO);
     }
 
+    @ApiOperation(value = "查询-招标快讯详情")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = TenderInfoDO.class)})
+    @GetMapping(value = "infoById")
+    public ResultBody<TenderInfoDO> infoById(@RequestParam Integer id){
+        return tenderService.infoById(id);
+    }
+
     @ApiOperation(value = "合作申请提交")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @PostMapping(value = "apply")

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

@@ -61,4 +61,6 @@ public interface TenderDao {
     List<TenderInfoDO> listNewListTenderInfo(IndustryCaseQO industryCaseQO);
 
     List<Integer> listApplyTenderInfoIds(List<Integer> tenderInfoIds, Integer applyUserId);
+
+    TenderInfoDO getInfoById(Integer id);
 }

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

@@ -7,6 +7,7 @@ import com.mmc.csf.infomation.vo.TenderApplyVO;
 import com.mmc.csf.infomation.vo.TenderInfoVO;
 import com.mmc.csf.infomation.vo.TenderNewsVO;
 import com.mmc.csf.release.auth.dto.LoginSuccessDTO;
+import com.mmc.csf.release.entity.tender.TenderInfoDO;
 import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
@@ -41,4 +42,6 @@ public interface TenderService {
 
     ResultBody listNewTenderInfo(IndustryCaseQO industryCaseQO,
                                  LoginSuccessDTO loginSuccessDTO, HttpServletRequest request);
+
+    ResultBody<TenderInfoDO> infoById(Integer id);
 }

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

@@ -306,4 +306,10 @@ public class TenderServiceImpl implements TenderService {
         }
         return ResultBody.success(PageResult.buildPage(pageNo, industryCaseQO.getPageSize(), count, pageList));
     }
+
+    @Override
+    public ResultBody<TenderInfoDO> infoById(Integer id) {
+        TenderInfoDO tenderInfoDO = tenderDao.getInfoById(id);
+        return ResultBody.success(tenderInfoDO);
+    }
 }

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

@@ -341,4 +341,21 @@
         </if>
     </select>
 
+    <select id="getInfoById" resultType="com.mmc.csf.release.entity.tender.TenderInfoDO">
+        SELECT
+            id,
+            tender_news_id,
+            tender_price,
+            tender_info_no,
+            tender_title,
+            is_deleted,
+            create_time,
+            update_time,
+            tender_content
+        FROM
+            tender_info
+        WHERE
+            is_deleted = 0 and id = #{id}
+    </select>
+
 </mapper>
\ No newline at end of file