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-06-18 09:18:09 +08:00
parent f7b7e003e7
commit a4b3b1af11
3 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteAccountController.java
View File

@ -70,6 +70,10 @@ public class EmisSiteAccountController extends EmisBaseController
public TableDataInfo list(EmisSiteAccount emisSiteAccount) public TableDataInfo list(EmisSiteAccount emisSiteAccount)
{ {
startPage(); startPage();
setPrivParams(emisSiteAccount);
List<EmisSiteAccount> list = emisSiteAccountService.selectEmisSiteAccountList(emisSiteAccount); List<EmisSiteAccount> list = emisSiteAccountService.selectEmisSiteAccountList(emisSiteAccount);
return getDataTable(list); return getDataTable(list);
} }

9
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteSettleRecordController.java
View File

@ -56,6 +56,9 @@ public class EmisSiteSettleRecordController extends EmisBaseController
public TableDataInfo list(EmisSiteSettleRecord emisSiteSettleRecord) public TableDataInfo list(EmisSiteSettleRecord emisSiteSettleRecord)
{ {
startPage(); startPage();
setPrivParams(emisSiteSettleRecord);
List<EmisSiteSettleRecord> list = emisSiteSettleRecordService.selectEmisSiteSettleRecordList(emisSiteSettleRecord); List<EmisSiteSettleRecord> list = emisSiteSettleRecordService.selectEmisSiteSettleRecordList(emisSiteSettleRecord);
return getDataTable(list); return getDataTable(list);
} }
@ -68,9 +71,9 @@ public class EmisSiteSettleRecordController extends EmisBaseController
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, EmisSiteSettleRecord emisSiteSettleRecord) public void export(HttpServletResponse response, EmisSiteSettleRecord emisSiteSettleRecord)
{ {
List<EmisSiteSettleRecord> list = emisSiteSettleRecordService.selectEmisSiteSettleRecordList(emisSiteSettleRecord); // List<EmisSiteSettleRecord> list = emisSiteSettleRecordService.selectEmisSiteSettleRecordList(emisSiteSettleRecord);
ExcelUtil<EmisSiteSettleRecord> util = new ExcelUtil<EmisSiteSettleRecord>(EmisSiteSettleRecord.class); // ExcelUtil<EmisSiteSettleRecord> util = new ExcelUtil<EmisSiteSettleRecord>(EmisSiteSettleRecord.class);
util.exportExcel(response, list, "网点账户结算记录数据"); // util.exportExcel(response, list, "网点账户结算记录数据");
} }
/** /**

16
emis-biz/src/main/resources/mapper/EmisSiteAccountMapper.xml
View File

@ -38,6 +38,7 @@
<include refid="selectEmisSiteAccountVo"/> <include refid="selectEmisSiteAccountVo"/>
<where> <where>
del_flag='0' del_flag='0'
<if test="id != null "> and id = #{id}</if> <if test="id != null "> and id = #{id}</if>
<if test="accCode != null and accCode != ''"> and acc_code=#{accCode}</if> <if test="accCode != null and accCode != ''"> and acc_code=#{accCode}</if>
<if test="siteCode != null and siteCode != ''"> and site_code= #{siteCode}</if> <if test="siteCode != null and siteCode != ''"> and site_code= #{siteCode}</if>
@ -65,7 +66,6 @@
<if test="createSite != null and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if> <if test="createSite != null and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
<if test="updateSite != null and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if> <if test="updateSite != null and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
<if test="params.balanceStatus != null and params.balanceStatus == '1'"> <if test="params.balanceStatus != null and params.balanceStatus == '1'">
and cur_money <![CDATA[ > ]]> watch_money and cur_money <![CDATA[ > ]]> watch_money
</if> </if>
@ -75,6 +75,20 @@
</if> </if>
<if test="params.privSiteCode != null and params.privSiteCode != '88888'">
and (
site_code in (
SELECT t1.site_code FROM (
SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
#{params.privSiteCode} ) pd
WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
UNION
SELECT #{params.privSiteCode} FROM dual
)
)
</if>
</where> </where>
order by create_time desc order by create_time desc