单位考评评级等级同步首页数据功能完善

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/EvaluateReportServiceImpl.java

@@ -528,7 +528,6 @@ public class EvaluateReportServiceImpl extends ServiceImpl<EvaluateReportMapper,
 				}
 			}
 			boolean orgRat = iOrganizationRatingService.saveOrUpdateBatch(orlist);
-			System.out.println(orgRat);
 
 			if(null !=portalList && portalList.size()>0){
 

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/OrganizationRatingServiceImpl.java

@@ -95,7 +95,7 @@ public class OrganizationRatingServiceImpl extends ServiceImpl<OrganizationRatin
 			//遍历Excel表每一行的数据
 			for (String[] str : strings) {
 				if (!str[1].equals(binName)) {
-					return R.error("请导入" + binSection + "的数据");
+					return R.error("请导入" + binName + "的数据");
 				}
 				if (!str[2].equals(orgRatings.get(0).getYear())) {
 					return R.error("请导入" + year + "年的数据");
@@ -119,6 +119,7 @@ public class OrganizationRatingServiceImpl extends ServiceImpl<OrganizationRatin
 				}
 			}
 			boolean b = super.saveOrUpdateBatch(orgList);
+			savePortal(orgList);
 			if (b) {
 				return R.ok().data(b);
 			} else {

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

@@ -36,7 +36,9 @@
 
     <select id="selectPortalList" resultType="java.util.Map">
         SELECT
-        ep.*,
+
+        ep.id,ep.bin_section,ep.company,REPLACE(ep.grade,'"','') as grade,ep.score,ep.base_score,ep.year,ep.season,ep.matter_heigh,ep.matter_low,ep.manage_heigh,
+        ep.manage_low,ep.standard_heigh,ep.standard_low,ep.dept_id,ep.create_time,ep.memo1,ep.memo2,ep.memo3,ep.memo4,ep.dept_name,ep.bin_stage,ep.bin_property,
         bs.section_name,
         ea.portal_id,
         ea.matter_heigh_note,

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

@@ -8,7 +8,7 @@
         select
         r.id,r.organization_year_rating_id,r.organization_short_name,r.organization_id,r.year,r.bin_section,TRIM('"' FROM r.scjy_rate) AS scjy_rate,
         TRIM('"' FROM r.qq_rate) AS qq_rate,TRIM('"' FROM r.jj_rate) AS jj_rate,TRIM('"' FROM r.year_rate) AS year_rate,r.create_by,r.update_by,r.create_time,r.update_time,
-        r.remark,r.safety_env_protection,r.veto,r.net_profit,r.composite_score,r.annual_target,r.bonus_point,r.composite_score_raking,r.project_level,
+        r.remark,r.safety_env_protection,r.veto,r.net_profit,r.composite_score,r.annual_target,r.bonus_point,r.composite_score_raking,r.project_level,r.score,
             bs.section_name binsectionname
         from
             organization_rating r