From 4d198cd78684d17c849b0bd7d323894009ca17f5 Mon Sep 17 00:00:00 2001
From: dhz <duhuizhe>
Date: 星期三, 22 六月 2022 09:59:44 +0800
Subject: [PATCH] 备件管理bug 修改
---
src/cn/ksource/web/facade/customerconfig/slacustomer/SlaCustomerFacadeImpl.java | 12 +++++++++---
src/cn/ksource/web/facade/bpbj/OverageLossFacadeImpl.java | 5 +++--
src/cn/ksource/web/facade/bpbj/OverageLossAuditingFacadeImpl.java | 2 +-
src/cn/ksource/web/facade/bpbj/SparePartsFacadeImpl.java | 2 +-
src/cn/ksource/web/facade/bpbj/StockTakingFacadeImpl.java | 4 ++--
5 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/src/cn/ksource/web/facade/bpbj/OverageLossAuditingFacadeImpl.java b/src/cn/ksource/web/facade/bpbj/OverageLossAuditingFacadeImpl.java
index a294e42..743ef94 100644
--- a/src/cn/ksource/web/facade/bpbj/OverageLossAuditingFacadeImpl.java
+++ b/src/cn/ksource/web/facade/bpbj/OverageLossAuditingFacadeImpl.java
@@ -79,7 +79,7 @@
Map paramMap = new HashMap();
sql.append("SELECT DISTINCT\n" +
- " D.* \n" +
+ " D.id,d.order_code,d.order_name,d.STATE,d.FLOW_ID,d.BUS_TYPE,d.CREATE_ID,d.CREATE_NAME,d.GMT_CREATE,d.GMT_MODIFIED \n" +
"FROM\n" +
" OVERAGE_LOSS D\n" +
"LEFT JOIN WORKFLOW_NODE ON WORKFLOW_NODE.FLOWID = D.FLOW_ID\n" +
diff --git a/src/cn/ksource/web/facade/bpbj/OverageLossFacadeImpl.java b/src/cn/ksource/web/facade/bpbj/OverageLossFacadeImpl.java
index 9d17fe3..de5bc69 100644
--- a/src/cn/ksource/web/facade/bpbj/OverageLossFacadeImpl.java
+++ b/src/cn/ksource/web/facade/bpbj/OverageLossFacadeImpl.java
@@ -61,7 +61,7 @@
private String getOverageLossList(Map<String, String> params){
- StringBuilder sql = new StringBuilder("select * from OVERAGE_LOSS a where 1=1 and state !=0");
+ StringBuilder sql = new StringBuilder("select a.id,a.order_code,a.order_name,a.STATE,a.FLOW_ID,a.BUS_TYPE,a.CREATE_ID,a.CREATE_NAME,a.GMT_CREATE,a.GMT_MODIFIED from OVERAGE_LOSS a where 1=1 and state !=0");
//鐩樼偣鍗曞彿
if(StringUtil.isNotBlank(params.get("gdbh"))){
@@ -118,7 +118,8 @@
- sql.append(" group by a.id order by a.GMT_CREATE desc");
+ sql.append(" group by a.id,a.order_code,a.order_name,a.STATE,a.FLOW_ID,a.BUS_TYPE,a.CREATE_ID,a.CREATE_NAME,a.GMT_CREATE,a.GMT_MODIFIED" +
+ " order by a.GMT_CREATE desc");
return sql.toString();
}
diff --git a/src/cn/ksource/web/facade/bpbj/SparePartsFacadeImpl.java b/src/cn/ksource/web/facade/bpbj/SparePartsFacadeImpl.java
index 8a0ccdb..05dabac 100644
--- a/src/cn/ksource/web/facade/bpbj/SparePartsFacadeImpl.java
+++ b/src/cn/ksource/web/facade/bpbj/SparePartsFacadeImpl.java
@@ -108,7 +108,7 @@
StringBuilder builder = new StringBuilder();
paramMap.put("create_id", userId);
- builder.append("SELECT COUNT(1) AS 'TOTAL',SUM(CASE WHEN STATE=2 THEN 1 ELSE 0 END) AS 'AUDITING' ,SUM(CASE WHEN STATE=3 THEN 1 ELSE 0 END) AS 'DELIVERY',SUM(CASE WHEN STATE=4 THEN 1 ELSE 0 END) AS 'CONFIRM' FROM SPARE_PART_APPLY WHERE CREATE_ID=:create_id");
+ builder.append("SELECT COUNT(1) AS TOTAL,SUM(CASE WHEN STATE=2 THEN 1 ELSE 0 END) AS AUDITING ,SUM(CASE WHEN STATE=3 THEN 1 ELSE 0 END) AS DELIVERY,SUM(CASE WHEN STATE=4 THEN 1 ELSE 0 END) AS CONFIRM FROM SPARE_PART_APPLY WHERE CREATE_ID=:create_id");
List<Map> list = baseDao.queryForList(builder.toString(),paramMap);
diff --git a/src/cn/ksource/web/facade/bpbj/StockTakingFacadeImpl.java b/src/cn/ksource/web/facade/bpbj/StockTakingFacadeImpl.java
index 4dab2f2..a8c4ae3 100644
--- a/src/cn/ksource/web/facade/bpbj/StockTakingFacadeImpl.java
+++ b/src/cn/ksource/web/facade/bpbj/StockTakingFacadeImpl.java
@@ -106,7 +106,7 @@
params.put("state", params.get("state"));
}
- sql.append(" group by a.ID order by a.GMT_CREATE desc");
+ sql.append(" group by a.id,a.ORDER_NAME,a.STATE,a.CREATE_NAME,a.GMT_CREATE,a.ORDER_CODE order by a.GMT_CREATE desc");
return sql.toString();
}
@@ -329,7 +329,7 @@
sql.setLength(0);
sql.append(" select inventory_order_id,sum(inventory_num) inventory_num,sum(book_num) book_num,sum(loss_num) loss_num,sum(overage_num) overage_num " +
- " from spare_part_detail where inventory_order_id=:orderId ");
+ " from spare_part_detail where inventory_order_id=:orderId group by inventory_order_id ");
Map sumInfo = baseDao.queryForMap(sql.toString(), param);
detail.put("inventory_num", ConvertUtil.obj2StrBlank(sumInfo.get("inventory_num")));
detail.put("book_num", ConvertUtil.obj2StrBlank(sumInfo.get("book_num")));
diff --git a/src/cn/ksource/web/facade/customerconfig/slacustomer/SlaCustomerFacadeImpl.java b/src/cn/ksource/web/facade/customerconfig/slacustomer/SlaCustomerFacadeImpl.java
index 78b028f..d521c39 100644
--- a/src/cn/ksource/web/facade/customerconfig/slacustomer/SlaCustomerFacadeImpl.java
+++ b/src/cn/ksource/web/facade/customerconfig/slacustomer/SlaCustomerFacadeImpl.java
@@ -799,7 +799,7 @@
*/
@Override
public List<Map> getCiCategoryTree(String pid,String type) {
- String sql = " SELECT ID as id,PID as pid,NAME as name,LV as jb FROM CMDB_CI_CATEGORY WHERE STATE=1 ";
+ String sql = " SELECT ID as id,PID as pid,NAME as name,LV as jb,STATE,SERIAL FROM CMDB_CI_CATEGORY WHERE STATE=1 ";
SqlParameter param = new SqlParameter();
if(StringUtil.notEmpty(type)){
sql+=" and cate_type=:type";
@@ -815,13 +815,19 @@
}
if(StringUtil.isBlank(pid) && type.equals("2")){
sql="";
- sql="select DISTINCT LV1_ID as id,\"0\" as pid ,LV1_name as name,\"1\" as lv from CMDB_CI_CATEGORY where STATE=1 and lv=3 and CATE_TYPE=2 ";
+ sql="select DISTINCT LV1_ID AS id,\n" +
+ " '0' AS pid ,\n" +
+ " LV1_name AS name,\n" +
+ " '1' AS lv,STATE,SERIAL from CMDB_CI_CATEGORY where STATE=1 and lv=3 and CATE_TYPE=2 ";
}else if(StringUtil.isNotBlank(pid) && type.equals("2")){
CMDB_CI_CATEGORY cmdb_ci_category=new CMDB_CI_CATEGORY(pid).getInstanceById();
Integer lv=cmdb_ci_category.getLv();
if(lv==1){
sql="";
- sql="select DISTINCT LV2_ID as id,LV1_ID as pid ,LV2_name as name,\"2\" as lv from CMDB_CI_CATEGORY where STATE=1 and lv=3 and CATE_TYPE=2 and LV1_ID=:pid ";
+ sql="select DISTINCT LV1_ID AS id,\n" +
+ " '0' AS pid ,\n" +
+ " LV1_name AS name,\n" +
+ " '1' AS lv,STATE,SERIAL from CMDB_CI_CATEGORY where STATE=1 and lv=3 and CATE_TYPE=2 and LV1_ID=:pid ";
param.addValue("pid", pid);
}
--
Gitblit v1.9.1