Sfoglia il codice sorgente

**********************************wx*************************
资产和竖井的关系

weixinVSjinlai 4 anni fa
parent
commit
f167d13da3

+ 3 - 4
datacenter/src/main/kotlin/com/persagy/server/mappers/IRelationExcelExportMapper.kt

@@ -261,10 +261,9 @@ interface IRelationExcelExportMapper {
      * @param   type            关系类型
      * @return  关系记录
      */
-    @Select("SELECT r.pe_id AS id, pe.name, pe.local_id, pe.local_name, '资产' AS object_type,\n" +
-            "       r.sh_id AS _id, sh.name AS _name, sh.local_id AS _local_id, sh.local_name AS _local_name, '竖井' AS _object_type\n" +
-            "FROM relationship.r_pe2sh r JOIN property AS pe ON r.pe_id = pe.id JOIN shaft AS sh ON r.sh_id = sh.id\n" +
-            "WHERE r.project_id = #{projectId} AND r.type = #{type}")
+    @Select("SELECT r.equip_id AS id, pe.name, pe.local_id, pe.local_name, '资产' AS object_type,r.shaft_id AS _id," +
+            " sh.name AS _name, sh.local_id AS _local_id, sh.local_name AS _local_name, '竖井' AS _object_type FROM" +
+            " r_pe_in_sh r JOIN property AS pe ON r.equip_id = pe.id JOIN shaft AS sh ON r.shaft_id = sh.id WHERE r.project_id = #{projectId}")
     fun pe2sh(projectId: String, type: String): List<HashMap<String, Any?>>
 
     /**

+ 3 - 0
datacenter/src/main/kotlin/com/persagy/server/services/relation_calc/RelationCalcService.kt

@@ -417,7 +417,10 @@ open class RelationCalcService {
                     val entity = RUpDateEquipAndSapceService.relationTypeProjectservice.select(SFilter.eq("projectId", projectId), SFilter.eq("relationTypeCode", "Fl2Fl")).entity()
                     if (entity != null) {
                         entity.computationalState = 1
+                        entity.computingTime = IdUtils.time()
                         RUpDateEquipAndSapceService.relationTypeProjectservice.update(entity)
+                    }else{
+                        upDateBiaoji(projectId, "fl2fl", 5)
                     }
                 } catch (e: Exception) {
                     e.printStackTrace()