指标修改

gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabIndexDescMapper.java

@@ -64,4 +64,6 @@ public interface TabIndexDescMapper {
     List<TabIndexDesc> listAllUnRel(@Param("ids") List<Integer> relIndexDescIdList);
 
     List<TabIndexDesc> listByIds(@Param("ids") List<Integer> indexDescIdList);
+
+    TabIndexDesc getIndexDescByIndexCode(@Param("moduleId") String moduleId, @Param("indexCode") String indexCode);
 }
\ No newline at end of file

gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabIndexModuleRelMapper.java

@@ -62,7 +62,7 @@ public interface TabIndexModuleRelMapper {
 
     List<String> listModuleIdByBusinessId(@Param("businessId") Integer businessId, @Param("type") Integer type);
 
-    List<Integer> listBusinessIdByModuleId(@Param("moduleId") String moduleId);
+    List<Integer> listBusinessIdByModuleId(@Param("moduleId") String moduleId, @Param("type") Integer type);
 
     List<Integer> listBusinessIdByModuleIds(@Param("ids") List<String> moduleIdList);
 

gic-data-cloud-service/src/main/java/com/gic/cloud/service/IndexDescService.java

@@ -26,4 +26,6 @@ public interface IndexDescService {
     List<TabIndexDesc> listAllUnRel(List<Integer> indexDescIdList);
 
     List<TabIndexDesc> listByIds(List<Integer> indexDescIdList);
+
+    TabIndexDesc getIndexDesc(String moduleId, String indexCode);
 }

gic-data-cloud-service/src/main/java/com/gic/cloud/service/IndexModuleRelService.java

@@ -13,7 +13,7 @@ public interface IndexModuleRelService {
 
     List<String> listModuleIdByBusinessId(Integer indexId, Integer type);
 
-    List<Integer> listBusinessIdByModuleId(String moduleId);
+    List<Integer> listBusinessIdByModuleId(String moduleId, Integer type);
 
     List<Integer> listBusinessIdByModuleIds(List<String> moduleIdList);
 

gic-data-cloud-service/src/main/java/com/gic/cloud/service/impl/IndexDescServiceImpl.java

@@ -61,4 +61,9 @@ public class IndexDescServiceImpl implements IndexDescService {
     public List<TabIndexDesc> listByIds(List<Integer> indexDescIdList) {
         return tabIndexDescMapper.listByIds(indexDescIdList);
     }
+
+    @Override
+    public TabIndexDesc getIndexDesc(String moduleId, String indexCode) {
+        return tabIndexDescMapper.getIndexDescByIndexCode(moduleId, indexCode);
+    }
 }

gic-data-cloud-service/src/main/java/com/gic/cloud/service/impl/IndexModuleRelServiceImpl.java

@@ -48,8 +48,8 @@ public class IndexModuleRelServiceImpl implements IndexModuleRelService {
     }
 
     @Override
-    public List<Integer> listBusinessIdByModuleId(String moduleId) {
-        return tabIndexModuleRelMapper.listBusinessIdByModuleId(moduleId);
+    public List<Integer> listBusinessIdByModuleId(String moduleId, Integer type) {
+        return tabIndexModuleRelMapper.listBusinessIdByModuleId(moduleId, type);
     }
 
     @Override

gic-data-cloud-service/src/main/java/com/gic/cloud/service/outer/impl/IndexDescApiServiceImpl.java

@@ -72,8 +72,16 @@ public class IndexDescApiServiceImpl implements IndexDescApiService {
 
     @Override
     public ServiceResponse<IndexDTO> getIndexDesc(Integer enterpriseId, String moduleId, String indexGroupName, String indexCode) {
-        TabIndex index = indexService.getByIndexCode(moduleId, indexCode);
-        return EnterpriseServiceResponse.success(EntityUtil.changeEntityByJSON(IndexDTO.class, index));
+//        TabIndex index = indexService.getByIndexCode(moduleId, indexCode);
+        TabIndexDesc indexDesc = indexDescService.getIndexDesc(moduleId, indexCode);
+        List<Integer> list = indexModuleRelService.listBusinessIdByModuleId(indexDesc.getIndexDescId().toString(), LogAndUpdateTipsTypeEnum.INDEX.getCode());
+        if (CollectionUtils.isNotEmpty(list)) {
+            Integer indexId = list.get(0);
+            TabIndex index = this.indexService.getByIndexId(indexId);
+            return EnterpriseServiceResponse.success(EntityUtil.changeEntityByJSON(IndexDTO.class, index));
+        } else {
+            return EnterpriseServiceResponse.success();
+        }
     }
 
     @Override

gic-data-cloud-service/src/main/resources/mapper/TabIndexDescMapper.xml

@@ -226,4 +226,9 @@
       </foreach>
     </if>
   </select>
+  <select id="getIndexDescByIndexCode" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from tab_index_desc where status = 1 and module_id = #{moduleId} and index_code = #{indexCode}
+  </select>
 </mapper>
\ No newline at end of file

gic-data-cloud-service/src/main/resources/mapper/TabIndexModuleRelMapper.xml

@@ -166,7 +166,7 @@
     select
     business_id
     from tab_index_module_rel
-    where status = 1 and module_id = #{moduleId}
+    where status = 1 and module_id = #{moduleId} and type = #{type}
   </select>
   <select id="listBusinessIdByModuleIds" resultType="int">
     select