Commit dc64c3eb authored by hongguangwu's avatar hongguangwu

Merge branch 'MVP1.7.4' into develop

parents 1cb37c92 cabe3f67
...@@ -30,7 +30,7 @@ import javax.validation.constraints.NotBlank; ...@@ -30,7 +30,7 @@ import javax.validation.constraints.NotBlank;
import java.time.LocalDateTime; import java.time.LocalDateTime;
/** /**
* 银企付款查询卡号所属行号记录表 * 银企付款查询卡号所属行号记录表——有可能重复
* *
* @author hgw * @author hgw
* @date 2024-11-18 17:04:20 * @date 2024-11-18 17:04:20
......
...@@ -73,4 +73,9 @@ public interface EkpBankGrantDetailMapper extends BaseMapper<EkpBankGrantDetail> ...@@ -73,4 +73,9 @@ public interface EkpBankGrantDetailMapper extends BaseMapper<EkpBankGrantDetail>
**/ **/
List<EkpBankCodeConfiglVo> getEkpBankCodeConfiglVo(); List<EkpBankCodeConfiglVo> getEkpBankCodeConfiglVo();
// 更新工资支出的 银企出纳
void updateGongZiZhiChuTable(@Param("fdId") String fdId, @Param("chuNaName") String chuNaName);
// 更新工资支出Main表的 银企出纳
void updateGongZiZhiChuMain(@Param("fdId") String fdId, @Param("chuNaName") String chuNaName);
} }
...@@ -66,4 +66,23 @@ public interface EkpBankGrantDetailService extends IService<EkpBankGrantDetail> ...@@ -66,4 +66,23 @@ public interface EkpBankGrantDetailService extends IService<EkpBankGrantDetail>
// 获取工行开户行配置表 // 获取工行开户行配置表
Map<String, EkpBankCodeConfiglVo> getEkpBankCodeConfiglVo(); Map<String, EkpBankCodeConfiglVo> getEkpBankCodeConfiglVo();
/**
* @param fdId 工资支出 表id
* @param chuNaName 银企出纳名字
* @Description: 更新 工资支出 的 银企出纳名字
* @Author: hgw
* @Date: 2024/12/26 11:41
* @return: void
**/
void updateGongZiZhiChuTable(String fdId, String chuNaName);
/**
* @param fdId 工资支出 表id
* @param chuNaName 银企出纳名字
* @Description: 更新 工资支出Main表 的 银企出纳名字
* @Author: hgw
* @Date: 2024/12/26 11:41
* @return: void
**/
void updateGongZiZhiChuMain(String fdId, String chuNaName);
} }
...@@ -118,4 +118,15 @@ public class EkpBankGrantDetailServiceImpl extends ServiceImpl<EkpBankGrantDetai ...@@ -118,4 +118,15 @@ public class EkpBankGrantDetailServiceImpl extends ServiceImpl<EkpBankGrantDetai
return returnMap; return returnMap;
} }
@Override
public void updateGongZiZhiChuTable(String fdId, String chuNaName) {
baseMapper.updateGongZiZhiChuTable(fdId, chuNaName);
}
@Override
public void updateGongZiZhiChuMain(String fdId, String chuNaName) {
baseMapper.updateGongZiZhiChuMain(fdId, chuNaName);
}
} }
...@@ -730,6 +730,9 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -730,6 +730,9 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
ekpBankPayTaskService.updateById(main); ekpBankPayTaskService.updateById(main);
// 同步更新明细的发放时间、发放状态 // 同步更新明细的发放时间、发放状态
ekpBankGrantDetailService.updateStatusByGrant(fdId); ekpBankGrantDetailService.updateStatusByGrant(fdId);
// 更新 工资支出 的 银企出纳名字
ekpBankGrantDetailService.updateGongZiZhiChuTable(fdId, submitUser);
ekpBankGrantDetailService.updateGongZiZhiChuMain(fdId, submitUser);
} }
redisUtil.remove(redisKey); redisUtil.remove(redisKey);
return returnR; return returnR;
......
...@@ -189,4 +189,13 @@ ...@@ -189,4 +189,13 @@
where a.bank_name_mvp is not null and a.bank_name_mvp != '' where a.bank_name_mvp is not null and a.bank_name_mvp != ''
</select> </select>
<!-- 更新工资支出 的 银企出纳 -->
<update id="updateGongZiZhiChuTable" >
UPDATE ekp_fd9be224c214ad0992aa SET fd_bank_pay_chu_na = #{chuNaName} WHERE fd_id = #{fdId};
</update>
<!-- 更新工资支出Main表的 银企出纳 -->
<update id="updateGongZiZhiChuMain" >
UPDATE modeling_model_main SET extend_data_xml=JSON_SET(extend_data_xml,'$[1].fd_bank_pay_chu_na',#{chuNaName}) WHERE fd_id = #{fdId};
</update>
</mapper> </mapper>
...@@ -156,7 +156,20 @@ public class DeptChangeCheckParam implements Serializable { ...@@ -156,7 +156,20 @@ public class DeptChangeCheckParam implements Serializable {
* 客户编码 * 客户编码
*/ */
@Schema(description = "客户编码") @Schema(description = "客户编码")
private String oldCustomerCode; private String oldCustomerCode;
@Schema(description = "结算状态")
private String settleStatus;
@Schema(description = "支出结算状态")
private String paySettleStatus;
@Schema(description = "预估结算状态")
private String ygSettleStatus;
@Schema(description = "预估支出结算状态")
private String ygPaySettleStatus;
} }
package com.yifu.cloud.plus.v1.yifu.insurances.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.Data;
import java.io.Serializable;
/**
* @author huyc
* @description EKP结算信息表
* @date 2024-12-25 17:37:21
*/
@Data
@Tag(name = "EKP结算信息表")
public class DeptSettleVo implements Serializable {
/**
* 主键id
*/
private String id;
/**
* 结算id
*/
@Schema(description = "结算id")
private String detailId;
@Schema(description = "结算状态")
private String settleStatus;
@Schema(description = "支出结算状态")
private String paySettleStatus;
}
package com.yifu.cloud.plus.v1.yifu.insurances.mapper.ekp; package com.yifu.cloud.plus.v1.yifu.insurances.mapper.ekp;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.DeptSettleVo;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpInsuranceViewVo; import com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpInsuranceViewVo;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpSocialViewVo; import com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpSocialViewVo;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.SettleVo; import com.yifu.cloud.plus.v1.yifu.insurances.vo.SettleVo;
...@@ -24,6 +25,24 @@ public interface EkpSettleMapper { ...@@ -24,6 +25,24 @@ public interface EkpSettleMapper {
*/ */
SettleVo getSettle(String id); SettleVo getSettle(String id);
/**
* 获取结算信息
*
* @author zhaji
* @param id
* @return {@link SettleVo}
*/
DeptSettleVo getDeptSettle(String id);
/**
* 获取结算信息
*
* @author zhaji
* @param id
* @return {@link SettleVo}
*/
DeptSettleVo getDeptYgSettle(String id);
/** /**
* 从商险订单明细中获取当前保单的结算状态 * 从商险订单明细中获取当前保单的结算状态
* *
......
...@@ -3,6 +3,7 @@ package com.yifu.cloud.plus.v1.yifu.insurances.service.ekp; ...@@ -3,6 +3,7 @@ package com.yifu.cloud.plus.v1.yifu.insurances.service.ekp;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R; import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeRate; import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeRate;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.DeptSettleVo;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpInsuranceViewVo; import com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpInsuranceViewVo;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpSocialViewVo; import com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpSocialViewVo;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.SettleVo; import com.yifu.cloud.plus.v1.yifu.insurances.vo.SettleVo;
...@@ -25,6 +26,10 @@ public interface EkpSettleService extends IService<TInsuranceTypeRate> { ...@@ -25,6 +26,10 @@ public interface EkpSettleService extends IService<TInsuranceTypeRate> {
*/ */
SettleVo getSettle(String id); SettleVo getSettle(String id);
DeptSettleVo getDeptSettle(String id);
DeptSettleVo getDeptYgSettle(String id);
/** /**
* 从商险订单明细中获取当前保单的结算状态 * 从商险订单明细中获取当前保单的结算状态
* *
......
...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeRate; import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeRate;
import com.yifu.cloud.plus.v1.yifu.insurances.mapper.ekp.EkpSettleMapper; import com.yifu.cloud.plus.v1.yifu.insurances.mapper.ekp.EkpSettleMapper;
import com.yifu.cloud.plus.v1.yifu.insurances.service.ekp.EkpSettleService; import com.yifu.cloud.plus.v1.yifu.insurances.service.ekp.EkpSettleService;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.DeptSettleVo;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpInsuranceViewVo; import com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpInsuranceViewVo;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpSocialViewVo; import com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpSocialViewVo;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.SettleVo; import com.yifu.cloud.plus.v1.yifu.insurances.vo.SettleVo;
...@@ -31,6 +32,16 @@ public class EkpSettleServiceImpl implements EkpSettleService { ...@@ -31,6 +32,16 @@ public class EkpSettleServiceImpl implements EkpSettleService {
return ekpSettleMapper.getSettle(id); return ekpSettleMapper.getSettle(id);
} }
@Override
public DeptSettleVo getDeptSettle(String id) {
return ekpSettleMapper.getDeptSettle(id);
}
@Override
public DeptSettleVo getDeptYgSettle(String id) {
return ekpSettleMapper.getDeptYgSettle(id);
}
@Override @Override
public String getSettleStatusFromEkpInsuranceDetail(String id) { public String getSettleStatusFromEkpInsuranceDetail(String id) {
return ekpSettleMapper.getSettleStatusFromEkpInsuranceDetail(id); return ekpSettleMapper.getSettleStatusFromEkpInsuranceDetail(id);
......
...@@ -468,6 +468,10 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> { ...@@ -468,6 +468,10 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
SettleVo getInsuranceDetailSettleStatus(String detailId, String defaultSettleId); SettleVo getInsuranceDetailSettleStatus(String detailId, String defaultSettleId);
DeptSettleVo deptUpdGetSettleStatusFromEkpInsuranceDetail(String detailId, String defaultSettleId);
DeptSettleVo deptYgGetSettleStatusFromEkpInsuranceDetail(String detailId, String defaultSettleId);
/** /**
* @param changeDeptVo * @param changeDeptVo
* @Description: ekp费用划转,商险划转项目 * @Description: ekp费用划转,商险划转项目
......
...@@ -11,6 +11,13 @@ ...@@ -11,6 +11,13 @@
<result property="actualStatus" column="fd_3b05bd5ed0b976" jdbcType="VARCHAR"/> <result property="actualStatus" column="fd_3b05bd5ed0b976" jdbcType="VARCHAR"/>
</resultMap> </resultMap>
<resultMap id="BaseDeptResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.vo.DeptSettleVo">
<id property="id" column="fd_id" jdbcType="VARCHAR"/>
<result property="detailId" column="fd_3b0a5743acab7e" jdbcType="VARCHAR"/>
<result property="settleStatus" column="fd_3adfe6ec6a8cbe" jdbcType="VARCHAR"/>
<result property="paySettleStatus" column="fd_3adfe6eda67236" jdbcType="VARCHAR"/>
</resultMap>
<resultMap id="BaseResultStatusMap" type="com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpInsuranceViewVo"> <resultMap id="BaseResultStatusMap" type="com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpInsuranceViewVo">
<id property="id" column="detailsId" jdbcType="VARCHAR"/> <id property="id" column="detailsId" jdbcType="VARCHAR"/>
<result property="incomeSettleFlag" column="earningStatus" jdbcType="VARCHAR"/> <result property="incomeSettleFlag" column="earningStatus" jdbcType="VARCHAR"/>
...@@ -37,6 +44,10 @@ ...@@ -37,6 +44,10 @@
detailsId,earningStatus,receiptStatus,zhichuEarningStatus,payStatus,orderType detailsId,earningStatus,receiptStatus,zhichuEarningStatus,payStatus,orderType
</sql> </sql>
<sql id="Base_Column_Dept">
fd_id,fd_3b0a5743acab7e,fd_3adfe6ec6a8cbe,fd_3adfe6eda67236
</sql>
<select id="getSettle" resultMap="BaseResultMap"> <select id="getSettle" resultMap="BaseResultMap">
select select
<include refid="Base_Column_List"></include> <include refid="Base_Column_List"></include>
...@@ -55,6 +66,24 @@ ...@@ -55,6 +66,24 @@
fd_3b0a5743acab7e = #{id} limit 1 fd_3b0a5743acab7e = #{id} limit 1
</select> </select>
<select id="getDeptSettle" resultMap="BaseDeptResultMap">
select
<include refid="Base_Column_Dept"></include>
from
ekp_e96a0a28442447c81ec0
where
fd_3b0a5743acab7e = #{id} and fd_3adfe6af71a1cc = '实缴' limit 1
</select>
<select id="getDeptYgSettle" resultMap="BaseDeptResultMap">
select
<include refid="Base_Column_Dept"></include>
from
ekp_e96a0a28442447c81ec0
where
fd_3b0a5743acab7e = #{id} and fd_3adfe6af71a1cc = '预估' limit 1
</select>
<!-- 根据结算单编码获取视图信息 --> <!-- 根据结算单编码获取视图信息 -->
<select id="selectSettleStatusBySettleNo" resultMap="BaseResultStatusMap"> <select id="selectSettleStatusBySettleNo" resultMap="BaseResultStatusMap">
select select
......
...@@ -65,7 +65,7 @@ public class TSalaryAccountPhoneController { ...@@ -65,7 +65,7 @@ public class TSalaryAccountPhoneController {
**/ **/
@Operation(description = "获取工资报账信息") @Operation(description = "获取工资报账信息")
@GetMapping("/getSalaryAccount") @GetMapping("/getSalaryAccount")
public R<AccountForWxVo> getSalaryAccount(@RequestParam String idNumber, String year,String openId) { public R<AccountForWxVo> getSalaryAccount(@RequestParam(required = false) String idNumber, String year,String openId) {
if (Common.isEmpty(idNumber) || Common.isEmpty(openId)){ if (Common.isEmpty(idNumber) || Common.isEmpty(openId)){
return R.failed(CommonConstants.PARAM_IS_NOT_ERROR); return R.failed(CommonConstants.PARAM_IS_NOT_ERROR);
} }
......
...@@ -428,7 +428,7 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand ...@@ -428,7 +428,7 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
} }
} }
if (dataRowFlag) { if (dataRowFlag) {
if (idCardNum != -1) { if (idCardNum != null && idCardNum != -1) {
return R.failed("您配置的身份证列第【"+(idCardNum+1)+"】列未找到身份证,请确认表头配置或表格数据!!"); return R.failed("您配置的身份证列第【"+(idCardNum+1)+"】列未找到身份证,请确认表头配置或表格数据!!");
} }
return R.failed("未找到身份证所在的数据行,请检查表数据!!"); return R.failed("未找到身份证所在的数据行,请检查表数据!!");
...@@ -713,7 +713,7 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand ...@@ -713,7 +713,7 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
} }
} }
if (dataRowFlag) { if (dataRowFlag) {
if (idCardNum != -1) { if (idCardNum != null && idCardNum != -1) {
return R.failed("您配置的身份证列第【"+(idCardNum+1)+"】列未找到身份证,请确认表头配置或表格数据!!"); return R.failed("您配置的身份证列第【"+(idCardNum+1)+"】列未找到身份证,请确认表头配置或表格数据!!");
} }
return R.failed("未找到身份证所在的数据行,请检查表数据!!"); return R.failed("未找到身份证所在的数据行,请检查表数据!!");
......
...@@ -32,7 +32,7 @@ spring: ...@@ -32,7 +32,7 @@ spring:
type: CLASS_BASED type: CLASS_BASED
tables: tables:
t_payment_info: t_payment_info:
actual-data-nodes: ds0.t_payment_info_20$->{17..24} actual-data-nodes: ds0.t_payment_info_20$->{17..25}
key-generate-strategy: key-generate-strategy:
column: ID column: ID
key-generator-name: snowflake key-generator-name: snowflake
......
...@@ -32,7 +32,7 @@ spring: ...@@ -32,7 +32,7 @@ spring:
type: CLASS_BASED type: CLASS_BASED
tables: tables:
t_payment_info: t_payment_info:
actual-data-nodes: ds0.t_payment_info_20$->{17..24} actual-data-nodes: ds0.t_payment_info_20$->{17..25}
key-generate-strategy: key-generate-strategy:
column: ID column: ID
key-generator-name: snowflake key-generator-name: snowflake
......
...@@ -206,9 +206,9 @@ ...@@ -206,9 +206,9 @@
a.UNIT_CREDIT_CODE unitCreditCode, a.UNIT_CREDIT_CODE unitCreditCode,
a.CUSTOMER_NO_YSD customerNoYsd, a.CUSTOMER_NO_YSD customerNoYsd,
a.SOCIAL_ACCOUNT socialAccount, a.SOCIAL_ACCOUNT socialAccount,
a.SOCIAL_PASSWORD socialPassword, "" socialPassword,
a.MEDICL_ACCOUNT mediclAccount, a.MEDICL_ACCOUNT mediclAccount,
a.MEDICL_PASSWORD mediclPassword, "" mediclPassword,
if(a.IS_SIGN = '0','是','否') isSign, if(a.IS_SIGN = '0','是','否') isSign,
if(a.AUTO_STATUS = '0','启用','禁用') autoStatus if(a.AUTO_STATUS = '0','启用','禁用') autoStatus
FROM sys_house_hold_info a FROM sys_house_hold_info a
......
...@@ -913,9 +913,6 @@ ...@@ -913,9 +913,6 @@
<if test="tPaymentInfo.socialHousehold != null and tPaymentInfo.socialHousehold.trim() != ''"> <if test="tPaymentInfo.socialHousehold != null and tPaymentInfo.socialHousehold.trim() != ''">
AND a.SOCIAL_HOUSEHOLD = #{tPaymentInfo.socialHousehold} AND a.SOCIAL_HOUSEHOLD = #{tPaymentInfo.socialHousehold}
</if> </if>
<if test="tPaymentInfo.providentHousehold != null and tPaymentInfo.providentHousehold.trim() != ''">
AND a.PROVIDENT_HOUSEHOLD = #{tPaymentInfo.providentHousehold}
</if>
<if test="tPaymentInfo.socialPayMonth != null and tPaymentInfo.socialPayMonth.trim() != ''"> <if test="tPaymentInfo.socialPayMonth != null and tPaymentInfo.socialPayMonth.trim() != ''">
AND a.SOCIAL_PAY_MONTH = #{tPaymentInfo.socialPayMonth} AND a.SOCIAL_PAY_MONTH = #{tPaymentInfo.socialPayMonth}
</if> </if>
...@@ -1112,9 +1109,6 @@ ...@@ -1112,9 +1109,6 @@
<if test="tPaymentInfo.providentHousehold != null and tPaymentInfo.providentHousehold.trim() != ''"> <if test="tPaymentInfo.providentHousehold != null and tPaymentInfo.providentHousehold.trim() != ''">
AND a.PROVIDENT_HOUSEHOLD = #{tPaymentInfo.providentHousehold} AND a.PROVIDENT_HOUSEHOLD = #{tPaymentInfo.providentHousehold}
</if> </if>
<if test="tPaymentInfo.socialHousehold != null and tPaymentInfo.socialHousehold.trim() != ''">
AND a.SOCIAL_HOUSEHOLD = #{tPaymentInfo.socialHousehold}
</if>
<!-- 区域 默认精准查询 0 包含下级查询 1 开始 2023-03-02 fxj --> <!-- 区域 默认精准查询 0 包含下级查询 1 开始 2023-03-02 fxj -->
<if test='tPaymentInfo.areaFlag == null || tPaymentInfo.areaFlag == "1"'> <if test='tPaymentInfo.areaFlag == null || tPaymentInfo.areaFlag == "1"'>
<if test="tPaymentInfo.socialTown == null"> <if test="tPaymentInfo.socialTown == null">
...@@ -1743,7 +1737,7 @@ ...@@ -1743,7 +1737,7 @@
w.PERSONAL_PROVIDENT_PERCENT w.PERSONAL_PROVIDENT_PERCENT
FROM ( FROM (
(SELECT (SELECT
CONCAT( a.EMP_IDCARD, '_', a.SOCIAL_PAY_MONTH, '_', a.SOCIAL_CREATE_MONTH) AS keyGroup, CONCAT( a.EMP_IDCARD, '_', a.SOCIAL_PAY_MONTH, '_', a.SOCIAL_CREATE_MONTH, '_', a.SETTLE_DOMAIN_CODE ) AS keyGroup,
a.EMP_NAME, a.EMP_NAME,
a.EMP_IDCARD, a.EMP_IDCARD,
a.UNIT_NAME, a.UNIT_NAME,
...@@ -1803,11 +1797,11 @@ ...@@ -1803,11 +1797,11 @@
IFNULL(a.SOCIAL_ID,'1') != '1' IFNULL(a.SOCIAL_ID,'1') != '1'
<include refid="tPaymentInfo_export_social_where"/> <include refid="tPaymentInfo_export_social_where"/>
</where> </where>
GROUP BY a.EMP_IDCARD,a.SOCIAL_PAY_MONTH,a.SOCIAL_CREATE_MONTH GROUP BY a.EMP_IDCARD,a.SOCIAL_PAY_MONTH,a.SOCIAL_CREATE_MONTH,a.SETTLE_DOMAIN_CODE
) )
union all union all
(SELECT (SELECT
CONCAT( a.EMP_IDCARD, '_', a.PROVIDENT_PAY_MONTH, '_', a.PROVIDENT_CREATE_MONTH) AS keyGroup, CONCAT( a.EMP_IDCARD, '_', a.PROVIDENT_PAY_MONTH, '_', a.PROVIDENT_CREATE_MONTH, '_', a.SETTLE_DOMAIN_CODE ) AS keyGroup,
a.EMP_NAME, a.EMP_NAME,
a.EMP_IDCARD, a.EMP_IDCARD,
a.UNIT_NAME, a.UNIT_NAME,
...@@ -1867,7 +1861,7 @@ ...@@ -1867,7 +1861,7 @@
IFNULL(a.FUND_ID,'1') != '1' IFNULL(a.FUND_ID,'1') != '1'
<include refid="tPaymentInfo_export_fund_where"/> <include refid="tPaymentInfo_export_fund_where"/>
</where> </where>
GROUP BY a.EMP_IDCARD,a.PROVIDENT_PAY_MONTH,a.PROVIDENT_CREATE_MONTH GROUP BY a.EMP_IDCARD,a.PROVIDENT_PAY_MONTH,a.PROVIDENT_CREATE_MONTH,a.SETTLE_DOMAIN_CODE
) )
) w ) w
GROUP BY w.keyGroup) k GROUP BY w.keyGroup) k
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment