产品认证修改

diagbotman-service/src/main/java/com/diagbot/dto/AuthDetailDTO.java

@@ -33,6 +33,11 @@ public class AuthDetailDTO implements Serializable {
      * 审核信息
      */
     private String auditStatusMsg;
+    
+    /**
+     * 不通过类型
+     */
+    private Integer rejectType;
 
     /**
      * 不通过原因

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

@@ -16,6 +16,7 @@ import com.diagbot.entity.ProductOrderIndex;
 import com.diagbot.entity.wrapper.OrderDetailsWapper;
 import com.diagbot.entity.wrapper.ProductOrderWrapper;
 import com.diagbot.enums.AuditStatusEnum;
+import com.diagbot.enums.NotPassEnum;
 import com.diagbot.enums.VisibleIdTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
@@ -94,6 +95,9 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
             products = detailMap.get(num);
             for(AuthDetailDTO i : products){
             	i.setAuditStatusMsg(AuditStatusEnum.getName(i.getAuditStatus()));
+            	if(i.getRejectType()!=null){
+            		i.setRejectReason(NotPassEnum.getName(i.getRejectType()));
+            	}
             }
             productAuthProgressDTO.setProducts(products);
             retList.add(productAuthProgressDTO);

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

@@ -50,15 +50,15 @@
 
     <select id="getOrderDetailsByNums" parameterType="list"
             resultType="com.diagbot.dto.AuthDetailDTO">
-        select
-        a.num as num,
+		select
+        b.order_num as num,
         b.audit_status as auditStatus,
         c.name as name,
+		b.reject_type as rejectType,
         b.reject_reason as rejectReason
-        from diag_product_order a join diag_order_details b on a.num=b.order_num
-        join diag_lantone_product c on b.product_id=c.id
-        where a.is_deleted = 'N' and b.is_deleted = 'N' and c.is_deleted = 'N'
-        and a.num in
+        from diag_order_details b join diag_lantone_product c on b.product_id=c.id
+        where b.is_deleted = 'N' and c.is_deleted = 'N'
+        and b.num in
         <foreach collection="list" separator="," open="(" close=")" item="num">
             #{num}
         </foreach>

user-service/src/main/java/com/diagbot/web/UserController.java

@@ -308,7 +308,7 @@ public class UserController {
         return RespDTO.onSuc(userFacade.removeById(baseIdVO.getId()));
     }
 
-    @ApiOperation(value = "控制台账户信息[by:rengb]", notes = "控制台账户信息")
+    @ApiOperation(value = "控制台账户信息[by:rengb]", notes = "控制台账户信息no")
     @PostMapping("/getConsoleUserInfo")
     @SysLogger("getConsoleUserInfo")
     public RespDTO<GetConsoleUserInfoDTO> getConsoleUserInfo() {