Merge remote-tracking branch 'origin/develop' into release_temp

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/issue/IssueProjectCategoryDictDTO.java

@@ -116,6 +116,6 @@ public class IssueProjectCategoryDictDTO implements Serializable {
     /**
      * 颜色
      */
-	private String colour;
+	private String color;
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/issue/IssueProjectCategoryDictEntity.java

@@ -83,6 +83,6 @@ public class IssueProjectCategoryDictEntity extends BaseEpmetEntity {
 	/**
 	 * 颜色
 	 */
-	private String colour;
+	private String color;
 
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java

@@ -117,6 +117,8 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
             }
             if(StringUtils.isBlank(item.getSatisfaction())){
                 item.setSatisfaction(StrConstant.HYPHEN);
+            }else{
+                item.setSatisfaction(new BigDecimal(item.getSatisfaction()).setScale(2,BigDecimal.ROUND_HALF_UP).toString());
             }
         });
         PageInfo<IcPartyUnitDTO> pageInfo = new PageInfo<>(dtoList);

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/CategoryListResultDTO.java

@@ -30,7 +30,7 @@ public class CategoryListResultDTO implements Serializable {
     /**
      * 颜色
      */
-    private String colour;
+    private String color;
 
     /**
      * 1级分类长度
@@ -42,6 +42,6 @@ public class CategoryListResultDTO implements Serializable {
         this.categoryName = "";
         this.count = NumConstant.ZERO;
         this.codeLength = NumConstant.ZERO;
-        this.colour = "";
+        this.color = "";
     }
 }

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzLeftPieChartResultDTO.java

@@ -35,12 +35,12 @@ public class ResiBuzzLeftPieChartResultDTO implements Serializable {
     /**
      * 颜色
      */
-    private String colour;
+    private String color;
 
     public ResiBuzzLeftPieChartResultDTO() {
         this.count = NumConstant.ZERO;
         this.categoryCode = "";
         this.categoryName = "";
-        this.colour = "";
+        this.color = "";
     }
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectCategoryDictEntity.java

@@ -86,6 +86,6 @@ public class IssueProjectCategoryDictEntity extends BaseEpmetEntity {
 	/**
 	 * 颜色
 	 */
-	private String colour;
+	private String color;
 
 }

epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.15__add_colour.sql

@@ -1,87 +1,87 @@
-alter table issue_project_category_dict add column `COLOUR` VARCHAR(20) COMMENT '颜色' AFTER `SORT`;
+alter table issue_project_category_dict add column `COLOR` VARCHAR(20) COMMENT '颜色' AFTER `SORT`;
 
 
 
 UPDATE issue_project_category_dict
-SET colour = '#ffba00'
+SET color = '#ffba00'
 WHERE DEL_FLAG = '0'
   AND CATEGORY_TYPE = '1'
   AND CATEGORY_NAME = '市场监管';
 
 UPDATE issue_project_category_dict
-SET colour = '#ffd074'
+SET color = '#ffd074'
 WHERE DEL_FLAG = '0'
   AND CATEGORY_TYPE = '1'
   AND CATEGORY_NAME = '卫生计生监督执法';
 
 UPDATE issue_project_category_dict
-SET colour = '#42cd05'
+SET color = '#42cd05'
 WHERE DEL_FLAG = '0'
   AND CATEGORY_TYPE = '1'
   AND CATEGORY_NAME = '建设管理';
 
 UPDATE issue_project_category_dict
-SET colour = '#16d783'
+SET color = '#16d783'
 WHERE DEL_FLAG = '0'
   AND CATEGORY_TYPE = '1'
   AND CATEGORY_NAME = '文化执法';
 
 UPDATE issue_project_category_dict
-SET colour = '#00e5ed'
+SET color = '#00e5ed'
 WHERE DEL_FLAG = '0'
   AND CATEGORY_TYPE = '1'
   AND CATEGORY_NAME = '民政';
 
 UPDATE issue_project_category_dict
-SET colour = '#0091ed'
+SET color = '#0091ed'
 WHERE DEL_FLAG = '0'
   AND CATEGORY_TYPE = '1'
   AND CATEGORY_NAME = '其他';
 
 UPDATE issue_project_category_dict
-SET colour = '#1b51ff'
+SET color = '#1b51ff'
 WHERE DEL_FLAG = '0'
   AND CATEGORY_TYPE = '1'
   AND CATEGORY_NAME = '城市管理';
 
 UPDATE issue_project_category_dict
-SET colour = '#1641cc'
+SET color = '#1641cc'
 WHERE DEL_FLAG = '0'
   AND CATEGORY_TYPE = '1'
   AND CATEGORY_NAME = '公安交通管理';
 
 UPDATE issue_project_category_dict
-SET colour = '#2a00ff'
+SET color = '#2a00ff'
 WHERE DEL_FLAG = '0'
   AND CATEGORY_TYPE = '1'
   AND CATEGORY_NAME = '消防安全';
 
 UPDATE issue_project_category_dict
-SET colour = '#7800ff'
+SET color = '#7800ff'
 WHERE DEL_FLAG = '0'
   AND CATEGORY_TYPE = '1'
   AND CATEGORY_NAME = '创卫复审类';
 
 UPDATE issue_project_category_dict
-SET colour = '#c600ff'
+SET color = '#c600ff'
 WHERE DEL_FLAG = '0'
   AND CATEGORY_TYPE = '1'
   AND CATEGORY_NAME = '环境保护';
 
 UPDATE issue_project_category_dict
-SET colour = '#ff00d2'
+SET color = '#ff00d2'
 WHERE DEL_FLAG = '0'
   AND CATEGORY_TYPE = '1'
   AND CATEGORY_NAME = '安全监管';
 
 UPDATE issue_project_category_dict
-SET colour = '#ff2a00'
+SET color = '#ff2a00'
 WHERE DEL_FLAG = '0'
   AND CATEGORY_TYPE = '1'
   AND CATEGORY_NAME = '社会治安综治';
 
 UPDATE issue_project_category_dict
-SET colour = '#ff7800'
+SET color = '#ff7800'
 WHERE DEL_FLAG = '0'
   AND CATEGORY_TYPE = '1'
   AND CATEGORY_NAME = '食品药品监管';

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml

@@ -637,12 +637,12 @@
 
     <!-- 查询居民热议左侧饼图 -->
     <select id="resiBuzzLeftPieChart" resultType="com.epmet.dto.result.ResiBuzzLeftPieChartResultDTO">
-        SELECT COUNT(issueId) AS count,categoryCode,categoryName,colour FROM
+        SELECT COUNT(issueId) AS count,categoryCode,categoryName,color FROM
             (SELECT
                 i.ID AS issueId,
                 IFNULL(LEFT(ic.CATEGORY_CODE,#{length}),'') AS categoryCode,
                 IFNULL(cd.CATEGORY_NAME,'其他') AS categoryName,
-                IFNULL(cd.colour,'#0091ed') AS colour
+                IFNULL(cd.color,'#0091ed') AS color
             FROM issue i
             LEFT JOIN issue_vote_statistical s ON (s.ISSUE_ID = i.ID AND s.DEL_FLAG = '0')
             LEFT JOIN issue_category ic ON (ic.ISSUE_ID = i.ID AND ic.DEL_FLAG = '0' AND ic.CUSTOMER_ID = i.CUSTOMER_ID)

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml

@@ -251,7 +251,7 @@
             CATEGORY_CODE,
             CATEGORY_NAME,
             LENGTH(CATEGORY_CODE) AS codeLength,
-            IFNULL(colour,'') AS colour
+            IFNULL(color,'') AS colour
         FROM issue_project_category_dict
         WHERE DEL_FLAG = 0
           AND CUSTOMER_ID = #{customerId}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyTreeResultDTO.java

@@ -26,6 +26,10 @@ public class AgencyTreeResultDTO implements Serializable {
     private String pid;
 
     private String level;
+    //经度【没值则取跟客户的值】
+    private String longitude;
+    //维度【没值则取跟客户的值】
+    private String latitude;
     /**
      * 下级机关组织
      */

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtGridResultDTO.java

@@ -28,4 +28,8 @@ public class ExtGridResultDTO implements Serializable {
      * 当前gridId所属的客户id add02.03
      * */
     private String customerId;
+    //经度【没值则取跟客户的值】
+    private String longitude;
+    //维度【没值则取跟客户的值】
+    private String latitude;
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtStaffPermissionResultDTO.java

@@ -50,4 +50,8 @@ public class ExtStaffPermissionResultDTO implements Serializable {
      * 当前agencyId所属的客户id add02.03
      * */
     private String customerId;
+    //经度【没值则取跟客户的值】
+    private String longitude;
+    //维度【没值则取跟客户的值】
+    private String latitude;
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java

@@ -1119,6 +1119,8 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         result.setAgencyName(rootAgency.getAgencyName());
         result.setAgencyId(rootAgency.getAgencyId());
         result.setLevel(rootAgency.getLevel());
+        result.setLongitude(rootAgency.getLongitude());
+        result.setLatitude(rootAgency.getLatitude());
         ExtStaffPermissionResultDTO res = baseDao.selectAgencyById(rootAgency.getAgencyId());
         convert2AgencyTreeResult(result,res.getSubAgencyList(),res.getGridList());
         return result;
@@ -1137,6 +1139,8 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
                 resultDTO.setAgencyName(agency.getAgencyName());
                 resultDTO.setPid(root.getAgencyId());
                 resultDTO.setLevel(agency.getLevel());
+                resultDTO.setLongitude(agency.getLongitude());
+                resultDTO.setLatitude(agency.getLatitude());
 
                 if (root.getSubAgencyList() == null) {
                     root.setSubAgencyList(new ArrayList<>());
@@ -1153,6 +1157,8 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
                 grid.setPid(root.getAgencyId());
                 grid.setLevel("grid");
                 grid.setSubAgencyList(null);
+                grid.setLongitude(o.getLongitude());
+                grid.setLatitude(o.getLatitude());
                 if (root.getSubAgencyList() == null) {
                     root.setSubAgencyList(new ArrayList<>());
                 }

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml

@@ -275,11 +275,15 @@
         <id column="agencyId" property="agencyId" />
         <result column="agencyName" property="agencyName"/>
         <result column="level" property="level" />
+        <result column="longitude" property="longitude" />
+        <result column="latitude" property="latitude" />
         <result column="customerId" property="customerId"/>
         <collection property="gridList" column="agencyId" ofType="com.epmet.dto.result.ExtGridResultDTO" select="selectGridList">
             <id column="gridId" property="gridId" />
             <result column="gridName" property="gridName" />
             <result column="customerId" property="customerId"/>
+            <result column="longitude" property="longitude" />
+            <result column="latitude" property="latitude" />
         </collection>
 
         <collection property="departmentList" column="agencyId" ofType="com.epmet.dto.result.ExtDeptResultDTO" select="selectDeptList">
@@ -310,7 +314,23 @@
             agency.ID AS agencyId,
             agency.ORGANIZATION_NAME AS agencyName,
             agency.LEVEL AS level,
-            agency.CUSTOMER_ID as customerId
+            agency.CUSTOMER_ID as customerId,
+            ( CASE WHEN agency.longitude is null THEN
+                ( SELECT longitude FROM customer_agency
+                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = agency.id)
+                    ORDER BY pid ASC LIMIT 1
+                )
+                ELSE agency.longitude
+                END
+            ) longitude,
+            ( CASE WHEN agency.latitude is null THEN
+                ( SELECT latitude FROM customer_agency
+                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = agency.id)
+                    ORDER BY pid ASC LIMIT 1
+                )
+                ELSE agency.latitude
+                END
+            ) latitude
         FROM
             CUSTOMER_AGENCY agency
         WHERE
@@ -334,9 +354,26 @@
         SELECT
             cg.id AS gridId,
             cg.GRID_NAME AS gridName,
-            cg.CUSTOMER_ID AS customerId
+            cg.CUSTOMER_ID AS customerId,
+            ( CASE WHEN ca.longitude is null THEN
+                ( SELECT longitude FROM customer_agency
+                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id)
+                    ORDER BY pid ASC LIMIT 1
+                )
+                ELSE ca.longitude
+                END
+            ) longitude,
+            ( CASE WHEN ca.latitude is null THEN
+                ( SELECT latitude FROM customer_agency
+                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id)
+                    ORDER BY pid ASC LIMIT 1
+                )
+                ELSE ca.latitude
+                END
+            ) latitude
         FROM
             customer_grid cg
+        INNER JOIN customer_agency ca ON cg.PID = ca.ID
         WHERE
             cg.DEL_FLAG = '0'
             AND cg.PID =#{agencyId}
@@ -347,7 +384,23 @@
             agency.ID AS agencyId,
             agency.ORGANIZATION_NAME AS agencyName,
             agency.LEVEL AS level,
-            agency.CUSTOMER_ID as customerId
+            agency.CUSTOMER_ID as customerId,
+            ( CASE WHEN agency.longitude is null THEN
+                ( SELECT longitude FROM customer_agency
+                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = agency.id)
+                    ORDER BY pid ASC LIMIT 1
+                )
+                ELSE agency.longitude
+                END
+            ) longitude,
+            ( CASE WHEN agency.latitude is null THEN
+                ( SELECT latitude FROM customer_agency
+                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = agency.id)
+                    ORDER BY pid ASC LIMIT 1
+                )
+                ELSE agency.latitude
+                END
+            ) latitude
         FROM
             CUSTOMER_AGENCY agency
         WHERE