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 2024-07-08 14:32:35 +08:00
parent 957f3417cc
commit 8fa484ddfa
7 changed files with 107 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java
View File

@ -11,13 +11,18 @@
package com.xdadan.erp.web.emis;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import com.xdadan.erp.emis.domain.EmisSitePrepaidRecharge;
import com.xdadan.erp.emis.domain.EmisWaybill;
import com.xdadan.erp.emis.domain.EmisWaybillAjustApply;
import com.xdadan.erp.emis.domain.exception.EmisBizError;
import com.xdadan.erp.emis.service.EmisBaseService;
import com.xdadan.erp.emis.utils.WaybillHelper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping;
@ -34,7 +39,6 @@ import com.xdadan.erp.common.core.controller.BaseController;
import com.xdadan.erp.common.core.domain.AjaxResult;
import com.xdadan.erp.common.core.page.TableDataInfo;
import com.xdadan.erp.common.enums.BusinessType;
import com.xdadan.erp.common.utils.StringUtils;
import com.xdadan.erp.common.utils.poi.ExcelUtil;
import com.xdadan.erp.emis.domain.EmisSettleSubBill;
@ -48,7 +52,7 @@ import com.xdadan.erp.emis.service.IEmisSettleSubBillService;
*/
@RestController
@RequestMapping("/emis/emisSettleSubBill")
public class EmisSettleSubBillController extends BaseController
public class EmisSettleSubBillController extends EmisBaseController
{
@Autowired
private IEmisSettleSubBillService emisSettleSubBillService;
@ -65,10 +69,47 @@ public class EmisSettleSubBillController extends BaseController
public TableDataInfo list(EmisSettleSubBill emisSettleSubBill)
{
startPage();
setPrivParams(emisSettleSubBill);
if(!org.apache.commons.lang3.StringUtils.isEmpty(emisSettleSubBill.getBillCode())){
emisSettleSubBill.setBillCode(WaybillHelper.formatQueryValue(emisSettleSubBill.getBillCode()));
String[] billCodeSortList = emisSettleSubBill.getBillCode().split(",");
if(billCodeSortList.length>1){
emisSettleSubBill.getParams().put("billCodeSortList", Arrays.asList(billCodeSortList));
}
}
List<EmisSettleSubBill> list = emisSettleSubBillService.selectEmisSettleSubBillList(emisSettleSubBill);
return getDataTable(list);
}
/**
* 查询统计信息
*/
@PreAuthorize("@ss.hasPermi('emis:emisSettleSubBill:list')")
@GetMapping("/getQueryStatInfoMap")
public AjaxResult getQueryStatInfoMap(EmisSettleSubBill emisSettleSubBill)
{
setPrivParams(emisSettleSubBill);
if(!org.apache.commons.lang3.StringUtils.isEmpty(emisSettleSubBill.getBillCode())){
emisSettleSubBill.setBillCode(WaybillHelper.formatQueryValue(emisSettleSubBill.getBillCode()));
String[] billCodeSortList = emisSettleSubBill.getBillCode().split(",");
if(billCodeSortList.length>1){
emisSettleSubBill.getParams().put("billCodeSortList", Arrays.asList(billCodeSortList));
}
}
Map rstMap = emisSettleSubBillService.getQueryStatInfoMap(emisSettleSubBill);
return AjaxResult.success("查询成功",rstMap);
}
/**
* 检查是否重复

4
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBill.java
View File

@ -19,6 +19,8 @@ import com.xdadan.erp.common.core.domain.TreeEntity;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import lombok.Data;
@ -84,6 +86,6 @@ public class EmisSettleSubBill extends BaseEntity
// 扩展参数
private EmisWaybill waybillDetail;
private List<EmisSettleSubBillFeeitem> feeitemList;
}

13
emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleSubBillMapper.java
View File

@ -11,8 +11,12 @@
package com.xdadan.erp.emis.mapper;
import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.xdadan.erp.emis.domain.EmisSettleSubBill;
import com.xdadan.erp.emis.domain.EmisWaybill;
/**
* @ClassName EmisSettleSubBillMapper
* @Description <p> 结算子账单 Mapper 接口 </p>
@ -39,8 +43,15 @@ public interface EmisSettleSubBillMapper extends BaseMapper<EmisSettleSubBill>
*/
public List<EmisSettleSubBill> selectEmisSettleSubBillList(EmisSettleSubBill emisSettleSubBill);
/**
* 统计数据
* @param emisSettleSubBill
* @return
*/
public Map getQueryStatInfoMap(EmisSettleSubBill emisSettleSubBill);
/**
/**
* 检查是否重复
*
* @param emisSettleSubBill

16
emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleSubBillService.java
View File

@ -10,9 +10,12 @@
package com.xdadan.erp.emis.service;
import java.util.List;
import com.xdadan.erp.emis.domain.EmisSettleSubBill;
import java.util.Map;
/**
import com.xdadan.erp.emis.domain.EmisSettleSubBill;
import com.xdadan.erp.emis.domain.EmisWaybill;
/**
* @ClassName EmisSettleSubBillService
* @Description 结算子账单
* @author linfso
@ -37,6 +40,15 @@ public interface IEmisSettleSubBillService
/**
* 查询统计信息
* @param emisSettleSubBill
* @return
*/
public Map getQueryStatInfoMap(EmisSettleSubBill emisSettleSubBill);
/**
* 检查是否重复
*
* @param emisSettleSubBill

17
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleSubBillServiceImpl.java
View File

@ -11,6 +11,9 @@
package com.xdadan.erp.emis.service.impl;
import java.util.List;
import java.util.Map;
import com.xdadan.erp.emis.domain.EmisWaybill;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.xdadan.erp.emis.domain.EmisSettleSubBill;
@ -54,6 +57,20 @@ public class EmisSettleSubBillServiceImpl implements IEmisSettleSubBillService
return emisSettleSubBillMapper.selectEmisSettleSubBillList(emisSettleSubBill);
}
/**
* 获取查询统计信息
*
* @param emisSettleSubBill
* @return 获取查询统计信息Map
*/
@Override
public Map getQueryStatInfoMap(EmisSettleSubBill emisSettleSubBill)
{
Map statInfoMap=emisSettleSubBillMapper.getQueryStatInfoMap(emisSettleSubBill);
return statInfoMap;
}
/**
* 检查是否重复
*

11
emis-biz/src/main/resources/mapper/EmisSettleSubBillFeeitemMapper.xml
View File

@ -20,6 +20,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select id, sub_bill_no, bill_code, fee_code, fee_name, bill_fee, orig_fee, currency, order_num, del_flag, create_by, create_time, update_by, update_time, remark from emis_settle_sub_bill_feeitem
</sql>
<select id="selectFeeitemListBySubBillNo" parameterType="String" resultMap="EmisSettleSubBillFeeitemResult">
select id, sub_bill_no, bill_code, fee_code, fee_name, bill_fee, orig_fee, currency, order_num
from emis_settle_sub_bill_feeitem a
where a.del_flag='0' and a.sub_bill_no = #{subBillNo}
</select>
<select id="selectEmisSettleSubBillFeeitemList" parameterType="EmisSettleSubBillFeeitem" resultMap="EmisSettleSubBillFeeitemResult">
<include refid="selectEmisSettleSubBillFeeitemVo"/>
<where>
@ -63,7 +70,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and remark = #{remark}
limit 1
</select>
<select id="selectEmisSettleSubBillFeeitemById" parameterType="Long" resultMap="EmisSettleSubBillFeeitemResult">
select id, sub_bill_no, bill_code, fee_code, fee_name, bill_fee, orig_fee, currency, order_num, del_flag, create_by, create_time, update_by, update_time, remark
from emis_settle_sub_bill_feeitem a

8
emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
View File

@ -39,8 +39,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
fetchType="lazy"
/>
<association property="feeitemList"
column="bill_no"
select="com.xdadan.erp.emis.mapper.EmisSettleSubBillFeeitemMapper.selectFeeitemListBySubBillNo"
fetchType="lazy"
/>
</resultMap>
<sql id="selectEmisSettleSubBillVo">
select id, bill_no, parent_bill_no, settle_bill_no, bill_code, bill_date, bill_fee, currency, settle_type, bl_split, bill_month, cust_no, customer_code, customer_name, bl_confirm, confirm_date, confirm_site, confirm_man_code, bl_site_confirm, confirm_note, site_confirm_date, site_confirm_man_code, site_confirm_note, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_settle_sub_bill
</sql>