rollback

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml

@@ -86,13 +86,13 @@
         <if test="orgType != null and orgType != ''">
             <choose>
                 <when test="orgType == 'grid'">
-                    INNER JOIN screen_customer_grid org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.GRID_ID = score.ORG_ID AND org.DEL_FLAG = '0'
+                    INNER JOIN screen_customer_grid org ON  org.GRID_ID = score.ORG_ID AND org.DEL_FLAG = '0'
                 </when>
                 <when test="orgType == 'agency'">
-                    INNER JOIN screen_customer_agency org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.AGENCY_ID = score.ORG_ID AND org.DEL_FLAG = '0'
+                    INNER JOIN screen_customer_agency org ON  org.AGENCY_ID = score.ORG_ID AND org.DEL_FLAG = '0'
                 </when>
                   <when test="orgType == 'department'">
-                    INNER JOIN screen_customer_dept org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.DEPT_ID = score.ORG_ID AND org.DEL_FLAG = '0'
+                    INNER JOIN screen_customer_dept org ON  org.DEPT_ID = score.ORG_ID AND org.DEL_FLAG = '0'
                 </when>
             </choose>
         </if>

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml

@@ -31,6 +31,19 @@
         score.ORG_TYPE orgType
         FROM
         screen_index_data_yearly score
+        <if test="orgType != null and orgType != ''">
+            <choose>
+                <when test="orgType == 'grid'">
+                    INNER JOIN screen_customer_grid org ON  org.GRID_ID = score.ORG_ID AND org.DEL_FLAG = '0'
+                </when>
+                <when test="orgType == 'agency'">
+                    INNER JOIN screen_customer_agency org ON  org.AGENCY_ID = score.ORG_ID AND org.DEL_FLAG = '0'
+                </when>
+                <when test="orgType == 'department'">
+                    INNER JOIN screen_customer_dept org ON  org.DEPT_ID = score.ORG_ID AND org.DEL_FLAG = '0'
+                </when>
+            </choose>
+        </if>
         WHERE
         score.del_flag = '0'
         AND score.parent_id = #{agencyId}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexCollectServiceImpl.java

@@ -893,6 +893,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
                 deleteNum = screenIndexDataYearlyDao.deleteIndexDataYearly(customerId, getYearStr(monthId));
             } while (deleteNum > NumConstant.ZERO);
             List<IndexDataYearlyFormDTO> entity = ConvertUtils.sourceToTarget(monthlyFormList, IndexDataYearlyFormDTO.class);
+            log.info("插入的entity:"+ JSON.toJSONString(entity));
             screenIndexDataYearlyDao.batchInsertIndexDataYearly(entity, customerId);
         }
     }