Merge remote-tracking branch 'origin/dev' into dev

src/main/java/platform/modules/government/dao/ProjectDeclarationDao.java

@@ -24,7 +24,8 @@ public interface ProjectDeclarationDao extends BaseMapper<ProjectDeclaration> {
 	int findProjectsCountOnHome(@Param("request") FindRequest request);
 
 	List<ProjectDeclaration> findProjectsOnHome(@Param("request") FindRequest request);
-	
-	List<ProjectDeclaration> findUnionProjectsOnHome(@Param("request") FindRequest request);
+
+    List<ProjectDeclaration> findUnionProjectsOnHome(@Param("request") FindRequest request);
+    List<ProjectDeclaration> findUnionProjectsOnHomeV2(@Param("request") FindRequest request);
 
 }

src/main/java/platform/modules/government/service/ProjectDeclarationService.java

@@ -2271,7 +2271,9 @@ public class ProjectDeclarationService extends BaseService<ProjectDeclaration> {
         if (request.getId() == 77) {
             contents = projectFillingService.findUnionProjectsOnHome(request);
         } else {//项目申报、省市申报
-            contents = projectDeclarationDao.findUnionProjectsOnHome(request);
+            // 解决项目申报 国家和高新区不能区分问题
+//            contents = projectDeclarationDao.findUnionProjectsOnHome(request);
+            contents = projectDeclarationDao.findUnionProjectsOnHomeV2(request);
         }
         if (contents.size() > 0) {
             for (ProjectDeclaration project : contents) {

src/main/java/platform/modules/home/HomeController.java

@@ -1285,6 +1285,8 @@ public class HomeController extends BaseController {
                     }
                 }
             }
+
+            // todo 创建多个用户可以通过这里去改进
             User user = new User();
             user.setUser_name(information.getUser_name());
             user.setNick_name(information.getNick_name().trim());

src/main/resources/application.yml

@@ -166,7 +166,7 @@ spring:
     password: ${password}
   #redis
   redis:
-    host: 192.168.1.116
+    host: 127.0.0.1
     password:
     port: 6379
     pool:

src/main/resources/mapper/carrier/BuildingDao.xml

@@ -4,7 +4,7 @@
 
     <select id="getParkBuildings" resultType="platform.modules.carrier.entity.Building">
         select * from ic_building
-        where del_flag = 0 and is_use = 1
+        where del_flag = 0
         <if test="condition.parkId != null and condition.parkId !=''">
             and park_id = #{condition.parkId}
         </if>

src/main/resources/mapper/government/ProjectDeclarationDao.xml

@@ -135,6 +135,43 @@
         </if>
 
     </select>
+
+    <select id="findUnionProjectsOnHomeV2" resultType="platform.modules.government.entity.ProjectDeclaration">
+            select * from
+            (
+            SELECT
+            a.id,a.project_name,a.create_time,a.project_source,a.apply_enddate,0 as isFilling,a.project_content AS
+            content
+            FROM project_declaration a
+            where
+            a.del_flag=0
+            and a.is_open = 1
+            and a.status = 1
+            UNION
+            select
+            b.id ,b.project_name,b.create_time,b.project_source,b.end_time AS apply_enddate,3 as isFilling,b.content
+            from project_intelligent_declaration b
+            where b.del_flag = 0 and b.status=1
+            union
+            select
+            c.id ,c.project_name,c.create_time,c.project_source,c.end_time AS apply_enddate,1 as isFilling,c.content
+            from project_provinces_declaration c
+            where c.del_flag = 0 and c.status=1
+            AND c.is_public = 1
+            ) temp
+            where 1=1
+            <if test="request.type != null and request.type != ''">
+                and temp.project_source = #{request.type}
+            </if>
+            <if test="request.startTime !='' and request.startTime !=null ">
+                and temp.create_time <![CDATA[>=]]> #{request.startTime}
+            </if>
+            <if test="request.endTime !='' and request.endTime !=null ">
+                and temp.create_time <![CDATA[<=]]> #{request.endTime}
+            </if>
+            order by temp.create_time desc
+    </select>
+
     <select id="findProjectsOnHome" resultType="platform.modules.government.entity.ProjectDeclaration">
         SELECT
         a.project_name,a.id,a.create_time,a.project_source,a.apply_enddate

src/main/resources/static/js/company/project_provinces/apply_add.js

@@ -147,7 +147,7 @@ function submit() {
                             parent.location.reload();
                             parent.layer.close(index);
                         } else {
-                            window.location.href = pagePath + "/home/informList/69";
+                            window.location.href = pagePath+"/index/#/projectList";
                             //history.back(-2);
                         }
                         return true;

src/main/resources/templates/admin/company/projectProvinces/apply_add.html

@@ -335,7 +335,7 @@
         	parent.layer.close(index);
         }else{
         	//返回门户申报页面
-        	window.location.href = pagePath+"/home/informList/69";
+        	window.location.href = pagePath+"/index/#/projectList";
         	//history.back(-2);
         }
     }