安高告知页面筛选

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

@@ -29,6 +29,9 @@ public class InstallNoticePageDto extends BaseDto {
     @ApiModelProperty(value = "项目安装区域")
     private String installRegion;
 
+    @ApiModelProperty(value = "项目开工日期")
+    private String startDate;
+
     @ApiModelProperty(value = "建设单位")
     private String constructionUnit;
 
@@ -48,10 +51,7 @@ public class InstallNoticePageDto extends BaseDto {
     private String chargerPersonId;
 
     @ApiModelProperty(value = "监检机构")
-    private String inspectionOrgId;
-
-    @ApiModelProperty(value = "附件查看")
-    private Text info;
+    private String inspectionUnitId;
 
     @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

@@ -28,7 +28,7 @@ public interface InstallNoticeMapper extends BaseMapper<InstallNotice> {
     InstallNoticePageDto selectById(@Param("sequenceNbr")Long sequenceNbr);
 
     //安装告知申请页面分页列表
-    Page<InstallNoticePageDto> installNoticePage(IPage<InstallNoticePageDto> page);
+    Page<InstallNoticePageDto> installNoticePage(IPage<InstallNoticePageDto> page,@RequestParam String name,@RequestParam String constructionUnit);
 
     //根据sequenceNbr查询告知申请详情
     InstallNoticeDto selectoneById(@RequestParam("sequenceNbr")Long sequenceNbr );

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

@@ -3,13 +3,11 @@
 <mapper namespace="com.yeejoin.amos.boot.module.ugp.api.mapper.InstallNoticeMapper">
 <!--    查询安装告知申请列表-->
     <select id="installNoticeList" 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.name LIKE  '%'|| #{name} || '%' AND construction_unit LIKE '%'|| #{constructionUnit} || '%'
     </select>
 <!--    安装告知申请列表按name,unit筛选-->
     <select id="selectByName" resultType="com.yeejoin.amos.boot.module.ugp.api.dto.InstallNoticePageDto">
@@ -36,11 +34,13 @@
     <!--    查询安装告知申请页面-->
     <select id="installNoticePage" resultType="com.yeejoin.amos.boot.module.ugp.api.dto.InstallNoticePageDto">
 
-        SELECT 	tz_ugp_project.sequence_nbr,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
+          SELECT 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>
 

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

@@ -120,13 +120,12 @@ public class InstallNoticeController extends BaseController {
 	@GetMapping(value = "/installNoticePage")
 	@ApiOperation(httpMethod = "GET", value = "安装告知表分页查询", notes = "安装告知表分页查询")
 	public ResponseModel<Page<InstallNoticePageDto>> queryForPage1(@RequestParam(value = "current") int current, @RequestParam
-			(value = "size") int size) {
+			(value = "size") int size,@RequestParam(required = false) String name,@RequestParam(required = false) String constructionUnit) {
 		Page<InstallNoticePageDto> page = new Page<InstallNoticePageDto>();
 		page.setCurrent(current);
 		page.setSize(size);
-		return ResponseHelper.buildResponse(installNoticeServiceImpl.installNoticePage(page));
+		return ResponseHelper.buildResponse(installNoticeServiceImpl.installNoticePage(page,name,constructionUnit));
 	}
-
 	/**
 	 * 列表全部数据查询
 	 *
@@ -181,4 +180,20 @@ public class InstallNoticeController extends BaseController {
 		model.setSequenceNbr(sequenceNbr);
 		return ResponseHelper.buildResponse(installNoticeServiceImpl.updateWithModel(model));
 	}
+
+	/**
+	 * 提交申请
+	 *
+	 * @param sequenceNbr 主键
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@PostMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "Post", value = "根据sequenceNbr更新提交申请", notes = "根据sequenceNbr更新提交申请")
+	public ResponseModel<InstallNoticeDto> InstallNotice(@RequestBody InstallNoticeDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+		model.setProjectId(sequenceNbr);
+		model.setNoticeStatus("已提交");
+		model = installNoticeServiceImpl.createWithModel(model);
+		return ResponseHelper.buildResponse(model);
+	}
 }

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

@@ -44,8 +44,8 @@ public class InstallNoticeServiceImpl extends BaseService<InstallNoticeDto,Insta
     /**
      * 安装告知申请分页查询
      */
-    public Page<InstallNoticePageDto> installNoticePage(Page<InstallNoticePageDto> page)   {
-        return installNoticeMapper.installNoticePage(page);
+    public Page<InstallNoticePageDto> installNoticePage(Page<InstallNoticePageDto> page,String name,String constructionUnit)   {
+        return installNoticeMapper.installNoticePage(page,name,constructionUnit);
     }
 
     /**