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-02 17:05:44 +08:00
parent 5dde3394f5
commit 661b9704c9
2 changed files with 16 additions and 15 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/EmisTmsScanRecordController.java
View File

@ -81,8 +81,8 @@ public class EmisTmsScanRecordController extends BaseController
* 签收异常数据对比 * 签收异常数据对比
*/ */
// @PreAuthorize("@ss.hasPermi('emis:emisTmsScanRecord:signStat')") // @PreAuthorize("@ss.hasPermi('emis:emisTmsScanRecord:signStat')")
@GetMapping("/queryScanStatDataList") @GetMapping("/queryScanStatList")
public TableDataInfo queryScanStatDataList(EmisTmsScanRecord emisTmsScanRecord) public TableDataInfo queryScanStatList(EmisTmsScanRecord emisTmsScanRecord)
{ {
startPage(); startPage();
emisTmsScanRecord.getParams().put("thisSiteCode",getLoginUser().getUser().getOwnerSiteCode()); emisTmsScanRecord.getParams().put("thisSiteCode",getLoginUser().getUser().getOwnerSiteCode());

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

@ -57,8 +57,7 @@
</resultMap> </resultMap>
<!-- 扫描统计 com.xdadan.erp.emis.domain.stat.--> <resultMap type="ScanStatDataInfo" id="ScanStatDataInfoResult">
<resultMap type="ScanStatDataInfo" id="ScanStatDataInfoResult" extends="EmisTmsScanRecordResult">
<result property="scanType" column="scan_type" /> <result property="scanType" column="scan_type" />
@ -68,12 +67,6 @@
<result property="billCodeStr" column="bill_code_str" /> <result property="billCodeStr" column="bill_code_str" />
<association property="signCount"
column="bill_code_str"
select="selectSignCountByBillCodeStr"
fetchType="lazy"
/>
<association property="scanSiteName" <association property="scanSiteName"
column="scan_site_code" column="scan_site_code"
select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"
@ -83,6 +76,12 @@
</resultMap> </resultMap>
<!-- <association property="signCount"-->
<!-- column="bill_code_str"-->
<!-- select="selectSignCountByBillCodeStr"-->
<!-- fetchType="lazy"-->
<!-- />-->
<!-- 根据获取签收数量统计 --> <!-- 根据获取签收数量统计 -->
<select id="selectSignCountByBillCodeStr" parameterType="string" resultType="int"> <select id="selectSignCountByBillCodeStr" parameterType="string" resultType="int">
@ -109,15 +108,17 @@
<if test="params.endScanDate != null and params.endScanDate != ''"> <if test="params.endScanDate != null and params.endScanDate != ''">
and scan_date <![CDATA[ <= ]]> #{params.endScanDate} and scan_date <![CDATA[ <= ]]> #{params.endScanDate}
</if> </if>
<if test="params.thisSiteScanType != null and params.thisSiteScanType !=''">
and bill_code in(
select bill_code from emis_tms_scan_record where scan_site_code=#{params.thisSiteCode} and scan_type=#{params.thisSiteScanType}
)
</if>
GROUP BY scan_site_code GROUP BY scan_site_code
</select> </select>
<!-- <if test="params.thisSiteScanType != null and params.thisSiteScanType !=''">-->
<!-- and bill_code in(-->
<!-- select bill_code from emis_tms_scan_record where scan_site_code=#{params.thisSiteCode} and scan_type=#{params.thisSiteScanType}-->
<!-- )-->
<!-- </if>-->
<select id="queryScanStatRecordList" parameterType="EmisTmsScanRecord" resultMap="EmisTmsScanRecordResult"> <select id="queryScanStatRecordList" parameterType="EmisTmsScanRecord" resultMap="EmisTmsScanRecordResult">
select distinct scan_site_code,bill_code select distinct scan_site_code,bill_code
from emis_tms_scan_record from emis_tms_scan_record