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

问题修复

This commit is contained in:
hongchao 2025-11-12 17:41:39 +08:00
parent bd8741fb92
commit 726b2d3eab
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ProjUsingRecord.java
View File

@ -141,4 +141,5 @@ public class ProjUsingRecord {
@ApiModelProperty(value = "总在用数量") @ApiModelProperty(value = "总在用数量")
private BigDecimal allUsNum; private BigDecimal allUsNum;
private String jijuType;
} }

4
bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/PushProDataUseInfoController.java
View File

@ -183,11 +183,7 @@ public class PushProDataUseInfoController extends BaseController {
try { try {
startPage(); startPage();
List<MachineInfoBean> results = new ArrayList<>(); List<MachineInfoBean> results = new ArrayList<>();
if(bean.getType() ==1){
results = null;
}else{
results = service.getApproachingDetails(bean); results = service.getApproachingDetails(bean);
}
return getDataTable(results); return getDataTable(results);
} catch (Exception e) { } catch (Exception e) {
logger.error(e.toString(), e); logger.error(e.toString(), e);

5
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/PartDetails.java
View File

@ -57,7 +57,7 @@ public class PartDetails extends BaseEntity {
@ApiModelProperty(value = "物资名称") @ApiModelProperty(value = "物资名称")
private String typeModelName; private String typeModelName;
@Excel(name = "规格型号",sort = 5, cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT) @Excel(name = "规格型号",sort = 5)
@ApiModelProperty(value = "规格型号") @ApiModelProperty(value = "规格型号")
private String typeName; private String typeName;
@ -89,6 +89,7 @@ public class PartDetails extends BaseEntity {
/** /**
* 类型（0不收费，1收费） * 类型（0不收费，1收费）
*/ */
@Excel(name = "是否收费",sort = 13,readConverterExp = "0=不收费,1=收费")
private Integer partType; private Integer partType;
@Excel(name = "配件名称",sort = 6) @Excel(name = "配件名称",sort = 6)
@ -99,7 +100,7 @@ public class PartDetails extends BaseEntity {
@ApiModelProperty(value = "配件规格型号") @ApiModelProperty(value = "配件规格型号")
private String partName; private String partName;
@Excel(name = "单价（元）",sort = 11) @Excel(name = "单价（元）",sort = 11,cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT)
@ApiModelProperty(value = "配件价格") @ApiModelProperty(value = "配件价格")
private BigDecimal partPrice; private BigDecimal partPrice;

6
bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml
View File

@ -223,7 +223,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
THEN 1 THEN 1
ELSE NULL ELSE NULL
END) AS ApproachingNum, END) AS ApproachingNum,
0 AS TimeoutNum COUNT(CASE
WHEN mm.next_check_time &lt; NOW()
THEN 1
ELSE NULL
END) AS TimeoutNum
FROM ma_machine mm FROM ma_machine mm
LEFT JOIN slt_agreement_info sai on sai.ma_id = mm.ma_id and mm.type_id = sai.type_id LEFT JOIN slt_agreement_info sai on sai.ma_id = mm.ma_id and mm.type_id = sai.type_id
LEFT JOIN bm_agreement_info bai ON sai.agreement_id = bai.agreement_id LEFT JOIN bm_agreement_info bai ON sai.agreement_id = bai.agreement_id

3
bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml
View File

@ -1608,7 +1608,8 @@
mpt1.unit_name as partUnit, mpt1.unit_name as partUnit,
mpt1.buy_price as partPrice, mpt1.buy_price as partPrice,
rpd.part_num as partNum, rpd.part_num as partNum,
rpd.part_cost as partCost, COALESCE(IFNULL(rpd.part_num,0) * IFNULL(mpt1.buy_price,0),0) as partCost,
IFNULL(rpd.part_type,0) as partType,
COALESCE(su.nick_name, rpd.create_by) as createBy COALESCE(su.nick_name, rpd.create_by) as createBy
from from
repair_part_details rpd repair_part_details rpd