bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-cq' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq

This commit is contained in:
BianLzhaoMin 2024-06-19 14:43:01 +08:00
parent b4b8a79df0 92200848f0
commit 771e755198
2 changed files with 41 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java
View File

@ -59,6 +59,7 @@ public class RepairServiceImpl implements RepairService {
List<RepairPartDetails> partList = bean.getPartList(); List<RepairPartDetails> partList = bean.getPartList();
BigDecimal sfCosts = new BigDecimal("0"); BigDecimal sfCosts = new BigDecimal("0");
BigDecimal bsfCosts = new BigDecimal("0"); BigDecimal bsfCosts = new BigDecimal("0");
Integer partNum = 0;
String nbType = "1"; String nbType = "1";
String fcType = "2"; String fcType = "2";
String sfPart = "1"; String sfPart = "1";
@ -111,8 +112,10 @@ public class RepairServiceImpl implements RepairService {
partDetails.setCreateBy(loginUser.getUserid()); partDetails.setCreateBy(loginUser.getUserid());
partDetails.setCompanyId(bean.getCompanyId()); partDetails.setCompanyId(bean.getCompanyId());
mapper.addPart(partDetails); mapper.addPart(partDetails);
partNum += partDetails.getPartNum();
} }
} }
bean.setPartNum(partNum);
} }
if (fcType.equals(bean.getRepairType())) { if (fcType.equals(bean.getRepairType())) {
bean.setPartName(partList.get(0).getPartName()); bean.setPartName(partList.get(0).getPartName());
@ -131,6 +134,7 @@ public class RepairServiceImpl implements RepairService {
bean.setPartNum(partList.get(0).getPartNum()); bean.setPartNum(partList.get(0).getPartNum());
} }
for (RepairPartDetails partDetails : partList) { for (RepairPartDetails partDetails : partList) {
if (sfPart.equals(partDetails.getPartType())) { if (sfPart.equals(partDetails.getPartType())) {
if (StringUtils.isEmpty(partDetails.getPartCost())) { if (StringUtils.isEmpty(partDetails.getPartCost())) {
partDetails.setPartCost("0"); partDetails.setPartCost("0");

3
sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
View File

@ -787,11 +787,12 @@
sd.id as sdId sd.id as sdId
FROM FROM
ma_machine mm ma_machine mm
LEFT JOIN slt_agreement_info sai on mm.type_id = sai.type_id and mm.ma_id = sai.ma_id
LEFT JOIN ma_type mt on mt.type_id=mm.type_id LEFT JOIN ma_type mt on mt.type_id=mm.type_id
LEFT JOIN ma_type mt2 on mt2.type_id=mt.parent_id LEFT JOIN ma_type mt2 on mt2.type_id=mt.parent_id
LEFT JOIN sys_dic sd on mm.ma_status=sd.id LEFT JOIN sys_dic sd on mm.ma_status=sd.id
WHERE WHERE
qr_code =#{qrCode} mm.qr_code =#{qrCode} and sai.agreement_id = #{agreementId}
</select> </select>
<select id="backReceiveRecord" resultType="com.bonus.sgzb.app.domain.BackApplyInfo"> <select id="backReceiveRecord" resultType="com.bonus.sgzb.app.domain.BackApplyInfo">
SELECT SELECT