冲突处理

ims-service/ims-eval/src/main/java/com/ims/eval/service/IEvaluateRuleInfoService.java

@@ -24,4 +24,7 @@ public interface IEvaluateRuleInfoService extends IService<EvaluateRuleInfo> {
 
 	List<EvaluateRuleInfoIndicatorDTO> listByIndicatorInfo(List<String> ruleInfoIds);
 
+	List<EvaluateRuleInfo> getEvaluateRuleInfoByEvaluateRuleId(String evaluateRuleId);
+
+	boolean updateDeleteTime(List<String> ids);
 }

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

@@ -393,5 +393,21 @@
         </where>
     </select>
 
+    <select id="getOrganizationEvaluationInfoListByIndicatorDictionaryId" resultType="com.ims.eval.entity.OrganizationEvaluationInfo">
+        select
+        oei.*,
+        oe.check_cycle checkCycle,
+        oe.year degreeYear,
+        oe.month quarterlyMonth,
+        uic.unit_name companyName,
+        uic.unit_short companyShort,
+        uic.install_capacity installCapacity
+        from organization_evaluation_info oei
+        left join organization_evaluation oe on oe.id = oei.organization_evaluation_id
+        left join unit_install_capacity uic on uic.unit_id = oei.organization_id
+        where oei.indicator_dictionary_id = #{indicatorDictionaryId} and oei.is_quantified = 't'
+        order by oei.organization_id asc
+    </select>
+
 
 </mapper>