Merge remote-tracking branch 'origin/liuna'

src/main/java/com/hp/cmsz/repository/KpiDao.java

@@ -48,8 +48,8 @@ public interface KpiDao extends JpaSpecificationExecutor<Kpi>,PagingAndSortingRe
        List<Object[]> findAllKpiIdAndKpiNameByBusinessId(@Param("businessIdList") List<Long> businessIdList);
        
        //由业务,采集频率联动得到指标
-       @Query("select kpi.kpiId, kpi.kpiName from Kpi kpi,Business business where business.businessId = kpi.businessId and kpi.isActive = 'Y' and kpi.calCycle=:calCycleValue and business.businessId in (:businessIds) and kpi.kpiId>=0 order by kpi.kpiId ")
-       List<Object[]> findKpiIdAndKpiNameByBusinessIds(@Param("businessIds")List<Long> businessIdList, @Param("calCycleValue") String calCycleValue);
+       @Query("select kpi.kpiId, kpi.kpiName, kpi.kpiCode from Kpi kpi,Business business where business.businessId = kpi.businessId and kpi.isActive = 'Y' and kpi.calCycle=:calCycleValue and business.businessId in (:businessIds) and kpi.kpiId>=0 order by kpi.kpiId ")
+       List<Object[]> findKpiIdAndKpiNameAndKpiCodeByBusinessIds(@Param("businessIds")List<Long> businessIdList, @Param("calCycleValue") String calCycleValue);
        
        //由单个业务ID得到指标
        @Query("select kpi.kpiId, kpi.kpiName from Kpi kpi,Business business where kpi.businessId=business.businessId and business.businessId = :businessIdList and kpi.kpiId >=0")

src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleConfigurationController.java

@@ -178,7 +178,7 @@ public class QualityRuleConfigurationController {
 		for(int i=0;i<strs.length;i++) {
 			businessIdlist.add(Long.valueOf(strs[i]));
 		}
-		List<Object[]> businessKpiList = (List<Object[]>)kpiDao.findKpiIdAndKpiNameByBusinessIds(businessIdlist,calCycleValue);
+		List<Object[]> businessKpiList = kpiDao.findKpiIdAndKpiNameAndKpiCodeByBusinessIds(businessIdlist,calCycleValue);
 
 		Gson gson = new Gson();
 		response.setContentType("text/Xml;charset=gbk");

src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java

@@ -168,7 +168,7 @@ public class QualityRuleMaintainController {
 		for(int i=0;i<strs.length;i++) {
 			businessIdlist.add(Long.valueOf(strs[i]));
 		}
-		List<Object[]> businessKpiList = (List<Object[]>)kpiDao.findKpiIdAndKpiNameByBusinessIds(businessIdlist,calCycleValue);
+		List<Object[]> businessKpiList = (List<Object[]>)kpiDao.findKpiIdAndKpiNameAndKpiCodeByBusinessIds(businessIdlist,calCycleValue);
 		
 		 Gson gson = new Gson();
 		 response.setContentType("text/Xml;charset=gbk");

src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleConfiguration.jsp

@@ -269,7 +269,7 @@
 
         //form表单提交
         $("#ruleSubmit").click(function(){
-            if($.trim($("#kpiMonitorTime").val())==""){
+            if($.trim($("#frequencyValue").val())==""){
                 $.alert("指标监控时间不能为空");
             }else if($("#businessTime").val()==""){
                 $.alert("指标业务时间不能为空");
@@ -441,7 +441,8 @@
                     td.empty();
                     data = JSON.parse(data)
                     data.forEach(function(t){
-                        td.append("<input type='checkbox' name='kpiinput' class='kpiItem' value='"+t[0]+"' >"+t[1]+"</input>")
+                        console.log(data)
+                        td.append("<input type='checkbox' title='kpiCode' name='kpiinput' class='kpiItem' value='"+t[0]+"' >"+t[1]+"</input>")
                     });
                 }
             });

src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp

@@ -261,7 +261,7 @@ $("#addParam").click(function(){
 
 	//form表单提交
 	$("#ruleSubmit").click(function(){
-		if($.trim($("#kpiMonitorTimeValue").val())==""){
+		if($.trim($("#frequencyValue").val())==""){
 			$.alert("指标监控时间不能为空");
 		}else if($("#businessTime").val()==""){
 			$.alert("指标业务时间不能为空");