Merge remote-tracking branch 'origin/master'

src/main/java/com/glxp/api/res/inv/DeviceReceiveOrderResponse.java

@@ -68,7 +68,7 @@ public class DeviceReceiveOrderResponse {
     /**
      * 领用人
      */
-    private String receiveUser;
+    private String receiveUserName;
 
     /**
      * 领用时间

src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDao.xml

@@ -2,21 +2,22 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.inv.DeviceReceiveOrderDao">
     <select id="filterList" resultType="com.glxp.api.res.inv.DeviceReceiveOrderResponse">
-        select dro.id,
-               dro.orderId,
-               dro.deptCode,
-               dro.createUser,
-               dro.auditUser,
-               dro.createTime,
-               dro.updateTime,
-               dro.status,
-               dro.receiveUser,
-               (select employeeName from auth_user where id = dro.createUser)  receiveUserName,
-               (select employeeName from auth_user where id = dro.auditUser)   auditUserName,
-               (select `name` from auth_dept where code = dro.fromDeptCode)      fromDeptName,
-               (select `name` from auth_warehouse where code = dro.fromInvCode)  fromInvName,
-               (select `name` from auth_space where code = dro.fromInvSpaceCode) fromInvSpaceName
-        from device_receive_order dro
+        SELECT
+        dro.id,
+        dro.orderId,
+        dro.deptCode,
+        dro.createUser,
+        dro.auditUser,
+        dro.createTime,
+        dro.updateTime,
+        dro.STATUS,
+        dro.receiveUser,
+        ( SELECT employeeName FROM auth_user WHERE id = dro.receiveUser ) receiveUserName,
+        ( SELECT `name` FROM auth_dept WHERE CODE = dro.fromDeptCode ) fromDeptName,
+        ( SELECT `name` FROM auth_warehouse WHERE CODE = dro.fromInvCode ) fromInvName,
+        ( SELECT `name` FROM auth_space WHERE CODE = dro.fromInvSpaceCode ) fromInvSpaceName
+        FROM
+        device_receive_order dro
         <where>
             <if test="status != null">
                 AND status = #{status}