完善门户网站的旅游项目列表接口和劳务项目接口的搜索项查询

application-webadmin/src/main/java/com/tourism/webadmin/WebAdminApplication.java

@@ -15,6 +15,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
  */
 @EnableAsync
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
+@MapperScan("com.tourism.webadmin.app.website.dao")
 //@MapperScan({"com.tourism.back.dao.mapper","com.tourism.upms.dao.mapper"})
 @ComponentScan("com.tourism")
 public class WebAdminApplication {

application-webadmin/src/main/java/com/tourism/webadmin/back/dao/mapper/JobProjectMapper.xml

@@ -123,7 +123,8 @@
             </if>
             <if test="jobProjectFilter.searchString != null and jobProjectFilter.searchString != ''">
                 <bind name = "safeJobProjectSearchString" value = "'%' + jobProjectFilter.searchString + '%'" />
-                AND IFNULL(tour_job_project.job_title,'') LIKE #{safeJobProjectSearchString}
+                AND (IFNULL(tour_job_project.job_title,'') LIKE #{safeJobProjectSearchString}
+                or IFNULL(tour_job_project.job_area,'') LIKE #{safeJobProjectSearchString})
             </if>
         </if>
     </sql>

application-webadmin/src/main/java/com/tourism/webadmin/back/dao/mapper/TourismProjectMapper.xml

@@ -84,7 +84,8 @@
             </if>
             <if test="tourismProjectFilter.searchString != null and tourismProjectFilter.searchString != ''">
                 <bind name = "safeTourismProjectSearchString" value = "'%' + tourismProjectFilter.searchString + '%'" />
-                AND IFNULL(tour_tourism_project.project_title,'') LIKE #{safeTourismProjectSearchString}
+                AND (IFNULL(tour_tourism_project.project_title,'') LIKE #{safeTourismProjectSearchString}
+                or IFNULL(tour_tourism_project.end_place,'') LIKE #{safeTourismProjectSearchString})
             </if>
             <if test="tourismProjectFilter.belongTab != null">
                 AND tour_tourism_project.belong_tab = #{tourismProjectFilter.belongTab}

application-webadmin/src/main/resources/application.yml

@@ -22,7 +22,7 @@ spring:
   application:
     name: application-webadmin
   profiles:
-    active: prod
+    active: dev
   servlet:
     multipart:
       max-file-size: 50MB
@@ -41,8 +41,8 @@ flowable:
   database-schema-update: false
 
 mybatis-plus:
-  mapper-locations: classpath:com/tourism/webadmin/*/dao/mapper/*Mapper.xml,com/tourism/common/log/dao/mapper/*Mapper.xml,com/tourism/common/mobile/dao/mapper/*Mapper.xml,com/tourism/common/online/dao/mapper/*Mapper.xml,com/tourism/common/flow/dao/mapper/*Mapper.xml,com/tourism/common/report/dao/mapper/*Mapper.xml
-  type-aliases-package: com.tourism.webadmin.*.model,com.tourism.common.log.model,com.tourism.common.mobile.model,com.tourism.common.online.model,com.tourism.common.flow.model,com.tourism.common.report.model
+  mapper-locations: classpath:com/tourism/webadmin/*/dao/mapper/*Mapper.xml,com/tourism/common/log/dao/mapper/*Mapper.xml,com/tourism/common/mobile/dao/mapper/*Mapper.xml,com/tourism/common/online/dao/mapper/*Mapper.xml,com/tourism/common/flow/dao/mapper/*Mapper.xml,com/tourism/common/report/dao/mapper/*Mapper.xml,com/tourism/webadmin/app/website/dao/mapper/*Mapper.xml
+  type-aliases-package: com.tourism.webadmin.*.model,com.tourism.common.log.model,com.tourism.common.mobile.model,com.tourism.common.online.model,com.tourism.common.flow.model,com.tourism.common.report.model,com.tourism.webadmin.app.website.model
   global-config:
     db-config:
       logic-delete-value: -1

application-webadmin/src/main/resources/logback-spring.xml

@@ -80,6 +80,10 @@ debug：当此属性设置为true时，将打印出logback内部日志信息，
         <appender-ref ref="console" />
         <appender-ref ref="file_log" />
     </logger>
+    <logger name="com.tourism.webadmin.app.website.dao" additivity="false" level="debug">
+        <appender-ref ref="console" />
+        <appender-ref ref="file_log" />
+    </logger>
     <logger name="com.tourism.webadmin.upms.dao" additivity="false" level="debug">
         <appender-ref ref="console" />
         <appender-ref ref="file_log" />

common/common-log/src/main/java/com/tourism/common/log/model/constant/SysOperationLogType.java

@@ -144,6 +144,10 @@ public final class SysOperationLogType {
      * 流程复活。
      */
     public static final int REVIVE_FLOW = 128;
+    /**
+     * 门户网站注册。
+     */
+    public static final int WEBSITE_Register = 129;
 
     /**
      * 私有构造函数，明确标识该常量类的作用。