成品外购第一个审批人是申请人，防止审批要素knttp没有赋值。

topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/application/impl/SapPurchaseOrderApplicationImpl.java

@@ -149,15 +149,11 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
     protected Map<String, Object> getProcessBizParams(String bizId) {
         // 返回业务数据给流程实例
         SapPurchaseOrder purchaseOrder = sapPurchaseOrderRepository.getOne(bizId);
-        Map<String, Object> map = ClassHelper.toMap(purchaseOrder);
-        List<SapPurchaseOrderItem> purchaseOrderItems = sapPurchaseOrderItemApplication.getPurchaseOrderItems(bizId);
-        Set<String> collect = purchaseOrderItems.stream().map(SapPurchaseOrderItem::getKnttp).collect(Collectors.toSet());
-        String next = "";
-        if (collect.iterator().hasNext()){
-            next = collect.iterator().next();
+        if (StringUtil.isBlank(purchaseOrder.getKnttp())) {
+            //防止审批要素knttp没有赋值。
+            purchaseOrder.setKnttp("无");
         }
-        map.put("knttp",next);
-        return map;
+        return ClassHelper.toMap(purchaseOrder);
     }
     /**
      * 流程撤销事件
@@ -332,25 +328,9 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
                 //审批要素不能为空，赋值E
                 retpo = "E";
             }
+            sapPurchaseOrder.setKnttp(approvalItemVo.getKnttp());
         }
         sapPurchaseOrder.setRetpo(retpo);
-            //初始化用户信息
-          /*  String createdById = "5EEB2DC861694A65933CB4CE9A8D870A@C18E23AAAA6940E09DF7C122332C51E0";
-            Operator operator = operatorApplication.createOperatorByPersonMemberId(createdById);
-            sapPurchaseOrder.setDefaultValues(new OrgUnit(operator.getFullId(), operator.getFullName()));
-
-            Map<String, Object> formData = BeanUtil.beanToMap(sapPurchaseOrder);
-            String bizId = sapPurchaseApprovalApplication.startProcessInstance(SapPurchaseOrderApplication.PROCESS_DEFINITION_KEY, formData);
-            sapPurchaseOrder.setId(bizId);
-            //映射双方字段
-            sapPurchaseOrder.setFillinDate(sapPurchaseOrderVo.getAedat());
-            */
-            //发起流程
-           // String nextCode = codeGenerator.getNextCode("sapPurchaseOrder");
-           // sapPurchaseOrder.setBillCode(nextCode);
-           // sapPurchaseOrder =mannualStartWorkflow(sapPurchaseOrder);
-          //  sapPurchaseOrder = this.sapPurchaseOrderRepository.save(sapPurchaseOrder);
-          //  purchaseOrderId = sapPurchaseOrder.getId();
         if (CollectionUtils.isEmpty(purchaseOrders)) {
             //存在也新建 04.28注释的    05.11 把存在的作废掉
             purchaseOrderId=mannualStartWorkApplication.startWorkflow(sapPurchaseOrder,PROCESS_DEFINITION_KEY,"sapPurchaseOrder");

topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/domain/SapPurchaseOrder.java

@@ -175,6 +175,12 @@ public class SapPurchaseOrder extends FlowBillAbstractEntity {
     @Column(name = "HEAD_TEXT")
     private String headText;
 
+    /**
+     * 科目分配类别
+     */
+    @Column(name = "KNTTP")
+    private String knttp;
+
     @Override
     protected String getCodeRuleId() {
         return "sapPurchaseOrder";

topsun/src/main/resources/config/topsun/base/function.xml

@@ -97,7 +97,7 @@
 		<!--根据单据ID查询申请人-->
 		<sql name="findPurchaseOrderPersonMember">
 			SELECT o.FULL_ID, o.FULL_NAME
-			FROM sa_oporg o LEFT JOIN sap_purchase_order t ON t.person_member_id = o.id WHERE t.id = ?
+			 FROM sa_oporg o LEFT JOIN sap_purchase_order t ON t.person_member_id = o.id WHERE t.id = ?
 		</sql>
 	</query>
 </query-mappings>
\ No newline at end of file

topsun/src/main/resources/config/topsun/sap/sapPurchaseOrder/sapPurchaseOrder.xml

@@ -2,9 +2,7 @@
 <query-mappings>
     <query name="sapPurchaseOrderList" label="SAP采购审批" table="sap_purchase_order">
         <sql-query>
-            SELECT t.*, oi.KNTTP FROM sap_purchase_order t
-             LEFT JOIN ( SELECT oi.purchase_order_id, group_concat( oi.KNTTP SEPARATOR ',' ) AS KNTTP FROM sap_purchase_order_item oi GROUP BY oi.purchase_order_id ) oi ON t.id = oi.purchase_order_id
-             where 1=1
+            SELECT t.* from sap_purchase_order t where 1=1
         </sql-query>
         <condition column="bill_code" name="billCode" type="java.lang.String" symbol="like" alias="t"/>
         <condition column="ebeln" name="ebeln" type="java.lang.String" symbol="like" alias="t"/>