Merge branch 'dev_plugins' into dev_temp

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FunctionCustomizedDetailResultDTO.java

@@ -32,7 +32,7 @@ public class FunctionCustomizedDetailResultDTO implements Serializable {
     /**
      * 默认名称
      */
-    private String customizedName;
+    private String functionName;
 
     /**
      * 默认大图标
@@ -58,4 +58,9 @@ public class FunctionCustomizedDetailResultDTO implements Serializable {
      * 来源app(工作端:gov、居民端:resi)
      */
     private String fromApp;
+
+    /**
+     * 是否有客户在使用(0:否 1:是)
+     */
+    private Integer isApply;
 }

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionCustomizedServiceImpl.java

@@ -144,7 +144,17 @@ public class FunctionCustomizedServiceImpl extends BaseServiceImpl<FunctionCusto
 
     @Override
     public Result<FunctionCustomizedDetailResultDTO> getFunctionCustomized(CommonFunctionIdFormDTO formDTO) {
+        //1.查询定制功能详情信息
         FunctionCustomizedDetailResultDTO resultDTO = baseDao.getFunctionCustomizedByFunctionId(formDTO);
+
+        //2.查询是否有客户在使用当前定制功能
+        CustomerFunctionDetailEntity entity = customerFunctionDetailService.selectById(formDTO.getFunctionId());
+        if (null == entity || null == entity.getFunctionId()) {
+            resultDTO.setIsApply(NumConstant.ZERO);
+        } else {
+            resultDTO.setIsApply(NumConstant.ONE);
+        }
+
         return new Result<FunctionCustomizedDetailResultDTO>().ok(resultDTO);
     }
 

epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.5__add_del_flag.sql

@@ -1 +1,6 @@
 ALTER TABLE function_shopping_history ADD ( DEL_FLAG INT ( 11 ) NOT NULL COMMENT '删除标识(0.未删除 1.已删除)');
+
+
+ALTER TABLE `customer_function_detail`
+MODIFY COLUMN `DOMAIN_NAME`  varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '自定义业务域名(可设置多个 用分号分隔)' AFTER `ICON_SMALL_IMG`;
+

epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/FunctionCustomizedDao.xml

@@ -9,7 +9,7 @@
             cu.FUNCTION_ID functionId,
             f.SHOPPING_STATUS shoppingStatus,
             f.FUNCTION_EXPLAIN functionExplain,
-            cu.CUSTOMIZED_NAME customizedName,
+            cu.CUSTOMIZED_NAME functionName,
             cu.ICON_LARGE_IMG iconLargeImg,
             cu.ICON_SMALL_IMG iconSmallImg,
             cu.TARGET_LINK targetLink,
@@ -113,6 +113,7 @@
         WHERE
             fc.DEL_FLAG = '0'
         AND f.DEL_FLAG = '0'
+        AND f.shopping_status = '1'  <!-- 只查询客户上架状态的 -->
         <foreach collection="functionIds" item="functionId" index="index" open="AND ( " separator=" AND " close=")">
             fc.FUNCTION_ID != #{functionId}
         </foreach>