明细

dockerbuild.bat

@@ -5,5 +5,3 @@ docker login --username=changqing7 10.130.16.8:30028 -p "Changqing7@2025!"
 docker tag ofnc:latest 10.130.16.8:30028/hygl-hltest-ecr/ofnc:latest
 
 docker push 10.130.16.8:30028/hygl-hltest-ecr/ofnc:latest
-
-

src/main/java/cn/chinaunicom/omniFlowNetCompute/controller/FreemarketController.java

@@ -13,7 +13,7 @@ import javax.validation.Valid;
 import java.util.List;
 
 @RestController
-@RequestMapping("/freemarket")
+@RequestMapping("/stage-api/freemarket")
 public class FreemarketController extends BaseController {
 
     @Autowired
@@ -48,7 +48,7 @@ public class FreemarketController extends BaseController {
     /**
      * 修改公告
      */
-    @PutMapping
+    @PostMapping("/update")
     public AjaxResult edit(@RequestBody Freemarket freemarket) {
         int result = freemarketService.updateFreemarket(freemarket);
         return result > 0 ? AjaxResult.success("修改成功") : AjaxResult.error("修改失败");

src/main/java/cn/chinaunicom/omniFlowNetCompute/controller/OpportunityController.java

@@ -13,7 +13,7 @@ import javax.validation.Valid;
 import java.util.List;
 
 @RestController
-@RequestMapping("/opportunity")
+@RequestMapping("/stage-api/opportunity")
 public class OpportunityController extends BaseController {
 
     @Autowired

src/main/java/cn/chinaunicom/omniFlowNetCompute/domain/Freemarket.java

@@ -1,7 +1,5 @@
 package cn.chinaunicom.omniFlowNetCompute.domain;
 
-
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.math.BigDecimal;

src/main/java/cn/chinaunicom/omniFlowNetCompute/pojo/OpportunityQueryParam.java

@@ -16,4 +16,5 @@ public class OpportunityQueryParam {
     private Date signTimeEnd;
     private Date establishTimeStart;
     private Date establishTimeEnd;
+    private String keyword;
 }

src/main/java/cn/chinaunicom/omniFlowNetCompute/service/FreemarketService.java

@@ -9,7 +9,7 @@ import java.util.List;
 public interface FreemarketService
 {
 
-    public List<Freemarket> listByCondition(Freemarket param) ;
+    List<Freemarket> listByCondition(Freemarket param) ;
 
 
     /**

src/main/resources/mapper/omni/FreemarketMapper.xml

@@ -127,25 +127,27 @@
             AND announcement_title LIKE CONCAT('%',#{announcementTitle},'%')
         </if>
         <!-- 项目编号 精准查询 -->
-        <if test="projectCode != null and projectCode != ''">
-            AND project_code = #{projectId}
-        </if>
-        <!-- 采购单位 模糊查询 -->
-        <if test="purchaseUnit != null and purchaseUnit != ''">
-            AND purchase_unit LIKE CONCAT('%',#{purchaseUnit},'%')
+        <if test="projectName != null and projectName != ''">
+            AND project_name = #{projectName}
         </if>
         <!-- 是否相关 精准查询 -->
         <if test="isRelevant != null">
             AND is_relevant = #{isRelevant}
         </if>
-        <!-- 客户群 精准查询 -->
-        <if test="customerGroup != null and customerGroup != ''">
-            AND customer_group = #{customerGroup}
+        <!-- 分公司 -->
+        <if test="branchCompany != null and branchCompany != ''">
+            AND branch_company = #{branchCompany}
         </if>
         <!-- 是否参与 精准查询 -->
         <if test="isParticipate != null">
             AND is_participate = #{isParticipate}
         </if>
+        <if test="category != null and category != '' ">
+            AND category = #{category}
+        </if>
+        <if test="category != null and category != '' ">
+            AND category = #{category}
+        </if>
         <!-- 排序：按创建时间倒序，最新的在前面 -->
         ORDER BY create_time DESC
     </select>

src/main/resources/mapper/omni/OpportunityMapper.xml

@@ -112,6 +112,11 @@
             <if test="establishTimeStart != null or establishTimeEnd != null">
                 AND establish_time BETWEEN #{establishTimeStart} AND #{establishTimeEnd}
             </if>
+            <if test="keyword != null and keyword != ''">
+                AND (opportunity_name LIKE CONCAT('%', #{keyword}, '%') OR opportunity_code LIKE CONCAT('%', #{keyword}, '%'))
+               
+            </if>
+            
         </where>
     </select>