资料整编导出水库效益、管理体制

aix

2024-07-17 994a3ef06957ba2a68915531ffae0a2f0dd8939d

资料整编导出水库效益、管理体制

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

@@ -44,6 +44,7 @@

    /**
     * 责任人类型
     * 1.政府行政责任人,2.主管部门责任人,3.管理单位责任人,4.技术责任人,5.巡查责任人，6.行政责任人
     */
    @ApiModelProperty(value = "责任人类型")
    @TableField("\"type\"")

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

@@ -400,7 +400,7 @@
                this.administrativeUnit = attResManagePerson.getUserUnit();
            }

            if (attResManagePerson.getType().equals("2")) {
            if (attResManagePerson.getType().equals("3")) {
                //主管
                this.competentDepartmentInfo = StringUtil.format("{}({}，{})",
                    attResManagePerson.getUserName(), attResManagePerson.getPosition(), attResManagePerson.getUserPhone());
@@ -562,10 +562,24 @@
            return;
        }

        this.protectCity = tbAttResEngBene.getCity().equals("无")?"":tbAttResEngBene.getCity();
        this.protectCity = tbAttResEngBene.getCity().equals("无")?tbAttResEngBene.getTown():tbAttResEngBene.getCity();
        if (StringUtil.isBlank(this.protectCity)) {
            this.protectCity = tbAttResEngBene.getTown().equals("无")?"":tbAttResEngBene.getTown();
        }

        double person = tbAttResEngBene.getFlControlPerson() / 10000.0;

        if (person > 0) {
            this.protectPersonLand = String.format("%.2f",person) + "万人口";
        }

        if (tbAttResEngBene.getFlControlLand() > 0) {
            if (StringUtil.isBlank(this.protectPersonLand)) {
                this.protectPersonLand = String.format("%.2f", tbAttResEngBene.getFlControlLand()) + "万亩耕地";
            } else {
                this.protectPersonLand = this.protectPersonLand + "、" + String.format("%.2f", tbAttResEngBene.getFlControlLand()) + "万亩耕地";
            }
        }

        this.protectPersonLand =
            StringUtil.format("{}万人口、{}万亩耕地", String.format("%.2f",person) , String.format("%.2f", tbAttResEngBene.getFlControlLand() / 1000));
@@ -637,7 +651,7 @@
        String type = SafetyAppraisalTypeEnum.find(tbAttResSafetyMonitor.getSafetyAppraisalResult()).getLabel();
        String surveyProblem = tbAttResSafetyMonitor.getSurveyProblem();
        //（若一类坝，不介绍问题，二、三类坝介绍）
        if (tbAttResSafetyMonitor.equals("1")) {
        if (tbAttResSafetyMonitor.getSafetyAppraisalResult().equals("1")) {
            this.safetyMonitorText = StringUtil.format("{}，水库进行安全鉴定，鉴定结果为\"{}\"。",
                time, type);
        } else {
@@ -653,7 +667,7 @@
        }

        this.mUnitName = tbAttResMgrSysB.getMUnitName();
        this.mUnitNature = tbAttResMgrSysB.getMUnitNature().replace("公益类","");
        this.mUnitNature = tbAttResMgrSysB.getMUnitNature();
        this.mUnitPersonNumber = tbAttResMgrSysB.getMUnitPersonNumber().toString();
    }


 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/resources/word/doc/skcgmb.docx

Binary files differ