普查查询修改，personVo修改

guoshilong

2024-03-19 6bd950b9e77fe0e917acf6a05c9c86d760633de7

普查查询修改，personVo修改

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

@@ -2,7 +2,7 @@

import cn.gistack.sm.sjztmd.entity.AttResManagePerson;
import cn.gistack.sm.sjztmd.service.IAttResManagePersonService;
import cn.gistack.sm.sjztmd.vo.PersonVO;
import cn.gistack.sm.sjztmd.vo.ChargePersonVO;
import cn.gistack.system.user.entity.User;
import cn.gistack.system.user.feign.IUserClient;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -141,7 +141,7 @@
    @GetMapping("/getManagePersonList")
    public R getManagePersonList(String resId,String findType){

        List<PersonVO> list =  attResManagePersonService.getManagePersonList(resId,findType);
        List<ChargePersonVO> list =  attResManagePersonService.getManagePersonList(resId,findType);
        return R.data(list);

    }

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

@@ -45,7 +45,7 @@
     * 填报季度
     */
    @ApiModelProperty(value = "填报季度")
    @TableField(value = "\"tb_quarter\"", fill = FieldFill.UPDATE)
    @TableField(value = "\"tb_quarter\"")
    private String tbQuarter;

    /**
@@ -59,139 +59,146 @@
     * 年度填报状态表id
     */
    @ApiModelProperty(value = "年度填报状态表id")
    @TableField(value = "\"tb_state_id\"", fill = FieldFill.UPDATE)
    @TableField(value = "\"tb_state_id\"")
    private String tbStateId;

    /**
     * 水库编码
     */
    @ApiModelProperty(value = "水库编码")
    @TableField(value = "\"dyke_guid\"", fill = FieldFill.UPDATE)
    @TableField(value = "\"dyke_guid\"")
    private String dykeGuid;

    /**
     * 水库名称
     */
    @ApiModelProperty(value = "水库名称")
    @TableField(value = "\"dyke_name\"", fill = FieldFill.UPDATE)
    @TableField(value = "\"dyke_name\"")
    private String dykeName;

    /**
     * 普查种类
     */
    @ApiModelProperty(value = "普查种类(白蚁、獾、狐、鼠等)")
    @TableField(value = "\"investigation_variety\"", fill = FieldFill.UPDATE)
    @TableField(value = "\"investigation_variety\"")
    private String investigationVariety;

    /**
     * 是否蚁患
     */
    @ApiModelProperty(value = "是否蚁患")
    @TableField(value = "\"is_ant_infestation\"", fill = FieldFill.UPDATE)
    @TableField(value = "\"is_ant_infestation\"")
    private String isAntInfestation;
    /**
     * 是否蚁源
     */
    @ApiModelProperty(value = "是否蚁源")
    @TableField(value = "\"is_ant_source\"", fill = FieldFill.UPDATE)
    @TableField(value = "\"is_ant_source\"")
    private String isAntSource;
    /**
     * 部位
     */
    @ApiModelProperty(value = "部位")
    @TableField(value = "\"part_place\"", fill = FieldFill.UPDATE)
    @TableField(value = "\"part_place\"")
    private String partPlace;

    /**
     * 普查面积
     */
    @ApiModelProperty(value = "普查面积")
    @TableField(value = "\"investigation_area\"", fill = FieldFill.UPDATE)
    @TableField(value = "\"investigation_area\"")
    private String investigationArea;

    /**
     * 普查类型
     */
    @ApiModelProperty(value = "普查类型")
    @TableField(value = "\"investigation_type\"", fill = FieldFill.UPDATE)
    @TableField(value = "\"investigation_type\"")
    private String investigationType;

    /**
     * 普查方式
     */
    @ApiModelProperty(value = "普查方式")
    @TableField(value = "\"investigation_way\"", fill = FieldFill.UPDATE)
    @TableField(value = "\"investigation_way\"")
    private String investigationWay;

    /**
     * 危害等级
     */
    @ApiModelProperty(value = "危害等级")
    @TableField(value = "\"hazard_rating\"", fill = FieldFill.UPDATE)
    @TableField(value = "\"hazard_rating\"")
    private String hazardRating;

    /**
     * 普查长度
     */
    @ApiModelProperty(value = "普查长度")
    @TableField(value = "\"investigation_length\"", fill = FieldFill.UPDATE)
    @TableField(value = "\"investigation_length\"")
    private Double investigationLength;

    /**
     * 危害长度
     */
    @ApiModelProperty(value = "危害长度")
    @TableField(value = "\"danger_length\"")
    private Double dangerLength;


    /**
     * 白蚁活动迹象
     */
    @ApiModelProperty(value = "白蚁活动迹象")
    @TableField(value = "\"signs_of_termite_activity\"", fill = FieldFill.UPDATE)
    @TableField(value = "\"signs_of_termite_activity\"")
    private String signsOfTermiteActivity;

    /**
     * 危害等级
     */
    @ApiModelProperty(value = "桩号")
    @TableField(value = "\"stake_mark\"", fill = FieldFill.UPDATE)
    @TableField(value = "\"stake_mark\"")
    private String stakeMark;

    /**
     * 危害等级
     */
    @ApiModelProperty(value = "是否致险情况")
    @TableField(value = "\"is_danger\"", fill = FieldFill.UPDATE)
    @TableField(value = "\"is_danger\"")
    private String isDanger;

    /**
     * 致险情况详情
     */
    @ApiModelProperty(value = "致险情况详情")
    @TableField(value = "\"danger_info\"", fill = FieldFill.UPDATE, typeHandler = FastjsonTypeHandler.class)
    @TableField(value = "\"danger_info\"", typeHandler = FastjsonTypeHandler.class)
    private Object dangerInfo;

    /**
     * 图片数组
     */
    @ApiModelProperty(value = "图片数组")
    @TableField(value = "\"image_urls\"", fill = FieldFill.UPDATE, typeHandler = FastjsonTypeHandler.class)
    @TableField(value = "\"image_urls\"", typeHandler = FastjsonTypeHandler.class)
    private Object[] imageUrls;

    /**
     * 视频数组
     */
    @ApiModelProperty(value = "视频数组")
    @TableField(value = "\"video_urls\"", fill = FieldFill.UPDATE, typeHandler = FastjsonTypeHandler.class)
    @TableField(value = "\"video_urls\"", typeHandler = FastjsonTypeHandler.class)
    private Object[] videoUrls;

    /**
     * 经度
     */
    @ApiModelProperty(value = "经度")
    @TableField(value = "\"lon\"", fill = FieldFill.UPDATE)
    @TableField(value = "\"lon\"")
    private String lon;

    /**
     * 纬度
     */
    @ApiModelProperty(value = "纬度")
    @TableField(value = "\"lat\"", fill = FieldFill.UPDATE)
    @TableField(value = "\"lat\"")
    private String lat;

    /**
@@ -215,7 +222,7 @@
     * 纬度
     */
    @ApiModelProperty(value = "纬度")
    @TableField(value = "\"create_user\"", fill = FieldFill.UPDATE)
    @TableField(value = "\"create_user\"")
    private String createUser;

}

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

@@ -19,11 +19,7 @@
            b."guid" as tbStateId,
            b."tb_year",
            b."tb_quarter",
            tmp.totalLength,
            tmp.firstLength,
            tmp.secondLength,
            tmp.thirdLength,

            (CASE WHEN tmp.totalDangerNum>0 THEN true ELSE false END) as hasDanger,
            tmp.totalDangerNum,
            tmp.termiteNum,
            tmp.otherNum
@@ -38,11 +34,6 @@

        (
            SELECT TRGI."tb_state_id",TRGI."res_guid",
            SUM(CASE WHEN trgi."hazard_rating" != '无危害' THEN trgi."investigation_length" ELSE 0 END) AS totalLength,

            SUM(CASE WHEN trgi."hazard_rating" = 'I' THEN trgi."investigation_length" ELSE 0 END) AS firstLength,
            SUM(CASE WHEN trgi."hazard_rating" = 'II' THEN trgi."investigation_length" ELSE 0 END) AS secondLength,
            SUM(CASE WHEN trgi."hazard_rating" = 'III' THEN trgi."investigation_length" ELSE 0 END) AS thirdLength,

            SUM(CASE WHEN (trgi."hazard_rating" != '无危害') THEN 1 ELSE 0 END) AS totalDangerNum,
            SUM(CASE WHEN (trgi."investigation_variety" = '白蚁' and trgi."hazard_rating" != '无危害') THEN 1 ELSE 0 END) AS termiteNum,

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

@@ -3,6 +3,7 @@
import cn.gistack.sm.intelligentCall.entity.Scene;
import cn.gistack.sm.sjztmd.entity.AttResManagePerson;
import cn.gistack.sm.sjztmd.entity.PatrolResponsiblePerson;
import cn.gistack.sm.sjztmd.vo.ChargePersonVO;
import cn.gistack.sm.sjztmd.vo.PersonVO;
import cn.gistack.sm.sjztmd.vo.UserPersonVO;
import com.baomidou.dynamic.datasource.annotation.DS;
@@ -79,5 +80,5 @@

    List<AttResManagePerson> getList(@Param("attResManagePerson") AttResManagePerson attResManagePerson);

    List<PersonVO> getPersonByRoleAndAd(@Param("roleAlias") String roleAlias,@Param("adCode") String adCode);
    List<ChargePersonVO> getPersonByRoleAndAd(@Param("roleAlias") String roleAlias, @Param("adCode") String adCode);
}

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

@@ -251,7 +251,7 @@
        </if>
        ORDER BY "type" ASC
    </select>
    <select id="getPersonByRoleAndAd" resultType="cn.gistack.sm.sjztmd.vo.PersonVO">
    <select id="getPersonByRoleAndAd" resultType="cn.gistack.sm.sjztmd.vo.ChargePersonVO">
        SELECT
            BU.id as userId,
            BU.real_name as userName,

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

@@ -15,34 +15,34 @@
                and trd."ad_code" LIKE #{vo.adCode}
            </if>
            <if test="vo.name != null and vo.name !=''">
                trd."name" LIKE CONCAT('%',#{vo.name},'%')
                and trd."name" LIKE CONCAT('%',#{vo.name},'%')
            </if>
            <if test="vo.startLocation != null and vo.startLocation !=''">
                trd."start_location" LIKE CONCAT('%',#{vo.startLocation},'%')
                and trd."start_location" LIKE CONCAT('%',#{vo.startLocation},'%')
            </if>
            <if test="vo.startStakeMark != null and vo.startStakeMark !=''">
                trd."start_stake_mark" LIKE CONCAT('%',#{vo.startStakeMark},'%')
                and trd."start_stake_mark" LIKE CONCAT('%',#{vo.startStakeMark},'%')
            </if>
            <if test="vo.endLocation != null and vo.endLocation !=''">
                trd."end_location" LIKE CONCAT('%',#{vo.endLocation},'%')
                and trd."end_location" LIKE CONCAT('%',#{vo.endLocation},'%')
            </if>
            <if test="vo.endStakeMark != null and vo.endStakeMark !=''">
                trd."end_stake_mark" LIKE CONCAT('%',#{vo.endStakeMark},'%')
                and trd."end_stake_mark" LIKE CONCAT('%',#{vo.endStakeMark},'%')
            </if>
            <if test="vo.rvName != null and vo.rvName !=''">
                trd."rv_name" LIKE CONCAT('%',#{vo.rvName},'%')
                and trd."rv_name" LIKE CONCAT('%',#{vo.rvName},'%')
            </if>
            <if test="vo.shoreType != null and vo.shoreType !=''">
                trd."shore_type" = #{vo.shoreType}
                and trd."shore_type" = #{vo.shoreType}
            </if>
            <if test="vo.dykeType != null and vo.dykeType != ''">
                trd."dyke_type" = #{vo.dykeType}
                and  trd."dyke_type" = #{vo.dykeType}
            </if>
            <if test="vo.dykeLevel != null and vo.dykeLevel !=''">
                trd."dyke_level" = #{vo.dykeLevel}
                and trd."dyke_level" = #{vo.dykeLevel}
            </if>
            <if test="vo.mgrUnitName != null and vo.mgrUnitName !=''">
                trd."mgr_unit_name" LIKE CONCAT('%',#{vo.mgrUnitName},'%')
                and trd."mgr_unit_name" LIKE CONCAT('%',#{vo.mgrUnitName},'%')
            </if>
        </where>

@@ -63,38 +63,42 @@
            resultType="cn.gistack.sm.sjztmd.vo.TbResDykeVO">
        select
        DISTINCT
        a.*,
        b."check_state" AS tb_state,
        b."guid" as tbStateId,
        trd.*,
        tdis."check_state" AS tb_state,
        tdis."guid" as tbStateId,
        aa."p_ad_code" as pAdCode,
        aa."p_ad_name" as pAdName,

        tmp.totalLength,
        tmp.firstLength,
        tmp.secondLength,
        tmp.thirdLength,
        (CASE WHEN tmp.totalDangerNum>0 THEN true ELSE false END) as hasDanger,

        tmp.totalDangerNum,
        tmp.termiteNum,
        tmp.otherNum

        from sjzt_md."tb_res_dyke" a
        left join "SJZT_MD"."tb_dyke_investigation_state" b on a."guid" = b."dyke_guid"
        left join YWXT."att_ad_base" aa on aa."guid" = a."ad_code"
        left join YWXT."att_ad_base" ab on ab."p_ad_code" = aa."ad_code"
        left join YWXT."att_ad_base" ac on ac."p_ad_code" = ab."ad_code"
        left join YWXT."att_ad_base" ad on ad."p_ad_code" = ac."ad_code"
        from sjzt_md."tb_res_dyke" trd
        left join "SJZT_MD"."tb_dyke_investigation_state" tdis on trd."guid" = tdis."dyke_guid"

        left join YWXT."att_ad_base" aa on aa."guid" = trd."ad_code"


        left join

        (
        SELECT tdi."tb_state_id",tdi."dyke_guid",
        SUM(CASE WHEN tdi."hazard_rating" != '无危害' THEN tdi."investigation_length" ELSE 0 END) AS totalLength,

        SUM(CASE WHEN tdi."hazard_rating" = 'I' THEN tdi."investigation_length" ELSE 0 END) AS firstLength,
        SUM(CASE WHEN tdi."hazard_rating" = 'II' THEN tdi."investigation_length" ELSE 0 END) AS secondLength,
        SUM(CASE WHEN tdi."hazard_rating" = 'III' THEN tdi."investigation_length" ELSE 0 END) AS thirdLength,

        select
            temp2."tb_state_id",
            temp2."dyke_guid",
            temp2.totalDangerNum,
            temp2.termiteNum,
            temp2.otherNum,
            SUM(CASE WHEN temp2.dangerLength THEN temp2.dangerLength ELSE 0 END) AS totalDangerLength
        from(
            SELECT
                TEMP1.*,
                TEMP1.dangerLength/temp1.num
            FROM (
                SELECT tdi."tb_state_id",tdi."dyke_guid",tdi."stake_mark",
                count(*) as num,
                SUM(CASE WHEN (tdi."danger_length") THEN tdi."danger_length" ELSE 0 END) AS dangerLength,
        SUM(CASE WHEN (tdi."hazard_rating" != '无危害') THEN 1 ELSE 0 END) AS totalDangerNum,
        SUM(CASE WHEN (tdi."investigation_variety" = '白蚁' and tdi."hazard_rating" != '无危害') THEN 1 ELSE 0 END) AS termiteNum,
        SUM(CASE WHEN (tdi."investigation_variety" != '白蚁' and tdi."hazard_rating" != '无危害') THEN 1 ELSE 0 END) AS otherNum
@@ -103,26 +107,33 @@
        <if test="vo.tbYear !=null and vo.tbYear !=''">
            AND tdi."tb_year" = #{vo.tbYear}
        </if>
        group by tdi."tb_state_id",tdi."dyke_guid"
            group by tdi."tb_state_id",tdi."dyke_guid",tdi."stake_mark"
            )TEMP1
        )temp2 group by
            temp2."tb_state_id",
            temp2."dyke_guid",
            temp2.totalDangerNum,
            temp2.termiteNum,
            temp2.otherNum

        ) tmp on tmp."tb_state_id" = b."guid"
        ) tmp on tmp."tb_state_id" = tdis."guid"
        where 1 = 1
        <if test="vo.tbYear !=null and vo.tbYear !=''">
            AND b."tb_year" = #{vo.tbYear}
            AND tdis."tb_year" = #{vo.tbYear}
        </if>
        <if test="vo.name !=null and vo.name !=''">
            AND a."name" LIKE CONCAT('%',#{vo.name},'%')
            AND trd."name" LIKE CONCAT('%',#{vo.name},'%')
        </if>
        <if test="vo.tbState != null and vo.tbState !=''">
            AND (
            <if test="vo.tbState == -1">
                b."check_state" IS NULL OR
                tdis."check_state" IS NULL OR
            </if>
            b."check_state" = #{vo.tbState}
            tdis."check_state" = #{vo.tbState}
            )
        </if>
        <if test="vo.adCode != null and vo.adCode != '' ">
            and a."ad_code" LIKE #{vo.adCode}
            and trd."ad_code" LIKE #{vo.adCode}
        </if>
    </select>
</mapper>

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

@@ -2,6 +2,7 @@

import cn.gistack.sm.sjztmd.entity.AttAdBase;
import cn.gistack.sm.sjztmd.vo.AttAdBaseVO;
import cn.gistack.sm.sjztmd.vo.ChargePersonVO;
import cn.gistack.sm.sjztmd.vo.PersonVO;
import com.baomidou.mybatisplus.extension.service.IService;


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

@@ -3,6 +3,7 @@
import cn.gistack.sm.intelligentCall.entity.Scene;
import cn.gistack.sm.sjztmd.entity.AttResManagePerson;
import cn.gistack.sm.sjztmd.entity.PatrolResponsiblePerson;
import cn.gistack.sm.sjztmd.vo.ChargePersonVO;
import cn.gistack.sm.sjztmd.vo.PersonVO;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springblade.core.tool.api.R;
@@ -98,5 +99,5 @@
     */
    List<AttResManagePerson> getPersonList(String resCd);

    List<PersonVO> getManagePersonList(String resId,String findType);
    List<ChargePersonVO> getManagePersonList(String resId, String findType);
}

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

@@ -6,16 +6,12 @@
import cn.gistack.sm.sjztmd.mapper.AttResManagePersonMapper;
import cn.gistack.sm.sjztmd.service.IAttResBaseService;
import cn.gistack.sm.sjztmd.service.IAttResManagePersonService;
import cn.gistack.sm.sjztmd.vo.AttResAdVO;
import cn.gistack.sm.sjztmd.vo.AttResBaseVO;
import cn.gistack.sm.sjztmd.vo.PersonVO;
import cn.gistack.sm.sjztmd.vo.UserPersonVO;
import cn.gistack.sm.sjztmd.vo.*;
import cn.gistack.system.user.entity.User;
import cn.gistack.system.user.feign.IUserClient;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
@@ -203,8 +199,8 @@

    @Override
    @DS("zt")
    public List<PersonVO> getManagePersonList(String resId,String findType) {
        List<PersonVO> result = new ArrayList<>();
    public List<ChargePersonVO> getManagePersonList(String resId, String findType) {
        List<ChargePersonVO> result = new ArrayList<>();
        if (StringUtil.isEmpty(resId)){
            throw new ServiceException("水库id为空");
        }
@@ -224,31 +220,31 @@
                List<User> userList = userClient.userInfoByPhone("000000", p.getUserPhone()).getData();
                if (userList.size() > 0) {

                    PersonVO personVO = new PersonVO();
                    personVO.setUserId(userList.get(0).getId().toString());
                    personVO.setUserName(userList.get(0).getRealName());
                    personVO.setType(p.getType());
                    ChargePersonVO chargePersonVO = new ChargePersonVO();
                    chargePersonVO.setUserId(userList.get(0).getId().toString());
                    chargePersonVO.setUserName(userList.get(0).getRealName());
                    chargePersonVO.setType(p.getType());
                    //1.政府行政责任人,2.主管部门责任人,3.管理单位责任人,4.技术责任人,5.巡查责任人，6.行政责任人
                    switch (p.getType()){
                        case "1":
                            personVO.setRoleName("行政责任人");
                            chargePersonVO.setRoleName("行政责任人");
                            break;
                        case "2":
                            personVO.setRoleName("主管部门责任人");
                            chargePersonVO.setRoleName("主管部门责任人");
                            break;
                        case "3":
                            personVO.setRoleName("管理单位责任人");
                            chargePersonVO.setRoleName("管理单位责任人");
                            break;
                        case "4":
                            personVO.setRoleName("技术责任人");
                            chargePersonVO.setRoleName("技术责任人");
                            break;
                        case "5":
                            personVO.setRoleName("巡查责任人");
                            chargePersonVO.setRoleName("巡查责任人");
                            break;
                        default:
                            break;
                    }
                    result.add(personVO);
                    result.add(chargePersonVO);
                }

        });
@@ -261,7 +257,7 @@

        if (StringUtil.isBlank(findType) || findType.indexOf("9")>-1){

            List<PersonVO> deptUser = new ArrayList<>();
            List<ChargePersonVO> deptUser = new ArrayList<>();

            if (cityName != null && cityName.equals("省直管")){
                //如果是省直管，找省厅管理员

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

@@ -4,6 +4,7 @@
import cn.gistack.sm.sjztmd.mapper.TbResDykeMapper;
import cn.gistack.sm.sjztmd.service.ITbResDykeService;
import cn.gistack.sm.sjztmd.vo.TbResDykeVO;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -15,6 +16,7 @@

@Data
@Service
@DS("zt")
public class TbResDykeServiceImpl extends ServiceImpl<TbResDykeMapper, TbResDyke> implements ITbResDykeService {
    @Override
    public TbResDykeVO getDetail(TbResDyke resDyke) {

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/AttResBaseGeneralInvestigationVO.java

@@ -33,6 +33,8 @@
    //三级危害普查长度
    private double thirdLength;

    private boolean hasDanger;

    //危害总处数
    private int totalDangerNum;


 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/ChargePersonVO.java

File was renamed from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/PersonVO.java
@@ -3,7 +3,7 @@
import lombok.Data;

@Data
public class PersonVO {
public class ChargePersonVO {

    private String userId;


 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/TbResDykeVO.java

@@ -16,6 +16,9 @@

    private Integer tbYear;//填报年度

    //危害长度
    private double totalDangerLength;

    //危害总普查长度
    private double totalLength;

@@ -38,4 +41,6 @@
    private int otherNum;

    private String tbStateId;

    private boolean hasDanger;
}