From b6673e839cde1597511e56b154e2fe02ee54ed63 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Thu, 26 Sep 2024 12:01:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbDykeUnitDangerMapper.xml | 10 ++++-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbDykeInvestigationServiceImpl.java | 6 ++-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/TbResDykeVO.java | 1
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResDykeMapper.xml | 45 ++++++++++++++++++++--
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResGeneralInvestigationServiceImpl.java | 7 ++-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/TbDykeUnitDangerVO.java | 2 +
6 files changed, 60 insertions(+), 11 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbDykeUnitDangerMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbDykeUnitDangerMapper.xml
index 0c992fd..e756dae 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbDykeUnitDangerMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbDykeUnitDangerMapper.xml
@@ -5,16 +5,22 @@
<select id="listDykeUnitDanger" resultType="cn.gistack.sm.sjztmd.vo.TbDykeUnitDangerVO">
select tdi.*,ifnull(tdud."danger_level",0) dangerLevel,tdud."id" from (
select
- "dyke_guid" dykeGuid,"unit",count(*) dangerNum,wm_concat(distinct "signs_of_termite_activity") hdjxs,
+ "dyke_guid" dykeGuid,"unit",count(*) dangerNum,wm_concat(distinct "signs_of_termite_activity") hdjxs,max("tb_year") as "tb_year",max("tb_quarter") as "tb_quarter",
sum("danger_length") as dangerLength
from sjzt_md."tb_dyke_investigation"
where "hazard_rating" = '有危害'
<if test="params.dykeGuid != null and params.dykeGuid != ''">
and "dyke_guid" = #{params.dykeGuid}
</if>
+ <if test="params.tbYear != null and params.tbYear != ''">
+ and "tb_year" = #{params.tbYear}
+ </if>
+ <if test="params.tbQuarter != null and params.tbQuarter != ''">
+ and "tb_quarter" = #{params.tbQuarter}
+ </if>
group by "dyke_guid","unit"
) tdi
- left join sjzt_md."tb_dyke_unit_danger" tdud on (tdi.dykeGuid = tdud."dyke_id" and tdi."unit" = tdud."unit")
+ left join sjzt_md."tb_dyke_unit_danger" tdud on (tdi.dykeGuid = tdud."dyke_id" and tdi."unit" = tdud."unit" and tdi."tb_year" = tdud."tb_year" and tdi."tb_quarter" = tdud."tb_quarter")
</select>
</mapper>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResDykeMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResDykeMapper.xml
index f31878a..1eb6c79 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResDykeMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResDykeMapper.xml
@@ -61,7 +61,7 @@
<!-- 堤防普查列表 -->
<select id="findTbResDykePcBy"
resultType="cn.gistack.sm.sjztmd.vo.TbResDykeVO">
-SELECT base.* from (
+ SELECT base.* from (
select
trd.*,
tdis."check_state" AS tb_state,
@@ -79,22 +79,56 @@
ifnull(tmp.totalDangerDw,0) totalDangerDw,
(
select sum(tdud."danger_length") from sjzt_md."tb_dyke_unit_danger" tdud
- left join "SJZT_MD"."tb_dyke_investigation_state" tdis on (tdud."dyke_id" = tdis."dyke_guid")
+ left join "SJZT_MD"."tb_dyke_investigation_state" tdis
+ on (
+ tdud."dyke_id" = tdis."dyke_guid"
+ <if test="vo.tbYear !=null and vo.tbYear !=''">
+ AND tdis."tb_year" = #{vo.tbYear}
+ </if>
+ <if test="vo.tbQuarter !=null and vo.tbQuarter !=''">
+ AND tdis."tb_quarter" = #{vo.tbQuarter}
+ </if>
+ )
where trd."guid" = tdud."dyke_id" and tdud."danger_level" = 1 and tdis."check_state" > 1
) as firstLength,
(
select sum(tdud."danger_length") from sjzt_md."tb_dyke_unit_danger" tdud
- left join "SJZT_MD"."tb_dyke_investigation_state" tdis on (tdud."dyke_id" = tdis."dyke_guid")
+ left join "SJZT_MD"."tb_dyke_investigation_state" tdis
+ on (
+ tdud."dyke_id" = tdis."dyke_guid"
+ <if test="vo.tbYear !=null and vo.tbYear !=''">
+ AND tdis."tb_year" = #{vo.tbYear}
+ </if>
+ <if test="vo.tbQuarter !=null and vo.tbQuarter !=''">
+ AND tdis."tb_quarter" = #{vo.tbQuarter}
+ </if>
+ )
where trd."guid" = tdud."dyke_id" and tdud."danger_level" = 2 and tdis."check_state" > 1
) as secondLength,
(
select sum(tdud."danger_length") from sjzt_md."tb_dyke_unit_danger" tdud
- left join "SJZT_MD"."tb_dyke_investigation_state" tdis on (tdud."dyke_id" = tdis."dyke_guid")
+ left join "SJZT_MD"."tb_dyke_investigation_state" tdis
+ on (
+ tdud."dyke_id" = tdis."dyke_guid"
+ <if test="vo.tbYear !=null and vo.tbYear !=''">
+ AND tdis."tb_year" = #{vo.tbYear}
+ </if>
+ <if test="vo.tbQuarter !=null and vo.tbQuarter !=''">
+ AND tdis."tb_quarter" = #{vo.tbQuarter}
+ </if>
+ )
where trd."guid" = tdud."dyke_id" and tdud."danger_level" = 3 and tdis."check_state" > 1
) as thirdLength
from sjzt_md."tb_res_dyke" trd
left join "SJZT_MD"."tb_dyke_investigation_state" tdis on trd."guid" = tdis."dyke_guid"
+ <if test="vo.tbYear !=null and vo.tbYear !=''">
+ AND tdis."tb_year" = #{vo.tbYear}
+ </if>
+ <if test="vo.tbQuarter !=null and vo.tbQuarter !=''">
+ AND tdis."tb_quarter" = #{vo.tbQuarter}
+ </if>
+
left join YWXT."att_ad_base" aa on aa."guid" = trd."ad_code"
left join YWXT."att_ad_base" ab on ab."ad_code" = aa."p_ad_code"
left join YWXT."att_ad_base" ac on ac."ad_code" = ab."p_ad_code"
@@ -132,6 +166,9 @@
<if test="vo.tbYear !=null and vo.tbYear !=''">
AND tdi."tb_year" = #{vo.tbYear}
</if>
+ <if test="vo.tbQuarter !=null and vo.tbQuarter !=''">
+ AND tdi."tb_quarter" = #{vo.tbQuarter}
+ </if>
group by tdi."tb_state_id",tdi."dyke_guid",tdi."unit"
)TEMP1
)temp2 group by
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbDykeInvestigationServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbDykeInvestigationServiceImpl.java
index bb4fe64..012552e 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbDykeInvestigationServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbDykeInvestigationServiceImpl.java
@@ -68,7 +68,7 @@
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("\"dyke_guid\"",entity.getDykeGuid());
queryWrapper.eq("\"tb_year\"",entity.getTbYear());
-// queryWrapper.eq("\"tb_quarter\"",entity.getTbQuarter());
+ queryWrapper.eq("\"tb_quarter\"",entity.getTbQuarter());
TbDykeInvestigationState state = tbDykeInvestigationStateService.getOne(queryWrapper);
if (null == state) {
state = new TbDykeInvestigationState();
@@ -78,7 +78,7 @@
state.setCreateTime(entity.getCreateTime());
state.setCreateUser(entity.getCreateUser());
} else {
- if (state.getCheckState() == 1 || state.getCheckState() == 2) {
+ if (state.getCheckState() > 1) {
return R.fail(entity.getDykeName() + "本年度已经普查完成，不能在提交了。");
}
}
@@ -100,6 +100,7 @@
QueryWrapper qw = new QueryWrapper();
qw.eq("\"dyke_guid\"",entity.getDykeGuid());
qw.eq("\"unit\"",entity.getUnit());
+ qw.eq("\"tb_quarter\"",entity.getTbQuarter());
long count = count(qw);
if (count > 0) {
entity.setDangerLength(0D);
@@ -120,6 +121,7 @@
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("\"dyke_guid\"",entity.getDykeGuid());
queryWrapper.eq("\"tb_year\"",entity.getTbYear());
+ queryWrapper.eq("\"tb_quarter\"",entity.getTbQuarter());
TbDykeInvestigationState state = tbDykeInvestigationStateService.getOne(queryWrapper);
if (null == state) {
//无填报状态记录则新建
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResGeneralInvestigationServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResGeneralInvestigationServiceImpl.java
index cb89900..d410e91 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResGeneralInvestigationServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResGeneralInvestigationServiceImpl.java
@@ -68,7 +68,7 @@
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("\"res_guid\"", entity.getResGuid());
queryWrapper.eq("\"tb_year\"", entity.getTbYear());
-// queryWrapper.eq("\"tb_quarter\"",entity.getTbQuarter());
+ queryWrapper.eq("\"tb_quarter\"",entity.getTbQuarter());
TbResGeneralInvestigationState state = tbResGeneralInvestigationStateService.getOne(queryWrapper);
if (null == state) {
state = new TbResGeneralInvestigationState();
@@ -78,7 +78,7 @@
state.setCreateTime(entity.getCreateTime());
state.setCreateUser(entity.getCreateUser());
} else {
- if (state.getCheckState() == 1 || state.getCheckState() == 2) {
+ if (state.getCheckState() > 1) {
return R.fail(entity.getResName() + "本年度已经普查完成，不能在提交了。");
}
}
@@ -108,6 +108,7 @@
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("\"res_guid\"", entity.getResGuid());
queryWrapper.eq("\"tb_year\"", entity.getTbYear());
+ queryWrapper.eq("\"tb_quarter\"",entity.getTbQuarter());
TbResGeneralInvestigationState state = tbResGeneralInvestigationStateService.getOne(queryWrapper);
if (null == state) {
//无填报状态记录则新建
@@ -119,7 +120,7 @@
state.setCreateUser(entity.getCreateUser());
} else {
//查看填报状态，只有0填报中才可以一直填报
- if (state.getCheckState() == 1 || state.getCheckState() == 2) {
+ if (state.getCheckState() <= 3) {
return R.fail(entity.getResName() + "本年度已经普查完成，不能在提交了。");
}
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/TbDykeUnitDangerVO.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/TbDykeUnitDangerVO.java
index 67dfc04..585adca 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/TbDykeUnitDangerVO.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/TbDykeUnitDangerVO.java
@@ -11,6 +11,8 @@
public class TbDykeUnitDangerVO {
private String dykeGuid;//提防id
+ private Integer tbYear;//提防id
+ private String tbQuarter;//提防id
private String unit;//提防单元
private String dangerNum;//危害处数
private String hdjxs;//活动迹象
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/TbResDykeVO.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/TbResDykeVO.java
index e2fa308..da99626 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/TbResDykeVO.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/TbResDykeVO.java
@@ -15,6 +15,7 @@
private String tbState;//填报状态
private Integer tbYear;//填报年度
+ private String tbQuarter;//填报年度
//危害长度
private double totalDangerLength;
--
Gitblit v1.9.3