From 8cc289e5027793fc2742046194cd8cfdcc05d45c Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Wed, 4 Sep 2024 13:55:32 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=A0=87=E6=AE=B5=E5=B7=A5=E7=A8=8B?=
=?UTF-8?q?=E7=9C=81=E4=BB=BD=E5=AD=97=E6=AE=B5=E6=9C=AA=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/resources/mapper/base/BmProjectLotMapper.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectLotMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectLotMapper.xml
index 852676cb..c4ec6e37 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectLotMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectLotMapper.xml
@@ -169,6 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
longitude = #{longitude},
latitude = #{latitude},
address = #{address},
+ province = #{province},
details_address = #{detailsAddress},
update_time = sysdate()
From 35e264680c2b9ab45fdb7cefd2887a6eefb1cc4c Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Thu, 5 Sep 2024 16:54:22 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=B5=8B=E8=AF=95bug=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../sgzb/base/domain/RepairApplyRecord.java | 3 ++-
.../base/service/impl/RepairServiceImpl.java | 4 ++--
.../resources/mapper/app/TmTaskMapper.xml | 19 +++++++++++++++++--
3 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairApplyRecord.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairApplyRecord.java
index dea956ff..d3f89ffc 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairApplyRecord.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairApplyRecord.java
@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -96,7 +97,7 @@ public class RepairApplyRecord implements Serializable {
* 配件单价
*/
@ApiModelProperty(value = "配件单价")
- private String partPrice;
+ private BigDecimal partPrice;
/**
* 维修内容
*/
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java
index f4dc2bf1..4ba54fd1 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java
@@ -135,7 +135,7 @@ public class RepairServiceImpl implements RepairService {
partDetails.setCreateBy(loginUser.getUserid());
partDetails.setCompanyId(bean.getCompanyId());
mapper.addPart(partDetails);
- bean.setPartPrice(partDetails.getPartCost());
+ bean.setPartPrice(new BigDecimal(partDetails.getPartCost()));
partNum += partDetails.getPartNum();
bean.setRepairContent(partDetails.getRepairContent());
bean.setPartType(partDetails.getPartType());
@@ -152,7 +152,7 @@ public class RepairServiceImpl implements RepairService {
} else {
bean.setSupplierId(partList.get(0).getSupplierId());
}
- bean.setPartPrice(partList.get(0).getPartPrice());
+ bean.setPartPrice(new BigDecimal(partList.get(0).getPartPrice()));
bean.setPartNum(partList.get(0).getPartNum());
}
for (RepairPartDetails partDetails : partList) {
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
index cdac1bb0..ccae0771 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
@@ -1045,12 +1045,27 @@
SELECT
lad.*, mt.type_name AS typeModelName, mt1.type_name AS typeName,mt.unit_name as unitName, mt.manage_type as manageType,
case WHEN mt.manage_type = '0' then '编号' else '计数' end manageTypeName,
- IFNULL(mt.num,0) AS num, (lad.pre_num - IF(lad.al_num IS NULL,'0',lad.al_num)) AS outNum,mm.ma_code as maCode
+ CASE mt.manage_type
+ WHEN 0 THEN
+ IFNULL(subquery0.num, 0)
+ ELSE
+ IFNULL(mt.num, 0)
+ END as num,
+ (lad.pre_num - IF(lad.al_num IS NULL,'0',lad.al_num)) AS outNum,mm.ma_code as maCode
FROM
lease_apply_details lad
LEFT JOIN ma_type mt ON lad.type_id = mt.type_id
LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id
- LEFT JOIN ma_machine mm ON lad.type_id = mm.type_id
+ LEFT JOIN (SELECT mt.type_id,
+ mt2.type_name AS typeName,
+ mt.type_name AS typeModelName,
+ mm.ma_code,
+ count(mm.ma_id) num
+ FROM ma_machine mm
+ LEFT JOIN ma_type mt ON mt.type_id = mm.type_id
+ LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
+ WHERE mm.ma_code is not null and mm.ma_status in (15)
+ GROUP BY mt.type_id) AS subquery0 ON subquery0.type_id = mt.type_id
WHERE
lad.parennt_id = #{record.id}
GROUP BY
From 9811e4bc1e685c45af2c6f8bcaca5a9650be2448 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Thu, 5 Sep 2024 18:26:00 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E4=BA=8C=E7=BA=A7?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/resources/mapper/largeScreen/LargeScreenMapper.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml
index 9f635889..13ef7f92 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml
@@ -956,7 +956,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
WHERE
bpl.lot_id = #{lotId}
- and lai.code = #{code}
+ and lai.code like concat('%', #{code}, '%')
and mt.type_id = #{typeId}
From 4d7feb8ea306fc39532d6786cf19e352b84a0d96 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Fri, 6 Sep 2024 16:15:24 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=AD=97=E5=85=B8=E8=A1=A8=E6=9B=B4?=
=?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/resources/mapper/material/IotMachineMapper.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/IotMachineMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/IotMachineMapper.xml
index 306aa208..c90e9615 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/IotMachineMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/IotMachineMapper.xml
@@ -168,7 +168,7 @@
sys_dic
WHERE
status = '0'
- AND p_id = '124'
+ AND p_id = '125'