Переглянути джерело

优化下 报表查询 数量

Your Name 2 роки тому
батько
коміт
49b60ab258

+ 8 - 0
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>

+ 3 - 0
java110-interface/src/main/java/com/java110/intf/order/ICordersInnerServiceSMO.java

@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 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 @@ public interface ICordersInnerServiceSMO {
     @RequestMapping(value = "/queryCorders", method = RequestMethod.POST)
     List<CorderDto> queryCorders(@RequestBody CorderDto corderDto);
 
+    @RequestMapping(value = "/queryUnitemLog", method = RequestMethod.POST)
+    Map queryUnitemLog(@RequestBody Map info);
 }

+ 39 - 0
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", "未包含业务ID");
+    }
+
+    @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));
+    }
+}

+ 1 - 0
service-order/src/main/java/com/java110/order/dao/ICorderServiceDao.java

@@ -24,4 +24,5 @@ public interface ICorderServiceDao {
 
     int queryCordersCount(Map info);
 
+    Map queryUnitemLog(Map info);
 }

+ 14 - 4
service-order/src/main/java/com/java110/order/dao/impl/CorderServiceDaoImpl.java

@@ -8,6 +8,7 @@ import org.slf4j.Logger;
 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 @@ public class CorderServiceDaoImpl extends BaseServiceDao implements ICorderServi
     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 @@ public class CorderServiceDaoImpl extends BaseServiceDao implements ICorderServi
 
         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);
+    }
 }

+ 6 - 0
service-order/src/main/java/com/java110/order/smo/impl/CorderInnerServiceSMOImpl.java

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 
 @RestController
@@ -45,6 +46,11 @@ public class CorderInnerServiceSMOImpl extends BaseServiceSMO implements ICorder
         return corders;
     }
 
+    @Override
+    public Map queryUnitemLog(@RequestBody Map info) {
+        return corderServiceDaoImpl.queryUnitemLog(info);
+    }
+
     /**
      * 从用户列表中查询用户,将用户中的信息 刷新到 floor对象中
      *