[feat] 巡检签收单添加多人签字的字段

[fix] 修复空指针异常

src/main/java/vion/dto/FormDTO.java

@@ -29,7 +29,7 @@ public class FormDTO extends BaseDTO {
     /**
      * 具体内容
      */
-    private String info;
+    private Object info;
 
     /**
      * 签字图片
@@ -37,6 +37,11 @@ public class FormDTO extends BaseDTO {
     private String signPic;
 
     /**
+     * 存放多人签名
+     */
+    private Object signJson;
+
+    /**
      * 签字时间
      */
     private LocalDateTime signTime;

src/main/java/vion/model/Form.java

@@ -48,7 +48,7 @@ public class Form {
      * 具体内容
      */
     @TableField(value = "info", typeHandler = JsonbTypeHandler.class)
-    private String info;
+    private Object info;
 
     /**
      * 签字图片
@@ -57,6 +57,12 @@ public class Form {
     private String signPic;
 
     /**
+     * 存放多人签名
+     */
+    @TableField(value = "sign_json", typeHandler = JsonbTypeHandler.class)
+    private Object signJson;
+
+    /**
      * 签字时间
      */
     @TableField(value = "sign_time")

src/main/java/vion/service/impl/StoreServiceImpl.java

@@ -146,7 +146,7 @@ public class StoreServiceImpl extends MPJBaseServiceImpl<StoreMapper, Store> imp
                         .select(Contract::getId, Contract::getName, Contract::getContractNo, Contract::getType, Contract::getSignDate, Contract::getWarrantyPeriod, Contract::getFinalDate, Contract::getStatus, Contract::getSaleName, Contract::getCustomerName, Contract::getMaintainSdate, Contract::getMaintainEdate)
                         .in(Contract::getId, l).list())
                 .map(contractList -> contractList.stream().collect(Collectors.toMap(Contract::getId, Function.identity())))
-                .orElse(Map.of());
+                .orElse(MapUtil.empty());
 
         // contractId -> 合同付款约定
         var contractId2CpMap = Opt.ofEmptyAble(contractIdList)
@@ -442,7 +442,7 @@ public class StoreServiceImpl extends MPJBaseServiceImpl<StoreMapper, Store> imp
         var contractStoreList = contractStoreService.lambdaQuery().in(RContractStore::getStoreId, storeIdList).list();
         var contractIdList = contractStoreList.stream().map(RContractStore::getContractId).toList();
         return fileService.lambdaQuery()
-                .in(FileInfo::getSourceId, contractIdList)
+                .in(FileInfo::getSourceId, CollUtil.defaultIfEmpty(contractIdList, List.of(-1L)))
                 .in(FileInfo::getStoreId, -1L)
                 .in(FileInfo::getSourceType, 7, 8, 9, 10, 11, 12, 13, 14, 33, 34)
                 .list();
@@ -453,7 +453,7 @@ public class StoreServiceImpl extends MPJBaseServiceImpl<StoreMapper, Store> imp
         var contractStoreList = contractStoreService.lambdaQuery().in(RContractStore::getStoreId, storeIdList).list();
         var contractIdList = contractStoreList.stream().map(RContractStore::getContractId).toList();
         var fileList = fileService.lambdaQuery()
-                .in(FileInfo::getSourceId, contractIdList)
+                .in(FileInfo::getSourceId, CollUtil.defaultIfEmpty(contractIdList, List.of(-1L)))
                 .in(FileInfo::getStoreId, -1L)
                 .in(FileInfo::getSourceType, 7, 8, 9, 10, 11, 12, 13, 14, 33, 34)
                 .list();

src/main/java/vion/vo/FormVO.java

@@ -32,7 +32,7 @@ public class FormVO {
     /**
      * 具体内容
      */
-    private String info;
+    private Object info;
 
     /**
      * 签字图片
@@ -40,6 +40,11 @@ public class FormVO {
     private String signPic;
 
     /**
+     * 存放多人签名
+     */
+    private Object signJson;
+
+    /**
      * 签字时间
      */
     private LocalDateTime signTime;