Merge branch 'release' of http://10.1.1.216/xm/sdenergy/sims/sims-order-sdenergy into release

order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/OrderProcessInfoMapper.java

@@ -155,4 +155,6 @@ public interface OrderProcessInfoMapper {
      */
     int selectCountByNsrsbhDdzt(@Param("ddztList") List<String> ddztList,
                                 @Param("shList") List<String> shList, @Param("entList") List<String> entList);
+
+    List<Map> getOrderMessageByMap(@Param("map") Map map);
 }

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInvoiceController.java

@@ -609,5 +609,14 @@ public class OrderInvoiceController {
     public R rewriteBzdh(@RequestBody RewriteBzdhDTO dto) {
         return bzdhService.rewriteBzdh(dto);
     }
+
+    /**
+     * 页面上有直接调用order-management-invoice模块的接口，这个模块没有order_process_info Mapper
+     * 有时候需要查询一些定制化字段，写此方法弥补这个问题
+     */
+    @PostMapping("/getOrderMessageByMap")
+    public R getOrderMessageByMap(@RequestBody Map map){
+        return R.ok(orderProcessService.getOrderMessageByMap(map));
+    }
 }
 

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderProcessService.java

@@ -149,4 +149,6 @@ public interface OrderProcessService {
      * @date 2021-11-03
      */
     int selectCountByNsrsbhDdzt(List<String> ddztList, List<String> shList, List<String> entList);
+
+    List<Map> getOrderMessageByMap(Map map);
 }

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java

@@ -249,5 +249,10 @@ public class OrderProcessServiceImpl implements OrderProcessService {
     public int selectCountByNsrsbhDdzt(List<String> ddztList, List<String> shList, List<String> entList) {
         return orderProcessInfoMapper.selectCountByNsrsbhDdzt(ddztList, shList, entList);
     }
-    
+
+    @Override
+    public List<Map> getOrderMessageByMap(Map map) {
+        return orderProcessInfoMapper.getOrderMessageByMap(map);
+    }
+
 }

order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml

@@ -1303,4 +1303,20 @@
         </if>
 
     </select>
+
+    <select id="getOrderMessageByMap" resultType="java.util.Map"
+            parameterType="java.util.Map">
+        select op.xtly from order_process_info op
+        left join order_invoice_info oii on op.order_info_id = oii.order_info_id
+        <where>
+            <if test="map.fpdm != null and map.fpdm != ''">
+                and oii.fpdm = #{map.fpdm,jdbcType=VARCHAR}
+            </if>
+            <if test="map.fphm != null and map.fphm != ''">
+                and oii.fphm = #{map.fphm,jdbcType=VARCHAR}
+            </if>
+        </where>
+    </select>
+
+
 </mapper>