fix

zhongzheng-admin-business/src/main/java/com/zhongzheng/controller/covenant/BsCovenantController.java

@@ -56,6 +56,7 @@ public class BsCovenantController extends BaseController {
     public TableDataInfo<BsCovenantVo> getCovenantList(BsCovenantQueryBo bo) {
         startPage();
         bo.setListType(1);
+        bo.setFormApp(2L);
         List<BsCovenantVo> list = iBsCovenantService.queryList(bo);
         return getDataTable(list);
     }
@@ -67,6 +68,7 @@ public class BsCovenantController extends BaseController {
     public TableDataInfo<BsCovenantVo> getStopCovenantList(BsCovenantQueryBo bo) {
         startPage();
         bo.setListType(2);
+        bo.setFormApp(2L);
         List<BsCovenantVo> list = iBsCovenantService.queryList(bo);
         return getDataTable(list);
     }
@@ -78,6 +80,7 @@ public class BsCovenantController extends BaseController {
     public TableDataInfo<BsCovenantVo> getCovenantCheckList(BsCovenantQueryBo bo) {
         startPage();
         bo.setListType(3);
+        bo.setFormApp(2L);
         List<BsCovenantVo> list = iBsCovenantService.queryList(bo);
         return getDataTable(list);
     }
@@ -89,6 +92,7 @@ public class BsCovenantController extends BaseController {
     public TableDataInfo<BsCovenantVo> getStopCheckList(BsCovenantQueryBo bo) {
         startPage();
         bo.setListType(4);
+        bo.setFormApp(2L);
         List<BsCovenantVo> list = iBsCovenantService.queryList(bo);
         return getDataTable(list);
     }
@@ -100,6 +104,7 @@ public class BsCovenantController extends BaseController {
     public TableDataInfo<BsCovenantVo> getCovenantUploadList(BsCovenantQueryBo bo) {
         startPage();
         bo.setListType(5);
+        bo.setFormApp(2L);
         List<BsCovenantVo> list = iBsCovenantService.queryList(bo);
         return getDataTable(list);
     }
@@ -122,6 +127,7 @@ public class BsCovenantController extends BaseController {
     public AjaxResult<Void> add(@RequestBody BsCovenantAddBo bo) {
         ClientBsLoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
+        bo.setFormApp(2L);
         return toAjax(iBsCovenantService.insertByAddBo(bo) ? 1 : 0);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/covenant/service/impl/BsCovenantServiceImpl.java

@@ -10,6 +10,7 @@ import com.zhongzheng.common.core.domain.entity.SysMenu;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.common.utils.ToolsUtils;
 import com.zhongzheng.common.utils.file.FileUtils;
 import com.zhongzheng.common.utils.pdf.PdfUtils;
 import com.zhongzheng.common.utils.pdf.bo.BsCovenantExportVo;
@@ -50,6 +51,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.tools.Tool;
 import java.io.*;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -647,8 +649,7 @@ public class BsCovenantServiceImpl extends ServiceImpl<BsCovenantMapper, BsCoven
 
     @Override
     public String getCovenantNum() {
-        String s = DateUtils.timestampToDateFormat(DateUtils.getNowTime(), "yyyyMMddHHmmss");
-        return "XY" + s;
+        return DateUtils.getTagOrderSn("XY");
     }
 
     @Override