Merge branch 'develop' into feature-zhaji

yifu-social/yifu-social-biz/src/main/resources/mapper/TForecastLibraryMapper.xml

@@ -606,11 +606,11 @@
 		SELECT
 			a.id,
 			a.EMP_IDCARD,
-			sum(ifnull(a.UNIT_BITAILMENT_FEE,0)) UNIT_BIGMAILMENT_MONEY,
-			sum(ifnull(a.UNIT_SOCIAL_SUM,0)) UNIT_SOCIAL_SUM,
-			sum(ifnull(a.PERSONAL_SOCIAL_SUM,0)) SOCIAL_SECURITY_PERSONAL_SUM,
-			sum(ifnull(a.UNIT_FUND_SUM,0)) UNIT_PROVIDENT_SUM,
-			sum(ifnull(a.PERSONAL_FUND_SUM,0)) PERSONAL_PROVIDENT_SUM,
+			ifnull(a.UNIT_BITAILMENT_FEE,0) UNIT_BIGMAILMENT_MONEY,
+			ifnull(a.UNIT_SOCIAL_SUM,0) UNIT_SOCIAL_SUM,
+			ifnull(a.PERSONAL_SOCIAL_SUM,0) SOCIAL_SECURITY_PERSONAL_SUM,
+			ifnull(a.UNIT_FUND_SUM,0) UNIT_PROVIDENT_SUM,
+			ifnull(a.PERSONAL_FUND_SUM,0) PERSONAL_PROVIDENT_SUM,
 			a.SALARY_SOCIAL_FLAG,
 			a.SALARY_FUND_FLAG,
 			a.SOCIAL_PAY_MONTH,
@@ -639,7 +639,6 @@
 				</if>
 			</if>
 		</where>
-		GROUP BY a.EMP_IDCARD
 	</select>
 
 	<!-- 更改薪资社保结算状态 -->

yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml

@@ -997,11 +997,11 @@
 		SELECT
 		a.id,
 		a.EMP_IDCARD,
-		sum(ifnull(a.UNIT_BIGMAILMENT_MONEY,0)) UNIT_BIGMAILMENT_MONEY,
-		sum(ifnull(a.UNIT_SOCIAL_SUM,0)) UNIT_SOCIAL_SUM,
-		sum(ifnull(a.SOCIAL_SECURITY_PERSONAL_SUM,0)) SOCIAL_SECURITY_PERSONAL_SUM,
-		sum(ifnull(a.UNIT_PROVIDENT_SUM,0)) UNIT_PROVIDENT_SUM,
-		sum(ifnull(a.PERSONAL_PROVIDENT_SUM,0)) PERSONAL_PROVIDENT_SUM,
+		ifnull(a.UNIT_BIGMAILMENT_MONEY,0) UNIT_BIGMAILMENT_MONEY,
+		ifnull(a.UNIT_SOCIAL_SUM,0) UNIT_SOCIAL_SUM,
+		ifnull(a.SOCIAL_SECURITY_PERSONAL_SUM,0) SOCIAL_SECURITY_PERSONAL_SUM,
+		ifnull(a.UNIT_PROVIDENT_SUM,0) UNIT_PROVIDENT_SUM,
+		ifnull(a.PERSONAL_PROVIDENT_SUM,0) PERSONAL_PROVIDENT_SUM,
 		a.SALARY_SOCIAL_FLAG,
 		a.SALARY_FUND_FLAG,
 		a.SOCIAL_PAY_MONTH,
@@ -1030,7 +1030,6 @@
 				</if>
 			</if>
 		</where>
-		GROUP BY a.EMP_IDCARD
 	</select>
 
 	<!-- 更改薪资社保结算状态 -->