变更时，如未变更产品信息，则无需采购经理审批

hx-sale/src/main/java/com/fjhx/sale/entity/contract/dto/ContractDto.java

@@ -85,4 +85,9 @@ public class ContractDto extends Contract implements SetCustomizeAreaId {
      * 国家ID
      */
     private Long countryId;
+
+    /**
+     * 发起类型 0：正常变更  1：直接审批通过
+     */
+    private Integer startType;
 }

hx-sale/src/main/java/com/fjhx/sale/entity/contract/vo/ContractPdfInfoVo.java

@@ -22,6 +22,15 @@ public class ContractPdfInfoVo {
     private String createTimeEn;
 
     /**
+     * 创建人名称
+     */
+    private String createUserName;
+    /**
+     * 创建人名称英文
+     */
+    private String createUserNameEn;
+
+    /**
      * 运输说明
      */
     private String transportRemark;

hx-sale/src/main/java/com/fjhx/sale/entity/sample/dto/SampleDto.java

@@ -41,4 +41,9 @@ public class SampleDto extends Sample implements SetCustomizeAreaId {
      * 国家ID
      */
     private Long countryId;
+
+    /**
+     * 发起类型 0：正常变更  1：直接审批通过
+     */
+    private Integer startType;
 }

hx-sale/src/main/java/com/fjhx/sale/flow/ContractUpdateFlow.java

@@ -139,7 +139,11 @@ public class ContractUpdateFlow extends FlowDelegate {
                 }
             }
         }
-        return update(contract);
+        long contractId = update(contract);
+        if(contract.getStartType()==1){//直接审批通过
+            this.end(flowId,contractId,submitData);
+        }
+        return contractId;
     }
 
     /**

hx-sale/src/main/java/com/fjhx/sale/flow/SampleUpdateFlow.java

@@ -137,7 +137,11 @@ public class SampleUpdateFlow extends FlowDelegate {
                 }
             }
         }
-        return update(newSample);
+        long sampleId = update(newSample);
+        if(newSample.getStartType()==1){//直接审批通过
+            this.end(flowId,sampleId,submitData);
+        }
+        return sampleId;
     }
 
     /**

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -1414,6 +1414,12 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         contractPdfInfoVo.setTransportMethod(contract.getTransportMethod());
         contractPdfInfoVo.setShroffAccountId(contract.getShroffAccountId());
         contractPdfInfoVo.setAdvanceRatio(contract.getAdvanceRatio());
+
+        //赋值创建人名称
+        Map<Long, SysUser> nickNameMapByIds = UserUtil.getMapByIds(Arrays.asList(contract.getCreateUser()));
+        SysUser sysUser = nickNameMapByIds.get(contract.getCreateUser());
+        contractPdfInfoVo.setCreateUserName(sysUser.getNickName());//中文名
+        contractPdfInfoVo.setCreateUserNameEn(sysUser.getNickNameEn());//英文名
     }
 
     /**