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

接口对接

This commit is contained in:
jiang 2025-08-31 13:25:08 +08:00
parent 59842231f8
commit abcbeff813
2 changed files with 62 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairPartDetails.java
View File

@ -23,15 +23,21 @@ import lombok.experimental.Accessors;
public class RepairPartDetails extends BaseEntity {
private static final long serialVersionUID = 1L;
/** ID */
/**
* ID
*/
private Long id;
/** 任务ID */
/**
* 任务ID
*/
@Excel(name = "任务ID")
@ApiModelProperty(value = "任务ID")
private Long taskId;
/** 机具ID */
/**
* 机具ID
*/
@Excel(name = "机具ID")
@ApiModelProperty(value = "机具ID")
private Long maId;
@ -39,7 +45,9 @@ public class RepairPartDetails extends BaseEntity {
@ApiModelProperty(value = "机具编码")
private String maCode;
/** 规格ID */
/**
* 规格ID
*/
@Excel(name = "规格ID")
@ApiModelProperty(value = "规格ID")
private Long typeId;
@ -50,12 +58,16 @@ public class RepairPartDetails extends BaseEntity {
@ApiModelProperty(value = "规格型号")
private String typeModelName;
/** 配件ID */
/**
* 配件ID
*/
@Excel(name = "配件ID")
@ApiModelProperty(value = "配件ID")
private Long partId;
/** 配件数量 */
/**
* 配件数量
*/
@Excel(name = "配件数量")
@ApiModelProperty(value = "配件数量")
private Integer partNum;
@ -63,7 +75,9 @@ public class RepairPartDetails extends BaseEntity {
@ApiModelProperty(value = "配件库存数量")
private Integer storageNum;
/** 配件费用 */
/**
* 配件费用
*/
@Excel(name = "配件费用")
@ApiModelProperty(value = "配件费用")
private BigDecimal partCost;
@ -71,44 +85,64 @@ public class RepairPartDetails extends BaseEntity {
@ApiModelProperty(value = "配件费用")
private BigDecimal backCost;
/** 类型（0不收费，1收费） */
/**
* 类型（0不收费，1收费）
*/
@Excel(name = "类型", readConverterExp = "0=不收费，1收费")
private Integer partType;
/** 数据所属组织 */
/**
* 数据所属组织
*/
@Excel(name = "数据所属组织")
@ApiModelProperty(value = "数据所属组织")
private Long companyId;
/** 维修内容 */
/**
* 维修内容
*/
@Excel(name = "维修内容")
@ApiModelProperty(value = "维修内容")
private String repairContent;
/** 维修数量 */
/**
* 维修数量
*/
@ApiModelProperty(value = "维修数量")
private BigDecimal repairNum;
/** 报废数量 */
/**
* 报废数量
*/
@ApiModelProperty(value = "报废数量")
private BigDecimal scrapNum;
/** 报废原因id */
/**
* 报废原因id
*/
private Long scrapId;
/** 报废原因 */
/**
* 报废原因
*/
@ApiModelProperty(value = "报废原因")
private String scrapReason;
/** 报废原因类型（0：自然损坏，1人为损坏） */
/**
* 报废原因类型（0：自然损坏，1人为损坏）
*/
@Excel(name = "损坏原因类型", readConverterExp = "0=：自然损坏，1人为损坏")
private String scrapType;
/** 附件集合 */
/**
* 附件集合
*/
@ApiModelProperty(value = "附件集合")
private List<BmFileInfo> fileList;
/** 维修人员 */
/**
* 维修人员
*/
@ApiModelProperty(value = "维修人")
private String repairer;
@ -130,4 +164,6 @@ public class RepairPartDetails extends BaseEntity {
* 状态
*/
private String status;
private String keyWord;
}

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

@ -877,7 +877,7 @@
partName IS NOT NULL
</select>
<select id="getDetailsListApp" resultType="com.bonus.material.repair.domain.RepairPartDetails">
SELECT a.*,
SELECT DISTINCT a.*,
rad.id as repairId,
rid.`status` as checkStatus,
sad.`status` as scrapStatus,
@ -925,6 +925,14 @@
LEFT JOIN repair_input_details rid on rid.repair_id = rad.id and rad.is_ds = 0
LEFT JOIN repair_audit_details rads on rads.repair_id = rad.id and rads.ma_id = a.maId
LEFT JOIN scrap_apply_details sad on sad.parent_id = rads.id
<where>
<if test="keyWord != null and keyWord != ''">
AND a.typeName = #{keyWord}
</if>
<if test="keyWord != null and keyWord != ''">
AND a.typeModelName = #{keyWord}
</if>
</where>
</select>
<select id="getLossPart" resultType="com.bonus.material.repair.domain.vo.RepairPartInfo">
<![CDATA[