1

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/entity/Order.java

@@ -127,6 +127,12 @@ public class Order extends Model<Order> {
     @TableField("company_signer")
     private String companySigner;
 
+    /**
+     * 负责人
+     */
+    @TableField("incharger_id")
+    private String inchargerId;
+
     /**
      * 备注
      */
@@ -187,6 +193,9 @@ public class Order extends Model<Order> {
     @TableField(exist = false)
     private String typeName;
 
+    @TableField(exist = false)
+    private String inchargerName;
+
 
     @Override
     protected Serializable pkVal() {

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/OrderServiceImpl.java

@@ -105,9 +105,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         List<Order> records = orderIPage.getRecords();
         records.forEach(r->{
             Optional<User> item = userList.stream().filter(u -> u.getId().equals(r.getCreatorId())).findFirst();
-//            if(item.isPresent()){
-//                r.setInchargerName(item.get().getName());
-//            }
+            if(item.isPresent()){
+                r.setInchargerName(item.get().getName());
+            }
             Optional<SysDict> type = sysDictOfOrderType.stream().filter(u -> u.getId().equals(r.getCreatorId())).findFirst();
             if(type.isPresent()){
                 r.setTypeName(type.get().getName());
@@ -117,7 +117,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         map.put("record",records);
         map.put("total",orderIPage.getTotal());
         msg.setData(map);
-        return null;
+        return msg;
     }
 
     //递归获取子部门

fhKeeper/formulahousekeeper/management-crm/src/main/resources/mapper/OrderMapper.xml

@@ -20,6 +20,7 @@
         <result column="un_received_payment" property="unReceivedPayment" />
         <result column="custom_signer" property="customSigner" />
         <result column="company_signer" property="companySigner" />
+        <result column="incharger_id" property="inchargerId" />
         <result column="remark" property="remark" />
         <result column="create_time" property="createTime" />
         <result column="creator_id" property="creatorId" />
@@ -33,7 +34,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, company_id, order_name, order_code, custom_id, business_opportunity_id, price, contacts_id, type, place_time, order_start_date, order_end_date, received_payment, un_received_payment, custom_signer, company_signer, remark, create_time, creator_id, is_delete, plate1, plate2, plate3, plate4, plate5
+        id, company_id, order_name, order_code, custom_id, business_opportunity_id, price, contacts_id, type, place_time, order_start_date, order_end_date, received_payment, un_received_payment, custom_signer, company_signer, incharger_id, remark, create_time, creator_id, is_delete, plate1, plate2, plate3, plate4, plate5
     </sql>
 
 </mapper>