33 Commits

Author SHA1 Message Date
xvx
53e0f1b6c0 小修改,增加贫化表的分页和查询本月或上月。 2025-05-19 18:53:53 +08:00
xvx
01aa266251 小修改 2025-05-13 18:50:54 +08:00
xvx
3c30523d7c 损失和贫化实体类 添加损失矿量LossMineralTon, 2025-05-13 18:14:38 +08:00
xvx
3169f8a2c8 小修改 2025-05-13 16:58:28 +08:00
xvx
5156669d27 小修改 2025-05-13 16:50:30 +08:00
fed3345b8a [add]水泵运行日志总报表 2025-05-08 16:10:50 +08:00
xvx
e429032a14 Merge branch 'main' of http://8.137.62.52:3000/admin/JdcProject 2025-05-07 21:50:00 +08:00
xvx
96dd359933 采剥量报表编辑 2025-05-07 21:48:52 +08:00
ff08e941ee [add]水泵运行日志管理 2025-05-07 15:38:40 +08:00
2965f39f28 Merge branch 'main-cj'
# Conflicts:
#	src/main/java/com/jdc/jdcproject/controller/FangpaishuiUnitController.java
#	src/main/java/com/jdc/jdcproject/mapper/FangpaishuiUnitMapper.java
#	src/main/java/com/jdc/jdcproject/mapper/xml/FangpaishuiUnitMapper.xml
#	src/main/java/com/jdc/jdcproject/service/FangpaishuiUnitService.java
#	src/main/java/com/jdc/jdcproject/service/impl/FangpaishuiUnitServiceImpl.java
2025-05-07 15:32:15 +08:00
246d840a41 [add]水泵运行日志管理 2025-05-07 15:26:24 +08:00
8ff089bfad [FIX]修改机组管理 2025-05-07 13:37:12 +08:00
xvx
901e565bf8 Revert "损失与贫化返回值修改;采剥量报表vo;
This reverts commit 4bda6d1d
2025-05-07 12:57:45 +08:00
xvx
69405ab0b1 损失与贫化返回值修改;采剥量报表通过月查询 2025-05-07 12:51:54 +08:00
da6303841e Merge branch 'main-cj' 2025-05-07 11:08:47 +08:00
cc428bbd76 [add]新增机组管理 2025-05-07 11:08:10 +08:00
e3ecf5cafe [add]新增处理水量和拉泥车逻辑 2025-05-07 10:26:59 +08:00
xvx
2de1f22e16 revert 4bda6d1df766d93d1b41619e74e91ad66de68b7b
revert 损失与贫化返回值修改;采剥量报表vo;采剥量报表出矿量不清楚获取哪里的数值
2025-05-06 23:27:51 +08:00
xvx
4bda6d1df7 损失与贫化返回值修改;采剥量报表vo;采剥量报表出矿量不清楚获取哪里的数值 2025-05-06 23:00:32 +08:00
a71ef52c00 [add]新增设备管理 2025-05-06 16:11:53 +08:00
42dc0c37e9 Merge branch 'main-cj' 2025-05-06 12:45:05 +08:00
3018fc4494 [add]处理水量功能新增 2025-05-06 12:44:08 +08:00
606ce6e3f6 新增排水根据id查询 2025-05-05 22:35:04 +08:00
xvx
101796bff5 损失和贫化报表新增 2025-05-05 16:45:44 +08:00
xvx
8afa943305 损失和贫化报表新增 2025-05-05 12:30:50 +08:00
xvx
4d2c9a2519 损失和贫化报表新增 2025-05-05 01:01:19 +08:00
xvx
fe7bc58857 损失和贫化报表查询,修改,删除 2025-05-03 22:52:41 +08:00
f12e152da2 修改shovel类型,新增查寻功能 2025-05-02 23:07:38 +08:00
b424434f59 Merge remote-tracking branch 'origin/main' 2025-04-28 13:25:45 +08:00
a8af8b1ebd 新增users登录校验锁定,解决swagger包版本依赖 冲突,增加地测科mo品味部分修改功能 2025-04-28 00:05:33 +08:00
a841f376a4 新增users登录校验锁定,解决swagger包版本依赖 冲突,增加地测科mo品味部分修改功能 2025-04-28 00:04:18 +08:00
a796117f96 [add]排水量逻辑新增 2025-04-27 22:14:11 +08:00
e9ae9ebb0d first add 2025-04-27 16:49:30 +08:00