需求开发

src/main/resources/mappers/initiateEvaluate/InitiateEvaluateMapper.xml

@@ -78,7 +78,7 @@
         left join pj_evaluate_details ped on ped.evaluate_id = per.evaluate_id
         left join pj_template_config pt on pt.config_id = per.template_id and pt.is_active = 1
         left join pm_org_info poi on per.dept_id = poi.id and poi.status = 1
-#         left join pm_org_info poi1 on poi1.id = r.pro_id
+        left join pm_org_info poi1 on poi1.id = r.pro_id
         where per.is_active = 1
 <!--          <if test="deptId == null or deptId == ''">-->
 <!--              and poi1.user_id = #{userId}-->

src/main/resources/static/pages/evaluate/evaluationSummary/evaluateSummaryForm.html

@@ -453,6 +453,11 @@
                                         subTotals = (subArr.reduce((a, b) => a + b, 0) / subArr.length).toFixed(2);
                                     } else if (twoLevelCountType === '最低分') {
                                         subTotals = Math.min(...subArr).toFixed(2);
+                                    } else if (twoLevelCountType === '累加') {
+                                        subTotals = subArr.reduce((a, b) => a + b, 0).toFixed(2);
+                                    } else if (twoLevelCountType === '累减') {
+                                        const sumOfDifferences = subArr.reduce((sum, value) => sum + (10 - value), 0);
+                                        subTotals = (10 - sumOfDifferences).toFixed(2);
                                     }
                                 } else {
                                     subTotals = "0.00";

src/main/resources/static/pages/evaluate/responsibleApproval/summaryAuditView.html

@@ -252,6 +252,11 @@
                                         subTotals = (subArr.reduce((a, b) => a + b, 0) / subArr.length).toFixed(2);
                                     } else if (twoLevelCountType === '最低分') {
                                         subTotals = Math.min(...subArr).toFixed(2);
+                                    } else if (twoLevelCountType === '累加') {
+                                        subTotals = subArr.reduce((a, b) => a + b, 0).toFixed(2);
+                                    } else if (twoLevelCountType === '累减') {
+                                        const sumOfDifferences = subArr.reduce((sum, value) => sum + (10 - value), 0);
+                                        subTotals = (10 - sumOfDifferences).toFixed(2);
                                     }
                                 } else {
                                     subTotals = "0.00";

src/main/resources/static/pages/evaluate/subEvaluate/InitiateEvaluationList.html

@@ -155,7 +155,7 @@
                         text +=
                             '<a lay-event="view" style="color: #009688;cursor: pointer;font-size: 15px"' +
                             '  id="view">查看</a>';
-                        if (d.status === '未评价'){
+                        if (d.status === '待评价'){
                             text +=
                                 '<a lay-event="edit" style="color: #009688;cursor: pointer;font-size: 15px;margin-left: 10px"' +
                                 '  id="view">编辑</a>';

src/main/resources/static/pages/evaluate/summaryAudit/summaryAuditView.html

@@ -264,6 +264,11 @@
                                         subTotals = (subArr.reduce((a, b) => a + b, 0) / subArr.length).toFixed(2);
                                     } else if (twoLevelCountType === '最低分') {
                                         subTotals = Math.min(...subArr).toFixed(2);
+                                    } else if (twoLevelCountType === '累加') {
+                                        subTotals = subArr.reduce((a, b) => a + b, 0).toFixed(2);
+                                    } else if (twoLevelCountType === '累减') {
+                                        const sumOfDifferences = subArr.reduce((sum, value) => sum + (10 - value), 0);
+                                        subTotals = (10 - sumOfDifferences).toFixed(2);
                                     }
                                 } else {
                                     subTotals = "0.00";

src/main/resources/static/pages/evaluate/template/evaluateTemplateFrom.html

@@ -136,6 +136,8 @@
                                     <input type="radio" name="sub_5161" value="最高分" title="最高分" checked>
                                     <input type="radio" name="sub_5161" value="最低分" title="最低分">
                                     <input type="radio" name="sub_5161" value="平均分" title="平均分">
+                                    <input type="radio" name="sub_5161" value="累加" title="累加">
+                                    <input type="radio" name="sub_5161" value="累减" title="累减">
                                 </div>
                             </div>
                         </div>