From 49b60ab2581e89f17088da232e9a9efcc4aeebca Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 20 九月 2023 01:20:33 +0800
Subject: [PATCH] 优化下 报表查询 数量

---
 service-common/src/main/java/com/java110/common/cmd/corders/ListUnitemLogCmd.java     |   39 +++++++++++++++++++
 service-order/src/main/java/com/java110/order/smo/impl/CorderInnerServiceSMOImpl.java |    6 +++
 service-order/src/main/java/com/java110/order/dao/impl/CorderServiceDaoImpl.java      |   18 +++++++--
 java110-db/src/main/resources/mapper/order/CorderServiceDaoImplMapper.xml             |    8 ++++
 service-order/src/main/java/com/java110/order/dao/ICorderServiceDao.java              |    1 
 java110-interface/src/main/java/com/java110/intf/order/ICordersInnerServiceSMO.java   |    3 +
 6 files changed, 71 insertions(+), 4 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/order/CorderServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/order/CorderServiceDaoImplMapper.xml
index 66cd9cc..ea3a895 100755
--- a/java110-db/src/main/resources/mapper/order/CorderServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/order/CorderServiceDaoImplMapper.xml
@@ -71,6 +71,7 @@
         <if test="staffNameLike !=null and staffNameLike != ''">
             and u.name like concat('%',#{staffNameLike},'%')
         </if>
+        and u.name != 'dev'
         order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
@@ -110,7 +111,14 @@
         <if test="staffNameLike !=null and staffNameLike != ''">
             and u.name like concat('%',#{staffNameLike},'%')
         </if>
+        and u.name != 'dev'
 
     </select>
 
+    <select id="queryUnitemLog" parameterType="Map" resultType="Map">
+        select t.service_name serviceName,t.log_text logText from unitem_log t
+        where t.b_id = #{bId}
+    </select>
+
+
 </mapper>
diff --git a/java110-interface/src/main/java/com/java110/intf/order/ICordersInnerServiceSMO.java b/java110-interface/src/main/java/com/java110/intf/order/ICordersInnerServiceSMO.java
index 71cecdf..cedde4f 100755
--- a/java110-interface/src/main/java/com/java110/intf/order/ICordersInnerServiceSMO.java
+++ b/java110-interface/src/main/java/com/java110/intf/order/ICordersInnerServiceSMO.java
@@ -8,6 +8,7 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 
 import java.util.List;
+import java.util.Map;
 
 @FeignClient(name = "order-service", configuration = {FeignConfiguration.class})
 @RequestMapping("/ordersApi")
@@ -20,4 +21,6 @@
     @RequestMapping(value = "/queryCorders", method = RequestMethod.POST)
     List<CorderDto> queryCorders(@RequestBody CorderDto corderDto);
 
+    @RequestMapping(value = "/queryUnitemLog", method = RequestMethod.POST)
+    Map queryUnitemLog(@RequestBody Map info);
 }
diff --git a/service-common/src/main/java/com/java110/common/cmd/corders/ListUnitemLogCmd.java b/service-common/src/main/java/com/java110/common/cmd/corders/ListUnitemLogCmd.java
new file mode 100644
index 0000000..143a08e
--- /dev/null
+++ b/service-common/src/main/java/com/java110/common/cmd/corders/ListUnitemLogCmd.java
@@ -0,0 +1,39 @@
+package com.java110.common.cmd.corders;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.intf.order.ICordersInnerServiceSMO;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.text.ParseException;
+import java.util.HashMap;
+import java.util.Map;
+
+@Java110Cmd(serviceCode = "corders.listUnitemLog")
+public class ListUnitemLogCmd extends Cmd {
+
+    @Autowired
+    private ICordersInnerServiceSMO cordersInnerServiceSMOImpl;
+
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+        Assert.hasKeyAndValue(reqJson, "bId", "鏈寘鍚笟鍔D");
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+
+        Map info = new HashMap();
+        info.put("bId", reqJson.getString("bId"));
+        Map log = cordersInnerServiceSMOImpl.queryUnitemLog(info);
+
+        context.setResponseEntity(ResultVo.createResponseEntity(log));
+    }
+}
diff --git a/service-order/src/main/java/com/java110/order/dao/ICorderServiceDao.java b/service-order/src/main/java/com/java110/order/dao/ICorderServiceDao.java
index 50178e1..80d4e45 100755
--- a/service-order/src/main/java/com/java110/order/dao/ICorderServiceDao.java
+++ b/service-order/src/main/java/com/java110/order/dao/ICorderServiceDao.java
@@ -24,4 +24,5 @@
 
     int queryCordersCount(Map info);
 
+    Map queryUnitemLog(Map info);
 }
diff --git a/service-order/src/main/java/com/java110/order/dao/impl/CorderServiceDaoImpl.java b/service-order/src/main/java/com/java110/order/dao/impl/CorderServiceDaoImpl.java
index 8ab6a86..778ece4 100755
--- a/service-order/src/main/java/com/java110/order/dao/impl/CorderServiceDaoImpl.java
+++ b/service-order/src/main/java/com/java110/order/dao/impl/CorderServiceDaoImpl.java
@@ -8,6 +8,7 @@
 import com.java110.core.log.LoggerFactory;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -22,19 +23,18 @@
     private static Logger logger = LoggerFactory.getLogger(CorderServiceDaoImpl.class);
 
 
-
     @Override
     public List<ApiCorderDataVo> getCorderInfo(Map info) throws DAOException {
-        logger.debug("鏌ヨdemo淇℃伅 鍏ュ弬 info : {}",info);
+        logger.debug("鏌ヨdemo淇℃伅 鍏ュ弬 info : {}", info);
 
-        List<ApiCorderDataVo> businessDemoInfos = sqlSessionTemplate.selectList("corderServiceDaoImpl.getCorderInfo",info);
+        List<ApiCorderDataVo> businessDemoInfos = sqlSessionTemplate.selectList("corderServiceDaoImpl.getCorderInfo", info);
 
         return businessDemoInfos;
     }
 
     @Override
     public int queryCordersCount(Map info) {
-        logger.debug("鏌ヨorder鏁版嵁 鍏ュ弬 info : {}",info);
+        logger.debug("鏌ヨorder鏁版嵁 鍏ュ弬 info : {}", info);
 
         List<Map> businessDemoInfos = sqlSessionTemplate.selectList("corderServiceDaoImpl.queryCordersCount", info);
         if (businessDemoInfos.size() < 1) {
@@ -43,4 +43,14 @@
 
         return Integer.parseInt(businessDemoInfos.get(0).get("count").toString());
     }
+
+    @Override
+    public Map queryUnitemLog(Map info) {
+        List<Map> infos = sqlSessionTemplate.selectList("corderServiceDaoImpl.queryUnitemLog", info);
+
+        if (infos == null || infos.size() < 1) {
+            return null;
+        }
+        return infos.get(0);
+    }
 }
diff --git a/service-order/src/main/java/com/java110/order/smo/impl/CorderInnerServiceSMOImpl.java b/service-order/src/main/java/com/java110/order/smo/impl/CorderInnerServiceSMOImpl.java
index 0c41516..2cc9a6f 100755
--- a/service-order/src/main/java/com/java110/order/smo/impl/CorderInnerServiceSMOImpl.java
+++ b/service-order/src/main/java/com/java110/order/smo/impl/CorderInnerServiceSMOImpl.java
@@ -15,6 +15,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 
 @RestController
@@ -45,6 +46,11 @@
         return corders;
     }
 
+    @Override
+    public Map queryUnitemLog(@RequestBody Map info) {
+        return corderServiceDaoImpl.queryUnitemLog(info);
+    }
+
     /**
      * 浠庣敤鎴峰垪琛ㄤ腑鏌ヨ鐢ㄦ埛锛屽皢鐢ㄦ埛涓殑淇℃伅 鍒锋柊鍒� floor瀵硅薄涓�
      *

--
Gitblit v1.8.0