feat(配发模块，维修模块): 配发新增手写板，维修修复了一个文件查找不出来

dev-allot/src/main/java/com/tykj/dev/device/allot/controller/AllotBillController.java

@@ -433,6 +433,19 @@ public class AllotBillController {
             allotBillEntity.setSendUserbId(allotReceiveVo.getSendUserbId());
             allotBillEntity.setAgent(userPublicService.getOne(allotReceiveVo.getSendUserbId()).getName());
         }
+        //添加电子签名
+        if (allotReceiveVo.getSendUseraIdSignature()!=null){
+            allotBillEntity.setSendUseraIdSignature(allotReceiveVo.getSendUseraIdSignature());
+        }
+        if (allotReceiveVo.getSendUserbIdSignature()!=null){
+            allotBillEntity.setSendUserbIdSignature(allotReceiveVo.getSendUserbIdSignature());
+        }
+        if (allotReceiveVo.getReceiveUseraIdSignature()!=null){
+            allotBillEntity.setReceiveUseraIdSignature(allotReceiveVo.getReceiveUseraIdSignature());
+        }
+        if (allotReceiveVo.getReceiveUserbIdSignature()!=null){
+            allotBillEntity.setReceiveUserbIdSignature(allotReceiveVo.getReceiveUseraIdSignature());
+        }
         allotBillService.update(allotBillEntity);
         //添加当前用户为涉及人员
         taskService.addInvolveUser(taskBto, userId);
@@ -689,6 +702,19 @@ public class AllotBillController {
             allotBill.setSendUserbId(fileUploadVo.getSendUserbId());
             allotBill.setAgent(userPublicService.getOne(fileUploadVo.getSendUserbId()).getName());
         }
+        //添加电子签名
+        if(fileUploadVo.getSendUseraIdSignature() != null){
+            allotBill.setSendUseraIdSignature(fileUploadVo.getSendUseraIdSignature());
+        }
+        if(fileUploadVo.getSendUserbIdSignature() != null){
+            allotBill.setSendUserbIdSignature(fileUploadVo.getSendUserbIdSignature());
+        }
+        if(fileUploadVo.getReceiveUseraIdSignature() != null){
+            allotBill.setReceiveUseraIdSignature(fileUploadVo.getReceiveUseraIdSignature());
+        }
+        if(fileUploadVo.getReceiveUserbIdSignature() != null){
+            allotBill.setReceiveUserbIdSignature(fileUploadVo.getReceiveUseraIdSignature());
+        }
         //是否上传接收方B岗
 //        if (fileUploadVo.getReceiveUserbId()!=null){
 //            allotBill.setReceiveUserbId(fileUploadVo.getReceiveUserbId());
@@ -770,6 +796,19 @@ public class AllotBillController {
             allotBill.setReceiveUserbId(fileVo.getReceiveUserbId());
             idList.add(fileVo.getReceiveUserbId());
         }
+        //添加电子签名
+        if (fileVo.getReceiveUseraIdSignature() != null) {
+            allotBill.setReceiveUseraIdSignature(fileVo.getReceiveUseraIdSignature());
+        }
+        if (fileVo.getReceiveUserbIdSignature() != null) {
+            allotBill.setReceiveUserbIdSignature(fileVo.getReceiveUserbIdSignature());
+        }
+        if (fileVo.getSendUseraIdSignature() != null) {
+            allotBill.setSendUseraIdSignature(fileVo.getSendUseraIdSignature());
+        }
+        if (fileVo.getSendUserbIdSignature() != null) {
+            allotBill.setSendUserbIdSignature(fileVo.getSendUserbIdSignature());
+        }
         //签发人阅知
 //        if (fileVo.getSendUserbId() != null) {
 //            allotBill.setSendUserbId(fileVo.getSendUserbId());

dev-allot/src/main/java/com/tykj/dev/device/allot/subject/domin/AllotBill.java

@@ -96,21 +96,37 @@ public class AllotBill {
      */
     @ApiModelProperty(value = "发件经办人(A岗位)")
     private Integer sendUseraId;
+
+    @ApiModelProperty(value = "发件经办人(A岗位)的电子签名")
+    @Column(name = "send_usera_id_signature",columnDefinition = "TEXT")
+    private String sendUseraIdSignature;
     /**
      * 发件方审核人id(B岗位)
      */
     @ApiModelProperty(value = "发件方审核人id(B岗位)")
     private Integer sendUserbId;
+
+    @Column(name = "send_userb_id_signature",columnDefinition = "TEXT")
+    @ApiModelProperty(value = "发件方审核人id(B岗位)的电子签名")
+    private String sendUserbIdSignature;
     /**
      * 收件经办人id(A岗位)
      */
     @ApiModelProperty(value = "收件经办人id(A岗位)")
     private Integer receiveUseraId;
+
+    @ApiModelProperty(value = "收件经办人id(A岗位)的电子签名")
+    @Column(name = "receive_usera_id_signature",columnDefinition = "TEXT")
+    private String receiveUseraIdSignature;
     /**
      * 收件方审核人id(B岗位)
      */
     @ApiModelProperty(value = "收件方审核人id(B岗位)")
     private Integer receiveUserbId;
+
+    @ApiModelProperty(value = "收件方审核人id(B岗位)的电子签名")
+    @Column(name = "receive_userb_id_signature",columnDefinition = "TEXT")
+    private String receiveUserbIdSignature;
     /**
      * 出库附件文件名
      */

dev-allot/src/main/java/com/tykj/dev/device/allot/subject/vo/AllotBillSaveVo.java

@@ -56,10 +56,10 @@ public class AllotBillSaveVo {
 
 //    @NotNull(message = "sendUserbId不能为空")
 //    @Min(value = 1,message = "sendUserbId不能小于1")
-    @ApiModelProperty(value = "发件方(B岗位)")
+    @ApiModelProperty(value = "发件方(B岗位)  签发人(左上)")
     private Integer sendUserbId;
 
-    @ApiModelProperty(value = "发件经办人id(A岗位)")
+    @ApiModelProperty(value = "发件经办人id(A岗位)  经办人(左下)")
     private Integer sendUseraId;
 
 //    @ApiModelProperty(value = "签章审核方")

dev-allot/src/main/java/com/tykj/dev/device/allot/subject/vo/AllotReceiveVo.java

@@ -21,11 +21,26 @@ public class AllotReceiveVo {
     @ApiModelProperty(value = "接收单位B岗")
     private Integer sendUserbId;
 
+    @ApiModelProperty(value = "发件经办人(A岗位)的电子签名")
+    private String sendUseraIdSignature;
+    @ApiModelProperty(value = "发件方审核人id(B岗位)的电子签名")
+    private String sendUserbIdSignature;
+
 //    @NotNull(message = "receiveUserbId不能为空")
 //    @Min(value = 1,message = "receiveUserbId不能小于1")
     @ApiModelProperty(value = "接收单位B岗")
     private Integer receiveUserbId;
 
+    @ApiModelProperty(value = "接收单位A岗  经办人右下")
+    private Integer receiveUseraId;
+
+    @ApiModelProperty(value = "收件经办人id(A岗位)的电子签名")
+    private String receiveUseraIdSignature;
+
+    @ApiModelProperty(value = "收件方审核人id(B岗位)的电子签名")
+    private String receiveUserbIdSignature;
+
+
     @NotNull(message = "taskId不能为空")
     @Min(value = 1,message = "taskId不能小于1")
     @ApiModelProperty(value = "任务Id")

dev-allot/src/main/java/com/tykj/dev/device/allot/subject/vo/FileUploadVo.java

@@ -39,6 +39,21 @@ public class FileUploadVo {
     @ApiModelProperty(value = "接收单位B岗")
     private Integer receiveUserbId;
 
+    @ApiModelProperty(value = "接收单位A岗  经办人右下")
+    private Integer receiveUseraId;
+
+    @ApiModelProperty(value = "发件经办人(A岗位)的电子签名")
+    private String sendUseraIdSignature;
+
+    @ApiModelProperty(value = "发件方审核人id(B岗位)的电子签名")
+    private String sendUserbIdSignature;
+
+    @ApiModelProperty(value = "收件经办人id(A岗位)的电子签名")
+    private String receiveUseraIdSignature;
+
+    @ApiModelProperty(value = "收件方审核人id(B岗位)的电子签名")
+    private String receiveUserbIdSignature;
+
     @ApiModelProperty(value = "接收方配发单")
     private List<FileRet> receiveFileList;
 }

dev-allot/src/main/java/com/tykj/dev/device/allot/subject/vo/FileVo.java

@@ -28,12 +28,30 @@ public class FileVo {
     @ApiModelProperty(value = "是否上传单据（0：否，1：是）")
     private Integer status;
 
-    @ApiModelProperty(value = "接收单位A岗")
+    @ApiModelProperty(value = "接收单位A岗  经办人右下")
     private Integer receiveUseraId;
 
-    @ApiModelProperty(value = "接收单位B岗")
+    @ApiModelProperty(value = "收件经办人id(A岗位)的电子签名")
+    private String receiveUseraIdSignature;
+
+    @ApiModelProperty(value = "接收单位B岗 经办人右上")
     private Integer receiveUserbId;
 
+    @ApiModelProperty(value = "收件方审核人id(B岗位)的电子签名")
+    private String receiveUserbIdSignature;
+
+    /**
+     * 发件方审核人id(B岗位)
+     */
+
+    @ApiModelProperty(value = "发件方审核人id(B岗位)的电子签名")
+    private String sendUserbIdSignature;
+
     @ApiModelProperty(value = "接收单位B岗")
     private Integer sendUserbId;
+
+    @ApiModelProperty(value = "发件经办人(A岗位)的电子签名")
+    private String sendUseraIdSignature;
+
+
 }

dev-repair/src/main/java/com/tykj/dev/device/repair/service/impl/RepairBackBillServiceImpl.java

@@ -7,6 +7,7 @@ import com.tykj.dev.blockcha.subject.service.BlockChainUtil;
 import com.tykj.dev.config.TaskBeanConfig;
 import com.tykj.dev.config.base.FileName;
 import com.tykj.dev.device.file.entity.FileRet;
+import com.tykj.dev.device.file.service.FilesUtil;
 import com.tykj.dev.device.repair.repository.RepairBackBillDao;
 import com.tykj.dev.device.repair.service.RepairBackBillService;
 import com.tykj.dev.device.repair.subject.domin.RepairBackBill;
@@ -122,9 +123,9 @@ public class RepairBackBillServiceImpl implements RepairBackBillService {
         Integer billId = taskService.get(taskId).getBillId();
         RepairBackBill repairBackBill = getOne(billId);
         //收件方签收单集合
-        map.put(FileName.SIGN.name,repairBackBill.getReceiveFileList());
+        map.put(FileName.SIGN.name, FilesUtil.stringFileToList(repairBackBill.getReceiveFiles()));
         //发件方回执单集合
-        map.put(FileName.RECEIPT.name,repairBackBill.getSendFileList());
+        map.put(FileName.RECEIPT.name,FilesUtil.stringFileToList(repairBackBill.getSendFiles()));
         return map;
     }