堤防普查

xieb

2024-03-17 6de28f3d62a4f77267628eaba28fecaebec8cb27

堤防普查

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbDykeInvestigationController.java

@@ -55,7 +55,7 @@
        if (!StringUtil.isBlank(param.getDykeName()))
            queryWrapper.like("\"dyke_name\"", param.getDykeName());
        if (!StringUtil.isBlank(param.getDykeGuid()))
            queryWrapper.like("\"dyke_guid\"", param.getDykeGuid());
            queryWrapper.eq("\"dyke_guid\"", param.getDykeGuid());
        if (!StringUtil.isBlank(param.getCreateUser()))
            queryWrapper.eq("\"create_user\"", param.getCreateUser());
        if (null != param.getTbYear())

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbResDyke.java

@@ -123,7 +123,7 @@
    @JsonSerialize(using = ToStringSerializer.class)
    @ApiModelProperty(value = "堤防长度")
    @TableField("\"dyke_length\"")
    private String dyke_length;
    private String dykeLength;

    /**
     * 管理单位名称

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

@@ -14,6 +14,9 @@
            <if test="vo.adCode != null and vo.adCode !=''">
                trd."ad_code" = #{vo.adCode}
            </if>
            <if test="vo.name != null and vo.name !=''">
                trd."name" LIKE CONCAT('%',#{vo.name},'%')
            </if>
            <if test="vo.startLocation != null and vo.startLocation !=''">
                trd."start_location" LIKE CONCAT('%',#{vo.startLocation},'%')
            </if>
@@ -58,7 +61,8 @@
    <!--  堤防普查列表  -->
    <select id="findTbResDykePcBy"
            resultType="cn.gistack.sm.sjztmd.vo.TbResDykeVO">
        select a.*,b."check_state" AS tb_state from sjzt_md."tb_res_dyke" a
        select DISTINCT a.*,b."check_state" AS tb_state,aa."p_ad_code" as pAdCode,
        aa."p_ad_name" as pAdName from sjzt_md."tb_res_dyke" a
        left join "SJZT_MD"."tb_dyke_investigation_state" b on a."guid" = b."dyke_guid"
        left join "SJZT_MD"."att_ad_base" aa on aa."guid" = a."ad_code"
        left join "SJZT_MD"."att_ad_base" ab on ab."p_ad_code" = aa."ad_code"

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

@@ -93,16 +93,19 @@

        state.setCheckState(tbResGeneralInvestigationParam.getCheckState());
        tbResGeneralInvestigationStateService.saveOrUpdate(state);
        //先把数据移除
        QueryWrapper delete = new QueryWrapper();
        delete.eq("\"tb_state_id\"",state.getGuid());
        boolean remove = remove(delete);
//        //先把数据移除
//        QueryWrapper delete = new QueryWrapper();
//        delete.eq("\"tb_state_id\"",state.getGuid());
//        boolean remove = remove(delete);
//
//        if (remove){
//
//        }

        if (remove){
            for (int i = 0; i < list.size(); i++) {
                TbResGeneralInvestigation tbResGeneralInvestigation = list.get(i);
                //id清空方便批量新增
                tbResGeneralInvestigation.setGuid("");
//            tbResGeneralInvestigation.setGuid("");

                if (tbResGeneralInvestigation.getCreateTime() == null){
                    tbResGeneralInvestigation.setCreateTime(DateUtil.now());
@@ -116,8 +119,5 @@
                tbResGeneralInvestigation.setTbStateId(state.getGuid());
            }
            return R.status(saveOrUpdateBatch(list));
        }

        return R.fail("操作失败");
    }
}