bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
hongchao 2025-02-10 17:21:46 +08:00
parent 1bffc4c4e3 02fe8438a0
commit 7cb7484618
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
View File

@ -425,7 +425,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
*/
@Override
public AjaxResult getInfoByQrcode(BmQrcodeInfo bmQrcodeInfo) {
if (bmQrcodeInfo.getQrCode() == null) {
if (StringUtils.isBlank(bmQrcodeInfo.getQrCode())) {
return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), "二维码code不能为空");
}
List<LeaseOutDetails> recordList = leaseApplyDetailsMapper.getInfoByQrcode(bmQrcodeInfo);

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/controller/ScrapReasonController.java
View File

@ -1,4 +1,4 @@
package com.bonus.material.warehouse.controller;
package com.bonus.material.scrap.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;

1
bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/service/IScrapReasonService.java
View File

@ -1,7 +1,6 @@
package com.bonus.material.scrap.service;
import com.bonus.material.scrap.domain.ScrapReason;
import com.bonus.material.warehouse.domain.WhHouseInfo;
import java.util.List;

3
bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseBindMapper.xml
View File

@ -260,7 +260,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM
bm_qrcode_info
WHERE
DATE_FORMAT(create_time, '%Y-%m') = #{genMonth}
qr_code IS NOT NULL
AND DATE_FORMAT(create_time, '%Y-%m') = #{genMonth}
ORDER BY
qr_code DESC
</select>