Commit a1619e69 authored by huyuchen's avatar huyuchen

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

parents 86822276 a18f6c49
......@@ -30,7 +30,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.MenuUtil;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
......@@ -385,4 +384,18 @@ public class TEmployeeContractInfoController {
tEmployeeContractInfoService.exportAuditContractInfo(contractInfo, response);
}
/**
* @param empIdCard 身份证
* @param deptId 项目id
* @Description: 通过身份证与项目id查询
* @Author: hgw
* @Date: 2023/3/9 14:30
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/
@Operation(summary = "通过身份证与项目id查询", description = "通过身份证与项目id查询")
@PostMapping("/getContractByEmpIdCardAndDeptId")
public R<String> getContractByEmpIdCardAndDeptId(@RequestParam String empIdCard, @RequestParam String deptId) {
return tEmployeeContractInfoService.getContractByEmpIdCardAndDeptId(empIdCard, deptId);
}
}
......@@ -21,10 +21,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractInfo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.EmpContractBusinessPageVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeContractExportAuditVO;
import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeContractExportVO;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeContractSearchVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.*;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
......@@ -107,4 +107,6 @@ public interface TEmployeeContractInfoMapper extends BaseMapper<TEmployeeContrac
List<EmpContractBusinessPageVo> getOtherContractBusinessInfo(@Param("empId")String empId, @Param("contractId")String contractId);
void updateContractChange(@Param("idCard")String empIdcard, @Param("deptNo")String deptNo, @Param("oldDeptNo")String odlDeptNo);
int getContractByEmpIdCardAndDeptId(@Param("empIdCard") String empIdCard, @Param("deptId") String deptId);
}
......@@ -184,4 +184,6 @@ public interface TEmployeeContractInfoService extends IService<TEmployeeContract
List<EmpContractBusinessPageVo> getOtherContractBusinessInfo(String empId, String contractId);
R<String> getContractByEmpIdCardAndDeptId(String mpIdCard, String deptId);
}
......@@ -1519,5 +1519,15 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
public List<EmpContractBusinessPageVo> getOtherContractBusinessInfo(String empId, String contractId) {
return baseMapper.getOtherContractBusinessInfo(empId,contractId);
}
@Override
public R<String> getContractByEmpIdCardAndDeptId(String mpIdCard, String deptId) {
int count = baseMapper.getContractByEmpIdCardAndDeptId(mpIdCard, deptId);
if (count >0) {
return R.ok();
} else {
return R.failed("未找到合同");
}
}
}
......@@ -790,4 +790,13 @@
a.SUBJECT_UNIT=b.CUSTOMER_NAME
where a.EMP_IDCARD = #{idCard} and a.DEPT_NO = #{oldDeptNo} and a.IN_USE='0' and b.DEPART_NO= #{deptNo} and b.DELETE_FLAG='0';
</update>
<select id="getContractByEmpIdCardAndDeptId" resultType="java.lang.Integer">
select
count(1)
from t_employee_contract_info e
where e.EMP_IDCARD = #{empIdCard} and e.SETTLE_DOMAIN = #{deptId}
and e.DELETE_FLAG = '0' and e.IS_OBSOLETE = '0'
and e.situation !='作废' and e.situation !='终止' and e.AUDIT_STATUS != 3
</select>
</mapper>
......@@ -18,6 +18,7 @@
package com.yifu.cloud.plus.v1.yifu.salary.entity;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.HeadFontStyle;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
......@@ -58,4 +59,12 @@ public class TBankSet extends BaseEntity {
@ExcelProperty("开户行")
@Schema(description = "开户行")
private String bankName;
/**
* 是否删除0:正常;1:已删除
*/
@ExcelAttribute(name = "是否删除0:正常;1:已删除")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("是否删除0:正常;1:已删除")
private String deleteFlag;
}
\ No newline at end of file
......@@ -19,6 +19,8 @@ package com.yifu.cloud.plus.v1.yifu.salary.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
......@@ -101,6 +103,13 @@ public class TBankSetController {
@PostMapping
@PreAuthorize("@pms.hasPermission('salary_tbankset_add')")
public R<Boolean> save(@RequestBody TBankSet tBankSet) {
if (Common.isEmpty(tBankSet.getBankName())) {
return R.failed("开户行不可为空!");
}
List<TBankSet> tBankSetList = tBankSetService.getList(tBankSet.getBankName(), null);
if (tBankSetList != null && !tBankSetList.isEmpty()) {
return R.failed("已存在该开户行!");
}
return R.ok(tBankSetService.save(tBankSet));
}
......@@ -115,6 +124,10 @@ public class TBankSetController {
@PutMapping
@PreAuthorize("@pms.hasPermission('salary_tbankset_edit')")
public R<Boolean> updateById(@RequestBody TBankSet tBankSet) {
List<TBankSet> tBankSetList = tBankSetService.getList(tBankSet.getBankName(), tBankSet.getId());
if (tBankSetList != null && !tBankSetList.isEmpty()) {
return R.failed("已存在该开户行!");
}
return R.ok(tBankSetService.updateById(tBankSet));
}
......@@ -129,7 +142,14 @@ public class TBankSetController {
@DeleteMapping("/{id}")
@PreAuthorize("@pms.hasPermission('salary_tbankset_del')")
public R<Boolean> removeById(@PathVariable String id) {
return R.ok(tBankSetService.removeById(id));
TBankSet bankSet = tBankSetService.getById(id);
if (bankSet != null) {
bankSet.setDeleteFlag(CommonConstants.STATUS_DEL);
tBankSetService.updateById(bankSet);
return R.ok();
} else {
return R.failed("未找到!");
}
}
/**
......
......@@ -58,4 +58,14 @@ public interface TBankSetService extends IService<TBankSet> {
void listExport(HttpServletResponse response, TBankSetSearchVo searchVo);
List<TBankSet> noPageDiy(TBankSetSearchVo searchVo);
/**
* @param bankName
* @param id
* @Description: 获取list
* @Author: hgw
* @Date: 2023/3/10 18:08
* @return: java.util.List<com.yifu.cloud.plus.v1.yifu.salary.entity.TBankSet>
**/
List<TBankSet> getList(String bankName, String id);
}
......@@ -177,6 +177,7 @@ public class TBankSetServiceImpl extends ServiceImpl<TBankSetMapper, TBankSet> i
if (Common.isNotNull(entity.getCreateName())) {
wrapper.eq(TBankSet::getCreateName, entity.getCreateName());
}
wrapper.eq(TBankSet:: getDeleteFlag, CommonConstants.STATUS_NORMAL);
return wrapper;
}
......@@ -255,4 +256,16 @@ public class TBankSetServiceImpl extends ServiceImpl<TBankSetMapper, TBankSet> i
BeanUtil.copyProperties(excel, insert);
this.save(insert);
}
@Override
public List<TBankSet> getList(String bankName, String id) {
LambdaQueryWrapper<TBankSet> wrapper = Wrappers.lambdaQuery();
wrapper.eq(TBankSet:: getDeleteFlag, CommonConstants.STATUS_NORMAL);
wrapper.eq(TBankSet:: getBankName, bankName);
if (Common.isNotNull(id)) {
wrapper.ne(TBankSet:: getId, id);
}
return baseMapper.selectList(wrapper);
}
}
......@@ -555,7 +555,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
emp.setTaxMonth(excel.getTaxMonth());
}
if (Common.isNotNull(excel.getBankName())) {
if (bankMap.get(emp.getBankName()) == null) {
if (bankMap.get(excel.getBankName()) == null) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), SalaryConstants.BANK_NAME_ERROR));
continue;
}
......@@ -749,7 +749,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
}
}
if (Common.isNotNull(excel.getBankName())) {
if (bankMap.get(emp.getBankName()) == null) {
if (bankMap.get(excel.getBankName()) == null) {
errorMessageList.add(new ErrorMessage((i + 2), SalaryConstants.BANK_NAME_ERROR));
continue;
}
......@@ -822,6 +822,10 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
errorMessageList.add(new ErrorMessage((i + 2), SalaryConstants.TAX_MONTH_LENGTH));
continue;
}
if (bankMap.get(excel.getBankName()) == null) {
errorMessageList.add(new ErrorMessage((i + 2), SalaryConstants.BANK_NAME_ERROR));
continue;
}
String pre = this.checkNewEmpBankAndPhone(excel, true);
if (pre != null) {
errorMessageList.add(new ErrorMessage((i + 2), pre));
......
......@@ -31,6 +31,7 @@
<result property="createTime" column="CREATE_TIME"/>
<result property="updateBy" column="UPDATE_BY"/>
<result property="updateTime" column="UPDATE_TIME"/>
<result property="deleteFlag" column="DELETE_FLAG"/>
</resultMap>
<sql id="Base_Column_List">
a.ID,
......@@ -39,7 +40,8 @@
a.CREATE_NAME,
a.CREATE_TIME,
a.UPDATE_BY,
a.UPDATE_TIME
a.UPDATE_TIME,
a.DELETE_FLAG
</sql>
<sql id="tBankSet_where">
<if test="tBankSet != null">
......@@ -72,7 +74,7 @@
<include refid="Base_Column_List"/>
FROM t_bank_set a
<where>
1=1
a.DELETE_FLAG = '0'
<include refid="tBankSet_where"/>
</where>
order by a.CREATE_TIME desc
......@@ -83,8 +85,9 @@
SELECT
a.BANK_NAME
FROM t_bank_set a
where a.DELETE_FLAG = '0'
<if test="bankName != null and bankName.trim() != ''">
where a.BANK_NAME = #{bankName}
and a.BANK_NAME = #{bankName}
</if>
order by a.CREATE_TIME desc
</select>
......
......@@ -569,4 +569,19 @@ public class TDispatchInfoController {
}
return new SocialAndFundReduceVo();
}
/**
* @param importVo
* @Description: 单个派增
* @Author: hgw
* @Date: 2023/3/10 15:35
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.Boolean>
**/
@Operation(summary = "单个派增 权限:social_dispatchinfo_add", description = "单个派增")
@PostMapping("/dispatchAdd")
@PreAuthorize("@pms.hasPermission('social_dispatchinfo_add')")
public R<List<ErrorMessage>> dispatchAdd(@RequestBody TDispatchImportVo importVo) {
return tDispatchInfoService.dispatchAdd(importVo);
}
}
......@@ -100,4 +100,12 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> {
**/
SocialAndFundReduceVo getSocialAndFundReduceInfo(String empId);
/**
* @param importVo
* @Description: 单个派增
* @Author: hgw
* @Date: 2023/3/10 15:46
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.util.List < com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage>>
**/
R<List<ErrorMessage>> dispatchAdd(TDispatchImportVo importVo);
}
......@@ -30,7 +30,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysArea;
import com.yifu.cloud.plus.v1.yifu.admin.api.vo.AllUserNaVo;
import com.yifu.cloud.plus.v1.yifu.admin.api.vo.AreaVo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject;
......@@ -47,6 +49,7 @@ import com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.social.constants.DispatchConstants;
import com.yifu.cloud.plus.v1.yifu.social.constants.PreDispatchConstants;
import com.yifu.cloud.plus.v1.yifu.social.entity.*;
import com.yifu.cloud.plus.v1.yifu.social.mapper.*;
import com.yifu.cloud.plus.v1.yifu.social.service.TDispatchInfoService;
......@@ -4826,4 +4829,44 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
return R.ok(errorMessageList);
}
private void initAreaMap(Map<String, SysArea> areaHashMap, Map<String, SysArea> areaIdMap, R<AreaVo> areaListR) {
AreaVo areaList = areaListR.getData();
if (null != areaList && !areaList.getSysAreaList().isEmpty()) {
for (SysArea area : areaList.getSysAreaList()) {
areaHashMap.put(area.getAreaName(), area);
areaIdMap.put(Integer.toString(area.getId()), area);
}
}
}
@Override
public R<List<ErrorMessage>> dispatchAdd(TDispatchImportVo importVo) {
YifuUser user = SecurityUtils.getUser();
if (null == user || null == user.getId()) {
return R.failed(CommonConstants.USER_FAIL);
}
List<ErrorMessage> errorMessageList = new ArrayList<>();
HashMap<String,SysArea> areaMap = new HashMap<>();
HashMap<String,SysArea> areaIdMap = new HashMap<>();
importVo.setRowIndex(CommonConstants.ONE_INT);
List<TDispatchImportVo> importVoList = new ArrayList<>();
importVoList.add(importVo);
// 如果档案地市空 只能用缴纳地封装,如果缴纳地有问题直接返回
if (null == importVo.getFileCity()) {
R<AreaVo> areaListR = upmsDaprUtils.getAreaListR();
if (null == areaListR || areaListR.getCode() != CommonConstants.SUCCESS) {
return R.failed(PreDispatchConstants.GET_AREA_INFO);
}
initAreaMap(areaMap, areaIdMap, areaListR);
}
// 档案地市没问题 开始派单处理
this.importTDispatchInfo(importVoList, errorMessageList, user, null, new HashMap<>());
if (errorMessageList.isEmpty()) {
return R.ok();
} else {
return R.failed(errorMessageList);
}
}
}
......@@ -413,16 +413,16 @@
<if test='tPaymentInfo.areaFlag == "0"'>
<if test="tPaymentInfo.socialProvince != null and tPaymentInfo.socialProvince.trim() != '' and tPaymentInfo.socialCity == null">
AND (
(a.SOCIAL_PROVINCE = '${tPaymentInfo.socialProvince}' and a.SOCIAL_CITY is null)
(a.SOCIAL_PROVINCE = '${tPaymentInfo.socialProvince}' and (a.SOCIAL_CITY is null or a.SOCIAL_CITY =''))
or
(a.FUND_PROVINCE = '${tPaymentInfo.socialProvince}' and a.FUND_CITY is null)
(a.FUND_PROVINCE = '${tPaymentInfo.socialProvince}' and (a.FUND_CITY is null or a.FUND_CITY =''))
)
</if>
<if test="tPaymentInfo.socialCity != null and tPaymentInfo.socialCity.trim() != '' and tPaymentInfo.socialTown == null">
AND (
(a.SOCIAL_CITY = '${tPaymentInfo.socialCity}' and a.SOCIAL_TOWN is null )
(a.SOCIAL_CITY = '${tPaymentInfo.socialCity}' and (a.SOCIAL_TOWN is null or a.SOCIAL_TOWN =''))
or
(a.FUND_CITY = '${tPaymentInfo.socialCity}' and a.FUND_TOWN is null)
(a.FUND_CITY = '${tPaymentInfo.socialCity}' and (a.FUND_TOWN is null or a.FUND_TOWN =''))
)
</if>
<if test="tPaymentInfo.socialTown != null and tPaymentInfo.socialTown.trim() != ''">
......@@ -649,16 +649,16 @@
<if test='tPaymentInfo.areaFlag == "0"'>
<if test="tPaymentInfo.socialProvince != null and tPaymentInfo.socialProvince.trim() != '' and tPaymentInfo.socialCity == null">
AND (
(a.SOCIAL_PROVINCE = '${tPaymentInfo.socialProvince}' and a.SOCIAL_CITY is null)
(a.SOCIAL_PROVINCE = '${tPaymentInfo.socialProvince}' and (a.SOCIAL_CITY is null or a.SOCIAL_CITY =''))
or
(a.FUND_PROVINCE = '${tPaymentInfo.socialProvince}' and a.FUND_CITY is null)
(a.FUND_PROVINCE = '${tPaymentInfo.socialProvince}' and (a.FUND_CITY is null or a.FUND_CITY =''))
)
</if>
<if test="tPaymentInfo.socialCity != null and tPaymentInfo.socialCity.trim() != '' and tPaymentInfo.socialTown == null">
AND (
(a.SOCIAL_CITY = '${tPaymentInfo.socialCity}' and a.SOCIAL_TOWN is null )
(a.SOCIAL_CITY = '${tPaymentInfo.socialCity}' and (a.SOCIAL_TOWN is null or a.SOCIAL_TOWN =''))
or
(a.FUND_CITY = '${tPaymentInfo.socialCity}' and a.FUND_TOWN is null)
(a.FUND_CITY = '${tPaymentInfo.socialCity}' and (a.FUND_TOWN is null or a.FUND_TOWN =''))
)
</if>
<if test="tPaymentInfo.socialTown != null and tPaymentInfo.socialTown.trim() != ''">
......@@ -740,34 +740,44 @@
<if test="tPaymentInfo.providentPayAddr != null and tPaymentInfo.providentPayAddr.trim() != ''">
AND a.PROVIDENT_PAY_ADDR = #{tPaymentInfo.providentPayAddr}
</if>
<if test="tPaymentInfo.fundProvince != null and tPaymentInfo.fundProvince.trim() != ''">
AND a.FUND_PROVINCE = #{tPaymentInfo.fundProvince}
</if>
<if test="tPaymentInfo.fundCity != null and tPaymentInfo.fundCity.trim() != ''">
AND a.FUND_CITY = #{tPaymentInfo.fundCity}
</if>
<if test="tPaymentInfo.fundTown != null and tPaymentInfo.fundTown.trim() != ''">
AND a.FUND_TOWN = #{tPaymentInfo.fundTown}
</if>
<if test="tPaymentInfo.socialProvince != null and tPaymentInfo.socialProvince.trim() != ''">
AND (a.SOCIAL_PROVINCE = '${tPaymentInfo.socialProvince}' or a.FUND_PROVINCE = '${tPaymentInfo.socialProvince}')
</if>
<if test="tPaymentInfo.socialCity != null and tPaymentInfo.socialCity.trim() != ''">
AND (a.SOCIAL_CITY = '${tPaymentInfo.socialCity}' or a.FUND_CITY = '${tPaymentInfo.socialCity}')
</if>
<if test="tPaymentInfo.socialTown == null">
<if test="tPaymentInfo.socialCity != null">
AND (a.SOCIAL_CITY = '${tPaymentInfo.socialCity}' or a.FUND_CITY = '${tPaymentInfo.socialCity}')
</if>
<if test="tPaymentInfo.socialCity == null">
<if test="tPaymentInfo.socialProvince != null">
AND (a.SOCIAL_PROVINCE = '${tPaymentInfo.socialProvince}' or a.FUND_PROVINCE = '${tPaymentInfo.socialProvince}')
<!-- 区域 默认精准查询 0 包含下级查询 1 开始 2023-03-02 fxj -->
<if test='tPaymentInfo.areaFlag == null || tPaymentInfo.areaFlag == "1"'>
<if test="tPaymentInfo.socialTown == null">
<if test="tPaymentInfo.socialCity != null">
AND (a.SOCIAL_CITY = '${tPaymentInfo.socialCity}' or a.FUND_CITY = '${tPaymentInfo.socialCity}')
</if>
<if test="tPaymentInfo.socialCity == null">
<if test="tPaymentInfo.socialProvince != null">
AND (a.SOCIAL_PROVINCE = '${tPaymentInfo.socialProvince}' or a.FUND_PROVINCE = '${tPaymentInfo.socialProvince}')
</if>
</if>
</if>
<if test="tPaymentInfo.socialTown != null and tPaymentInfo.socialTown.trim() != ''">
AND (a.SOCIAL_TOWN = '${tPaymentInfo.socialTown}' or a.FUND_TOWN = '${tPaymentInfo.socialTown}')
</if>
</if>
<if test="tPaymentInfo.socialTown != null and tPaymentInfo.socialTown.trim() != ''">
AND (a.SOCIAL_TOWN = '${tPaymentInfo.socialTown}' or a.FUND_TOWN = '${tPaymentInfo.socialTown}')
<if test='tPaymentInfo.areaFlag == "0"'>
<if test="tPaymentInfo.socialProvince != null and tPaymentInfo.socialProvince.trim() != '' and tPaymentInfo.socialCity == null">
AND (
(a.SOCIAL_PROVINCE = '${tPaymentInfo.socialProvince}' and (a.SOCIAL_CITY is null or a.SOCIAL_CITY =''))
or
(a.FUND_PROVINCE = '${tPaymentInfo.socialProvince}' and (a.FUND_CITY is null or a.FUND_CITY =''))
)
</if>
<if test="tPaymentInfo.socialCity != null and tPaymentInfo.socialCity.trim() != '' and tPaymentInfo.socialTown == null">
AND (
(a.SOCIAL_CITY = '${tPaymentInfo.socialCity}' and (a.SOCIAL_TOWN is null or a.SOCIAL_TOWN =''))
or
(a.FUND_CITY = '${tPaymentInfo.socialCity}' and (a.FUND_TOWN is null or a.FUND_TOWN =''))
)
</if>
<if test="tPaymentInfo.socialTown != null and tPaymentInfo.socialTown.trim() != ''">
AND (a.SOCIAL_TOWN = '${tPaymentInfo.socialTown}' or a.FUND_TOWN = '${tPaymentInfo.socialTown}')
</if>
</if>
<!-- 区域 默认精准查询 0 包含下级查询 1 结束 2023-03-02 fxj -->
<if test="tPaymentInfo.providentNo != null and tPaymentInfo.providentNo.trim() != ''">
AND a.PROVIDENT_NO = #{tPaymentInfo.providentNo}
</if>
......
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