资料整编导出优化

xieb

2023-12-11 d10defb38403e0547c8ab1bf7bb082fa6c746a8b

资料整编导出优化

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

@@ -150,7 +150,7 @@
        tableMap.put("engGrad", tbAttResBase.getEngGrad());
        tableMap.put("longitude", tbAttResBase.getLgtd());
        tableMap.put("latitude", tbAttResBase.getLttd());
        tableMap.put("elevationSystem", tbAttResBase.getElevationSystem());
        tableMap.put("elevationSystem", tbAttResBase.getElevationSystem().replace(",","").replace("其它",""));
        tableMap.put("region", tbAttResBase.getBuildAddress());
        tableMap.put("basName", BasCodeEnum.find(tbAttResBase.getBasCode()).getLabel());
        tableMap.put("locRvName", tbAttResBase.getLocRvName());
@@ -173,7 +173,7 @@
                ResFucEnum resFucEnum = ResFucEnum.find(key);
                resFucTextList.add(resFucEnum.getLabel());
            }
            resFunc = String.join(",", resFucTextList);
            resFunc = String.join("、", resFucTextList);
        }
        tableMap.put("resFunc", resFunc);
        //水文特征
@@ -320,7 +320,13 @@
            }

            norCheckingFloodDischarge = isNullObject(tbAttResRsbNorspi.getCheckingFloodDischarge());
            disEnergyType = isNullObject(tbAttResRsbNorspi.getDisEnergyType());
            disEnergyType = isNullObject(tbAttResRsbNorspi.getDisEnergyType()).equals("1")?"挑流消能":
                isNullObject(tbAttResRsbNorspi.getDisEnergyType()).equals("2")?"底流消能":
                    isNullObject(tbAttResRsbNorspi.getDisEnergyType()).equals("3")?"面流消能":
                    isNullObject(tbAttResRsbNorspi.getDisEnergyType()).equals("4")?"戽流消能":
                    isNullObject(tbAttResRsbNorspi.getDisEnergyType()).equals("5")?"跌流消能":
                    isNullObject(tbAttResRsbNorspi.getDisEnergyType()).equals("6")?"孔板消能":
                    isNullObject(tbAttResRsbNorspi.getDisEnergyType()).equals("9")?"其他":"";
            List<String> list = new ArrayList<>();


@@ -383,7 +389,7 @@
            coveLength = isNullObject(tbAttResRsbSpillway.getCoveLength());
            rsbThresholdElevation = isNullObject(tbAttResRsbSpillway.getThresholdElevation());
            rsbExportElevation = isNullObject(tbAttResRsbSpillway.getExportElevation());
            rsbSection = StringUtil.format("{}X{}", tbAttResRsbSpillway.getSectionWide(), tbAttResRsbSpillway.getSectionLength());
            rsbSection = StringUtil.format("{}×{}", tbAttResRsbSpillway.getSectionWide(), tbAttResRsbSpillway.getSectionLength());
            ;
            checkFlDisCharge = isNullObject(tbAttResRsbSpillway.getCheckFlDisCharge());

@@ -423,7 +429,7 @@
            aqueductLength = isNullObject(tbAttResWaterDelivery.getAqueductLength());
            thresholdElevation = isNullObject(tbAttResWaterDelivery.getThresholdElevation());
            exportElevation = isNullObject(tbAttResWaterDelivery.getExportElevation());
            deliverSection = StringUtil.format("{}X{}", tbAttResWaterDelivery.getSectionWide(), tbAttResWaterDelivery.getSectionHigh());
            deliverSection = StringUtil.format("{}×{}", tbAttResWaterDelivery.getSectionWide(), tbAttResWaterDelivery.getSectionHigh());
            designFlow = isNullObject(tbAttResWaterDelivery.getDesignFlow());
            workingGateType = tbAttResWaterDelivery.getWorkingGateType();
            List<String> list = new ArrayList<>();
@@ -501,11 +507,11 @@
        }

        tableMap.put("flControlPerson", String.format("%.2f", person));
        tableMap.put("flControlLand", tbAttResEngBene.getFlControlLand());
        tableMap.put("flControlLand", String.format("%.2f", tbAttResEngBene.getFlControlLand() / 10000));
        tableMap.put("irrObject", tbAttResEngBene.getIrrObject());
        tableMap.put("moyearIrrAvg", tbAttResEngBene.getMoyearIrrAvg());
        tableMap.put("desIrrArea", tbAttResEngBene.getDesIrrArea());
        tableMap.put("checIrrArea", tbAttResEngBene.getChecIrrArea());
        tableMap.put("desIrrArea", String.format("%.2f", tbAttResEngBene.getDesIrrArea() / 10000));
        tableMap.put("checIrrArea", String.format("%.2f", tbAttResEngBene.getChecIrrArea() / 10000));
        tableMap.put("supplyObject", tbAttResEngBene.getSupplyObject());

        Double sup = 0.0;
@@ -536,10 +542,10 @@
        tableMap.put("resMaxOutFlow", tbAttResProjectUtilize.getResMaxOutFlow());
        //new SimpleDateFormat("yyyy-MM-dd").format(tbAttResProjectUtilize.getResMaxStagDate())

        String resMaxStagDate = tbAttResProjectUtilize.getResMaxStagDate() != null ? new SimpleDateFormat("yyyy-MM-dd").format(tbAttResProjectUtilize.getResMaxStagDate()) : "";
        String resMinStagDate = tbAttResProjectUtilize.getResMinStagDate() != null ? new SimpleDateFormat("yyyy-MM-dd").format(tbAttResProjectUtilize.getResMinStagDate()) : "";
        String resMaxInFlowDate = tbAttResProjectUtilize.getResMaxInFlowDate() != null ? new SimpleDateFormat("yyyy-MM-dd").format(tbAttResProjectUtilize.getResMaxInFlowDate()) : "";
        String resMaxOutFlowDate = tbAttResProjectUtilize.getResMaxOutFlowDate() != null ? new SimpleDateFormat("yyyy-MM-dd").format(tbAttResProjectUtilize.getResMaxOutFlowDate()) : "";
        String resMaxStagDate = tbAttResProjectUtilize.getResMaxStagDate() != null ? new SimpleDateFormat("yyyy年MM月dd日").format(tbAttResProjectUtilize.getResMaxStagDate()) : "";
        String resMinStagDate = tbAttResProjectUtilize.getResMinStagDate() != null ? new SimpleDateFormat("yyyy年MM月dd日").format(tbAttResProjectUtilize.getResMinStagDate()) : "";
        String resMaxInFlowDate = tbAttResProjectUtilize.getResMaxInFlowDate() != null ? new SimpleDateFormat("yyyy年MM月dd日").format(tbAttResProjectUtilize.getResMaxInFlowDate()) : "";
        String resMaxOutFlowDate = tbAttResProjectUtilize.getResMaxOutFlowDate() != null ? new SimpleDateFormat("yyyy年MM月dd日").format(tbAttResProjectUtilize.getResMaxOutFlowDate()) : "";
        tableMap.put("resMaxStagDate", resMaxStagDate);
        tableMap.put("resMinStagDate", resMinStagDate);
        tableMap.put("resMaxInFlowDate", resMaxInFlowDate);
@@ -554,7 +560,7 @@
        tableMap.put("isWmst", InfoBuildingEnum.find(tbAttResInformationProject.getIsWmst()).getLabel());
        tableMap.put("isTermites", InfoBuildingEnum.find(tbAttResInformationProject.getIsTermites()).getLabel());
        //
        String tm = tbAttResSafetyMonitor.getSafetyAppraisalTime() != null ? new SimpleDateFormat("yyyy-MM-dd").format(tbAttResSafetyMonitor.getSafetyAppraisalTime()) : "";
        String tm = tbAttResSafetyMonitor.getSafetyAppraisalTime() != null ? new SimpleDateFormat("yyyy年MM月dd日").format(tbAttResSafetyMonitor.getSafetyAppraisalTime()) : "";
        tableMap.put("safetyAppraisalTime", tm);
        tableMap.put("safetyAppraisalResult", tbAttResSafetyMonitor.getSafetyAppraisalResult());


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

Binary files differ