fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionServiceImpl.java

@@ -1063,6 +1063,15 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
 
     private boolean isXueJianQuestionStart(String content,Integer type,List<String> alKeyList) {
         content = dealTxt(content);
+        if (content.startsWith("一、单项选择题")) {
+            return true;
+        }
+        if (content.startsWith("二、多项选择题")) {
+            return true;
+        }
+        if (content.startsWith("三、实务操作和案例分析题")) {
+            return true;
+        }
         if (Validator.isNotEmpty(content)) {
             if(type==5){
                 if(alKeyList.contains(content)){
@@ -1991,6 +2000,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                 boolean hasError = false;
                 for (XWPFParagraph paragraph : paragraphList) {
                     content = paragraph.getText();
+                    System.out.println(content);
                     List<XWPFRun> runs = paragraph.getRuns();
                     imgUrl = null;
                     for (XWPFRun run : runs) {

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderAddBo.java

@@ -42,7 +42,7 @@ public class OrderAddBo {
     @ApiModelProperty("支付时间")
     private Long payTime;
     /** 支付平台 1微信 2支付宝 */
-    @ApiModelProperty("支付平台 1微信 2支付宝")
+    @ApiModelProperty("支付平台  1微信 2支付宝 3金币 4现金 5网银支付6协议7对公转账")
     private Integer payType;
     /** 微信流水号 */
     @ApiModelProperty("微信流水号")

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderInputAddBo.java

@@ -48,4 +48,7 @@ public class OrderInputAddBo {
     /** 旧业务系统订单号 */
     @ApiModelProperty("旧业务系统订单号")
     private String oldOrderSn;
+    /** 录单来源 1普通录单 2新B端下单  3旧B端下单 */
+    @ApiModelProperty("录单来源 1普通录单 2新B端下单  3旧B端下单")
+    private Integer inputFrom;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderInputEditBo.java

@@ -55,4 +55,7 @@ public class OrderInputEditBo {
     /** 旧业务系统订单号 */
     @ApiModelProperty("旧业务系统订单号")
     private String oldOrderSn;
+    /** 录单来源 1普通录单 2新B端下单  3旧B端下单 */
+    @ApiModelProperty("录单来源 1普通录单 2新B端下单  3旧B端下单")
+    private Integer inputFrom;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderInputQueryBo.java

@@ -73,4 +73,7 @@ public class OrderInputQueryBo extends BaseEntity {
 	/** 订单来源 1业务员录单 */
 	@ApiModelProperty("订单来源 1业务员普通单 2祥粤云学堂小程序 3祥粤云学堂网站 4祥粤e管证小程序 5业务员录单")
 	private Integer orderFrom;
+	/** 录单来源 1普通录单 2新B端下单  3旧B端下单 */
+	@ApiModelProperty("录单来源 1普通录单 2新B端下单  3旧B端下单")
+	private Integer inputFrom;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/OrderInput.java

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.order.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
@@ -48,4 +49,6 @@ private static final long serialVersionUID=1L;
     private Long projectId;
     /** 旧业务系统订单号 */
     private String oldOrderSn;
+    /** 录单来源 1普通录单 2B端下单 */
+    private Integer inputFrom;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderInputServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.order.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.goods.domain.Goods;
@@ -92,6 +93,9 @@ public class OrderInputServiceImpl extends ServiceImpl<OrderInputMapper, OrderIn
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
+        if(Validator.isEmpty(add.getInputFrom())){
+            add.setInputFrom(1);
+        }
         this.save(add);
         return add.getInputOrderSn();
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderInputVo.java

@@ -109,4 +109,8 @@ public class OrderInputVo {
 	@Excel(name = "旧业务系统订单号")
 	@ApiModelProperty("旧业务系统订单号")
 	private String oldOrderSn;
+	/** 录单来源 1普通录单 2B端下单 */
+	@Excel(name = "录单来源 1普通录单 2新B端下单  3旧B端下单")
+	@ApiModelProperty("录单来源 1普通录单 2新B端下单  3旧B端下单")
+	private Integer inputFrom;
 }

zhongzheng-system/src/main/resources/mapper/modules/order/OrderInputMapper.xml

@@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="businessId" column="business_id"/>
         <result property="projectId" column="project_id"/>
         <result property="oldOrderSn" column="old_order_sn"/>
+        <result property="inputFrom" column="input_from"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.order.vo.OrderInputVo" id="OrderInputVoResult">
@@ -48,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="goodsType" column="goods_type"/>
         <result property="goodsRealPrice" column="goods_real_price"/>
         <result property="oldOrderSn" column="old_order_sn"/>
+        <result property="inputFrom" column="input_from"/>
     </resultMap>
 
     <select id="selectList" parameterType="com.zhongzheng.modules.order.bo.OrderInputQueryBo" resultMap="OrderInputVoResult">