单位关联建筑功能开发

sql/zfjq_2024122701.sql

@@ -2,12 +2,3 @@ ALTER TABLE enforce_obj_architecture_relate ADD `architecture_name` varchar(512)
 ALTER TABLE enforce_obj_architecture_relate_his ADD `before_architecture_name` varchar(512) DEFAULT NULL COMMENT '更正前建筑名称';
 ALTER TABLE enforce_obj_architecture_relate_his ADD `after_architecture_name` varchar(512) DEFAULT NULL COMMENT '更正后建筑名称';
 ALTER TABLE w_report ADD `clue_resource` varchar(50) DEFAULT NULL COMMENT '线索来源（SUPERVISE-内部执法监督,REPORT-举报投诉,RECONSIDERATION-复议、诉讼，PATROL-上级巡察,SUPERVISION-上级督导，上级考评-EVALUATE,FIREINVESTIGATION-火灾事故调查,OTHER-其他工作中）';
-
-UPDATE enforce_obj_architecture_relate a
-SET a.architecture_name = ( SELECT architecture_name FROM remote.public_architecture WHERE id = a.architecture_id );
-
-UPDATE enforce_obj_architecture_relate_his a
-SET a.before_architecture_name = ( SELECT architecture_name FROM remote.public_architecture WHERE id = a.before_architecture_id );
-
-UPDATE enforce_obj_architecture_relate_his a
-SET a.after_architecture_name = ( SELECT architecture_name FROM remote.public_architecture WHERE id = a.after_architecture_id );

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/controller/other/EnforceObjArchitectureRelateController.java

@@ -128,6 +128,12 @@ public class EnforceObjArchitectureRelateController extends BaseController {
     public R<List<EnforceObjArchitectureRelate>> getArchitecturelist(@PathVariable String enforceObjId) {
         List<EnforceObjArchitectureRelate> list = enforceObjArchitectureRelateService.list(new LambdaQueryWrapper<EnforceObjArchitectureRelate>()
                 .eq(EnforceObjArchitectureRelate::getEnforceObjId,enforceObjId).groupBy(EnforceObjArchitectureRelate::getRelateType));
+        list.forEach(e->{
+            ArchitectureDTO dto = architectureService.getArchitectureDTO(e.getArchitectureUuid());
+            if (dto != null) {
+                e.setArchitectureName(dto.getArchitectureName());
+            }
+        });
         return R.ok(list);
     }