From e69dc34457a700a27659d17501957ed1dd5be66c Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 27 六月 2025 17:03:12 +0800
Subject: [PATCH] 2025-06-27 bug修改
---
src/main/java/com/ruoyi/device/controller/DeviceRepairController.java | 12 +++++-
src/main/java/com/ruoyi/device/service/IDeviceMaintenanceService.java | 1
src/main/resources/mapper/device/DeviceMaintenanceMapper.xml | 8 ++++
src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java | 2
src/main/java/com/ruoyi/device/mapper/DeviceRepairMapper.java | 2 +
src/main/java/com/ruoyi/purchase/dto/ProductRecordDto.java | 6 +-
src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java | 9 ++--
src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java | 6 +++
src/main/resources/mapper/device/DeviceRepairMapper.xml | 8 ++++
src/main/java/com/ruoyi/device/service/IDeviceRepairService.java | 1
src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java | 6 +++
src/main/resources/mapper/system/SysUserMapper.xml | 4 +-
src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java | 21 +++++++---
src/main/java/com/ruoyi/device/mapper/DeviceMaintenanceMapper.java | 2 +
doc/add.sql | 5 ++
15 files changed, 74 insertions(+), 19 deletions(-)
diff --git a/doc/add.sql b/doc/add.sql
index 2980a2f..2803cae 100644
--- a/doc/add.sql
+++ b/doc/add.sql
@@ -63,3 +63,8 @@
alter table sales_ledger
add payment_method varchar(255) null;
+
+alter table payment_registration
+ modify sale_ledger_id bigint default 0 null comment '閿�鍞彴璐d';
+
+
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
index 1b6cfb5..acbb8a5 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
@@ -25,32 +25,39 @@
@Autowired
private IDeviceMaintenanceService deviceMaintenanceService;
- @ApiModelProperty("璁惧鎶ヤ慨鍒楄〃")
+ @ApiModelProperty("璁惧淇濆吇鍒楄〃")
@GetMapping("/page")
public AjaxResult page(Page page , DeviceMaintenanceDto deviceMaintenanceDto) {
return AjaxResult.success(deviceMaintenanceService.queryPage(page,deviceMaintenanceDto));
}
@PostMapping()
- @ApiModelProperty("娣诲姞璁惧鎶ヤ慨")
+ @ApiModelProperty("娣诲姞璁惧淇濆吇")
public AjaxResult add(@RequestBody DeviceMaintenance deviceRepair) {
return deviceMaintenanceService.saveDeviceRepair(deviceRepair);
}
- @ApiModelProperty("鏍规嵁id鏌ヨ璁惧鎶ヤ慨")
+ @ApiModelProperty("鏍规嵁id鏌ヨ璁惧淇濆吇")
@GetMapping("/{id}")
public AjaxResult detail(@PathVariable Long id) {
- return AjaxResult.success(deviceMaintenanceService.getById(id));
+ return AjaxResult.success(deviceMaintenanceService.detailById(id));
}
@PutMapping ()
- @ApiModelProperty("淇敼璁惧鎶ヤ慨")
+ @ApiModelProperty("淇敼璁惧淇濆吇")
public AjaxResult update(@RequestBody DeviceMaintenance deviceMaintenance) {
return deviceMaintenanceService.updateDeviceRepair(deviceMaintenance);
}
+ @PostMapping ("maintenance")
+ @ApiModelProperty("淇敼璁惧淇濆吇")
+ public AjaxResult maintenance(@RequestBody DeviceMaintenance deviceMaintenance) {
+ return deviceMaintenanceService.updateDeviceRepair(deviceMaintenance);
+ }
+
+
@DeleteMapping("/{id}")
- @ApiModelProperty("鍒犻櫎璁惧鎶ヤ慨")
+ @ApiModelProperty("鍒犻櫎璁惧淇濆吇")
public AjaxResult delete(@PathVariable ArrayList<Long> ids) {
boolean b = deviceMaintenanceService.removeBatchByIds(ids);
if (!b) {
@@ -60,7 +67,7 @@
}
@PostMapping("export")
- @ApiModelProperty("瀵煎嚭璁惧鎶ヤ慨")
+ @ApiModelProperty("瀵煎嚭璁惧淇濆吇")
public void export(HttpServletResponse response, Long[] ids) {
deviceMaintenanceService.export(response, ids);
}
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java b/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
index 44021a9..55e8189 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
@@ -18,7 +18,7 @@
import java.util.Arrays;
@Api(tags = "璁惧鎶ヤ慨绠＄悊")
-@RequestMapping("/device/reppair")
+@RequestMapping("/device/repair")
@RestController
public class DeviceRepairController {
@@ -40,7 +40,8 @@
@ApiModelProperty("鏍规嵁id鏌ヨ璁惧鎶ヤ慨")
@GetMapping("/{id}")
public AjaxResult detail(@PathVariable Long id) {
- return AjaxResult.success(deviceRepairService.getById(id));
+ DeviceRepairDto byId = deviceRepairService.detailById(id);
+ return AjaxResult.success(byId);
}
@PutMapping ()
@@ -49,6 +50,13 @@
return deviceRepairService.updateDeviceRepair(deviceRepair);
}
+ @PostMapping ("repair")
+ @ApiModelProperty("璁惧缁翠慨")
+ public AjaxResult repair( @RequestBody DeviceRepair deviceRepair) {
+ deviceRepair.setStatus(1);
+ return deviceRepairService.updateDeviceRepair(deviceRepair);
+ }
+
@DeleteMapping("/{ids}")
@ApiModelProperty("鍒犻櫎璁惧鎶ヤ慨")
public AjaxResult delete(@PathVariable("ids") Long[] ids) {
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
index 8df1411..c101bc0 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
@@ -16,7 +16,7 @@
private Long id;
@ApiModelProperty("璁惧鍙拌处id")
- private String deviceLedgerId;
+ private Long deviceLedgerId;
@ApiModelProperty("璁惧鍚嶇О")
private String deviceName;
diff --git a/src/main/java/com/ruoyi/device/mapper/DeviceMaintenanceMapper.java b/src/main/java/com/ruoyi/device/mapper/DeviceMaintenanceMapper.java
index b1bee95..5fde866 100644
--- a/src/main/java/com/ruoyi/device/mapper/DeviceMaintenanceMapper.java
+++ b/src/main/java/com/ruoyi/device/mapper/DeviceMaintenanceMapper.java
@@ -13,4 +13,6 @@
public interface DeviceMaintenanceMapper extends BaseMapper<DeviceMaintenance> {
IPage<DeviceMaintenanceDto> queryPage(Page page, DeviceMaintenanceDto deviceMaintenanceDto);
+
+ DeviceMaintenanceDto detailById(Long id);
}
diff --git a/src/main/java/com/ruoyi/device/mapper/DeviceRepairMapper.java b/src/main/java/com/ruoyi/device/mapper/DeviceRepairMapper.java
index 5b1da18..cbfcbcd 100644
--- a/src/main/java/com/ruoyi/device/mapper/DeviceRepairMapper.java
+++ b/src/main/java/com/ruoyi/device/mapper/DeviceRepairMapper.java
@@ -11,4 +11,6 @@
@Mapper
public interface DeviceRepairMapper extends BaseMapper<DeviceRepair> {
IPage<DeviceRepairDto> queryPage(Page page, @Param("deviceRepairDto") DeviceRepairDto deviceRepairDto);
+
+ DeviceRepairDto detailById(Long id);
}
diff --git a/src/main/java/com/ruoyi/device/service/IDeviceMaintenanceService.java b/src/main/java/com/ruoyi/device/service/IDeviceMaintenanceService.java
index ff595e5..a92a097 100644
--- a/src/main/java/com/ruoyi/device/service/IDeviceMaintenanceService.java
+++ b/src/main/java/com/ruoyi/device/service/IDeviceMaintenanceService.java
@@ -19,4 +19,5 @@
void export(HttpServletResponse response, Long[] ids);
+ DeviceMaintenanceDto detailById(Long id);
}
diff --git a/src/main/java/com/ruoyi/device/service/IDeviceRepairService.java b/src/main/java/com/ruoyi/device/service/IDeviceRepairService.java
index 4ee1358..5877ffd 100644
--- a/src/main/java/com/ruoyi/device/service/IDeviceRepairService.java
+++ b/src/main/java/com/ruoyi/device/service/IDeviceRepairService.java
@@ -20,4 +20,5 @@
void export(HttpServletResponse response, Long[] ids);
+ DeviceRepairDto detailById(Long id);
}
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
index 4a92286..b59d466 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
@@ -71,4 +71,10 @@
ExcelUtil<DeviceMaintenanceExeclDto> util = new ExcelUtil<DeviceMaintenanceExeclDto>(DeviceMaintenanceExeclDto.class);
util.exportExcel(response, deviceLedgerExeclDtos, "璁惧鎶ヤ慨瀵煎嚭");
}
+
+ @Override
+ public DeviceMaintenanceDto detailById(Long id) {
+
+ return deviceMaintenanceMapper.detailById(id);
+ }
}
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
index 707063b..a4f148c 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
@@ -87,4 +87,10 @@
}
+ @Override
+ public DeviceRepairDto detailById(Long id) {
+
+ return deviceRepairMapper.detailById(id);
+ }
+
}
diff --git a/src/main/java/com/ruoyi/purchase/dto/ProductRecordDto.java b/src/main/java/com/ruoyi/purchase/dto/ProductRecordDto.java
index ab7365f..92c4b86 100644
--- a/src/main/java/com/ruoyi/purchase/dto/ProductRecordDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/ProductRecordDto.java
@@ -23,11 +23,11 @@
//渚涘簲鍟嗗悕绉�
private String supplierName;
//澧炲�肩◣
- private String invoiceAmount;
+ private String invoiceAmount = "0";
- private String invoiceNumber;
+ private String invoiceNumber = "0";
- private String unTicketsPrice;
+ private String unTicketsPrice = "0";
private List<CommonFile> commonFiles;
}
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java
index cbc5b53..c7753c2 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java
@@ -99,11 +99,12 @@
PurchaseLedger purchaseLedger = purchaseLedgerMapper.selectById(paymentRegistration.getPurchaseLedgerId());
SalesLedger salesLedger = salesLedgerMapper.selectOne(new QueryWrapper<SalesLedger>().
eq("sales_contract_no", purchaseLedger.getSalesContractNo()));
- if (salesLedger == null) {
- throw new RuntimeException("鍏宠仈閿�鍞悎鍚屽彿涓嶅瓨鍦�");
+// if (salesLedger == null) {
+// throw new RuntimeException("鍏宠仈閿�鍞悎鍚屽彿涓嶅瓨鍦�");
+// }
+ if (salesLedger != null) {
+ paymentRegistration.setSaleLedgerId(salesLedger.getId());
}
-
- paymentRegistration.setSaleLedgerId(salesLedger.getId());
paymentRegistration.setSupplierId(purchaseLedger.getSupplierId());
TicketRegistration tr = ticketRegistrationMapper.selectOne(new LambdaQueryWrapper<TicketRegistration>().eq(TicketRegistration::getId, paymentRegistration.getTicketRegistrationId()));
diff --git a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
index 9072d29..9a6e711 100644
--- a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
+++ b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
@@ -20,5 +20,13 @@
</if>
</where>
</select>
+ <select id="detailById" resultType="com.ruoyi.device.dto.DeviceMaintenanceDto">
+ select dm.*,
+ dl.device_name,
+ dl.device_model
+ from device_maintenance dm
+ left join device_ledger dl on dm.device_ledger_id = dl.id
+ where dm.id = #{id}
+ </select>
</mapper>
diff --git a/src/main/resources/mapper/device/DeviceRepairMapper.xml b/src/main/resources/mapper/device/DeviceRepairMapper.xml
index 0dd7b3a..d754e43 100644
--- a/src/main/resources/mapper/device/DeviceRepairMapper.xml
+++ b/src/main/resources/mapper/device/DeviceRepairMapper.xml
@@ -20,5 +20,13 @@
</if>
</where>
</select>
+ <select id="detailById" resultType="com.ruoyi.device.dto.DeviceRepairDto">
+ select dr.*,
+ dl.device_name,
+ dl.device_model
+ from device_repair dr
+ left join device_ledger dl on dr.device_ledger_id = dl.id
+ where dr.id = #{id}
+ </select>
</mapper>
diff --git a/src/main/resources/mapper/system/SysUserMapper.xml b/src/main/resources/mapper/system/SysUserMapper.xml
index 8824e35..3afcaf0 100644
--- a/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/src/main/resources/mapper/system/SysUserMapper.xml
@@ -94,7 +94,7 @@
</select>
<select id="selectAllocatedList" parameterType="com.ruoyi.project.system.domain.SysUser" resultMap="SysUserResult">
- select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+ select distinct u.user_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
from sys_user u
left join sys_user_role ur on u.user_id = ur.user_id
left join sys_role r on r.role_id = ur.role_id
@@ -110,7 +110,7 @@
</select>
<select id="selectUnallocatedList" parameterType="com.ruoyi.project.system.domain.SysUser" resultMap="SysUserResult">
- select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+ select distinct u.user_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
from sys_user u
left join sys_user_role ur on u.user_id = ur.user_id
left join sys_role r on r.role_id = ur.role_id
--
Gitblit v1.9.3