Skip to content

A
amos-boot-biz
Commit cf11044d authored by limei's avatar limei
Browse files
Options

质量问题整改短信列表查询

parent 7f0787ce
Hide whitespace changes
Inline Side-by-side
Showing with 156 additions and 9 deletions
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/QualityProblemDto.java
View file @ cf11044d
......@@ -122,4 +122,40 @@ public class QualityProblemDto extends BaseDto {
* 检验员名称
*/
private String inspectorName;
/**
* 监管部门
*/
private String superviseDeptName;
/**
* 、监检机构
*/
private String inspectionUnitName;
/**
* 建设单位
*/
private String constructionUnit;
/**
* 安装单位
*/
private String installationUnit;
/**
* 建设单位负责人
*/
private String chargerPerson;
/**
* 流程id
*/
private String installId;
/**
* 流程状态
*/
private String status;
}
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/RectifyMsgDto.java
View file @ cf11044d
......@@ -36,4 +36,30 @@ public class RectifyMsgDto extends BaseDto {
@ApiModelProperty(value = "短信发送日期")
private Date sendTime;
@ApiModelProperty(value = "质量问题编码")
private String code;
@ApiModelProperty(value = "质量问题产生阶段")
private String generateStage;
@ApiModelProperty(value = "质量问题描述")
private String desc;
@ApiModelProperty(value = "项目名称")
private String name;
@ApiModelProperty(value = "安装（使用）单位")
private String installationUnit;
@ApiModelProperty(value = "所在地")
private String address;
@ApiModelProperty(value = "质量问题处理进度")
private String processProgress;
@ApiModelProperty(value = "短信通知单位")
private String noticeUnitName;
}
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/entity/QualityProblem.java
View file @ cf11044d
......@@ -136,4 +136,14 @@ public class QualityProblem extends BaseEntity {
@TableField("rectify_within_time")
private Boolean rectifyWithinTime;
/**
* 流程id
*/
private String instanceId;
/**
* 流程状态
*/
private String status;
}
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/mapper/RectifyMsgMapper.java
View file @ cf11044d
package com.yeejoin.amos.boot.module.ugp.api.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.ugp.api.dto.InstallNoticeMsgPageDto;
import com.yeejoin.amos.boot.module.ugp.api.dto.RectifyMsgDto;
import com.yeejoin.amos.boot.module.ugp.api.entity.RectifyMsg;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
/**
* 整改短信通知表 Mapper 接口
......@@ -11,4 +16,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface RectifyMsgMapper extends BaseMapper<RectifyMsg> {
IPage<RectifyMsgDto> queryForRectifyMsgPage(IPage<RectifyMsgDto> page, String name,String installationUnit );
}
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/service/IRectifyMsgService.java
View file @ cf11044d
package com.yeejoin.amos.boot.module.ugp.api.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.ugp.api.dto.InstallNoticeMsgPageDto;
import com.yeejoin.amos.boot.module.ugp.api.dto.RectifyMsgDto;
import com.yeejoin.amos.boot.module.ugp.api.entity.RectifyMsg;
/**
* 整改短信通知表接口类
*
......@@ -9,4 +15,7 @@ package com.yeejoin.amos.boot.module.ugp.api.service;
*/
public interface IRectifyMsgService {
IPage<RectifyMsgDto> queryForRectifyMsgPage(IPage<RectifyMsgDto> page, String name, String installationUnit);
}
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/QualityProblemMapper.xml
View file @ cf11044d
......@@ -7,15 +7,24 @@
qi.*,
up.`name` AS project_name,
up.address AS project_address,
up.construction_unit,
up.installation_unit,
up.charge_person,
uv.stage,
uv.target_info,
uv.verify_unit_id,
uv.charger_person_id,
uv.inspector_id
uv.inspector_id,
ou.biz_org_name AS supervise_dept_name,
cou.biz_org_name AS inspection_unit_name
FROM
tz_ugp_quality_problem AS qi
LEFT JOIN tz_ugp_project AS up ON up.sequence_nbr = qi.project_id
LEFT JOIN tz_ugp_verify AS uv ON uv.sequence_nbr = qi.stage_verify_id
LEFT JOIN tz_ugp_supervise_rule AS ur ON up.install_region_code = ur.admin_region_code
LEFT JOIN cb_org_usr AS ou ON ur.supervise_dept_id = ou.sequence_nbr
LEFT JOIN cb_org_usr AS cou ON ur.inspection_unit_id = cou.sequence_nbr
<where>
<if test="qualityProblemDto.projectName != '' and qualityProblemDto.projectName != null">
and up.`name` like concat("%",qualityProblemDto.projectName,"%")
......
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/RectifyMsgMapper.xml
View file @ cf11044d
......@@ -2,4 +2,25 @@
<!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.RectifyMsgMapper">
<select id = 'queryForRectifyMsgPage' resultType="com.yeejoin.amos.boot.module.ugp.api.dto.RectifyMsgDto">
SELECT msg.*,pro.project_id,org.biz_org_name,up.installation_unit,pro.`code`,pro.generate_stage,pro.`desc`,up.`name`,up.address,pro.process_progress,gro.biz_org_name AS notice_unit_name
FROM tz_ugp_rectify_msg AS msg
LEFT JOIN tz_ugp_quality_problem AS pro ON pro.sequence_nbr = msg.problem_id
LEFT JOIN cb_org_usr AS org ON org.sequence_nbr = msg.msg_receiver
LEFT JOIN tz_ugp_project AS up ON up.sequence_nbr = pro.project_id
LEFT JOIN cb_org_usr AS gro ON gro.sequence_nbr = msg.notice_unit_id
<where>
<if test="name != '' and name != null" >
and up.`name` like concat("%", #{name},"%")
</if>
<if test="installationUnit != '' and installationUnit != null" >
and up.installation_unit like concat("%",#{installationUnit},"%")
</if>
</where>
</select>
</mapper>
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/RectifyMsgController.java
View file @ cf11044d
package com.yeejoin.amos.boot.module.ugp.biz.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.web.bind.annotation.RequestMapping;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.Api;
......@@ -91,15 +92,18 @@ public class RectifyMsgController extends BaseController {
* @param current 每页大小
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "整改短信通知表分页查询", notes = "整改短信通知表分页查询")
public ResponseModel<Page<RectifyMsgDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
(value = "size") int size) {
Page<RectifyMsgDto> page = new Page<RectifyMsgDto>();
public ResponseModel<IPage<RectifyMsgDto>> queryForPage(
@RequestParam(value = "current") int current,
@RequestParam(value = "size") int size,
@RequestParam(value = "name",required = false) String name,
@RequestParam(value = "installationUnit",required = false) String installationUnit) {
IPage<RectifyMsgDto> page = new Page<RectifyMsgDto>();
page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(rectifyMsgServiceImpl.queryForRectifyMsgPage(page));
return ResponseHelper.buildResponse(rectifyMsgServiceImpl.queryForRectifyMsgPage(page,name,installationUnit));
}
/**
......@@ -107,7 +111,7 @@ public class RectifyMsgController extends BaseController {
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@ApiOperation(httpMethod = "GET",value = "整改短信通知表列表全部数据查询", notes = "整改短信通知表列表全部数据查询")
@GetMapping(value = "/list")
public ResponseModel<List<RectifyMsgDto>> selectForList() {
......
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/RectifyMsgServiceImpl.java
View file @ cf11044d
package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yeejoin.amos.boot.module.ugp.api.dto.CompanyDto;
import com.yeejoin.amos.boot.module.ugp.api.dto.QualityProblemDto;
import com.yeejoin.amos.boot.module.ugp.api.entity.RectifyMsg;
import com.yeejoin.amos.boot.module.ugp.api.mapper.RectifyMsgMapper;
import com.yeejoin.amos.boot.module.ugp.api.service.IRectifyMsgService;
import com.yeejoin.amos.boot.module.ugp.api.dto.RectifyMsgDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
/**
* 整改短信通知表服务实现类
......@@ -17,11 +25,17 @@ import java.util.List;
*/
@Service
public class RectifyMsgServiceImpl extends BaseService<RectifyMsgDto,RectifyMsg,RectifyMsgMapper> implements IRectifyMsgService {
@Autowired
IRectifyMsgService iRectifyMsgService;
@Autowired
RectifyMsgMapper rectifyMsgMapper;
/**
* 分页查询
*/
public Page<RectifyMsgDto> queryForRectifyMsgPage(Page<RectifyMsgDto> page) {
return this.queryForPage(page, null, false);
public IPage<RectifyMsgDto> queryForRectifyMsgPage(IPage<RectifyMsgDto> page,String name,String installationUnit) {
return rectifyMsgMapper.queryForRectifyMsgPage(page,name,installationUnit);
}
/**
......@@ -30,4 +44,10 @@ public class RectifyMsgServiceImpl extends BaseService<RectifyMsgDto,RectifyMsg,
public List<RectifyMsgDto> queryForRectifyMsgList() {
return this.queryForList("" , false);
}
/**
* 质量问题整改短信列表查询
*/
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment