update

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentPaymentRouteOrder.java

@@ -3,6 +3,8 @@ package com.ym.mec.biz.dal.entity;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import com.alibaba.fastjson.JSONObject;
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.enums.AuditStatusEnum;
 
 public class StudentPaymentRouteOrder {
@@ -65,6 +67,14 @@ public class StudentPaymentRouteOrder {
     private Integer createBy;
     
     private Integer updateBy;
+    
+    private CooperationOrgan cooperationOrgan = new CooperationOrgan();
+    
+    private SysUser student = new SysUser();
+    
+    private SysUser operator = new SysUser();
+    
+    private Organization organ = new Organization();
 
     public Long getId() {
         return id;
@@ -233,4 +243,36 @@ public class StudentPaymentRouteOrder {
 	public void setUpdateBy(Integer updateBy) {
 		this.updateBy = updateBy;
 	}
+
+	public CooperationOrgan getCooperationOrgan() {
+		return cooperationOrgan;
+	}
+
+	public void setCooperationOrgan(CooperationOrgan cooperationOrgan) {
+		this.cooperationOrgan = cooperationOrgan;
+	}
+
+	public SysUser getStudent() {
+		return student;
+	}
+
+	public void setStudent(SysUser student) {
+		this.student = student;
+	}
+
+	public SysUser getOperator() {
+		return operator;
+	}
+
+	public void setOperator(SysUser operator) {
+		this.operator = operator;
+	}
+
+	public Organization getOrgan() {
+		return organ;
+	}
+
+	public void setOrgan(Organization organ) {
+		this.organ = organ;
+	}
 }

mec-biz/src/main/resources/config/mybatis/StudentPaymentRouteOrderMapper.xml

@@ -22,8 +22,8 @@
         <result column="audit_status_" property="auditStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
         <result column="audit_comment_" property="auditComment"/>
         <result column="create_time_" property="createTime"/>
-        <result column="create_by_" property="updateTime"/>
-        <result column="update_time_" property="createBy"/>
+        <result column="create_by_" property="createBy"/>
+        <result column="update_time_" property="updateTime"/>
         <result column="update_by_" property="updateBy"/>
     </resultMap>
 
@@ -39,16 +39,26 @@
         <result column="fee_flag_" property="feeFlag"/>
     </resultMap>
 
+    <resultMap id="StudentPaymentRouteOrderMap" type="com.ym.mec.biz.dal.entity.StudentPaymentRouteOrder" extends="StudentPaymentRouteOrder">
+        <result column="username_" property="student.username"/>
+        <result column="phone_" property="student.phone"/>
+        <result column="school_name_" property="cooperationOrgan.name"/>
+        <result column="organ_name_" property="organ.name"/>
+        <result column="operator_name_" property="operator.username"/>
+    </resultMap>
+
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
         id_, route_organ_id_, route_amount_,route_balance_amount_, mer_no_, order_no_, fee_flag_,user_id_,school_id_,trans_no_,pay_time_,sale_amount_,service_amount_,memo_,goods_json_,audit_status_,audit_comment_,create_time_,create_by_,update_time_,update_by_
     </sql>
-    <select id="get" parameterType="java.lang.Long" resultMap="StudentPaymentRouteOrder">
+    <select id="get" parameterType="java.lang.Long" resultMap="StudentPaymentRouteOrderMap">
         <!--@mbg.generated-->
-        select
-        <include refid="Base_Column_List"/>
-        from student_payment_route_order
-        where id_ = #{id}
+       SELECT spro.*,u.username_,u.phone_,s.name_ school_name_,o.name_ organ_name_,ou.username_ operator_name_ FROM student_payment_route_order spro
+        left join sys_user u on spro.user_id_ = u.id_
+        left join sys_user ou on ou.id_ = spro.create_by_
+        left join school s on s.id_ = spro.school_id_
+        left join organization o on o.id_ = spro.route_organ_id_
+        where spro.id_ = #{id}
     </select>
     <delete id="delete" parameterType="java.lang.Long">
         <!--@mbg.generated-->
@@ -141,8 +151,8 @@
     </insert>
 
     <select id="queryPageOrder" parameterType="map" resultMap="StudentPaymentRouteOrderDto">
-        SELECT spo.*,spro.*,u.username_,u.phone_ FROM student_payment_order spo
-        LEFT JOIN student_payment_route_order spro ON spo.order_no_ = spro.order_no_
+        SELECT spo.*,spro.*,u.username_,u.phone_ FROM student_payment_route_order spro
+        LEFT JOIN student_payment_order spo ON spo.order_no_ = spro.order_no_
         left join sys_user u on spo.user_id_ = u.id_
         <include refid="queryPaymentOrder"/>
         ORDER BY spo.id_ DESC
@@ -164,8 +174,8 @@
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int" parameterType="map">
-        SELECT COUNT(spo.id_) FROM student_payment_order spo
-        LEFT JOIN student_payment_route_order spro ON spo.order_no_ = spro.order_no_
+        SELECT COUNT(spo.id_) FROM student_payment_route_order spro
+        LEFT JOIN student_payment_order spo ON spo.order_no_ = spro.order_no_
         LEFT JOIN sys_user u on spo.user_id_ = u.id_
         <include refid="queryPaymentOrder"/>
     </select>
@@ -329,9 +339,12 @@
 		order by spro.id_ desc
 	</select>
 
-	<select id="queryAuditPage" parameterType="map" resultMap="StudentPaymentRouteOrderDto">
-		SELECT spro.*,u.username_,u.phone_ FROM student_payment_route_order spro
+	<select id="queryAuditPage" parameterType="map" resultMap="StudentPaymentRouteOrderMap">
+		SELECT spro.*,u.username_,u.phone_,s.name_ school_name_,o.name_ organ_name_,ou.username_ operator_name_ FROM student_payment_route_order spro
         left join sys_user u on spro.user_id_ = u.id_
+        left join sys_user ou on ou.id_ = spro.create_by_
+        left join cooperation_organ s on s.id_ = spro.school_id_
+        left join organization o on o.id_ = spro.route_organ_id_
         <where>
         	<if test="transNo != null and transNo != ''">
         		and spro.trans_no_ = #{transNo}
@@ -345,10 +358,10 @@
         	<if test="type != null and type != ''">
         		and
         		<if test="type == 'SERVICE'">
-        			spro.service_amount_ is not null
+        			(spro.service_amount_ is not null or spro.service_amount_ = 0) 
         		</if>
         		<if test="type == 'SELL'">
-        			spro.sale_amount_ is not null
+        			(spro.sale_amount_ is not null or spro.sale_amount_ = 0)
         		</if>
         	</if>
         </where>

mec-web/src/main/java/com/ym/mec/web/controller/StudentPaymentRouteOrderController.java

@@ -108,15 +108,16 @@ public class StudentPaymentRouteOrderController extends BaseController {
             }
         }
 
-        return succeed(studentPaymentRouteOrderService.queryPage(queryInfo));
+        return succeed(studentPaymentRouteOrderService.queryAuditList(queryInfo));
     }
 
     @ApiOperation(value = "财务订单列表")
     @GetMapping("/query")
     @PreAuthorize("@pcs.hasPermissions('routeOrder/query')")
     public HttpResponseResult<StudentPaymentRouteOrder> query(Long id) {
-
-        return succeed(studentPaymentRouteOrderService.get(id));
+    	StudentPaymentRouteOrder studentPaymentRouteOrder = studentPaymentRouteOrderService.get(id);
+    	
+        return succeed(studentPaymentRouteOrder);
     }