Merge remote-tracking branch 'origin/MVP1.5.6' into MVP1.5.6

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java

@@ -179,10 +179,11 @@ public class SalaryAccountUtil implements Serializable {
 								annualBonusFlag = true;
 							}
 							if (SalaryConstants.PHONE_SUBSIDY_JAVA.equals(scs.getJavaFiedName())) {
+
 								BigDecimal bigDecimal1 = NumberUtils.createBigDecimal(cellValueStr);
 								if(bigDecimal1.compareTo(BigDecimal.valueOf(300)) == 1) {
 									errorFlag = false;
-									error = "第" + (i + 2) + "行：当月已发"+cellValueStr+"元，超出300元的限制，禁止导入";
+									error = "第" + (i + 2) + "行：本次发放"+cellValueStr+"元，超出300元的限制，禁止导入";
 									errorList.add(new ErrorMessage((i + 2), error));
 									continue;
 								}
@@ -375,9 +376,10 @@ public class SalaryAccountUtil implements Serializable {
 							BigDecimal LL = item.getSalaryMoney().add(phoneSubsidy);
 							if (LL.compareTo(BigDecimal.valueOf(300)) == 1) {
 								BigDecimal HH = LL.subtract(phoneSubsidy);
-								error = "第" + (i + 2) + "行：当月已发"+HH+"元，超出300元的限制，禁止导入";
+								error = "第" + (i + 2) + "行：当月已发" + HH + "元，本次发放" + phoneSubsidy + "元，累计超出300元限制，禁止发放！";
 								errorList.add(new ErrorMessage((i + 2), error));
 								continue;
+
 							}
 						}
 						if (annualBonusFlag && Common.isEmpty(entity.getAnnualBonusType())) {

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryAccountItemMapper.xml

@@ -31,17 +31,18 @@
 
     <!--tSalaryAccountItem简单分页查询-->
     <select id="getTSalaryAccountItemPage" resultMap="tSalaryAccountItemMap">
-        SELECT
-        ID,
-        SALARY_ACCOUNT_ID,
-        CN_NAME,
-        JAVA_FIED_NAME,
-        SALARY_MONEY,
-        TEXT_VALUE,
-        IS_TAX
-        FROM
+		SELECT
+		ID,
+		SALARY_ACCOUNT_ID,
+		CN_NAME,
+		JAVA_FIED_NAME,
+		SUM(SALARY_MONEY)SALARY_MONEY,
+		TEXT_VALUE,
+		IS_TAX
+		FROM
 			<if test="tSalaryAccountItem.salaryMonth == null or tSalaryAccountItem.salaryMonth.trim() >= '202201'">
 				t_salary_account_item a
+
 			</if>
 			<if test="tSalaryAccountItem.salaryMonth != null and tSalaryAccountItem.salaryMonth.trim() &lt; '202201' ">
 				t_salary_account_item_hro_2021 a
@@ -63,6 +64,7 @@
                 AND SALARY_MONEY = #{tSalaryAccountItem.salaryMoney}
             </if>
         </where>
+		GROUP BY CN_NAME
     </select>
 
     <select id="getAllTSalaryAccountItem" resultMap="tSalaryAccountItemMap">

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryEmployeeMapper.xml

@@ -275,11 +275,13 @@
 			a.IS_TAX,
 			a.TEXT_VALUE,
 			b.EMP_IDCARD,
-			b.SALARY_MONTH
+			b.SALARY_MONTH,
+			b.DELETE_FLAG
 		FROM `t_salary_account_item`  a LEFT JOIN t_salary_account b on a.SALARY_ACCOUNT_ID =b.ID
 		WHERE  a.JAVA_FIED_NAME ='phoneSubsidy'
 		  and b.EMP_IDCARD= #{empIdCard}
 		  and b.SETTLEMENT_MONTH=#{nowMonth}
+		   and b.DELETE_FLAG='0'
 	</select>
 	<!--  人员花名册薪资信息  -->
 	<select id="getSalaryEmpRoster" resultMap="salaryEmpRosterMap" parameterType="com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryEmpRosterVo">