Merge branch 'develop_tzs_bugfix' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/DataDockServiceImpl.java

@@ -1540,7 +1540,7 @@ public class DataDockServiceImpl {
      * @param rowError
      */
     public void checkPipeSpecifications(String item, String errorMessage, StringBuffer rowError) {
-        String regex = "^\\d(\\d*[.]?\\d*)([-/]\\d*[.]?\\d*)?$";
+        String regex = "^(?:0|[1-9]\\d*(?:[.]\\d*)?)((?:[-/](?:0[.]\\d+|[1-9]\\d*(?:[.]\\d*)?))?)+$";
         if (!item.matches(regex)) {
             rowError.append(errorMessage);
         }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgReformNoticeServiceImpl.java

@@ -725,7 +725,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                 .taskContent(String.format("来自%s的业务办理，【申请单号：%s】", item.getEquListName(), item.getApplyNo()))
                 .taskDesc(String.format("来自%s的业务办理，【申请单号：%s】", item.getEquListName(), item.getApplyNo()))
                 .startUserId(item.getCreateUserId()).startUser(item.getCreateUserName())
-                .startUserCompanyName(item.getCreateUserCompanyName())
+                .startUserCompanyName(item.getInstallUnitName())
                 .startDate(item.getCreateDate())
                 .model(taskMessageDto)
                 .nextExecuteUser(item.getNextExecuteIds())
@@ -1286,7 +1286,27 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
     private void createNewTodo(JgReformNotice transfer, WorkflowResultDto workflowResultDto, TaskV2Model taskV2Model, FlowStatusEnum statusEnum) {
         TaskMessageDto taskMessageDto = new TaskMessageDto();
         BeanUtil.copyProperties(transfer, taskMessageDto);
-        TaskModelDto taskModelDto = TaskModelDto.builder().flowCreateDate(taskV2Model.getFlowCreateDate()).taskName(workflowResultDto.getNextTaskName()).taskCode(taskV2Model.getTaskCode()).taskType(taskV2Model.getTaskType()).taskTypeLabel(taskV2Model.getTaskTypeLabel()).relationId(taskV2Model.getRelationId()).executeUserIds(workflowResultDto.getNextExecutorUserIds()).taskStatusLabel(statusEnum.getName()).flowStatus(statusEnum.getCode()).flowCode(workflowResultDto.getNextTaskId()).flowStatusLabel(statusEnum.getName()).taskContent(String.format("来自%s的业务办理，【申请单号：%s】", transfer.getEquListName(), transfer.getApplyNo())).taskDesc(String.format("来自%s的业务办理，【申请单号%s】", transfer.getEquList(), transfer.getApplyNo())).startUserCompanyName(transfer.getCreateUserCompanyName()).startUserId(taskV2Model.getStartUserId()).startUser(taskV2Model.getStartUser()).startDate(taskV2Model.getStartDate()).model(taskMessageDto).pageType(statusEnum.getCode() == 6614 ? "edit" : "look").nextExecuteUser(workflowResultDto.getNextExecutorRoleIds()).build();
+        TaskModelDto taskModelDto = TaskModelDto.builder()
+                .flowCreateDate(taskV2Model.getFlowCreateDate())
+                .taskName(workflowResultDto.getNextTaskName())
+                .taskCode(taskV2Model.getTaskCode())
+                .taskType(taskV2Model.getTaskType())
+                .taskTypeLabel(taskV2Model.getTaskTypeLabel())
+                .relationId(taskV2Model.getRelationId())
+                .executeUserIds(workflowResultDto.getNextExecutorUserIds())
+                .taskStatusLabel(statusEnum.getName())
+                .flowStatus(statusEnum.getCode())
+                .flowCode(workflowResultDto.getNextTaskId())
+                .flowStatusLabel(statusEnum.getName())
+                .taskContent(String.format("来自%s的业务办理，【申请单号：%s】", transfer.getEquListName(), transfer.getApplyNo()))
+                .taskDesc(String.format("来自%s的业务办理，【申请单号%s】", transfer.getEquList(), transfer.getApplyNo()))
+                .startUserCompanyName(transfer.getInstallUnitName())
+                .startUserId(taskV2Model.getStartUserId())
+                .startUser(taskV2Model.getStartUser())
+                .startDate(taskV2Model.getStartDate())
+                .model(taskMessageDto).pageType(statusEnum.getCode() == 6614 ? "edit" : "look")
+                .nextExecuteUser(workflowResultDto.getNextExecutorRoleIds())
+                .build();
         commonService.buildTaskModel(Collections.singletonList(taskModelDto));
     }