From 533d543c55aeb903c6da281ee06cbfac80d9decc Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 27 四月 2026 17:40:50 +0800
Subject: [PATCH] fix: 去除人员汇总接口
---
src/main/java/com/ruoyi/production/service/ProductionProductMainService.java | 2 -
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 10 -----
src/main/resources/mapper/production/ProductionProductMainMapper.xml | 77 --------------------------------------
src/main/java/com/ruoyi/production/mapper/ProductionProductMainMapper.java | 2 -
src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java | 21 +---------
5 files changed, 3 insertions(+), 109 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java b/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
index e4ef6a4..f4b85bb 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
@@ -33,7 +33,7 @@
* @param productionProductMainDto
* @return
*/
- @ApiOperation("鎶ュ伐鍙拌处姹囨�诲垎椤�(褰撳墠鐧诲綍浜�)")
+ @ApiOperation("鎶ュ伐鍙拌处姹囨�诲垎椤�")
@ApiImplicitParams({
@ApiImplicitParam(name = "current", value = "椤电爜", dataType = "long", paramType = "query"),
@ApiImplicitParam(name = "size", value = "姣忛〉鏁伴噺", dataType = "long", paramType = "query"),
@@ -48,11 +48,11 @@
/**
* 鎶ュ伐鏄庣粏鏌ヨ(姣忔潯鎶ュ伐璁板綍)
*/
- @ApiOperation("鎶ュ伐鏄庣粏鍒嗛〉(姣忔潯鎶ュ伐璁板綍, 褰撳墠鐧诲綍浜�)")
+ @ApiOperation("鎶ュ伐鏄庣粏鍒嗛〉(姣忔潯鎶ュ伐璁板綍)")
@ApiImplicitParams({
@ApiImplicitParam(name = "current", value = "椤电爜", dataType = "long", paramType = "query"),
@ApiImplicitParam(name = "size", value = "姣忛〉鏁伴噺", dataType = "long", paramType = "query"),
- @ApiImplicitParam(name = "workOrderId", value = "宸ュ崟ID(寤鸿蹇呬紶)", dataType = "long", paramType = "query"),
+ @ApiImplicitParam(name = "workOrderId", value = "宸ュ崟ID", dataType = "long", paramType = "query"),
@ApiImplicitParam(name = "startDate", value = "寮�濮嬫棩鏈�(鎸夌粨鏉熸椂闂磋繃婊�, yyyy-MM-dd)", dataType = "string", paramType = "query"),
@ApiImplicitParam(name = "endDate", value = "缁撴潫鏃ユ湡(鎸夌粨鏉熸椂闂磋繃婊�, yyyy-MM-dd)", dataType = "string", paramType = "query")
})
@@ -61,21 +61,6 @@
return R.ok(productionProductMainService.listPageProductionProductMainDetailDto(page, productionProductMainDto));
}
- /**
- * 鎶ュ伐鏄庣粏姹囨��(姣忎釜浜哄憳姣忓ぉ)
- */
- @ApiOperation("鎶ュ伐姣忔棩姹囨�诲垎椤�(姣忎汉姣忓ぉ, 褰撳墠鐧诲綍浜�)")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "current", value = "椤电爜", dataType = "long", paramType = "query"),
- @ApiImplicitParam(name = "size", value = "姣忛〉鏁伴噺", dataType = "long", paramType = "query"),
- @ApiImplicitParam(name = "workOrderId", value = "宸ュ崟ID(寤鸿蹇呬紶)", dataType = "long", paramType = "query"),
- @ApiImplicitParam(name = "startDate", value = "寮�濮嬫棩鏈�(report_date, yyyy-MM-dd)", dataType = "string", paramType = "query"),
- @ApiImplicitParam(name = "endDate", value = "缁撴潫鏃ユ湡(report_date, yyyy-MM-dd)", dataType = "string", paramType = "query")
- })
- @GetMapping("listPageDaily")
- public R<?> pageDaily(Page<ProductionProductMainDto> page, ProductionProductMainDto productionProductMainDto) {
- return R.ok(productionProductMainService.listPageProductionProductMainDailyDto(page, productionProductMainDto));
- }
/**
* 鎶ュ伐鏂板鏇存柊
diff --git a/src/main/java/com/ruoyi/production/mapper/ProductionProductMainMapper.java b/src/main/java/com/ruoyi/production/mapper/ProductionProductMainMapper.java
index 4ac7d47..5dd0a5a 100644
--- a/src/main/java/com/ruoyi/production/mapper/ProductionProductMainMapper.java
+++ b/src/main/java/com/ruoyi/production/mapper/ProductionProductMainMapper.java
@@ -20,8 +20,6 @@
IPage<ProductionProductMainDto> listPageProductionProductMainDetailDto(Page<ProductionProductMainDto> page, @Param("c") ProductionProductMainDto productionProductMainDto);
- IPage<ProductionProductMainDto> listPageProductionProductMainDailyDto(Page<ProductionProductMainDto> page, @Param("c") ProductionProductMainDto productionProductMainDto);
-
/**
* 鏍规嵁宸ュ崟ID鎵归噺鍒犻櫎鐢熶骇涓昏〃鏁版嵁
*/
diff --git a/src/main/java/com/ruoyi/production/service/ProductionProductMainService.java b/src/main/java/com/ruoyi/production/service/ProductionProductMainService.java
index f0124f2..142cbcf 100644
--- a/src/main/java/com/ruoyi/production/service/ProductionProductMainService.java
+++ b/src/main/java/com/ruoyi/production/service/ProductionProductMainService.java
@@ -18,8 +18,6 @@
IPage<ProductionProductMainDto> listPageProductionProductMainDetailDto(Page<ProductionProductMainDto> page, ProductionProductMainDto productionProductMainDto);
- IPage<ProductionProductMainDto> listPageProductionProductMainDailyDto(Page<ProductionProductMainDto> page, ProductionProductMainDto productionProductMainDto);
-
Boolean addProductMain(ProductionProductMainDto productionProductMainDto);
/**
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
index b21c4fd..2b069af 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -103,16 +103,6 @@
return result;
}
- @Override
- public IPage<ProductionProductMainDto> listPageProductionProductMainDailyDto(Page<ProductionProductMainDto> page, ProductionProductMainDto productionProductMainDto) {
- if (productionProductMainDto == null) {
- productionProductMainDto = new ProductionProductMainDto();
- }
- IPage<ProductionProductMainDto> result = productionProductMainMapper.listPageProductionProductMainDailyDto(page, productionProductMainDto);
- fillHourDefaults(result.getRecords());
- return result;
- }
-
private void fillHourDefaults(List<ProductionProductMainDto> records) {
if (records == null || records.isEmpty()) {
return;
diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index 3c3dbca..133cfaf 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -91,83 +91,6 @@
order by max(ppm.id) desc
</select>
- <select id="listPageProductionProductMainDailyDto" resultType="com.ruoyi.production.dto.ProductionProductMainDto">
- select
- min(ppm.id) as id,
- min(ppm.product_no) as productNo,
- d.user_id as userId,
- d.work_order_id as workOrderId,
- max(pwo.work_order_no) as workOrderNo,
- max(po.nps_no) as productOrderNpsNo,
- max(pwo.status) as workOrderStatus,
- max(u.nick_name) as nickName,
- max(p.product_name) as productName,
- max(CASE pp.type
- WHEN 1 THEN '鍔犲伐'
- WHEN 2 THEN '鍒澘鍐疯姱鍒朵綔'
- WHEN 3 THEN '绠¤矾缁勫'
- WHEN 4 THEN '缃愪綋杩炴帴鍙婅皟璇�'
- WHEN 5 THEN '娴嬭瘯鎵撳帇'
- WHEN 6 THEN '鍏朵粬'
- ELSE pp.name
- END) as process,
- max(pm.model) as productModelName,
- max(pm.unit) as unit,
- max(sl.sales_contract_no) as salesContractNo,
- d.report_date as schedulingDate,
- sum(d.duration_minutes) as reportDurationMinutes,
- round(sum(d.duration_minutes) / 60, 2) as dailyPersonHours,
- round(sum(d.duration_minutes) / 60, 2) as actualReportHours,
- sum(ifnull(ppo.quantity, 0)) as quantity,
- sum(ifnull(ppo.scrap_qty, 0)) as scrapQty,
- sum(ifnull(ppo.quantity, 0)) as outputTotalQuantity,
- sum(ifnull(ppo.scrap_qty, 0)) as scrapTotalQuantity,
- round(ifnull((
- select sum(ifnull(pri.planned_work_hours, 0))
- from product_process_route_item pri
- where pri.product_order_id = po.id
- ), 0), 2) as projectTotalHours,
- ifnull(max(pp.salary_quota), 0) as processStandardHours
- from production_product_report_daily d
- left join production_product_main ppm on ppm.id = d.product_main_id
- left join product_work_order pwo on pwo.id = d.work_order_id
- left join product_process_route_item ppri on ppri.id = pwo.product_process_route_item_id
- left join product_process pp on pp.id = ppri.process_id
- left join product_order po on po.id = pwo.product_order_id
- left join production_product_output ppo
- on ppm.id = ppo.product_main_id
- and date(ppm.report_end_time) = d.report_date
- left join product_model pm on pm.id = ppo.product_model_id
- left join product p on p.id = pm.product_id
- left join sales_ledger sl on sl.id = po.sales_ledger_id
- left join sys_user u on u.user_id = d.user_id
- <where>
- <if test="c.workOrderId != null">
- and d.work_order_id = #{c.workOrderId}
- </if>
- <if test="c.nickName != null and c.nickName != ''">
- and u.nick_name like concat('%',#{c.nickName},'%')
- </if>
- <if test="c.workOrderNo != null and c.workOrderNo != ''">
- and pwo.work_order_no like concat('%',#{c.workOrderNo},'%')
- </if>
- <if test="c.workOrderStatus != null and c.workOrderStatus != ''">
- and pwo.status = #{c.workOrderStatus}
- </if>
- <if test="c.userId != null">
- and d.user_id = #{c.userId}
- </if>
- <if test="c.startDate != null">
- and d.report_date <![CDATA[ >= ]]> #{c.startDate}
- </if>
- <if test="c.endDate != null">
- and d.report_date <![CDATA[ <= ]]> #{c.endDate}
- </if>
- </where>
- group by d.work_order_id, d.user_id, d.report_date, po.sales_ledger_id, po.sale_ledger_product_id
- order by d.report_date desc, d.user_id
- </select>
-
<select id="listPageProductionProductMainDetailDto" resultType="com.ruoyi.production.dto.ProductionProductMainDto">
select
ppm.*,
--
Gitblit v1.9.3