aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2025-05-07 06:40:40 +08:00
parent 1d41a4b1fa
commit beaa4cbb95
5 changed files with 56 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettlePayRecordController.java
View File

@ -21,6 +21,7 @@ import com.alibaba.fastjson.JSONObject;
import com.xdadan.erp.emis.domain.EmisSettleBill;
import com.xdadan.erp.emis.domain.EmisWaybill;
import com.xdadan.erp.emis.domain.exception.EmisBizError;
import com.xdadan.erp.emis.domain.stat.PayBackRecordDtl;
import com.xdadan.erp.emis.utils.WaybillHelper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -98,7 +99,18 @@ public class EmisSettlePayRecordController extends BaseController
setPrivParams(emisSettlePayRecord);
List<Map> list = emisSettlePayRecordService.queryPayBackRecordList(emisSettlePayRecord);
List<PayBackRecordDtl> list = emisSettlePayRecordService.queryPayBackRecordList(emisSettlePayRecord);
return getDataTable(list);
}
@GetMapping("/queryNoPayBackRecordList")
public TableDataInfo queryNoPayBackRecordList(EmisSettlePayRecord emisSettlePayRecord)
{
startPage();
setPrivParams(emisSettlePayRecord);
List<PayBackRecordDtl> list = emisSettlePayRecordService.queryNoPayBackRecordList(emisSettlePayRecord);
return getDataTable(list);
}

6
emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettlePayRecordMapper.java
View File

@ -15,6 +15,8 @@ import java.util.Map;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.xdadan.erp.emis.domain.EmisSettlePayRecord;
import com.xdadan.erp.emis.domain.stat.PayBackRecordDtl;
/**
* @ClassName EmisSettlePayRecordMapper
* @Description <p> 账单收退款记录 Mapper 接口 </p>
@ -41,7 +43,9 @@ public interface EmisSettlePayRecordMapper extends BaseMapper<EmisSettlePayRecor
public List<EmisSettlePayRecord> selectSettlePayRecordListBySettleBillNo(String settleBillNo);
public List<Map> queryPayBackRecordList(EmisSettlePayRecord emisSettlePayRecord);
public List<PayBackRecordDtl> queryPayBackRecordList(EmisSettlePayRecord emisSettlePayRecord);
public List<PayBackRecordDtl> queryNoPayBackRecordList(EmisSettlePayRecord emisSettlePayRecord);
/**
* 检查是否重复

5
emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettlePayRecordService.java
View File

@ -15,6 +15,7 @@ import java.util.Map;
import com.xdadan.erp.emis.domain.EmisSettleBill;
import com.xdadan.erp.emis.domain.EmisSettlePayRecord;
import com.xdadan.erp.emis.domain.exception.EmisBizError;
import com.xdadan.erp.emis.domain.stat.PayBackRecordDtl;
/**
* @ClassName EmisSettlePayRecordService
@ -39,7 +40,9 @@ public interface IEmisSettlePayRecordService
*/
public List<EmisSettlePayRecord> selectEmisSettlePayRecordList(EmisSettlePayRecord emisSettlePayRecord);
public List<Map> queryPayBackRecordList(EmisSettlePayRecord emisSettlePayRecord);
public List<PayBackRecordDtl> queryPayBackRecordList(EmisSettlePayRecord emisSettlePayRecord);
public List<PayBackRecordDtl> queryNoPayBackRecordList(EmisSettlePayRecord emisSettlePayRecord);
/**
* 检查是否重复

10
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java
View File

@ -17,6 +17,7 @@ import java.util.Map;
import com.xdadan.erp.emis.domain.*;
import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType;
import com.xdadan.erp.emis.domain.exception.EmisBizError;
import com.xdadan.erp.emis.domain.stat.PayBackRecordDtl;
import com.xdadan.erp.emis.mapper.*;
import com.xdadan.erp.emis.service.EmisBaseService;
import com.xdadan.erp.emis.service.IEmisSettleBillService;
@ -92,11 +93,18 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I
}
@Override
public List<Map> queryPayBackRecordList(EmisSettlePayRecord emisSettlePayRecord)
public List<PayBackRecordDtl> queryPayBackRecordList(EmisSettlePayRecord emisSettlePayRecord)
{
return emisSettlePayRecordMapper.queryPayBackRecordList(emisSettlePayRecord);
}
@Override
public List<PayBackRecordDtl> queryNoPayBackRecordList(EmisSettlePayRecord emisSettlePayRecord)
{
return emisSettlePayRecordMapper.queryNoPayBackRecordList(emisSettlePayRecord);
}
/**
* 检查是否重复
*

27
emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml
View File

@ -201,12 +201,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND b.pay_id = d.pay_id
AND a.bill_no = d.bill_no
AND b.pay_id IN (
SELECT pay_id FROM emis_settle_pay_bill_rel
WHERE FIND_IN_SET(settle_bill_no,#{settleBillNo})
SELECT pay_id FROM emis_settle_pay_bill_rel espbr,emis_settle_bill esb
WHERE espbr.del_flag=0 and esb.del_flag=0
and espbr.settle_bill_no=esb.settle_bill_no
<if test="params.queryDataType != null and params.queryDataType == 1">
b.trade_date <![CDATA[ <= ]]> esb.payment_due_date
</if>
<if test="params.queryDataType != null and params.queryDataType == 2">
b.trade_date <![CDATA[ > ]]> esb.payment_due_date and b.trade_date <![CDATA[ <= ]]> DATE_SUB( esb.payment_due_date, INTERVAL - 30 DAY )
</if>
<if test="params.queryDataType != null and params.queryDataType == 3">
b.trade_date <![CDATA[ > ]]> DATE_SUB( esb.payment_due_date, INTERVAL - 30 DAY )
</if>
and FIND_IN_SET(settle_bill_no,#{settleBillNo})
)
order by b.create_time desc
</select>
<select id="queryNoPayBackRecordList" parameterType="EmisSettlePayRecord" resultMap="PayBackRecordDtlResult">
SELECT
a.settle_bill_no,
a.bill_code
FROM
emis_settle_sub_bill a
WHERE a.del_flag = '0'
and a.payment_status != '1'
and FIND_IN_SET(settle_bill_no,#{settleBillNo})
order by a.create_time desc
</select>
<select id="checkUnique" parameterType="EmisSettlePayRecord" resultType="int">
select count(1) from emis_settle_pay_record