From bb82c543675698d16eb80ae2bc6b82593fae8491 Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期一, 21 八月 2023 11:11:17 +0800
Subject: [PATCH] Merge branch 'master' of ssh://139.186.142.91:29418/productDev/dmMes
---
server/src/main/java/doumeemes/api/ext/StatisticsController.java | 6 +-----
server/src/main/java/doumeemes/config/shiro/ShiroConfig.java | 1 +
server/src/main/resources/application.yml | 2 +-
server/src/main/resources/mappers/WorkorderRecordExtMapper.xml | 2 +-
server/src/main/resources/mappers/WStockExtMapper.xml | 5 +++--
5 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/server/src/main/java/doumeemes/api/ext/StatisticsController.java b/server/src/main/java/doumeemes/api/ext/StatisticsController.java
index b3dbd43..3c404e0 100644
--- a/server/src/main/java/doumeemes/api/ext/StatisticsController.java
+++ b/server/src/main/java/doumeemes/api/ext/StatisticsController.java
@@ -25,7 +25,7 @@
* @date 2022/04/20 10:56
*/
@RestController
-@RequestMapping("/ext/statistic")
+@RequestMapping("/statistics")
@Api(tags = "澶у睆鏁版嵁鐪嬫澘-缁熻鏁版嵁鎺ュ彛")
public class StatisticsController extends BaseController {
@@ -42,7 +42,6 @@
public ApiResponse<StatisticsPlanDataModel> getProcedurePlanData(@PathVariable Integer companyId, @PathVariable Integer departId,@RequestParam Integer procedureId) {
return ApiResponse.success(statisticsService.getProcedurePlanData(companyId,departId,procedureId));
}
-
@ApiOperation("鍛樺伐浜у搧缁熻TOP10")
@GetMapping("/userProduceTop/{companyId}/{departId}")
public ApiResponse<List<UserProduceTopModel>> getUserProducceTop(@PathVariable Integer companyId, @PathVariable Integer departId,@RequestParam Integer procedureId) {
@@ -64,14 +63,12 @@
, @RequestBody PageWrap<QueryWorkorderRecordExtDTO> pageWrap) {
return ApiResponse.success(statisticsService.getRecordLogPage(companyId,departId,pageWrap));
}
-
@ApiOperation("宸℃璁板綍鍒嗛〉鏌ヨ")
@PostMapping("/getDeviceCheckPage/{companyId}/{departId}")
public ApiResponse<PageData<DeviceCheckExtListVO>> getDeviceCheckPage (@PathVariable Integer companyId, @PathVariable Integer departId
,@RequestBody PageWrap<QueryDeviceCheckExtDTO> pageWrap) {
return ApiResponse.success(statisticsService.getDeviceCheckPage(companyId,departId,pageWrap));
}
-
@ApiOperation("宸ュ簭璁″垝杩涘害鏌ヨ")
@GetMapping("/getProcedurePlansList/{companyId}/{departId}")
public ApiResponse<List<ProcedurePlansPageModel>> getProcedurePlansList (@PathVariable Integer companyId, @PathVariable Integer departId,@RequestParam Integer procedureId) {
@@ -92,6 +89,5 @@
public ApiResponse<List<StockDataModel>> getStockList (@PathVariable Integer companyId, @PathVariable Integer departId ) {
return ApiResponse.success(statisticsService.getStockList(companyId,departId));
}
-
}
diff --git a/server/src/main/java/doumeemes/config/shiro/ShiroConfig.java b/server/src/main/java/doumeemes/config/shiro/ShiroConfig.java
index ee38466..60e1b4f 100644
--- a/server/src/main/java/doumeemes/config/shiro/ShiroConfig.java
+++ b/server/src/main/java/doumeemes/config/shiro/ShiroConfig.java
@@ -76,6 +76,7 @@
map.put("/system/initCompany", "anon");
map.put("/system/logout", "anon");
map.put("/common/captcha", "anon");
+ map.put("/statistics/**", "anon");
map.put("/dingding/push", "anon");
// map.put("/ext/workorderExt/freshStatistics", "anon");
map.put("/dingding/jsapiTicket", "anon");
diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml
index dd0fac5..72fcf23 100644
--- a/server/src/main/resources/application.yml
+++ b/server/src/main/resources/application.yml
@@ -10,7 +10,7 @@
# application:
# name: doumeemes
profiles:
- active: standardPro
+ active: standard
# JSON杩斿洖閰嶇疆
jackson:
# 榛樿鏃跺尯
diff --git a/server/src/main/resources/mappers/WStockExtMapper.xml b/server/src/main/resources/mappers/WStockExtMapper.xml
index 0f32d14..e74bf27 100644
--- a/server/src/main/resources/mappers/WStockExtMapper.xml
+++ b/server/src/main/resources/mappers/WStockExtMapper.xml
@@ -78,16 +78,17 @@
</association>
</resultMap>
<select id="getStatisticsStockList" parameterType="doumeemes.dao.ext.dto.QueryWStockExtDTO" resultType="doumeemes.dao.business.dto.statistics.StockDataModel">
- select sum(a.NUM) as num,c.`NAME` as materialName,d.name as warehouseName,f.UNION_NAME as location,u.name as unitName
+ select sum(a.NUM) as num,c.`NAME` as materialName,d.name as warehouseName,f.UNION_NAME as location,u.name as unitName,p.`NAME` as procedureName
from w_stock a
left join material_distribute b on a.MATERIAL_ID=b.ID
left join material c on b.MATERIAL_ID=c.ID
left join warehouse d on a.WAREHOUSE_ID=d.ID
left join warehouse_location f on a.LOCATION_ID=f.ID
+ left join procedures p on p.ID=a.PROCEDURE_ID
left join unit u on a.UNIT_ID=u.id
where a.DELETED = 0 AND a.ROOT_DEPART_ID = #{rootDepartId} AND d.DEPART_ID=#{wmodelDepartId}
GROUP BY a.MATERIAL_ID,a.WAREHOUSE_ID,a.BATCH
- ORDER BY num DESC
+ ORDER BY c.code , p.SORTNUM
</select>
<select id="selectAllList" parameterType="doumeemes.dao.ext.dto.QueryWStockExtDTO" resultMap="WStockExtListVO">
SELECT a.*
diff --git a/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml b/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
index 7ba6f80..ba1ad1b 100644
--- a/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
+++ b/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
@@ -494,7 +494,7 @@
from workorder_record a
left join company_user b on b.DELETED=0 and b.user_id=a.CREATE_USER
left join workorder c on a.WORKORDER_ID=c.id
- where a.deleted=0 and a.ROOT_DEPART_ID=#{rootDepartId} and a.DEPART_ID=#{departId} and s.status=4
+ where a.deleted=0 and a.ROOT_DEPART_ID=#{rootDepartId} and a.DEPART_ID=#{departId} and c.status=4
<if test="procedureId != null">
AND a.`PROCEDURE_ID` = #{procedureId}
</if>
--
Gitblit v1.9.3