fix 录单

zhongzheng-admin/src/main/java/com/zhongzheng/controller/order/OrderController.java

@@ -4,6 +4,7 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 
+import cn.hutool.core.lang.Validator;
 import com.zhongzheng.common.core.domain.model.LoginUser;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.SecurityUtils;
@@ -134,8 +135,12 @@ public class OrderController extends BaseController {
     @PostMapping("/inputOrder")
     public AjaxResult addInputOrder(@RequestBody OrderAddBo bo) {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setCreateSysUserId(loginUser.getUser().getUserId());
-        bo.setCreateBy(SecurityUtils.getUsername());
+        if(Validator.isEmpty(bo.getCreateUsername())){
+            bo.setCreateSysUserId(loginUser.getUser().getUserId());
+            bo.setCreateBy(SecurityUtils.getUsername());
+        }else{
+            bo.setCreateSysUserId(-1L);  //老业务系统下单标识
+        }
         return AjaxResult.success(iOrderService.placePlatInputOrder(bo));
     }
 

zhongzheng-admin/src/main/java/com/zhongzheng/controller/order/OrderInputController.java

@@ -3,6 +3,7 @@ package com.zhongzheng.controller.order;
 import java.util.List;
 import java.util.Arrays;
 
+import cn.hutool.core.lang.Validator;
 import com.zhongzheng.common.core.domain.model.LoginUser;
 import com.zhongzheng.common.utils.SecurityUtils;
 import com.zhongzheng.common.utils.ServletUtils;
@@ -81,8 +82,12 @@ public class OrderInputController extends BaseController {
     @PostMapping()
     public AjaxResult<String> add(@RequestBody OrderInputAddBo bo) {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setCreateSysUserId(loginUser.getUser().getUserId());
-        bo.setCreateUsername(SecurityUtils.getUsername());
+        if(Validator.isEmpty(bo.getCreateUsername())){
+            bo.setCreateSysUserId(loginUser.getUser().getUserId());
+            bo.setCreateUsername(SecurityUtils.getUsername());
+        }else{
+            bo.setCreateSysUserId(-1L);  //老业务系统下单标识
+        }
         return AjaxResult.success("录单单号",iOrderInputService.insertByAddBo(bo));
     }
 

zhongzheng-system/src/main/resources/mapper/modules/bank/ExamMapper.xml

@@ -125,7 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="examPaperId != null and examPaperId != ''">
             AND e.exam_paper_id = #{examPaperId}
         </if>
-        <if test="publishStatus != null and publishStatus != ''">
+        <if test="publishStatus != null ">
             AND e.publish_status = #{publishStatus}
         </if>
         <if test="examName != null and examName != ''">