Merge remote-tracking branch 'origin/develop' into develop

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceOperate.java

@@ -36,6 +36,12 @@ public class TInsuranceOperate implements Serializable {
 	@Schema(description = "操作描述")
     private String operateDesc;
 
+	/**
+	 * 备注(审核意见)
+	 */
+	@Schema(description = "备注(审核意见)")
+	private String remark;
+
     /**
      * 创建者
      */

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceOperateMapper.xml

@@ -8,13 +8,14 @@
             <id property="id" column="ID" jdbcType="VARCHAR"/>
             <result property="insuranceDetailId" column="INSURANCE_DETAIL_ID" jdbcType="VARCHAR"/>
             <result property="operateDesc" column="OPERATE_DESC" jdbcType="VARCHAR"/>
+			<result property="remark" column="REMARK" jdbcType="VARCHAR"/>
             <result property="createBy" column="CREATE_BY" jdbcType="VARCHAR"/>
             <result property="createName" column="CREATE_NAME" jdbcType="VARCHAR"/>
             <result property="createTime" column="CREATE_TIME" jdbcType="TIMESTAMP"/>
     </resultMap>
 
     <sql id="Base_Column_List">
-        ID,INSURANCE_DETAIL_ID,OPERATE_DESC,
+        ID,INSURANCE_DETAIL_ID,OPERATE_DESC,REMARK,
         CREATE_BY,CREATE_NAME,CREATE_TIME
     </sql>
 </mapper>

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TSalaryAccountMapper.java

@@ -56,6 +56,8 @@ public interface TSalaryAccountMapper extends BaseMapper<TSalaryAccount> {
 	 **/
 	List<AccountCheckVo> getAccountCheckList(@Param("settleId") String settleId, @Param("settleMonth") String settleMonth);
 
+	List<AccountCheckVo> getAccountCheckListLabor(@Param("settleId") String settleId, @Param("settleMonth") String settleMonth);
+
 	/**
 	 * @param empIdCard
 	 * @param nowYear

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/TSalaryAccountService.java

@@ -55,7 +55,7 @@ public interface TSalaryAccountService extends IService<TSalaryAccount> {
 	 * @Date: 2021/9/17 18:06
 	 * @return: java.util.Map<java.lang.String, java.lang.Integer>
 	 **/
-	Map<String, Integer> getAccountCheckMap(String settleId, String settleMonth);
+	Map<String, Integer> getAccountCheckMap(String settleId, String settleMonth, String salaryType);
 
 	/**
 	 * @param empIdCard

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryAccountServiceImpl.java

@@ -158,8 +158,13 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
 	}
 
 	@Override
-	public Map<String, Integer> getAccountCheckMap(String settleId, String settleMonth) {
-		List<AccountCheckVo> list = baseMapper.getAccountCheckList(settleId, settleMonth);
+	public Map<String, Integer> getAccountCheckMap(String settleId, String settleMonth, String salaryType) {
+		List<AccountCheckVo> list = new ArrayList<>();
+		if (CommonConstants.ZERO_STRING.equals(salaryType)) {
+			list = baseMapper.getAccountCheckList(settleId, settleMonth);
+		} else {
+			list = baseMapper.getAccountCheckListLabor(settleId, settleMonth);
+		}
 		Map<String, Integer> map = new HashMap<>();
 		if (list != null && !list.isEmpty()) {
 			for (AccountCheckVo str : list) {

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

@@ -333,6 +333,17 @@ public class SalaryAccountUtil implements Serializable {
 							entity.setHaveSpecialFlag(CommonConstants.ONE_INT);
 						}
 					}
+					if (actualSalarySum != null) {
+						actualSalarySum = actualSalarySum.setScale(2, BigDecimal.ROUND_HALF_UP);
+						if (!checkMap.isEmpty() && checkMap.get(entity.getEmpIdcard() + CommonConstants.DOWN_LINE_STRING + DateUtil.addMonth(configSalary.getSalaryMonth())
+								+ CommonConstants.DOWN_LINE_STRING + salaryType + CommonConstants.DOWN_LINE_STRING + actualSalarySum) != null) {
+							entity.setIsRepeat(CommonConstants.ONE_INT);
+						}
+						if (new BigDecimal("3500").compareTo(actualSalarySum) == CommonConstants.ZERO_INT
+								|| new BigDecimal("5000").compareTo(actualSalarySum) == CommonConstants.ZERO_INT) {
+							entity.setHaveSpecialFlag(CommonConstants.ONE_INT);
+						}
+					}
 					if (Common.isNotNull(checkListY) && checkListY.contains(entity.getEmpIdcard())) {
 						entity.setHaveSalaryFlag(CommonConstants.ONE_INT);
 					}
@@ -373,7 +384,7 @@ public class SalaryAccountUtil implements Serializable {
 									}
 								}
 								if (entity != null) {
-									if (!"3".equals(salaryType)) {
+									if (!"3".equals(salaryType) && !"4".equals(salaryType)) {
 										if (Common.isEmpty(entity.getTaxMonth())) {
 											error = "第" + (i + 2) + "行：新员工-计税月份-不可为空！";
 											errorList.add(new ErrorMessage((i + 2), error));
@@ -467,7 +478,7 @@ public class SalaryAccountUtil implements Serializable {
 								newEmp.setUnitNo(dept.getCustomerCode());
 								newEmp.setCreateBy(String.valueOf(user.getId()));
 								newEmp.setCreateName(user.getNickname());
-								if (!"3".equals(salaryType)) {
+								if (!"3".equals(salaryType) && !"4".equals(salaryType)) {
 									minTaxMonth = tSalaryAccountService.getMinTaxMonthByNowYear(newEmp.getEmpIdcard(), nowYear);
 									if (Common.isNotNull(minTaxMonth)
 											&& !minTaxMonth.equals(entity.getTaxMonth())) {
@@ -575,7 +586,7 @@ public class SalaryAccountUtil implements Serializable {
 									entity.setBankNo(null);
 								}
 							}
-							if (!"3".equals(salaryType)) {
+							if (!"3".equals(salaryType)  && !"4".equals(salaryType)) {
 								if (emp.getTaxMonth().length() > CommonConstants.dingleDigitIntArray[6]) {
 									entity.setTaxMonth(emp.getTaxMonth().substring(0, 6));
 								} else if (emp.getTaxMonth().length() < CommonConstants.dingleDigitIntArray[6]) {

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

@@ -261,6 +261,15 @@
 		where a.DELETE_FLAG = 0 and a.DEPT_ID = #{settleId} and a.SALARY_MONTH = #{settleMonth}
 	</select>
 
+	<!-- 获取校验的报账明细 ### 格式：身份证号_工资月份_报表类型_应发金额 -->
+	<select id="getAccountCheckListLabor" resultType="com.yifu.cloud.plus.v1.yifu.salary.vo.AccountCheckVo">
+		select
+			CONCAT(a.EMP_IDCARD,"_",a.SALARY_MONTH,"_",a.FORM_TYPE) title,ifnull(actSalary.SALARY_MONEY,0) relaySalary
+		from t_salary_account a
+				 left join t_salary_account_item actSalary on actSalary.SALARY_ACCOUNT_ID = a.id and actSalary.JAVA_FIED_NAME='actualSalarySum'
+		where a.DELETE_FLAG = 0 and a.DEPT_ID = #{settleId} and a.SALARY_MONTH = #{settleMonth}
+	</select>
+
 	<!-- 获取当前年最小计税月 -->
 	<select id="getMinTaxMonthByNowYear" resultType="java.lang.String">
 		select