Merge remote-tracking branch 'origin/dev/one' into dev/one

diagbotman-service/src/main/java/com/diagbot/entity/wrapper/ProductOrderWrapper.java

@@ -1,9 +1,10 @@
 package com.diagbot.entity.wrapper;
 
-import com.diagbot.entity.ProductOrder;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Date;
+
 /**
  * @Description:
  * @author: wangyu
@@ -11,12 +12,39 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class ProductOrderWrapper extends ProductOrder {
+public class ProductOrderWrapper{
+    /**
+     * 订单id
+     */
+    private Long id;
+
+    /**
+     * 订单编号
+     */
+    private String num;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 下单时间（申请时间）
+     */
+    private Date time;
+
+    /**
+     * 审核状态
+     */
+    private Integer auditStatus;
+
     private String username;// 用户名
+
     private String linkman;//联系人
+
     private String email;// 邮箱
+
     private Long orgId;//机构ID
+
     private String orgName;//机构名称
-    private Integer isReject; //是否通过认证
-    private Integer auStatus;  //认证状态（0：未认证，1：已认证，2：认证中）
 }

diagbotman-service/src/main/java/com/diagbot/facade/ProductOrderFacade.java

@@ -200,8 +200,6 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
 				bean.setEmail(uo.getEmail());
 				bean.setOrgId(uo.getOrgId());
 				bean.setOrgName(uo.getOrgName());
-				bean.setIsReject(uo.getIsReject());
-				bean.setAuStatus(uo.getAuStatus());
 			}
 		}
 		return RespDTO.onSuc(list);

diagbotman-service/src/main/java/com/diagbot/web/ProductOrderController.java

@@ -25,7 +25,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -132,10 +131,16 @@ public class ProductOrderController {
     }
 
     @ApiOperation(value = "产品申请——显示所有订单[by:wangyu]",
-            notes =
-                    "current:页数<br>" +
-                            "size:每页显示条数<br>" +
-                            "status:订单状态（0.未付款1.已付款）")
+            notes = "current:页数<br>" +
+                    "size:每页显示条数<br>" +
+                    "auditStatus:审核状态（0.未付款1.已付款）<br>" +
+                    "num:订单编号<br>" +
+                    "orgName:机构名称<br>" +
+                    "id:订单id<br>" +
+                    "userId:用户id<br>" +
+                    "time:下单时间<br>" +
+                    "linkman:用户名称<br>" +
+                    "username:手机号码<br>")
     @PostMapping("/getAllProductOrder")
     @SysLogger("getAllProductOrder")
     public RespDTO<List<ProductOrderWrapper>> getAllProductOrder(@RequestBody ProductOrderVO productOrderVO) {

diagbotman-service/src/main/resources/mapper/ProductOrderMapper.xml

@@ -81,7 +81,7 @@
 
     <select id="selectAllProductOrder" resultMap="BaseResultWrapper"
             parameterType="com.diagbot.entity.ProductOrderIndex">
-        SELECT * FROM diag_product_order WHERE is_deleted='N'
+        SELECT id , `num` , `user_id` , `time` , `audit_status` FROM diag_product_order WHERE is_deleted='N'
         <if test="num != null and num != ''">
             AND num=#{num}
         </if>