修改安高告知页面返回数据，删除多余接口

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/InstallNoticePageDto.java

@@ -44,15 +44,24 @@ public class InstallNoticePageDto extends BaseDto {
     @ApiModelProperty(value = "安装负责人")
     private String installPri;
 
-    @ApiModelProperty(value = "监察部门")
+    @ApiModelProperty(value = "监察部门id")
     private String superviseDeptId;
 
-    @ApiModelProperty(value = "监察负责人")
+    @ApiModelProperty(value = "监察部门")
+    private String superviseDept;
+
+    @ApiModelProperty(value = "监察负责人id")
     private String chargerPersonId;
 
-    @ApiModelProperty(value = "监检机构")
+    @ApiModelProperty(value = "监察负责人")
+    private String chargerPerson;
+
+    @ApiModelProperty(value = "监检机构id")
     private String inspectionUnitId;
 
+    @ApiModelProperty(value = "监检机构")
+    private String inspectionUnit;
+
     @ApiModelProperty(value = "告知申请状态")
     private String noticeStatus;
 

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/mapper/InstallNoticeMapper.java

@@ -20,25 +20,14 @@ import java.util.List;
  * @date 2022-09-22
  */
 public interface InstallNoticeMapper extends BaseMapper<InstallNotice> {
-    //安装告知申请页面列表
-    List<InstallNoticePageDto> installNoticeList();
-    //筛选sequenceNbr查询安装告知申请页面数据
-    List<InstallNoticePageDto> selectByName(@Param("name") String name , @Param("unit") String unit);
-    //根据
-    InstallNoticePageDto selectById(@Param("sequenceNbr")Long sequenceNbr);
 
     //安装告知申请页面分页列表
     Page<InstallNoticePageDto> installNoticePage(IPage<InstallNoticePageDto> page,@RequestParam String name,@RequestParam String constructionUnit);
 
-    //根据project_id提交改变申请状态
-    void submit (Long sequenceNbr);
-
     //根据project_id查询一条数据
     InstallNoticeDto selectOneByPid(Long sequenceNbr );
 
     //根据sequenceNbr查询告知申请详情
     InstallNoticeDto selectoneById(@RequestParam("sequenceNbr")Long sequenceNbr );
 
-
-
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/service/IInstallNoticeService.java

@@ -12,12 +12,4 @@ import java.util.List;
  * @date 2022-09-22
  */
 public interface IInstallNoticeService {
-     //安装告知页面列表
-     List<InstallNoticePageDto>  installNoticeList();
-     //安装告知页面分页查询
-     List<InstallNoticePageDto> selectByName(@Param("name") String name ,@Param("unit") String unit);
-     //根据sequenceNbr查询列表数据
-     InstallNoticePageDto selectById(@Param("sequenceNbr")Long sequenceNbr);
-
-
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/InstallNoticeMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.ugp.api.mapper.InstallNoticeMapper">
-<!--    通过id查询页面数据-->
-    <select id="selectById" resultType="com.yeejoin.amos.boot.module.ugp.api.dto.InstallNoticePageDto">
-        SELECT 	tz_ugp_project.name,install_region,start_date,construction_unit,install_pri,charge_person,installation_unit,charge_person_id,
-                  notice_status,notice_date ,supervise_dept_id,info
-        FROM tz_ugp_install_notice, tz_ugp_project ,tz_ugp_supervise_rule ,tz_ugp_attachment
-        WHERE tz_ugp_install_notice.project_id=tz_ugp_project.sequence_nbr AND tz_ugp_supervise_rule.admin_region_code= tz_ugp_project.install_region_code
-          AND tz_ugp_attachment.source_id=tz_ugp_project.sequence_nbr
-          AND tz_ugp_project.sequence_nbr=#{sequenceNbr}
-    </select>
 
     <!--    查询安装告知申请页面-->
     <select id="installNoticePage" resultType="com.yeejoin.amos.boot.module.ugp.api.dto.InstallNoticePageDto">
-          SELECT tz_ugp_install_notice.sequence_nbr,tz_ugp_project.name,install_region,start_date,construction_unit,charge_person,installation_unit,install_pri,supervise_dept_id
-                ,charge_person_id,inspection_unit_id,notice_status,notice_date
-           FROM tz_ugp_install_notice, tz_ugp_project ,tz_ugp_supervise_rule ,tz_ugp_verify
-           WHERE tz_ugp_install_notice.project_id=tz_ugp_project.sequence_nbr
-             AND tz_ugp_install_notice.project_id=tz_ugp_verify.project_id
-             AND tz_ugp_supervise_rule.admin_region_code=tz_ugp_project.install_region_code
-             AND tz_ugp_project.name LIKE  '%${name}%' AND construction_unit LIKE '%${constructionUnit}%'
-
+        SELECT a.* ,u1.biz_org_name AS superviseDept,u2.biz_org_name AS chargerPerson,u3.biz_org_name AS inspectionUnit
+        FROM
+            (SELECT tz_ugp_install_notice.sequence_nbr,tz_ugp_project.name,install_region,start_date,construction_unit,charge_person,installation_unit,install_pri
+                  ,supervise_dept_id
+                  ,charger_person_id
+                  ,inspection_unit_id
+                  ,notice_status,notice_date
+             FROM tz_ugp_install_notice, tz_ugp_project ,tz_ugp_supervise_rule ,tz_ugp_verify
+             WHERE tz_ugp_install_notice.project_id=tz_ugp_project.sequence_nbr
+               AND tz_ugp_install_notice.project_id=tz_ugp_verify.project_id
+               AND tz_ugp_supervise_rule.admin_region_code=tz_ugp_project.install_region_code
+               AND tz_ugp_project.name LIKE  '%${name}%' AND construction_unit LIKE '%${constructionUnit}%') AS a
+                LEFT JOIN cb_org_usr AS u1 ON a.supervise_dept_id=u1.sequence_nbr
+                LEFT JOIN cb_org_usr AS u2 ON a.charger_person_id=u2.sequence_nbr
+                LEFT JOIN cb_org_usr AS u3 ON a.inspection_unit_id=u3.sequence_nbr
     </select>
 
-<!--    //根据project_id提交改变申请状态-->
-    <update id="submit">
-        update tz_ugp_install_notice
-        set notice_status='已提交'
-        where project_id=#{sequenceNbr}
-    </update>
-
 <!--    //根据project_id查询一条数据-->
     <select id="selectOneByPid" resultType="com.yeejoin.amos.boot.module.ugp.api.dto.InstallNoticeDto">
         SELECT*

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/InstallNoticeController.java

@@ -51,9 +51,6 @@ public class InstallNoticeController extends BaseController {
 	InstallNoticeServiceImpl installNoticeServiceImpl;
 
 	@Autowired
-	ProjectMapper projectMapper;
-
-	@Autowired
 	ProjectInitiationServiceImpl projectInitiationServiceImpl;
 
 	@Autowired
@@ -162,16 +159,6 @@ public class InstallNoticeController extends BaseController {
 	}
 
 	/**
-	 * 查询安装告知申请列表
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-	@GetMapping(value = "/installApplyList")
-	@ApiOperation(httpMethod = "GET", value = "安装告知表分页查询", notes = "安装告知表分页查询")
-	public ResponseModel<List<InstallNoticePageDto>> queryForPage1() {
-		return ResponseHelper.buildResponse(installNoticeServiceImpl.installNoticeList());
-	}
-
-	/**
 	 * 根据主键sequenceNbr查询安装告知申请详情
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/InstallNoticeServiceImpl.java

@@ -49,30 +49,6 @@ public class InstallNoticeServiceImpl extends BaseService<InstallNoticeDto,Insta
     }
 
     /**
-     * 安装告知申请列表查询
-     */
-    @Override
-    public List<InstallNoticePageDto> installNoticeList()   {
-        return installNoticeMapper.installNoticeList();
-    }
-    /**
-     * 安装告知申请列表按name,unit筛选
-     */
-    @Override
-    public List<InstallNoticePageDto> selectByName(String name, String unit) {
-        return installNoticeMapper.selectByName(name,unit);
-    }
-
-    /**
-     *通过sequenceNbr查列表数据
-     */
-    @Override
-    public InstallNoticePageDto selectById(Long sequenceNbr) {
-
-        return installNoticeMapper.selectById(sequenceNbr);
-    }
-
-    /**
      * 根据sequenceNbr查询告知申请详情
      * @param sequenceNbr
      * @return