Browse Source

feat:加上办理单位

master
buaixuexideshitongxue 1 month ago
parent
commit
a8ade7ade9
  1. 6
      src/main/java/com/biutag/supervision/pojo/dto/complaintCollection/ComplaintCollectionPageDTO.java
  2. 3
      src/main/java/com/biutag/supervision/pojo/param/ComplaintCollection/ComplaintCollectionQueryParam.java
  3. 3
      src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionPageRequest.java
  4. 7
      src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionServiceImpl.java
  5. 18
      src/main/resources/mapper/ComplaintCollectionMapper.xml

6
src/main/java/com/biutag/supervision/pojo/dto/complaintCollection/ComplaintCollectionPageDTO.java

@ -165,6 +165,12 @@ public class ComplaintCollectionPageDTO {
@Schema(description = "涉及单位")
private String involveDepartName;
@Schema(description = "办理单位二级名称")
private String handleSecondDepartName;
@Schema(description = "办理单位三级名称")
private String handleThreeDepartName;
@Schema(description = "接访领导姓名")
private String receivingLeaderName;

3
src/main/java/com/biutag/supervision/pojo/param/ComplaintCollection/ComplaintCollectionQueryParam.java

@ -133,6 +133,9 @@ public class ComplaintCollectionQueryParam extends BasePage {
@Schema(description = "阶段2同步标记")
private String blameSyncStatus;
@Schema(description = "办理单位ID集合(包含所有子节点)")
private Set<String> handleDepartIds;
// @Schema(description = "部门ID集合")
// private Set<String> secondDepartIds;

3
src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionPageRequest.java

@ -90,6 +90,9 @@ public class ComplaintCollectionPageRequest extends BasePage implements ParamChe
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private List<LocalDateTime> createTimeList = new ArrayList<>();
@Schema(description = "办理单位ID")
private String handleDepartId;
@Override
public void check() {

7
src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionServiceImpl.java

@ -296,6 +296,13 @@ public class ComplaintCollectionServiceImpl implements ComplaintCollectionServic
}
}
}
// 办理单位:获取所有子节点ID
if (StrUtil.isNotBlank(request.getHandleDepartId())) {
List<String> allDepartIds = departService.getAllNodeIds(List.of(request.getHandleDepartId()));
if (CollectionUtil.isNotEmpty(allDepartIds)) {
param.setHandleDepartIds(new HashSet<>(allDepartIds));
}
}
// doto 自办信件的只有市局管理员 12377管理员可以看
Page<ComplaintCollection> page = new Page<>(param.getCurrent(), param.getSize());
IPage<ComplaintCollectionPageDTO> pageResult = complaintCollectionMapper.selectPageWithNegative(page, param);

18
src/main/resources/mapper/ComplaintCollectionMapper.xml

@ -221,7 +221,11 @@
n.check_status_code AS checkStatusCode,
n.checkStatusName AS checkStatusName,
n.check_status_desc AS checkStatusDesc,
n.involveDepartName AS involveDepartName
n.involveDepartName AS involveDepartName,
n.handle_second_depart_id AS handleSecondDepartId,
n.handle_second_depart_name AS handleSecondDepartName,
n.handle_three_depart_id AS handleThreeDepartId,
n.handle_three_depart_name AS handleThreeDepartName
FROM complaint_collection cc
LEFT JOIN negative n ON n.id = cc.negative_id
<where>
@ -321,6 +325,18 @@
<if test="param.createTimeList != null and param.createTimeList.size == 2">
AND cc.create_time BETWEEN #{param.createTimeList[0]} AND #{param.createTimeList[1]}
</if>
<if test="param.handleDepartIds != null and param.handleDepartIds.size > 0">
AND (
n.handle_second_depart_id IN
<foreach collection="param.handleDepartIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
OR n.handle_three_depart_id IN
<foreach collection="param.handleDepartIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
)
</if>
</where>
ORDER BY n.crtTime DESC, cc.id DESC
</select>

Loading…
Cancel
Save