Commit 5c70926c authored by 周昊's avatar 周昊
Browse files

1、word修改优化

2、开发现有风险的评分
parent 87349419
Loading
Loading
Loading
Loading
+13 −0
Original line number Diff line number Diff line
@@ -861,4 +861,17 @@ public class RiskPlanAppController extends BaseController {
        return AjaxResult.success(ledgerFloorService.copyFloor(sourceFloorId,targetFloorId,planId,getLoginUser()));
    }



    /**
     * 现有风险根据得分返回对应的风险等级
     *
     * @param score 得分
     * @real_return {@link R<RiskAssessmentMatrixLevel>}
     */
    @GetMapping("/existing/matrix/score/{score}")
    public R<RiskAssessmentMatrixLevel> getRiskAssessmentExistingMatrixLevelByScore(@PathVariable BigDecimal score) {
        return R.ok(riskAssessmentMatrixLevelService.getRiskAssessmentExistingMatrixLevelByScore(score));
    }

}
+2 −0
Original line number Diff line number Diff line
@@ -14,4 +14,6 @@ import java.math.BigDecimal;
public interface IRiskAssessmentMatrixLevelService extends IService<RiskAssessmentMatrixLevel> {

    RiskAssessmentMatrixLevel getRiskAssessmentMatrixLevelByScore(BigDecimal score);

    RiskAssessmentMatrixLevel getRiskAssessmentExistingMatrixLevelByScore(BigDecimal score);
}
+15 −0
Original line number Diff line number Diff line
@@ -44,4 +44,19 @@ public class RiskAssessmentMatrixLevelServiceImpl

        return first.get();
    }

    @Override
    public RiskAssessmentMatrixLevel getRiskAssessmentExistingMatrixLevelByScore(BigDecimal score) {
        RiskAssessmentMatrixLevel riskAssessmentMatrixLevel = new RiskAssessmentMatrixLevel();
        if (score.compareTo(new BigDecimal(1))<=0){
            riskAssessmentMatrixLevel.setLevel("低风险");
        }else if (score.compareTo(new BigDecimal(2))>0 && score.compareTo(new BigDecimal(3))<=0){
            riskAssessmentMatrixLevel.setLevel("一般风险");
        }else if (score.compareTo(new BigDecimal(3))>0 && score.compareTo(new BigDecimal(3.5))<=0){
            riskAssessmentMatrixLevel.setLevel("较大风险");
        }else {
            riskAssessmentMatrixLevel.setLevel("重大风险");
        }
        return riskAssessmentMatrixLevel;
    }
}
+2 −15
Original line number Diff line number Diff line
@@ -698,9 +698,7 @@
                                        <wx:font wx:val="宋体"/>
                                    </w:rPr>
                                    <#if dangerName??>
                                        <w:t>
                                            ${dangerName}
                                        </w:t>
                                        <w:t>${dangerName}</w:t>
                                    </#if>
                                </w:r>
                            </w:p>
@@ -769,11 +767,9 @@
                                    <w:rPr>
                                        <wx:font wx:val="宋体"/>
                                    </w:rPr>
                                    <w:t>
                                        <#if pointType??>
                                            <w:t>${pointType}</w:t>
                                        </#if>
                                    </w:t>
                                </w:r>
                            </w:p>
                        </w:tc>
@@ -791,11 +787,10 @@
                                    <w:rPr>
                                        <wx:font wx:val="宋体"/>
                                    </w:rPr>
                                    <w:t>

                                        <#if type??>
                                            <w:t>${type}</w:t>
                                        </#if>
                                    </w:t>
                                </w:r>
                            </w:p>
                        </w:tc>
@@ -967,11 +962,9 @@
                                    <w:rPr>
                                        <wx:font wx:val="宋体"/>
                                    </w:rPr>
                                    <w:t>
                                        <#if measuresAdministration??>
                                            <w:t>${measuresAdministration}</w:t>
                                        </#if>
                                    </w:t>
                                </w:r>
                            </w:p>
                        </w:tc>
@@ -1051,11 +1044,9 @@
                                    <w:jc w:val="center"/>
                                </w:pPr>
                                <w:r wsp:rsidRPr="009370A0">
                                    <w:t>
                                        <#if deptName??>
                                            <w:t>${deptName}</w:t>
                                        </#if>
                                    </w:t>
                                </w:r>
                            </w:p>
                        </w:tc>
@@ -1070,11 +1061,9 @@
                                    <w:jc w:val="center"/>
                                </w:pPr>
                                <w:r wsp:rsidRPr="009370A0">
                                    <w:t>
                                        <#if userName??>
                                            <w:t>${userName}</w:t>
                                        </#if>
                                    </w:t>
                                </w:r>
                            </w:p>
                        </w:tc>
@@ -1092,11 +1081,9 @@
                                    <w:rPr>
                                        <wx:font wx:val="宋体"/>
                                    </w:rPr>
                                    <w:t>
                                        <#if measuresEmergency??>
                                            <w:t>${measuresEmergency}</w:t>
                                        </#if>
                                    </w:t>
                                </w:r>
                            </w:p>
                        </w:tc>