From 080e3168061e4a90b9c66cd6e58d7ec4b4171533 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 29 Feb 2024 13:26:47 +0800
Subject: [PATCH] bug 修复

---
 src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java |    2 +-
 src/main/java/org/springblade/modules/task/entity/TaskReportForRepairsEntity.java            |    6 ++++++
 src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml                           |    4 ++--
 src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml             |   19 +++++--------------
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
index 31938d0..d1f27b3 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -743,13 +743,13 @@
 
     <!--比对两点间的距离是否在1km 范围内 (和采集的位置对比)-->
     <select id="comparisonPositionNotHouseCode" resultType="java.lang.Boolean">
-        select (
+        select IFNULL((
             ACOS(
             SIN(
             ( #{place.y} * 3.1415 )/ 180 ) * SIN(( #{place.lat} * 3.1415 )/ 180 )
              + COS(( #{place.y} * 3.1415 )/ 180 ) * COS(( #{place.lat} * 3.1415 )/ 180 ) * COS(( #{place.x} * 3.1415 )/ 180
              - ( #{place.lng} * 3.1415 )/ 180 ))* 6370.996
-        ) &lt;= 1
+        ),2) &lt;= 1
     </select>
 
 
diff --git a/src/main/java/org/springblade/modules/task/entity/TaskReportForRepairsEntity.java b/src/main/java/org/springblade/modules/task/entity/TaskReportForRepairsEntity.java
index fb5b27a..8775ed7 100644
--- a/src/main/java/org/springblade/modules/task/entity/TaskReportForRepairsEntity.java
+++ b/src/main/java/org/springblade/modules/task/entity/TaskReportForRepairsEntity.java
@@ -125,4 +125,10 @@
 	 */
 	@ApiModelProperty(value = "临时用  1：已查看  2：未查看")
 	private Integer viewType;
+
+	/**
+	 * 1：房屋 2：场所
+	 */
+	@ApiModelProperty(value = "1：房屋 2：场所")
+	private Integer houseFlag;
 }
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
index 65b29b2..3537c8e 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
@@ -41,6 +41,7 @@
         <result property="lat" column="lat"/>
         <result property="address" column="address"/>
         <result property="viewType" column="view_type"/>
+        <result property="houseFlag" column="house_flag"/>
 
 
         <collection property="taskRepairStepList" column="id" select="selectTaskRepairStepList"
@@ -122,7 +123,8 @@
                lng,
                lat,
                address,
-               view_type
+               view_type,
+               house_flag
         from jczz_task_report_for_repairs
     </sql>
 
@@ -152,6 +154,7 @@
         jtrfr.lat,
         jtrfr.address,
         jtrfr.view_type,
+        jtrfr.house_flag,
         br.town_name streetName,
         jg.grid_name,
         jda.aoi_name,
@@ -311,19 +314,7 @@
         <if test="houseCode != null and houseCode != ''">
             and jtrfr.address_code = #{houseCode}
         </if>
-        <if test="isAdministrator==2">
-            <choose>
-                <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
-                    and jda.nei_code in
-                    <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
-                        #{code}
-                    </foreach>
-                </when>
-                <otherwise>
-                    and jda.nei_code in ('')
-                </otherwise>
-            </choose>
-        </if>
+
     </select>
 
 
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
index 80e0a26..5cd4855 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
@@ -84,7 +84,7 @@
 		taskReportForRepairs.setConfirmUserId(AuthUtil.getUserId());
 		List<String> addressCodeList = new ArrayList<>();
 		if (null != taskReportForRepairs.getRoleName() && !taskReportForRepairs.getRoleName().equals("")) {
-			 if (taskReportForRepairs.getRoleName().equals("居民")) {
+			 if (taskReportForRepairs.getRoleName().equals("inhabitant")) {
 				taskReportForRepairs.setCreateUser(AuthUtil.getUserId());
 				taskReportForRepairs.setConfirmUserId(null);
 				//

--
Gitblit v1.9.3