Merge remote-tracking branch 'origin/master'

hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/workTicket/entity/WorkTicketInfoEntity.java

@@ -498,7 +498,7 @@ public class WorkTicketInfoEntity extends TenantEntity implements Serializable {
 
     @ApiModelProperty("是否线下 ： 1-线下，0-线上")
     private Boolean isOffline;
-    @ApiModelProperty("0未执行，1为执行（运行人员确认过）")
+    @ApiModelProperty("0未执行，1为执行（运行人员确认过）,3为结束")
     private String implementStatus;
     @ApiModelProperty("创建人名称")
     private String createUserName;

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/OperationTicketServiceImpl.java

@@ -395,14 +395,14 @@ public class OperationTicketServiceImpl implements OperationTicketService {
      */
     private void saveStandardTicketInfo(StandardTicketInfoVo standardTicketInfoVo) {
         StandardTicketInfoEntity standardTicketInfo = new StandardTicketInfoEntity();
+        BeanUtils.copyProperties(standardTicketInfoVo, standardTicketInfo);
        //保存前保存对应用户得姓名
-        if(ObjectUtil.isNotEmpty(standardTicketInfoVo.getCreateUser())){
             BladeUser user = AuthUtil.getUser();
             if (ObjectUtil.isNotEmpty(user.getUserName())){
                 standardTicketInfo.setCreateUserName(user.getUserName());
                 standardTicketInfo.setUpdateUserName(user.getUserName());
             }
-        }
+
         /*发令人、受令人、负责人、监护人*/
         if(ObjectUtil.isNotEmpty(standardTicketInfoVo.getIssueOrderPerson())) {
             User issueOrderPerson = UserCache.getUser(standardTicketInfoVo.getIssueOrderPerson());
@@ -413,17 +413,17 @@ public class OperationTicketServiceImpl implements OperationTicketService {
         if(ObjectUtil.isNotEmpty(standardTicketInfoVo.getAccessOrderPerson())) {
             User accessOrderPerson = UserCache.getUser(standardTicketInfoVo.getAccessOrderPerson());
             if (ObjectUtil.isNotEmpty(accessOrderPerson)){
-                standardTicketInfo.setIssueOrderPersonName(accessOrderPerson.getName());
+                standardTicketInfo.setAccessOrderPersonName(accessOrderPerson.getName());
             }
         }
 
         if(ObjectUtil.isNotEmpty(standardTicketInfoVo.getGuardian())) {
             User guardian = UserCache.getUser(standardTicketInfoVo.getGuardian());
             if (ObjectUtil.isNotEmpty(guardian)){
-                standardTicketInfo.setIssueOrderPersonName(guardian.getName());
+                standardTicketInfo.setGuardianName(guardian.getName());
             }
         }
-        BeanUtils.copyProperties(standardTicketInfoVo, standardTicketInfo);
+
         boolean save = standardTicketInfoService.save(standardTicketInfo);
         if (!save) {
             throw new ServiceException("Save failed");

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java

@@ -589,6 +589,7 @@ public class TicketProcessServiceImpl implements TicketProcessService {
             workTicket.setNextStepOperator(" ");
             workTicket.setStepOperator(" ");
             workTicket.setFlowStatus(999);
+            workTicket.setImplementStatus("3");
         } else {
             workTicket.setFlowTaskId(taskId);
             workTicket.setFlowTaskName(response.getTaskName());