提交代码

src/main/java/com/steerinfo/dil/controller/BmstruckDetailsOrderController.java

@@ -343,8 +343,9 @@ public class BmstruckDetailsOrderController extends BaseRESTfulController {
             System.out.println("查询订单状态异常");
         }
         for (Map<String,Object> map :mapList) {
-             map.put("updatePlace",mapValue.get("updatePlace"));
-             code += bmstruckDetailsOrderService.updateDetailsOrder(map);
+            map.put("userId",mapValue.get("userId"));
+            map.put("updatePlace",mapValue.get("updatePlace"));
+            code += bmstruckDetailsOrderService.updateDetailsOrder(map);
         }
         return success(code);
     }

src/main/java/com/steerinfo/dil/mapper/BmstruckDetailsOrderMapper.java

@@ -184,6 +184,12 @@ public interface BmstruckDetailsOrderMapper extends IBaseMapper<BmstruckDetailsO
 
     List<BigDecimal> getDetailIds(BigDecimal orderId);
 
+    //获取承运商信息
+    String getCarrierNameForPriceValue(String userId);
+
+    //查询出运输订单记录下来的用户名
+    String getUserName(BigDecimal orderId);
+
     BigDecimal getDetailAmount(BigDecimal orderId);
 
     int updatePlace(Map<String, Object> mapValue);

src/main/java/com/steerinfo/dil/model/OmstruckOrder.java

@@ -147,6 +147,20 @@ public class OmstruckOrder implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="订单所属承运商ID",required=false)
     private BigDecimal carrierId;
 
+    /**
+     *  记录下来的修改单价人
+     */
+    @ApiModelProperty(value="记录下来的修改单价人",required=false)
+    private String recordUsername;
+
+    public String getRecordUsername() {
+        return recordUsername;
+    }
+
+    public void setRecordUsername(String recordUsername) {
+        this.recordUsername = recordUsername;
+    }
+
     private static final long serialVersionUID = 1L;
 
     @Override

src/main/java/com/steerinfo/dil/service/impl/BmstruckDetailsOrderServiceImpl.java

@@ -137,7 +137,7 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
                 bmstruckDetailsOrder.setInsertUpdateRemark("无");
                 result += bmstruckDetailsOrderMapper.insertSelective(bmstruckDetailsOrder);
             }catch (Exception e){
-                e.printStackTrace();
+                //不打印给控制台（有可能是正常情况）
             }
         }
         return result;
@@ -535,13 +535,36 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
         try {
             int i = insertSelective(orderId);
         } catch (Exception e) {
-            e.printStackTrace();
+            //不打印给控制台（可能是正常情况）
         }
         BigDecimal priceId = DataChange.dataToBigDecimal(mapValue.get("priceId"));
         //根据运输订单id查询计费详单id
         OmstruckOrder omstruckOrder = new OmstruckOrder();
         omstruckOrder.setOrderId(orderId);
         omstruckOrder.setPriceId(priceId);
+        try{
+            //通过userId查询出用户名
+            String carrierName = bmstruckDetailsOrderMapper.getCarrierNameForPriceValue((String) mapValue.get("userId"));
+            //根据运输ID查询出记录下来的用户名
+            String recordUserName = bmstruckDetailsOrderMapper.getUserName(orderId);
+            if (recordUserName==null){
+                omstruckOrder.setRecordUsername(carrierName+",");
+            }else {
+                String[] s = recordUserName.split(",");
+                if (s.length < 2){
+                    omstruckOrder.setRecordUsername(recordUserName+carrierName+",");
+                }else if (s.length ==2){
+                    omstruckOrder.setRecordUsername(recordUserName+carrierName);
+                }else if (s.length==3){
+                    s[0]=s[1];
+                    s[1]=s[2];
+                    s[2]=carrierName;
+                    omstruckOrder.setRecordUsername(s[0]+","+s[1]+","+s[2]);
+                }
+            }
+        }catch (Exception e){
+            System.out.println("e"+e.getMessage());
+        }
         omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
         List<BigDecimal> detailIds = bmstruckDetailsOrderMapper.getDetailIds(orderId);
         int result = 0;

src/main/resources/com/steerinfo/dil/mapper/BmstruckDetailsOrderMapper.xml

@@ -2318,6 +2318,20 @@
         SELECT BDO.DETAILS_ID "detailId" FROM BMSTRUCK_DETAILS_ORDER BDO
         WHERE BDO.ORDER_ID = #{orderId}
     </select>
+
+    <!--获取承运商名字-->
+    <select id="getCarrierNameForPriceValue" resultType="java.lang.String">
+        select SU.USER_NAME from
+            "SSO".SYS_USER SU
+        WHERE SU.USER_ID=#{userId}
+    </select>
+
+    <select id="getUserName" resultType="java.lang.String">
+        select OO.RECORD_USERNAME "recordUsername"
+        from OMSTRUCK_ORDER OO
+        WHERE OO.ORDER_ID=#{orderId}
+    </select>
+
     <select id="getDetailAmount" resultType="java.math.BigDecimal" parameterType="decimal">
         SELECT BDO.DETAILS_AMOUNT "detailsAmount" FROM BMSTRUCK_DETAILS_ORDER BDO
         WHERE BDO.ORDER_ID = #{orderId} and rownum=1

src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderMapper.xml

@@ -25,20 +25,21 @@
         <result column="DRIVER_CONFIRMATION" jdbcType="DECIMAL" property="driverConfirmation" />
         <result column="PRICE_ID" jdbcType="DECIMAL" property="priceId" />
         <result column="CARRIER_ID" jdbcType="DECIMAL" property="carrierId" />
+        <result column="RECORD_USERNAME" jdbcType="VARCHAR" property="recordUsername" />
     </resultMap>
     <sql id="columns">
         ORDER_ID, ORDER_PLAN_ID, ORDER_NUMBER, CAPACITY_ID, ORDER_ISSUE_TIME, ORDER_RECEIVE_STATUS, 
     ORDER_RECEIVE_REFUSE_TIME, ORDER_COMMUNICATION_DURATION, ORDER_STATUS, INSERT_USERNAME, 
     INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, ORDER_TYPE, 
     ORDER_LINE_SEQUENCE, LINE_ID, ORDER_ENTRY_TIME, UNLOAD_POINT_ID, DRIVER_CONFIRMATION, 
-    PRICE_ID, CARRIER_ID
+    PRICE_ID, CARRIER_ID,RECORD_USERNAME
     </sql>
     <sql id="columns_alias">
         t.ORDER_ID, t.ORDER_PLAN_ID, t.ORDER_NUMBER, t.CAPACITY_ID, t.ORDER_ISSUE_TIME, t.ORDER_RECEIVE_STATUS, 
     t.ORDER_RECEIVE_REFUSE_TIME, t.ORDER_COMMUNICATION_DURATION, t.ORDER_STATUS, t.INSERT_USERNAME, 
     t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED, 
     t.ORDER_TYPE, t.ORDER_LINE_SEQUENCE, t.LINE_ID, t.ORDER_ENTRY_TIME, t.UNLOAD_POINT_ID, 
-    t.DRIVER_CONFIRMATION, t.PRICE_ID, t.CARRIER_ID
+    t.DRIVER_CONFIRMATION, t.PRICE_ID, t.CARRIER_ID,t.RECORD_USERNAME
     </sql>
     <sql id="select">
         SELECT <include refid="columns" /> FROM OMSTRUCK_ORDER
@@ -526,6 +527,9 @@
             <if test="carrierId != null">
                 CARRIER_ID = #{carrierId,jdbcType=DECIMAL},
             </if>
+            <if test="recordUsername!=null">
+                RECORD_USERNAME=#{recordUsername,jdbcType=VARCHAR}
+            </if>
         </set>
         where ORDER_ID = #{orderId,jdbcType=DECIMAL}
     </update>