单位关联建筑功能开发

zfjg-api/zfjg-api-manage/src/main/java/com/zfjg/manage/api/dto/other/ArchitectureDTO.java

@@ -40,8 +40,12 @@ public class ArchitectureDTO {
     private String buildEra;
     @ApiModelProperty("区id")
     private Long regionId;
+    @ApiModelProperty("区名称")
+    private String regionName;
     @ApiModelProperty("街道id")
     private Long streetId;
+    @ApiModelProperty("街道名称")
+    private String streetName;
     @ApiModelProperty("详细地址")
     private String address;
 

zfjg-modules/zfjg-manage/src/main/resources/mapper/other/EnforceObjArchitectureRelateMapper.xml

@@ -14,7 +14,8 @@
         INNER JOIN enforce_obj eo ON eoarh.enforce_obj_id = eo.id
         LEFT JOIN enforce_job ej ON ej.enforce_obj_id = eo.id
         where eo.is_deleted = 0
-            <if test="pm.architectureUuid  != null  and pm.architectureUuid != ''">
+              and ej.job_type in ('NORMAL','SPECIAL','REPORT','REVIEW','BRIGADE','OTHER')
+        <if test="pm.architectureUuid  != null  and pm.architectureUuid != ''">
                 and eoarh.after_architecture_uuid = #{pm.architectureUuid}
             </if>
             <if test="pm.relateType  != null">