白蚁提防水库普查、提防普查填报增加季度

aix

2024-09-25 2f10ca63b173d7abfa5dba60609ca3128d25582a

白蚁提防水库普查、提防普查填报增加季度

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbDykeUnitDangerMapper.xml

@@ -12,6 +12,12 @@
            <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")

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbDykeInvestigationServiceImpl.java

@@ -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() + "本年度已经普查完成，不能在提交了。");
            }
        }

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResGeneralInvestigationServiceImpl.java

@@ -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() + "本年度已经普查完成，不能在提交了。");
            }
        }
@@ -120,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() + "本年度已经普查完成，不能在提交了。");
            }
        }

 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;//活动迹象