更新

dev-file/src/main/java/com/tykj/dev/device/file/service/FilesUtil.java

@@ -17,13 +17,13 @@ public class FilesUtil {
     public static List<FileRet> stringFileToList(String fileString){
         if (fileString!=null) {
             List<FileRet> fileRetList = new ArrayList<>();
-            FileRet fileRet = new FileRet();
             String[] fileRets = fileString.substring(3).split("<\\*>");
             List<String> strings = Arrays.asList(fileRets);
             strings.forEach(
                     file -> {
                         System.out.println(file);
                         String[] files = file.split(",");
+                        FileRet fileRet = new FileRet();
                         fileRet.setName(files[0]);
                         fileRet.setFilePath(files[1]);
                         fileRet.setPreviewPath(files[2]);
@@ -48,8 +48,8 @@ public class FilesUtil {
        return fileString.toString();
     }
     public static void main(String[] args) {
-        stringFileToList("<*>123123,123123,123123");
-        stringFileToList(stringFileToList("<*>123123,123123,123123"));
+        stringFileToList("<*>123123,123123,123123<*>222,222,222");
+        stringFileToList(stringFileToList("<*>123123,123123,123123<*>222,222,222"));
     }
 
 }

dev-storage/src/main/java/com/tykj/dev/device/storage/subject/vo/StorageBillSaveVo.java

@@ -4,11 +4,12 @@ import com.tykj.dev.device.file.entity.FileRet;
 import com.tykj.dev.device.file.service.FilesUtil;
 import com.tykj.dev.device.library.subject.vo.DeviceLibrarySaveVo;
 import com.tykj.dev.device.storage.subject.domin.StorageBill;
+import com.tykj.dev.misc.base.BeanHelper;
 import com.tykj.dev.misc.utils.JacksonUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springframework.beans.BeanUtils;
+import org.modelmapper.ModelMapper;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
@@ -100,8 +101,9 @@ public class StorageBillSaveVo {
     private List<StorageBillDetailVo> storageBillDetailVos = new ArrayList<>();
 
     public StorageBill toDo() {
-        StorageBill storageBillEntity = new StorageBill();
-        BeanUtils.copyProperties(this, storageBillEntity);
+        //modelMap复制
+        ModelMapper mapper = BeanHelper.getUserMapper();
+        StorageBill storageBillEntity = mapper.map(this, StorageBill.class);
         storageBillEntity.setStorageStatus(2);
         storageBillEntity.setStorageDetail("x");
         storageBillEntity.setPackingDetail(JacksonUtil.toJSon(storageBillDetailVos));

dev-task/src/main/java/com/tykj/dev/device/task/service/impl/TaskServiceImpl.java

@@ -587,7 +587,8 @@ public class TaskServiceImpl implements TaskService {
                         boolean userConfirm2 = taskBto.getInvolveUserIdList().get(taskBto.getCurrentPoint()) == -1;
                         boolean pointExists = taskBto.getCurrentPoint() < taskBto.getInvolveUserIdList().size();
                         boolean userConfirm = userId.equals(taskBto.getInvolveUserIdList().get(taskBto.getCurrentPoint()));
-                        return unitExists && pointExists && !userConfirm && !userConfirm2;
+                        boolean isDraft = taskBto.getBillStatus()==201||taskBto.getBillStatus()==333;
+                        return unitExists && pointExists && !userConfirm && !userConfirm2 && !isDraft;
                     })
                     .collect(Collectors.toList());
             //涉及人员当前指针为-1，且所属单位为当前单位