wangchangsheng il y a 1 an
Parent
commit
3f6e1d336d

+ 1 - 0
ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/DeptResponsibilityServiceImpl.java

@@ -226,6 +226,7 @@ public class DeptResponsibilityServiceImpl extends ServiceImpl<DeptResponsibilit
 				info.setIsQuantified(dto.getIsQuantified());
 				info.setCreateTime(new Date());
 				info.setState("0");
+				info.setDataState("有效");
 				info.setOrganizationId(evaluationRule.getOrganizationId());
 				infoList.add(info);
 

+ 1 - 1
ims-service/ims-eval/src/main/resources/mappers/OrganizationEvaluationInfoMapper.xml

@@ -364,7 +364,7 @@
             and id.option_code not in ('CZMAX','CZMIN','LRGXKLMAX','LRGXKLMIN','DWQWLRMAX','DWQWLRMIN','LRGXKHMAX','LRGXKHMIN')
         </where>
 
-        order by be.order_num,oer.organization_short_name,bn.order_num,ri.order_num,id.child_code,id.option_code,id.option_order asc
+        order by oer.order_num asc
 
     </select>
 

+ 1 - 1
ims-service/ims-eval/src/main/resources/mappers/OrganizationEvaluationRuleMapper.xml

@@ -72,7 +72,7 @@
                 </if>
 
 
-                order by r.organization_short_name asc
+                order by r.order_num asc
 
             </where>
 

+ 2 - 0
ims-service/ims-eval/src/main/resources/mappers/ResponsibilityIndicatorInfoMapper.xml

@@ -208,6 +208,8 @@
                 and be.id = #{binStage}
             </if>
 
+            and ri.data_state = '有效'
+
         </where>
 
         order by  ri.child_code desc